openmodule 10.0.6__tar.gz → 10.0.7__tar.gz

{openmodule-10.0.6 → openmodule-10.0.7}/ChangeLog

@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+v10.0.7
+-------
+
+* fix
+* schemes here and not required to load
+
 v10.0.6
 -------
 
@@ -164,11 +170,3 @@ v6.1.2
 * settings module now module instead of path, developer errors removed from non openmodule test
 * migration notice for tox.ini change [skip ci]
 * allow externals bash added for tox v4, and if fixed
-* updated tox to check for openmodule\_test imports
-* rebase on master
-* session wrapper for database session, do not allow access to 'closed' sessions
-
-v6.1.1
-------
-
-* interrupt test mixin rework

{openmodule-10.0.6 → openmodule-10.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openmodule
-Version: 10.0.6
+Version: 10.0.7
 Summary: Libraries for developing the arivo openmodule
 Home-page: https://gitlab.com/arivo-public/device-python/openmodule.git
 Author: ARIVO

{openmodule-10.0.6 → openmodule-10.0.7}/openmodule/utils/matching.py

@@ -1,5 +1,5 @@
+import copy
 import glob
-import threading
 import unicodedata
 from io import StringIO
 
@@ -28,6 +28,38 @@ replacements:
     to: "U"
 exactitude: 0.0
 """
+DEFAULT_5_STRING = """
+allowed: "0123456789ABCDEFGHIJKLMNPQRSTUVWXYZÄÖÜ"
+kept_separators: NONE
+replacements:
+- from: "O"
+  to: "0"
+exactitude: 0.4
+"""
+DEFAULT_10_STRING = """
+allowed: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜ:"
+kept_separators: NONE
+replacements:
+ - from: " "
+   to: ":"
+ - from: "-"
+   to: ":"
+ - from: "."
+   to: ":"
+exactitude: 0.6
+"""
+DEFAULT_20_STRING = """
+allowed: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜ:"
+kept_separators: FIRST
+replacements:
+ - from: " "
+   to: ":"
+ - from: "-"
+   to: ":"
+ - from: "."
+   to: ":"
+exactitude: 0.7
+"""
 
 
 class MatchingConfig(OpenModuleModel):
@@ -115,6 +147,13 @@ class PlateYaml:
 
 
 class PlateYamlSelector(object):
+    standard_schemes = {
+        "LEGACY": {0: PlateYaml("LEGACY-0.yml", LEGACY_YAML_STRING)},
+        "DEFAULT": {5: PlateYaml("DEFAULT-5.yml", DEFAULT_5_STRING),
+                    10: PlateYaml("DEFAULT-10.yml", DEFAULT_10_STRING),
+                    20: PlateYaml("DEFAULT-20.yml", DEFAULT_20_STRING)}
+    }
+
     @classmethod
     def from_config(cls, config: MatchingConfig):
         revision_path = os.path.join(os.path.dirname(config.directory), "revision")
@@ -145,8 +184,8 @@ class PlateYamlSelector(object):
             new_revision = "LOADED"
 
         if new_revision != self.revision:
+            self.schemes = copy.deepcopy(self.standard_schemes)
             yaml_filenames = glob.glob(os.path.join(self.yaml_dir, "*.yml"))
-            self.schemes.clear()
             for fn in yaml_filenames:
                 plate_yaml = PlateYaml(fn)
                 if plate_yaml.version >= 0:  # check, if loading was successful
@@ -154,16 +193,8 @@ class PlateYamlSelector(object):
                         self.schemes[plate_yaml.scheme][plate_yaml.version] = plate_yaml
                     else:
                         self.schemes[plate_yaml.scheme] = {plate_yaml.version: plate_yaml}
-            if self.schemes.get("LEGACY", {}).get(0, None) is None:
-                legacy_yaml = PlateYaml("LEGACY-0.yml", LEGACY_YAML_STRING)
-                if legacy_yaml.version < 0:
-                    raise Exception("NO LEGACY YAML COULD BE LOADED / CREATED")
-            else:
-                legacy_yaml = self.schemes["LEGACY"][0]
-                del self.schemes["LEGACY"]
-            if "DEFAULT" not in self.schemes:
-                self.schemes["DEFAULT"] = {}
-
+            legacy_yaml = self.schemes["LEGACY"][0]
+            del self.schemes["LEGACY"]
             for key in self.schemes.keys():
                 self.schemes[key][0] = legacy_yaml
 

{openmodule-10.0.6 → openmodule-10.0.7}/openmodule.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openmodule
-Version: 10.0.6
+Version: 10.0.7
 Summary: Libraries for developing the arivo openmodule
 Home-page: https://gitlab.com/arivo-public/device-python/openmodule.git
 Author: ARIVO

openmodule-10.0.7/openmodule.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "8d83058", "is_release": true}

{openmodule-10.0.6 → openmodule-10.0.7}/tests/test_utils_matching.py

@@ -297,8 +297,11 @@ class MatchingTest(unittest.TestCase):
                 pys.match_plate(p, db[0], random.randint(0, 1), random.randint(0, 1), return_only_best=False)
 
     def test_no_yamls(self):
-        pys = PlateYamlSelector("/")
-        self.assertEqual("GARIV01", pys.convert("G ARIVO 1", "A", 10))
+        pys = PlateYamlSelector("/")  # should
+        self.assertEqual("GARIV01", pys.convert("G ARIVO 1", "A", 0))
+        self.assertEqual("GARIV01", pys.convert("G ARIVO 1", "A", 5))
+        self.assertEqual("GARIVO1", pys.convert("G ARIVO 1", "A", 10))
+        self.assertEqual("G:ARIVO1", pys.convert("G ARIVO 1", "A", 20))
 
     def test_reload(self):
         tempdir = tempfile.mktemp()
@@ -310,7 +313,7 @@ class MatchingTest(unittest.TestCase):
             with open(revision_path, 'w') as f:
                 f.write("1")
             pys = PlateYamlSelector(tempdir, revision_path)
-            self.assertEqual("GARIV01", pys.convert("G ARIVO 1", "A", 10))
+            self.assertEqual("GARIVO1", pys.convert("G ARIVO 1", "A", 10))
             with open(default_10_path, "w") as f:
                 f.write("""
     allowed: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜ:-. "
@@ -320,7 +323,7 @@ class MatchingTest(unittest.TestCase):
 
             # revision did not change, no reload is happening
             pys.reload_yamls()
-            self.assertEqual("GARIV01", pys.convert("G ARIVO 1", "A", 10))
+            self.assertEqual("GARIVO1", pys.convert("G ARIVO 1", "A", 10))
 
             # change revision to trigger reload
             with open(revision_path, 'w') as f:

openmodule-10.0.6/openmodule.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "e6843ea", "is_release": true}