OpenGeodeWeb-Back 3.0.0rc5__tar.gz → 3.0.0rc7__tar.gz

{OpenGeodeWeb-Back-3.0.0rc5/src/OpenGeodeWeb_Back.egg-info → OpenGeodeWeb-Back-3.0.0rc7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenGeodeWeb-Back
-Version: 3.0.0rc5
+Version: 3.0.0rc7
 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
@@ -17,7 +17,7 @@ Requires-Dist: blinker==1.7.0
 Requires-Dist: click==8.1.7
 Requires-Dist: colorama==0.4.6
 Requires-Dist: flask[async]==3.0.0
-Requires-Dist: geode-common==30.0.3
+Requires-Dist: geode-common==30.0.4
 Requires-Dist: geode-viewables==2.1.7
 Requires-Dist: importlib-metadata==7.0.0
 Requires-Dist: itsdangerous==2.1.2
@@ -28,11 +28,11 @@ Requires-Dist: markupsafe==2.1.3
 Requires-Dist: opengeode-core==14.10.2
 Requires-Dist: opengeode-geosciences==7.3.2
 Requires-Dist: opengeode-geosciencesio==4.5.4
-Requires-Dist: opengeode-inspector==4.0.3
+Requires-Dist: opengeode-inspector==4.0.4
 Requires-Dist: opengeode-io==6.2.4
-Requires-Dist: referencing==0.31.1
+Requires-Dist: referencing==0.32.0
 Requires-Dist: rpds-py==0.13.2
-Requires-Dist: typing-extensions==4.8.0
+Requires-Dist: typing-extensions==4.9.0
 Requires-Dist: werkzeug==3.0.1
 Requires-Dist: zipp==3.17.0
 

{OpenGeodeWeb-Back-3.0.0rc5 → OpenGeodeWeb-Back-3.0.0rc7}/pyproject.toml

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

{OpenGeodeWeb-Back-3.0.0rc5 → OpenGeodeWeb-Back-3.0.0rc7}/requirements.txt

@@ -18,7 +18,7 @@ colorama==0.4.6
     # via click
 flask[async]==3.0.0
     # via -r requirements.in
-geode-common==30.0.3
+geode-common==30.0.4
     # via geode-viewables
 geode-viewables==2.1.7
     # via -r requirements.in
@@ -50,19 +50,15 @@ opengeode-geosciences==7.3.2
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-geosciencesio
-    #   opengeode-inspector
 opengeode-geosciencesio==4.5.4
-    # via
-    #   -r requirements.in
-    #   opengeode-inspector
-opengeode-inspector==4.0.3
+    # via -r requirements.in
+opengeode-inspector==4.0.4
     # via -r requirements.in
 opengeode-io==6.2.4
     # via
     #   -r requirements.in
     #   geode-viewables
-    #   opengeode-inspector
-referencing==0.31.1
+referencing==0.32.0
     # via
     #   jsonschema
     #   jsonschema-specifications
@@ -70,7 +66,7 @@ rpds-py==0.13.2
     # via
     #   jsonschema
     #   referencing
-typing-extensions==4.8.0
+typing-extensions==4.9.0
     # via asgiref
 werkzeug==3.0.1
     # via

{OpenGeodeWeb-Back-3.0.0rc5 → OpenGeodeWeb-Back-3.0.0rc7/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenGeodeWeb-Back
-Version: 3.0.0rc5
+Version: 3.0.0rc7
 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
@@ -17,7 +17,7 @@ Requires-Dist: blinker==1.7.0
 Requires-Dist: click==8.1.7
 Requires-Dist: colorama==0.4.6
 Requires-Dist: flask[async]==3.0.0
-Requires-Dist: geode-common==30.0.3
+Requires-Dist: geode-common==30.0.4
 Requires-Dist: geode-viewables==2.1.7
 Requires-Dist: importlib-metadata==7.0.0
 Requires-Dist: itsdangerous==2.1.2
@@ -28,11 +28,11 @@ Requires-Dist: markupsafe==2.1.3
 Requires-Dist: opengeode-core==14.10.2
 Requires-Dist: opengeode-geosciences==7.3.2
 Requires-Dist: opengeode-geosciencesio==4.5.4
-Requires-Dist: opengeode-inspector==4.0.3
+Requires-Dist: opengeode-inspector==4.0.4
 Requires-Dist: opengeode-io==6.2.4
-Requires-Dist: referencing==0.31.1
+Requires-Dist: referencing==0.32.0
 Requires-Dist: rpds-py==0.13.2
-Requires-Dist: typing-extensions==4.8.0
+Requires-Dist: typing-extensions==4.9.0
 Requires-Dist: werkzeug==3.0.1
 Requires-Dist: zipp==3.17.0
 

{OpenGeodeWeb-Back-3.0.0rc5 → OpenGeodeWeb-Back-3.0.0rc7}/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -4,7 +4,7 @@ blinker==1.7.0
 click==8.1.7
 colorama==0.4.6
 flask[async]==3.0.0
-geode-common==30.0.3
+geode-common==30.0.4
 geode-viewables==2.1.7
 importlib-metadata==7.0.0
 itsdangerous==2.1.2
@@ -15,10 +15,10 @@ markupsafe==2.1.3
 opengeode-core==14.10.2
 opengeode-geosciences==7.3.2
 opengeode-geosciencesio==4.5.4
-opengeode-inspector==4.0.3
+opengeode-inspector==4.0.4
 opengeode-io==6.2.4
-referencing==0.31.1
+referencing==0.32.0
 rpds-py==0.13.2
-typing-extensions==4.8.0
+typing-extensions==4.9.0
 werkzeug==3.0.1
 zipp==3.17.0

{OpenGeodeWeb-Back-3.0.0rc5 → OpenGeodeWeb-Back-3.0.0rc7}/src/opengeodeweb_back/geode_functions.py

@@ -151,27 +151,20 @@ def list_geode_objects(extension: str, key: str = None):
 
 
 def geode_objects_output_extensions(geode_object: str, data):
-    return_list = []
-    geode_object_dict = {}
-    geode_object_dict["geode_object"] = geode_object
-
-    output = geode_object_output_extensions(geode_object)
-
-    extension_saveable_array = []
-    for output_extension in output:
+    geode_objects_output_extensions_dict = {}
+    output_extensions = geode_object_output_extensions(geode_object)
+    extensions_dict = {}
+    for output_extension in output_extensions:
         bool_is_saveable = is_saveable(geode_object, data, f"test.{output_extension}")
-        extension_saveable_array.append(
-            {"extension": output_extension, "is_saveable": bool_is_saveable}
-        )
-
-    geode_object_dict["outputs"] = extension_saveable_array
-
-    return_list.append(geode_object_dict)
+        extensions_dict[output_extension] = {"is_saveable": bool_is_saveable}
+    geode_objects_output_extensions_dict[geode_object] = extensions_dict
 
     if "parent" in geode_object_value(geode_object).keys():
-        parent_key = geode_object_value(geode_object)["parent"]
-        return_list += geode_objects_output_extensions(parent_key, data)
-    return return_list
+        parent_geode_object = geode_object_value(geode_object)["parent"]
+        geode_objects_output_extensions_dict.update(
+            geode_objects_output_extensions(parent_geode_object, data)
+        )
+    return geode_objects_output_extensions_dict
 
 
 def versions(list_packages: list):
@@ -303,3 +296,28 @@ def create_coordinate_system(
     create_crs(
         geode_object, data, name, input_coordiante_system, output_coordiante_system
     )
+
+
+def send_file(upload_folder, saved_files, new_file_name):
+    if len(saved_files) == 1:
+        mimetype = "application/octet-binary"
+    else:
+        mimetype = "application/zip"
+        new_file_name = strict_file_name + ".zip"
+        with zipfile.ZipFile(os.path.join(upload_folder, new_file_name), "w") as zipObj:
+            for saved_file_path in saved_files:
+                zipObj.write(
+                    saved_file_path,
+                    os.path.basename(saved_file_path),
+                )
+
+    response = flask.send_from_directory(
+        directory=upload_folder,
+        path=new_file_name,
+        as_attachment=True,
+        mimetype=mimetype,
+    )
+    response.headers["new-file-name"] = new_file_name
+    response.headers["Access-Control-Expose-Headers"] = "new-file-name"
+
+    return response

{OpenGeodeWeb-Back-3.0.0rc5 → OpenGeodeWeb-Back-3.0.0rc7}/tests/test_functions.py

@@ -72,41 +72,44 @@ def test_load():
                 )
 
                 data = geode_functions.load(geode_object, file_apsolute_path)
+
+                if "save_viewable" in value:
+                    uu_id = str(uuid.uuid4()).replace("-", "")
+                    viewable_file_path = geode_functions.save_viewable(
+                        geode_object,
+                        data,
+                        os.path.abspath(f"/output"),
+                        uu_id,
+                    )
+                    os.remove(viewable_file_path)
+                geode_objects_and_output_extensions = (
+                    geode_functions.geode_objects_output_extensions(geode_object, data)
+                )
+                assert type(geode_objects_and_output_extensions) is dict
                 for (
-                    geode_object_and_output_extensions
-                ) in geode_functions.geode_objects_output_extensions(
-                    geode_object, data
-                ):
-                    output_geode_object = geode_object_and_output_extensions[
-                        "geode_object"
-                    ]
+                    output_geode_object,
+                    output_geode_object_value,
+                ) in geode_objects_and_output_extensions.items():
                     print(f"\t\t{output_geode_object=}")
-                    output_extensions = geode_functions.geode_object_output_extensions(
-                        geode_object
-                    )
-
-                    for output_extension in output_extensions:
+                    for (
+                        output_extension,
+                        output_extension_value,
+                    ) in output_geode_object_value.items():
                         print(f"\t\t\t{output_extension=}")
                         uu_id = str(uuid.uuid4()).replace("-", "")
                         filename = f"{uu_id}.{output_extension}"
-                        if geode_functions.is_saveable(geode_object, data, filename):
-                            file_path = geode_functions.save(
-                                geode_object,
+                        if geode_functions.is_saveable(
+                            output_geode_object, data, filename
+                        ):
+                            saved_files = geode_functions.save(
+                                output_geode_object,
                                 data,
-                                os.path.abspath(f"output"),
-                                f"{uu_id}.{output_extension}",
+                                os.path.abspath(f"/output"),
+                                filename,
                             )
-
-                            if "save_viewable" in value:
-                                uu_id = str(uuid.uuid4()).replace("-", "")
-                                viewable_file_path = geode_functions.save_viewable(
-                                    geode_object,
-                                    data,
-                                    os.path.abspath(f"output"),
-                                    uu_id,
-                                )
-
-                                os.remove(viewable_file_path)
+                            assert type(saved_files) is list
+                            for saved_file in saved_files:
+                                os.remove(saved_file)
 
 
 def test_is_model():
@@ -137,10 +140,39 @@ def test_geode_object_input_extensions():
 
 def test_geode_object_output_extensions():
     for geode_object, value in geode_objects.geode_objects_dict().items():
-        output_extensions = geode_functions.geode_object_output_extensions(geode_object)
-        assert type(output_extensions) is list
-        for output_extension in output_extensions:
-            assert type(output_extension) is str
+        print(f"\n{geode_object=}")
+        input_extensions = geode_functions.geode_object_input_extensions(geode_object)
+        for input_extension in input_extensions:
+            if geode_object != "RegularGrid3D" and input_extension != "vti":
+                print(f"\t{input_extension=}")
+                missing_files = geode_functions.missing_files(
+                    geode_object, f"tests/data/test.{input_extension}"
+                )
+                has_missing_files = missing_files.has_missing_files()
+                if has_missing_files:
+                    mandatory_files = missing_files.mandatory_files
+                    print(f"\t\t{mandatory_files=}")
+                    additional_files = missing_files.additional_files
+                    print(f"\t\t{additional_files=}")
+                file_apsolute_path = os.path.abspath(
+                    f"tests/data/test.{input_extension}"
+                )
+
+                data = geode_functions.load(geode_object, file_apsolute_path)
+                geode_objets_and_output_extensions = (
+                    geode_functions.geode_objects_output_extensions(geode_object, data)
+                )
+                assert type(geode_objets_and_output_extensions) is dict
+                for (
+                    output_geode_object,
+                    output_geode_object_value,
+                ) in geode_objets_and_output_extensions.items():
+                    for (
+                        output_extension,
+                        output_extension_value,
+                    ) in output_geode_object_value.items():
+                        assert type(output_extension) is str
+                        assert type(output_extension_value["is_saveable"]) is bool
 
 
 def test_list_input_extensions():
@@ -168,8 +200,6 @@ def test_list_geode_objects():
                 "Graph",
                 "RasterImage2D",
                 "RasterImage3D",
-                "RasterImage2D",
-                "RasterImage3D",
                 "VertexSet",
             ],
         },
