delete all database_path.

missing viewer_object = self.get_viewer_object_type(params["id"])

Author: MaxNumerique

src/opengeodeweb_viewer/config.py

@@ -48,13 +48,10 @@ def _copy_test_assets(
             copyfile(src, os.path.join(uploads_directory, file))
 
 
-def test_config(path: str) -> None:
+def test_config() -> None:
     default_config()
-    os.environ["DATA_FOLDER_PATH"] = os.path.join(
-        os.path.dirname(__file__), "..", "..", "tests", "data"
-    )
-
-    os.environ["DATABASE_PATH"] = str(path)
-    db_file = os.path.join(path, "project.db")
+    data_path = os.path.join(os.path.dirname(__file__), "..", "..", "tests", "data")
+    os.environ["DATA_FOLDER_PATH"] = data_path
+    db_file = os.path.join(data_path, "project.db")
     if not os.path.exists(db_file):
         open(db_file, "a").close()

src/opengeodeweb_viewer/rpc/generic/generic_protocols.py

@@ -23,7 +23,6 @@ def __init__(self, mesh_protocols, model_protocols):
 
     @exportRpc(generic_prefix + generic_schemas_dict["register"]["rpc"])
     def register(self, params):
-        print(f"{self.generic_schemas_dict["register"]}", flush=True)
         validate_schema(
             params, self.generic_schemas_dict["register"], self.generic_prefix
         )

src/opengeodeweb_viewer/vtk_protocol.py

@@ -14,7 +14,6 @@ class VtkView(vtk_protocols.vtkWebProtocol):
     def __init__(self) -> None:
         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()
 
@@ -26,38 +25,38 @@ def get_object(self, id: str) -> dict[str, object | str]:
 
     def get_viewer_object_type(self, data_id: str) -> str:
         data = self.get_data(data_id)
-        geode_object = data.get("geode_object")
-        if geode_object == "mesh":
+        object_type = data.get("object_type")
+        if object_type == "mesh":
             return "mesh"
-        elif geode_object == "model":
+        elif object_type == "model":
             return "model"
-        raise Exception(f"Unknown geode_object type: {geode_object}")
+        raise Exception(f"Unknown object_type type: {object_type}")
 
     def get_data(self, data_id: str) -> dict[str, str | list[str] | None]:
         if Data is None:
             raise Exception("Data model not available")
 
-        session = get_session()
-        if not session:
-            raise Exception("No database session available")
-
-        try:
-            data = session.get(Data, data_id)
-            if not data:
-                raise Exception(f"Data with id {data_id} not found in database")
-
-            return {
-                "id": data.id,
-                "native_file_name": data.native_file_name,
-                "viewable_file_name": data.viewable_file_name,
-                "geode_object": data.geode_object,
-                "light_viewable": data.light_viewable,
-                "input_file": data.input_file,
-                "additional_files": data.additional_files,
-            }
-        except Exception as e:
-            print(f"Error fetching data {data_id}: {e}")
-            raise
+        with get_session() as session:
+            if not session:
+                raise Exception("No database session available")
+
+            try:
+                data = session.get(Data, data_id)
+                if not data:
+                    raise Exception(f"Data with id {data_id} not found in database")
+
+                return {
+                    "id": data.id,
+                    "native_file_name": data.native_file_name,
+                    "viewable_file_name": data.viewable_file_name,
+                    "geode_object": data.geode_object,
+                    "light_viewable": data.light_viewable,
+                    "input_file": data.input_file,
+                    "additional_files": data.additional_files,
+                }
+            except Exception as e:
+                print(f"Error fetching data {data_id}: {e}")
+                raise
 
     def get_data_file_path(self, data_id: str, filename: str | None = None) -> str:
         if filename is None:

src/opengeodeweb_viewer/vtkw_server.py

@@ -58,11 +58,6 @@ 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):
@@ -141,20 +136,9 @@ def run_server(Server=_Server):
     if "data_folder_path" in args and args.data_folder_path:
         os.environ["DATA_FOLDER_PATH"] = args.data_folder_path
 
-    if "data_folder_path" in args and args.data_folder_path:
-        if not args.database_path:
-            args.database_path = args.data_folder_path
-            os.environ["DATABASE_PATH"] = args.data_folder_path
-        else:
-            os.environ["DATABASE_PATH"] = args.database_path
-
-    db_path = os.environ.get("DATABASE_PATH")
-    if db_path:
-        db_full_path = os.path.join(db_path, "project.db")
-        connection.init_database(db_full_path)
-        print(f"Viewer database initialized at: {db_full_path}", flush=True)
-    else:
-        print("WARNING: No DATABASE_PATH set, database not initialized!", flush=True)
+    db_full_path = os.path.join(os.environ["DATA_FOLDER_PATH"], "project.db")
+    connection.init_database(db_full_path)
+    print(f"Viewer connected to database at: {db_full_path}", flush=True)
 
     print(f"{args=}", flush=True)
     Server.configure(args)