OpenGeodeWeb-Back 1.3.0rc1__tar.gz → 1.3.0rc2__tar.gz

{OpenGeodeWeb-Back-1.3.0rc1/src/OpenGeodeWeb_Back.egg-info → OpenGeodeWeb-Back-1.3.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenGeodeWeb-Back
-Version: 1.3.0rc1
+Version: 1.3.0rc2
 Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back

{OpenGeodeWeb-Back-1.3.0rc1 → OpenGeodeWeb-Back-1.3.0rc2}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "1.3.0-rc.1"
+version = "1.3.0-rc.2"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="team-web@geode-solutions.com" },

{OpenGeodeWeb-Back-1.3.0rc1 → OpenGeodeWeb-Back-1.3.0rc2/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenGeodeWeb-Back
-Version: 1.3.0rc1
+Version: 1.3.0rc2
 Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back

{OpenGeodeWeb-Back-1.3.0rc1 → OpenGeodeWeb-Back-1.3.0rc2}/src/opengeodeweb_back/geode_functions.py

@@ -110,55 +110,49 @@ def get_geode_object_output_extensions(geode_object: str):
     return output_list
 
 
-def list_input_extensions(
-    keys: list = [],
-):
-    """
-    Purpose:
-        Function that returns a list of all input extensions
-    Args:
-        keys -- Tells the function if we want the geode_objects that have a crs
-    Returns:
-        An ordered list of input file extensions
-    """
+def list_input_extensions(key: str = None):
     extensions_list = []
-
     for geode_object, value in objects_list().items():
-        if keys:
-            for key in keys:
-                if key in value:
-                    if type(value[key]) == bool and value[key] == True:
-                        pass
-                    else:
-                        continue
+        if key != None:
+            if key in value:
+                if type(value[key]) == bool:
+                    if value[key] == True:
+                        extensions_list += get_geode_object_input_extensions(
+                            geode_object
+                        )
                 else:
-                    continue
-
-        geode_object_input_extensions = get_geode_object_input_extensions(geode_object)
-        extensions_list = extensions_list + geode_object_input_extensions
+                    extensions_list += get_geode_object_input_extensions(geode_object)
+        else:
+            extensions_list += get_geode_object_input_extensions(geode_object)
 
     extensions_list = list(set(extensions_list))
     extensions_list.sort()
     return extensions_list
 
 
-def list_geode_objects(extension: str, keys: list = []):
-    """
-    Purpose:
-        Function that returns a list of objects that can handle a file, given his extension
-    Args:
-        extension -- The extension of the file
-    Returns:
-        An ordered list of object's names
-    """
-    geode_objects_list = []
+def has_creator(geode_object: str, extension: str):
+    geode_object_input_factory = get_input_factory(geode_object)
+    for input in geode_object_input_factory:
+        if input.has_creator(extension):
+            return True
+    return False
 
+
+def list_geode_objects(extension: str, key: str = None):
+    geode_objects_list = []
     for geode_object, value in objects_list().items():
-        input_factory = get_input_factory(geode_object)
-        for input in input_factory:
-            if input.has_creator(extension):
-                if geode_object not in geode_objects_list:
+        if key != None:
+            if key in value:
+                if type(value[key]) == bool:
+                    if value[key] == True:
+                        if has_creator(geode_object, extension):
+                            geode_objects_list.append(geode_object)
+                elif has_creator(geode_object, extension):
                     geode_objects_list.append(geode_object)
+        else:
+            if has_creator(geode_object, extension):
+                geode_objects_list.append(geode_object)
+
     geode_objects_list.sort()
     return geode_objects_list
 

{OpenGeodeWeb-Back-1.3.0rc1 → OpenGeodeWeb-Back-1.3.0rc2}/tests/test_functions.py

@@ -71,7 +71,7 @@ def test_get_geode_object_output_extensions():
 
 
 def test_list_input_extensions():
-    keys_array = [["crs"], ["inspector"]]
+    keys_array = ["crs", "inspector", None]
     for geode_object, value in geode_objects.objects_list().items():
         for keys in keys_array:
             input_extensions = geode_functions.list_input_extensions(keys)
@@ -79,18 +79,51 @@ def test_list_input_extensions():
 
 
 def test_list_geode_objects():
-    keys_array = [["crs"], ["inspector"]]
-    input_extensions = geode_functions.list_input_extensions()
-    for geode_object, value in geode_objects.objects_list().items():
-        for input_extension in input_extensions:
-            for keys in keys_array:
-                print(f"{input_extension=}")
-                print(f"{keys=}")
+    test_list = [
+        {
+            "key": "crs",
+            "invalid_geode_objects": [
+                "Graph",
+                "RasterImage2D",
+                "RasterImage3D",
+                "VertexSet",
+            ],
+        },
+        {
+            "key": "inspector",
+            "invalid_geode_objects": [
+                "Graph",
+                "RasterImage2D",
+                "RasterImage3D",
+                "RasterImage2D",
+                "RasterImage3D",
+                "VertexSet",
+            ],
+        },
+        {
+            "key": None,
+            "invalid_geode_objects": [],
+        },
+    ]
+    for test in test_list:
+        key = test["key"]
+        invalid_geode_objects = test["invalid_geode_objects"]
+
+        input_extensions = geode_functions.list_input_extensions(key)
+        for geode_object, value in geode_objects.objects_list().items():
+            for input_extension in input_extensions:
                 geode_objects_list = geode_functions.list_geode_objects(
-                    input_extension, keys
+                    input_extension, key
                 )
                 assert type(geode_objects_list) is list
 
+                if key != None:
+                    assert len(geode_objects_list) > 0
+                    for invalid_geode_object in invalid_geode_objects:
+                        assert invalid_geode_object not in geode_objects_list
+                else:
+                    assert len(geode_objects_list) >= 1
+
 
 def test_get_versions():
     list_packages = [
@@ -107,7 +140,5 @@ def test_get_versions():
 
 def test_get_extension_from_filename():
     extension = geode_functions.get_extension_from_filename("test.toto")
-    print(extension)
     assert type(extension) is str
-    print()
     assert extension.count(".") == 0