database integration. using id from database of OGW-Microservice's da…

.gitignore

@@ -11,4 +11,6 @@ build
 /src/tests/tests_output/
 *.egg-info
 .coverage*
-.mypy_cache
+.mypy_cache
+*.db
+tests/data

requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --output-file=./requirements.txt --pre ./requirements-internal.in ./requirements.in
+#    pip-compile --output-file=./requirements.txt --pre ./requirements.in
 #
 aiohappyeyeballs==2.*,>=2.6.1
     # via aiohttp
@@ -12,54 +12,20 @@ aiosignal==1.*,>=1.4.0
     # via aiohttp
 attrs==25.*,>=25.3.0
     # via aiohttp
-blinker==1.*,>=1.9.0
-    # via
-    #   flask
-    #   opengeodeweb-microservice
-click==8.*,>=8.3.0
-    # via
-    #   flask
-    #   opengeodeweb-microservice
 contourpy==1.*,>=1.3.3
     # via matplotlib
 cycler==0.*,>=0.12.1
     # via matplotlib
-fastjsonschema==2.*,>=2.21.1
-    # via opengeodeweb-microservice
-flask==3.*,>=3.1.2
-    # via
-    #   flask-sqlalchemy
-    #   opengeodeweb-microservice
-flask-sqlalchemy==3.*,>=3.1.1
-    # via opengeodeweb-microservice
 fonttools==4.*,>=4.60.1
     # via matplotlib
 frozenlist==1.*,>=1.7.0
     # via
     #   aiohttp
     #   aiosignal
-greenlet==3.*,>=3.2.4
-    # via
-    #   opengeodeweb-microservice
-    #   sqlalchemy
 idna==3.10
     # via yarl
-itsdangerous==2.*,>=2.2.0
-    # via
-    #   flask
-    #   opengeodeweb-microservice
-jinja2==3.*,>=3.1.6
-    # via
-    #   flask
-    #   opengeodeweb-microservice
-kiwisolver==1.*,>=1.4.10rc0
+kiwisolver==1.4.10rc0
     # via matplotlib
-markupsafe==3.*,>=3.0.2
-    # via
-    #   flask
-    #   jinja2
-    #   opengeodeweb-microservice
-    #   werkzeug
 matplotlib==3.*,>=3.10.6
     # via vtk
 multidict==6.*,>=6.6.4
@@ -70,8 +36,6 @@ numpy==2.*,>=2.3.3
     # via
     #   contourpy
     #   matplotlib
-opengeodeweb-microservice==1.*,>=1.0.1rc1
-    # via -r requirements-internal.in
 packaging==25.0
     # via matplotlib
 pillow==11.*,>=11.3.0
@@ -80,29 +44,18 @@ propcache==0.*,>=0.3.2
     # via
     #   aiohttp
     #   yarl
-pyparsing==3.*,>=3.3.0a1
+pyparsing==3.3.0a1
     # via matplotlib
-python-dateutil==2.9.*,>=2.9.0.post0
+python-dateutil==2.9.0.post0
     # via matplotlib
 six==1.*,>=1.17.0
     # via python-dateutil
-sqlalchemy==2.*,>=2.0.43
-    # via
-    #   flask-sqlalchemy
-    #   opengeodeweb-microservice
 typing-extensions==4.*,>=4.15.0
-    # via
-    #   aiosignal
-    #   opengeodeweb-microservice
-    #   sqlalchemy
+    # via aiosignal
 vtk==9.5.2
     # via -r requirements.in
 websocket-client==1.*,>=1.8.0
     # via -r requirements.in
-werkzeug==3.*,>=3.1.3
-    # via
-    #   flask
-    #   opengeodeweb-microservice
 wslink==1.12.4
     # via -r requirements.in
 yarl==1.*,>=1.20.1

src/opengeodeweb_viewer/config.py

@@ -1,20 +1,19 @@
 import os
-import tempfile
 from shutil import copyfile, copytree
 from sys import platform
 
 
-def default_config():
+def default_config() -> None:
     os.environ["DEFAULT_HOST"] = "localhost"
     os.environ["DEFAULT_PORT"] = "1234"
 
 
-def prod_config():
+def prod_config() -> None:
     default_config()
     os.environ["DATA_FOLDER_PATH"] = "/data/"
 
 
-def dev_config():
+def dev_config() -> None:
     default_config()
     if platform == "linux":
         os.environ["DATA_FOLDER_PATH"] = "/temp/OpenGeodeWeb_Data/"
@@ -26,51 +25,36 @@ def dev_config():
         os.mkdir(os.environ.get("DATA_FOLDER_PATH"))
 
 
-def test_config(path):
-    default_config()
-
-    tmp_data_root = tempfile.mkdtemp(prefix="ogw_test_data_")
-    os.environ["DATA_FOLDER_PATH"] = tmp_data_root
-
-    src_data = os.path.join(path, "data")
-    if not os.path.isdir(src_data):
-        raise FileNotFoundError(f"Test data folder not found: {src_data}")
-
-    test_ids = ["123456789", "12345678"]
-    valid_exts = {".vtp", ".vti", ".vtu", ".vtm"}
-
-    project_uuid = "test-project-uuid"
-    data_uuid = "test-data-uuid"
-    uploads_directory = os.path.join(tmp_data_root, project_uuid, "uploads")
-    structure_directory = os.path.join(tmp_data_root, project_uuid, data_uuid)
-
-    for directory in [
-        *test_ids,
-        uploads_directory,
-        structure_directory,
-    ]:  # create directories for tests
-        os.makedirs(
-            (
-                os.path.join(tmp_data_root, directory)
-                if isinstance(directory, str)
-                else directory
-            ),
-            exist_ok=True,
-        )
-
+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,
+) -> None:
     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 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))
 
-    print(f"\nDATA_FOLDER_PATH set to: {tmp_data_root}", flush=True)
+
+def test_config(path: str) -> 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")
+    if not os.path.exists(db_file):
+        open(db_file, "a").close()