fixes for new version

Author: Mika

setup.py

@@ -23,7 +23,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.2.2',
+    version='1.2.3',
 
     description='An NLP library for Uralic languages such as Finnish and Sami. Also supports Arabic, Russian etc.',
     long_description=long_description,

test_uralicnlp.py

@@ -3,15 +3,17 @@
 from uralicNLP.cg3 import Cg3, Cg3Pipe
 from uralicNLP.translate import *
 from uralicNLP import dependency
+from uralicNLP.ud_tools import UD_collection
 from uralicNLP.dictionary_backends import MongoDictionary
 import re
+from mikatools import *
 
 uralicApi.get_all_forms("kissa", "N", "fin")
 
-uralicApi.get_transducer("spa", analyzer=True).lookup_optimize()
-print(uralicApi.analyze("hola", "spa"))
-print(type(uralicApi.get_transducer("spa", analyzer=True)))
-print()
+#uralicApi.get_transducer("spa", analyzer=True).lookup_optimize()
+#print(uralicApi.analyze("hola", "spa"))
+#print(type(uralicApi.get_transducer("spa", analyzer=True)))
+#print()
 #print(uralicApi.supported_languages())
 
 #uralicApi.download("fin")
@@ -52,7 +54,6 @@
 #print (uralicApi.lemmatize("livsmedel", "swe",force_local=True, word_boundaries=True))
 
 
-
 """
 for w in ["الكتاب", "الكاتب", "الميكا", "المكتوب", "كلب", "كلبين", "كلاب", "كلبتي", "كلبي", "قلب", "قلبين"]:
 	print("\n\n" +w)
@@ -64,8 +65,8 @@
 
 str = "+adj{كَلْبِيّ}+masc+sg@"
 print(re.findall(r"[ء-ي]+", str))
-
 """
+
 """
 print(uralicApi.analyze("kissa", "fin"))
 print(uralicApi.analyze("on", ["fin","olo"]))
@@ -111,4 +112,10 @@
 	for word in sentence:
 		print word.pos, word.lemma, word.get_attribute("deprel")
 	print "---"
-"""
+"""
+ud = UD_collection(open_read("test_data/fi_test.conllu"))
+sentences = ud.find_sentences(query={"lemma": "olla"}) #finds all sentences with the lemma kissa
+
+for sentence in sentences:
+    word = sentence.find(query={"lemma": "olla"})
+    print(word[0].get_attribute("form"))

uralicNLP/translate.py

@@ -76,8 +76,7 @@ def ApertiumStableTranslator():
 def ApertiumGiellateknoTranslator():
 	return ApertiumTranslator("https://gtweb.uit.no/apy/")
 
-def ApertiumJorgalTranslator():
-	return ApertiumTranslator("http://gtweb.uit.no/jorgal/apy/")
+ApertiumJorgalTranslator = ApertiumGiellateknoTranslator
 
 def ApertiumLocalhostTranslator():
 	return ApertiumTranslator("http://localhost:2737/")

uralicNLP/ud_tools.py

@@ -2,6 +2,7 @@
 import re, sys
 from copy import copy
 import codecs
+from typing import Pattern
 
 if (sys.version_info > (3, 0)):
 	#python 3
@@ -246,7 +247,7 @@ def find(self, query={}, head_query={}, match_range_tokens = False, match_empty_
 				else:
 					attr = self.get_attribute(key)
 				v = query[key]
-				if isinstance(v, re._pattern_type):
+				if isinstance(v, Pattern):
 					if v.match(attr) is None:
 						passed = False
 						break
@@ -273,7 +274,7 @@ def find(self, query={}, head_query={}, match_range_tokens = False, match_empty_
 						else:
 							attr = getattr(self, key)
 						v = head_query[key]
-						if isinstance(v, re._pattern_type):
+						if isinstance(v, Pattern):
 							if v.match(attr) is None:
 								head_pass = False
 								break