refactor database : integrate sqlite database for object management

- Replace file_name parameter with database lookup in registerObject
- Add database connection methods to VtkView base class

Author: MaxNumerique

src/opengeodeweb_viewer/config.py

@@ -7,11 +7,13 @@
 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():
@@ -24,6 +26,7 @@ def dev_config():
         )
     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 test_config(path):
@@ -48,7 +51,7 @@ def test_config(path):
         *test_ids,
         uploads_directory,
         structure_directory,
-    ]:  # create directories for tests
+    ]:
         os.makedirs(
             (
                 os.path.join(tmp_data_root, directory)

src/opengeodeweb_viewer/object/object_methods.py

@@ -13,10 +13,20 @@ class VtkObjectView(VtkView):
     def __init__(self):
         super().__init__()
 
-    def registerObject(self, id, file_name, reader, filter, mapper):
+    def registerObject(self, id):
+        data = self.get_data_by_id(id)
+        if not data:
+            raise Exception(f"Données avec l'ID {id} non trouvées dans la base de données")
+        
+        reader = vtk.vtkXMLGenericDataObjectReader()
+        mapper = vtk.vtkDataSetMapper()
+        mapper.SetInputConnection(reader.GetOutputPort())
         actor = vtk.vtkActor()
-        self.register_object(id, reader, filter, actor, mapper, {})
-        reader.SetFileName(os.path.join(self.DATA_FOLDER_PATH, id, file_name))
+        
+        self.register_object(id, reader, {}, actor, mapper, {})
+        
+        reader.SetFileName(os.path.join(self.DATA_FOLDER_PATH, id, data["viewable_file_name"]))
+        
         actor.SetMapper(mapper)
         mapper.SetColorModeToMapScalars()
         mapper.SetResolveCoincidentTopologyLineOffsetParameters(1, -0.1)

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -22,14 +22,11 @@ def __init__(self):
     @exportRpc(mesh_prefix + mesh_schemas_dict["register"]["rpc"])
     def registerMesh(self, params):
         validate_schema(params, self.mesh_schemas_dict["register"], self.mesh_prefix)
-        id, file_name = params["id"], params["file_name"]
+        id = params["id"]
         try:
-            reader = vtk.vtkXMLGenericDataObjectReader()
-            filter = {}
-            mapper = vtk.vtkDataSetMapper()
-            mapper.SetInputConnection(reader.GetOutputPort())
-            self.registerObject(id, file_name, reader, filter, mapper)
+            self.registerObject(id)
 
+            reader = self.get_object(id)["reader"]
             data_object = reader.GetOutput()
             data_set = vtk.vtkDataSet.SafeDownCast(data_object)
             cell_types = vtk.vtkCellTypes()
@@ -52,6 +49,7 @@ def registerMesh(self, params):
             self.get_data_base()[id]["max_dimension"] = max_dimension
         except Exception as e:
             print("error : ", str(e), flush=True)
+            raise
 
     @exportRpc(mesh_prefix + mesh_schemas_dict["deregister"]["rpc"])
     def deregisterMesh(self, params):

src/opengeodeweb_viewer/rpc/mesh/schemas/register.json

@@ -5,15 +5,10 @@
     "id": {
       "type": "string",
       "minLength": 1
-    },
-    "file_name": {
-      "type": "string",
-      "minLength": 1
     }
   },
   "required": [
-    "id",
-    "file_name"
+    "id"
   ],
   "additionalProperties": false
 }

src/opengeodeweb_viewer/vtk_protocol.py

@@ -1,5 +1,6 @@
 # Standard library imports
 import os
+import sqlite3
 
 # Third party imports
 import vtk
@@ -12,11 +13,37 @@ class VtkView(vtk_protocols.vtkWebProtocol):
     def __init__(self):
         super().__init__()
         self.DATA_FOLDER_PATH = os.getenv("DATA_FOLDER_PATH")
+        self.DATABASE_PATH = os.getenv("DATABASE_PATH")
         self.DataReader = vtk.vtkXMLPolyDataReader()
         self.ImageReader = vtk.vtkXMLImageDataReader()
 
     def get_data_base(self):
         return self.getSharedObject("db")
+    
+    def get_db_connection(self):
+        conn = sqlite3.connect(self.DATABASE_PATH)
+        conn.row_factory = sqlite3.Row
+        return conn
+    
+    def get_data_by_id(self, data_id):
+        conn = self.get_db_connection()
+        try:
+            cursor = conn.cursor()
+            cursor.execute("SELECT * FROM data WHERE id = ?", (data_id,))
+            data = cursor.fetchone()
+            return dict(data) if data else None
+        finally:
+            conn.close()
+    
+    def get_all_data(self):
+        conn = self.get_db_connection()
+        try:
+            cursor = conn.cursor()
+            cursor.execute("SELECT * FROM data")
+            data = cursor.fetchall()
+            return [dict(row) for row in data]
+        finally:
+            conn.close()
 
     def get_renderer(self):
         return self.getSharedObject("renderer")

src/opengeodeweb_viewer/vtkw_server.py

@@ -57,11 +57,20 @@ def add_arguments(parser):
             default=os.environ.get("DATA_FOLDER_PATH"),
             help="Path to the folder where data is stored",
         )
+        parser.add_argument(
+            "--database_path",
+            default=os.environ.get("DATABASE_PATH"),
+            help="Path to the SQLite database file",
+        )
 
     @staticmethod
     def configure(args):
         # Standard args
         _Server.authKey = args.authKey
+        if args.data_folder_path:
+            os.environ["DATA_FOLDER_PATH"] = args.data_folder_path
+        if args.database_path:
+            os.environ["DATABASE_PATH"] = args.database_path
 
     def initialize(self):
         # Bring used components