@@ -202,32 +232,23 @@ def test_geode_objects_output_extensions():
     for geode_object, value in geode_objects.geode_objects_dict().items():
         input_extensions = geode_functions.geode_object_input_extensions(geode_object)
         for input_extension in input_extensions:
-            if input_extension not in ["og_img3d", "vti"]:
+            if geode_object != "RegularGrid3D" and input_extension != "vti":
                 data = geode_functions.load(
                     geode_object, f"tests/data/test.{input_extension}"
                 )
-                geode_objects_and_output_extensions_list = (
+                geode_objects_and_output_extensions = (
                     geode_functions.geode_objects_output_extensions(geode_object, data)
                 )
-                print(f"{geode_objects_and_output_extensions_list=}")
-                assert type(geode_objects_and_output_extensions_list) is list
+                assert type(geode_objects_and_output_extensions) is dict
                 for (
-                    geode_object_and_output_extensions
-                ) in geode_objects_and_output_extensions_list:
-                    print(f"{geode_object_and_output_extensions=}")
-                    assert type(geode_object_and_output_extensions) is dict
-                    assert "geode_object" in geode_object_and_output_extensions
-                    assert (
-                        type(geode_object_and_output_extensions["geode_object"]) is str
-                    )
-                    assert "outputs" in geode_object_and_output_extensions
-                    assert type(geode_object_and_output_extensions["outputs"]) is list
-                    outputs = geode_object_and_output_extensions["outputs"]
-                    for output in outputs:
-                        assert "extension" in output
-                        assert type(output["extension"]) is str
-                        assert "is_saveable" in output
-                        assert type(output["is_saveable"]) is bool
+                    output_geode_object,
+                    output_geode_object_value,
+                ) in geode_objects_and_output_extensions.items():
+                    for (
+                        output_extension,
+                        output_extension_value,
+                    ) in output_geode_object_value.items():
+                        assert type(output_extension_value["is_saveable"]) is bool
 
 
 def test_versions():