load return

Author: JulienChampagnol

.gitignore

@@ -1,3 +1,4 @@
 .pytest_cache
 dist
-venv
+venv
+output

COPYLEFT

@@ -0,0 +1,4 @@
+## Dependencies
+
+Flask: BSD-3-Clause
+Copyright (c) 2010-present, Pallets.

pyproject.toml

@@ -17,14 +17,6 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
 ]
-dependencies = [
-    "geode-viewables>=2.0.3",
-    "opengeode-core>=14.4.1",
-    "opengeode-geosciences>=7.1.1",
-    "opengeode-geosciencesio>=4.1.6",
-    "opengeode-inspector>=3.0.7",
-    "opengeode-io>=6.0.10",
-]
 
 [project.urls]
 "Homepage" = "https://github.com/Geode-solutions/OpenGeodeWeb-Back"

requirements.txt

@@ -8,7 +8,7 @@ geode-common==26.1.5
     # via geode-viewables
 geode-viewables==2.0.3
     # via -r requirements.in
-opengeode-core==14.4.5
+opengeode-core==14.8.0
     # via
     #   -r requirements.in
     #   geode-common

src/opengeodeweb_back/geode_functions.py

@@ -25,7 +25,7 @@ def get_geode_object_output(geode_object: str):
 
 
 def load(geode_object: str, file_absolute_path: str):
-    objects_list()[geode_object]["load"](file_absolute_path)
+    return objects_list()[geode_object]["load"](file_absolute_path)
 
 
 def save(geode_object: str, data, folder_absolute_path: str, filename: str):
@@ -78,7 +78,7 @@ def get_inspector(geode_object: str, data):
 
 
 def save_viewable(geode_object: str, data, folder_absolute_path: str, id: str):
-    objects_list()[geode_object]["save_viewable"](
+    return objects_list()[geode_object]["save_viewable"](
         data, os.path.join(folder_absolute_path, id)
     )
 

tests/test_functions.py

@@ -53,27 +53,32 @@ def test_get_geode_object_input_extensions():
             assert type(extension) is str
 
 
-# def test_load():
-#     for geode_object, value in geode_objects.objects_list().items():
-#         input_extensions = geode_functions.get_geode_object_input_extensions(
-#             geode_object
-#         )
-
-#         output_extensions = geode_functions.get_geode_object_output_extensions(
-#             geode_object
-#         )
-#         for input_extension in input_extensions:
-#             data = geode_functions.load(
-#                 geode_object,
-#                 os.path.join(
-#                     os.path.abspath("./tests/data"), f"test.{input_extension}"
-#                 ),
-#             )
-
-#             for output_extension in output_extensions:
-#                 geode_functions.save(
-#                     geode_object,
-#                     data,
-#                     os.path.abspath("./output"),
-#                     f"test.{output_extension}",
-#                 )
+def test_load():
+    for geode_object, value in geode_objects.objects_list().items():
+        input_extensions = geode_functions.get_geode_object_input_extensions(
+            geode_object
+        )
+
+        output_extensions = geode_functions.get_geode_object_output_extensions(
+            geode_object
+        )
+        for input_extension in input_extensions:
+            data = geode_functions.load(
+                geode_object,
+                os.path.join(
+                    os.path.abspath("./tests/data"), f"test.{input_extension}"
+                ),
+            )
+
+            for output_extension in output_extensions:
+                file_path = os.path.abspath(f"./output/test.{output_extension}")
+
+                if os.path.isfile(file_path):
+                    os.remove(file_path)
+                    print(f"{file_path} deleted.")
+                geode_functions.save(
+                    geode_object,
+                    data,
+                    os.path.abspath("./output"),
+                    f"test.{output_extension}",
+                )