input_file as str

Author: MaxNumerique

src/opengeodeweb_back/data.py

@@ -23,10 +23,10 @@ class Data(Base):
     def create(
         name: str,
         geode_object: str,
-        input_file: str,
+        input_file: str | None = None,
         additional_files: list[str] | None = None,
     ) -> "Data":
-        input_file = input_file if input_file is not None else {}
+        input_file = input_file if input_file is not None else ""
         additional_files = additional_files if additional_files is not None else []
 
         data_entry = Data(

src/opengeodeweb_back/utils_functions.py

@@ -158,8 +158,11 @@ def save_all_viewables_and_return_info(
     geode_object: str,
     data: Any,
     input_file: str,
-    additional_files: list[str] = [],
+    additional_files: list[str] | None = None,
 ) -> dict[str, Any]:
+    if additional_files is None:
+        additional_files = []
+        
     data_entry = Data.create(
         name=data.name(),
         geode_object=geode_object,
@@ -201,9 +204,9 @@ def save_all_viewables_and_return_info(
 
 
 def generate_native_viewable_and_light_viewable_from_object(
-    geode_object: str, data: Any, input_file: str
+    geode_object: str, data: Any
 ) -> dict[str, Any]:
-    return save_all_viewables_and_return_info(geode_object, data, input_file)
+    return save_all_viewables_and_return_info(geode_object, data, input_file="")
 
 
 def generate_native_viewable_and_light_viewable_from_file(
@@ -247,6 +250,6 @@ def generate_native_viewable_and_light_viewable_from_file(
     return save_all_viewables_and_return_info(
         geode_object,
         data,
-        input_file=[input_filename],
+        input_file=input_filename,
         additional_files=additional_files_copied,
-    )
+    )

tests/test_utils_functions.py

@@ -100,7 +100,7 @@ def test_save_all_viewables_and_return_info(client):
 
         geode_object = "BRep"
         data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
-        input_file = ["test.og_brep"]
+        input_file = "test.og_brep"
         additional_files = ["additional_file.txt"]
 
         result = utils_functions.save_all_viewables_and_return_info(
@@ -137,7 +137,7 @@ def test_save_all_viewables_commits_to_db_properly(client):
     with app.app_context():
         geode_object = "BRep"
         data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
-        input_file = ["test.og_brep"]
+        input_file = "test.og_brep"
         result = utils_functions.save_all_viewables_and_return_info(
             geode_object, data, input_file
         )
@@ -175,7 +175,7 @@ def test_generate_native_viewable_and_light_viewable_from_object(client):
     assert re.match(r"[0-9a-f]{32}", result["id"])
     assert isinstance(result["object_type"], str)
     assert isinstance(result["binary_light_viewable"], str)
-    assert result["input_files"] == []
+    assert result["input_files"] == ""
 
 
 def test_generate_native_viewable_and_light_viewable_from_file(client):
@@ -198,4 +198,4 @@ def test_generate_native_viewable_and_light_viewable_from_file(client):
     assert re.match(r"[0-9a-f]{32}", result["id"])
     assert isinstance(result["object_type"], str)
     assert isinstance(result["binary_light_viewable"], str)
-    assert isinstance(result["input_files"], list)
+    assert isinstance(result["input_files"], str)