fix(database): adding database integration. stable version

Author: MaxNumerique

src/opengeodeweb_viewer/config.py

@@ -7,31 +7,37 @@
 def default_config():
     os.environ["DEFAULT_HOST"] = "localhost"
     os.environ["DEFAULT_PORT"] = "1234"
-    os.environ["DATABASE_PATH"] = os.path.join(
-        os.environ.get("DATA_FOLDER_PATH", "/data/"), "project.db"
-    )
 
 
 def prod_config():
     default_config()
     os.environ["DATA_FOLDER_PATH"] = "/data/"
-    os.environ["DATABASE_PATH"] = os.path.join("/data/", "project.db")
 
 
 def dev_config():
     default_config()
     if platform == "linux":
         os.environ["DATA_FOLDER_PATH"] = "/temp/OpenGeodeWeb_Data/"
     elif platform == "win32":
-        os.environ["DATA_FOLDER_PATH"] = os.path.join(
-            "C:/Users", os.getlogin(), "OpenGeodeWeb_Data"
-        )
+        user_home = os.path.expanduser("~")
+        os.environ["DATA_FOLDER_PATH"] = os.path.join(user_home, "OpenGeodeWeb_Data")
     if not os.path.exists(os.environ.get("DATA_FOLDER_PATH")):
         os.mkdir(os.environ.get("DATA_FOLDER_PATH"))
-    os.environ["DATABASE_PATH"] = os.path.join(
-        os.environ.get("DATA_FOLDER_PATH"), "project.db"
-    )
 
+def _copy_test_assets(src_data: str, tmp_data_root: str, test_ids: list[str], valid_exts: set[str], uploads_directory: str, structure_directory: str):
+    for root, directories, files in os.walk(src_data):
+        for directory in directories:
+            for test_id in test_ids:
+                dst = os.path.join(tmp_data_root, test_id, directory)
+                copytree(os.path.join(root, directory), dst, dirs_exist_ok=True)
+        for file in files:
+            if os.path.splitext(file)[1].lower() not in valid_exts:
+                continue
+            src = os.path.join(root, file)
+            for test_id in test_ids:
+                copyfile(src, os.path.join(tmp_data_root, test_id, file))
+            copyfile(src, os.path.join(structure_directory, file))
+            copyfile(src, os.path.join(uploads_directory, file))
 
 def test_config(path):
     default_config()
@@ -43,11 +49,7 @@ def test_config(path):
     if not os.path.isdir(src_data):
         raise FileNotFoundError(f"Test data folder not found: {src_data}")
 
-    test_ids = [
-        "123456789",
-        "12345678",
-    ]  # needs to match IDs in test_data_helpers.py
-    print(f"Creating test data folders in {tmp_data_root}", flush=True)
+    test_ids = ["123456789", "12345678", "44556677", "22334455", "11223344", "33445566", "33445577"]
     valid_exts = {".vtp", ".vti", ".vtu", ".vtm"}
 
     project_uuid = "test-project-uuid"
@@ -69,19 +71,13 @@ def test_config(path):
             exist_ok=True,
         )
 
-    for root, directories, files in os.walk(src_data):
-        for directory in directories:
-            dst = os.path.join(tmp_data_root, test_ids[0], directory)
-            copytree(os.path.join(root, directory), dst, dirs_exist_ok=True)
-
-        for file in files:
-            if os.path.splitext(file)[1].lower() not in valid_exts:
-                continue
-
-            src = os.path.join(root, file)
-            for test_id in test_ids:
-                copyfile(src, os.path.join(tmp_data_root, test_id, file))
-            copyfile(src, os.path.join(structure_directory, file))
-            copyfile(src, os.path.join(uploads_directory, file))
+    _copy_test_assets(
+        src_data=src_data,
+        tmp_data_root=tmp_data_root,
+        test_ids=test_ids,
+        valid_exts=valid_exts,
+        uploads_directory=uploads_directory,
+        structure_directory=structure_directory,
+    )
 
-    print(f"\nDATA_FOLDER_PATH set to: {tmp_data_root}", flush=True)
+    print(f"\nDATA_FOLDER_PATH set to: {tmp_data_root}", flush=True)

src/opengeodeweb_viewer/database/connection.py

@@ -21,6 +21,7 @@ def initialize(self, database_path: str):
 
         try:
             self._engine = create_engine(f"sqlite:///{database_path}", echo=False)
+            Base.metadata.create_all(self._engine)
             self._session_factory = sessionmaker(bind=self._engine)
             self._scoped_session = scoped_session(self._session_factory)
             print(f"Database initialized at: {database_path}")

src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -20,32 +20,43 @@ class VtkModelView(VtkObjectView):
     def __init__(self):
         super().__init__()
 
+    def _resolve_model_file_path(self, data_id: str, params):
+        file_name = params.get("file_name")
+        if file_name:
+            return os.path.join(self.DATA_FOLDER_PATH, data_id, file_name)
+        return self.get_data_file_path(data_id)
+
+    def _build_model_pipeline(self, file_path: str):
+        reader = vtk.vtkXMLMultiBlockDataReader()
+        reader.SetFileName(file_path)
+        geometry = vtk.vtkGeometryFilter()
+        geometry.SetInputConnection(reader.GetOutputPort())
+        mapper = vtk.vtkCompositePolyDataMapper()
+        mapper.SetInputConnection(geometry.GetOutputPort())
+        attributes = vtkCompositeDataDisplayAttributes()
+        mapper.SetCompositeDataDisplayAttributes(attributes)
+        actor = vtk.vtkActor()
+        actor.SetMapper(mapper)
+
+        return reader, geometry, mapper, actor
+
     @exportRpc(model_prefix + model_schemas_dict["register"]["rpc"])
     def registerModel(self, params):
         validate_schema(params, self.model_schemas_dict["register"], self.model_prefix)
         data_id = params["id"]
         try:
-            data = self.get_data(data_id)
-            reader = vtk.vtkXMLMultiBlockDataReader()
-            filter = vtk.vtkGeometryFilter()
-            filter.SetInputConnection(reader.GetOutputPort())
-            mapper = vtk.vtkCompositePolyDataMapper()
-            mapper.SetInputConnection(filter.GetOutputPort())
-            attributes = vtkCompositeDataDisplayAttributes()
-            mapper.SetCompositeDataDisplayAttributes(attributes)
-
-            file_path = self.get_data_file_path(data_id)
-            reader.SetFileName(file_path)
-
-            actor = vtk.vtkActor()
-            actor.SetMapper(mapper)
-
+            _ = self.get_data(data_id)
+            file_path = self._resolve_model_file_path(data_id, params)
+            reader, geometry, mapper, actor = self._build_model_pipeline(file_path)
             renderer = self.get_renderer()
             renderer.AddActor(actor)
 
-            self.register_object(data_id, reader, filter, actor, mapper, {})
+            self.register_object(data_id, reader, geometry, actor, mapper, {})
             self.get_object(data_id)["max_dimension"] = "default"
-
+            renderWindow = self.getView("-1")
+            renderer.ResetCamera()
+            renderWindow.Render()
+            self.render()
         except Exception as e:
             print(f"Error registering model {data_id}: {str(e)}", flush=True)
             raise