OpenGeodeWeb-Viewer 1.22.3__tar.gz → 1.23.0__tar.gz

{opengeodeweb_viewer-1.22.3 → opengeodeweb_viewer-1.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.22.3
+Version: 1.23.0
 Summary: OpenGeodeWeb-Viewer is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Viewer

{opengeodeweb_viewer-1.22.3 → opengeodeweb_viewer-1.23.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Viewer"
-version = "1.22.3"
+version = "1.23.0"
 dynamic = ["dependencies"]
 authors = [{ name = "Geode-solutions", email = "team-web@geode-solutions.com" }]
 description = "OpenGeodeWeb-Viewer is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem"

{opengeodeweb_viewer-1.22.3 → opengeodeweb_viewer-1.23.0}/src/OpenGeodeWeb_Viewer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.22.3
+Version: 1.23.0
 Summary: OpenGeodeWeb-Viewer is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Viewer

{opengeodeweb_viewer-1.22.3 → opengeodeweb_viewer-1.23.0}/src/opengeodeweb_viewer/app.py

@@ -108,8 +108,7 @@ class _Server(VtkTypingMixin, ServerProtocol):
     @staticmethod
     def add_arguments(parser: argparse.ArgumentParser) -> None:
         parser.add_argument(
-            "--data_folder_path",
-            default=os.environ.get("DATA_FOLDER_PATH"),
+            "--project_folder_path",
             help="Path to the folder where data is stored",
         )
 
@@ -194,24 +193,40 @@ class _Server(VtkTypingMixin, ServerProtocol):
 
 
 def run_server(Server: type[ServerProtocol] = _Server) -> None:
-    PYTHON_ENV = os.environ.get("PYTHON_ENV", default="prod").strip().lower()
-    if PYTHON_ENV == "prod":
-        prod_config()
-    elif PYTHON_ENV == "dev":
-        dev_config()
-
     parser = argparse.ArgumentParser(description="Vtk server")
     server.add_arguments(parser)
-
+    parser.set_defaults(port=None, host=None)
     Server.add_arguments(parser)
     args = parser.parse_args()
 
-    if not "host" in args:
-        args.host = os.environ["DEFAULT_HOST"]
-    if not "port" in args or args.port == 8080:
-        args.port = os.environ.get("DEFAULT_PORT")
-    if "data_folder_path" in args and args.data_folder_path:
-        os.environ["DATA_FOLDER_PATH"] = args.data_folder_path
+    if args.project_folder_path is None:
+        raise ValueError("project_folder_path must be provided")
+    else:
+        args.project_folder_path = os.path.abspath(args.project_folder_path)
+
+    PYTHON_ENV = os.environ.get("PYTHON_ENV", "prod").strip().lower()
+
+    app_config: Config
+    if PYTHON_ENV == "prod":
+        app_config = ProdConfig(args.project_folder_path)
+    elif PYTHON_ENV == "dev":
+        app_config = DevConfig(args.project_folder_path)
+    elif PYTHON_ENV == "test":
+        app_config = TestConfig(args.project_folder_path)
+    else:
+        raise ValueError(f"Unknown PYTHON_ENV: {PYTHON_ENV!r}")
+
+    if args.host is not None:
+        app_config.HOST = str(args.host)
+    else:
+        args.host = app_config.HOST
+
+    if args.port is not None:
+        app_config.PORT = str(args.port)
+    else:
+        args.port = app_config.PORT
+
+    app_config.sync_env()
 
     db_full_path = os.path.join(os.environ["DATA_FOLDER_PATH"], "project.db")
     connection.init_database(db_full_path, create_tables=False)
@@ -219,7 +234,6 @@ def run_server(Server: type[ServerProtocol] = _Server) -> None:
 
     print(f"{args=}", flush=True)
     Server.configure(args)
-
     server.start_webserver(options=args, protocol=Server)
 
 

opengeodeweb_viewer-1.23.0/src/opengeodeweb_viewer/config.py

@@ -0,0 +1,66 @@
+import os
+from shutil import copyfile, copytree
+
+
+class Config:
+    HOST = "localhost"
+    PORT = "1234"
+    DATABASE_FILENAME = "project.db"
+
+    def __init__(self, project_folder_path: str):
+        self.PROJECT_FOLDER_PATH = project_folder_path
+        self.DATA_FOLDER_PATH = os.path.join(project_folder_path, "data")
+        self.sync_env()
+
+    def sync_env(self) -> None:
+        print("self.PROJECT_FOLDER_PATH=", self.PROJECT_FOLDER_PATH)
+        print("self.DATA_FOLDER_PATH=", self.DATA_FOLDER_PATH)
+        os.environ["PROJECT_FOLDER_PATH"] = self.PROJECT_FOLDER_PATH
+        os.environ["DATA_FOLDER_PATH"] = self.DATA_FOLDER_PATH
+        os.environ["HOST"] = self.HOST
+        os.environ["PORT"] = self.PORT
+        os.environ["DATABASE_FILENAME"] = self.DATABASE_FILENAME
+
+
+class ProdConfig(Config):
+    def __init__(self, project_folder_path: str) -> None:
+        super().__init__(project_folder_path)
+
+
+class DevConfig(Config):
+    def __init__(self, project_folder_path: str) -> None:
+        super().__init__(project_folder_path)
+        os.makedirs(self.DATA_FOLDER_PATH, exist_ok=True)
+
+
+class TestConfig(Config):
+    def __init__(self, project_folder_path: str) -> None:
+        print("Received ", project_folder_path, flush=True)
+        super().__init__(project_folder_path)
+        os.makedirs(self.DATA_FOLDER_PATH, exist_ok=True)
+        db_file = os.path.join(self.DATA_FOLDER_PATH, self.DATABASE_FILENAME)
+        if not os.path.exists(db_file):
+            open(db_file, "a").close()
+
+
+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:
+            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))

{opengeodeweb_viewer-1.22.3 → opengeodeweb_viewer-1.23.0}/src/opengeodeweb_viewer/rpc/viewer/schemas/preview_points.json

@@ -29,7 +29,8 @@
       "type": "string",
       "enum": [
         "points",
-        "curve"
+        "curve",
+        "surface"
       ]
     },
     "closed": {

{opengeodeweb_viewer-1.22.3 → opengeodeweb_viewer-1.23.0}/src/opengeodeweb_viewer/rpc/viewer/schemas/preview_points.py

@@ -17,6 +17,7 @@ class Point(DataClassJsonMixin):
 class Style(Enum):
     CURVE = "curve"
     POINTS = "points"
+    SURFACE = "surface"
 
 
 @dataclass

{opengeodeweb_viewer-1.22.3 → opengeodeweb_viewer-1.23.0}/src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -423,7 +423,7 @@ class VtkViewerView(VtkView):
         for i, pt in enumerate(points_data):
             self._preview_points.InsertNextPoint(pt.x, pt.y, pt.z)
             self._preview_verts.InsertNextCell(1, [i])
-            if style_name == "curve" and i == 0:
+            if style_name in ["curve", "surface"] and i == 0:
                 colors.InsertNextTuple3(60, 153, 131)
             else:
                 colors.InsertNextTuple3(102, 102, 102)
@@ -432,11 +432,20 @@ class VtkViewerView(VtkView):
         self._preview_polydata.GetPointData().SetActiveScalars("Colors")
 
         lines = vtkCellArray()
+        polys = vtkCellArray()
         if style_name == "curve":
             for i in range(len(points_data) - 1):
                 lines.InsertNextCell(2, [i, i + 1])
             if params.closed and len(points_data) >= 2:
                 lines.InsertNextCell(2, [len(points_data) - 1, 0])
+        elif style_name == "surface":
+            for i in range(len(points_data) - 1):
+                lines.InsertNextCell(2, [i, i + 1])
+            if len(points_data) >= 3:
+                lines.InsertNextCell(2, [len(points_data) - 1, 0])
+                polys.InsertNextCell(len(points_data), list(range(len(points_data))))
+
         self._preview_polydata.SetLines(lines)
+        self._preview_polydata.SetPolys(polys)
         self._preview_polydata.Modified()
         self.render(-1)

{opengeodeweb_viewer-1.22.3 → opengeodeweb_viewer-1.23.0}/src/opengeodeweb_viewer/vtk_protocol.py

@@ -39,7 +39,7 @@ from vtkmodules.vtkRenderingAnnotation import (
 from vtkmodules.vtkInteractionWidgets import vtkOrientationMarkerWidget
 
 # Local application imports
-from opengeodeweb_microservice.database.connection import get_session
+from opengeodeweb_microservice.database.connection import get_session, init_database
 from opengeodeweb_microservice.database.data import Data
 from opengeodeweb_microservice.database.data_types import ViewerType, ViewerElementsType
 

opengeodeweb_viewer-1.22.3/src/opengeodeweb_viewer/config.py

@@ -1,64 +0,0 @@
-import os
-from shutil import copyfile, copytree
-from sys import platform
-
-
-def default_config() -> None:
-    os.environ["DEFAULT_HOST"] = "localhost"
-    os.environ["DEFAULT_PORT"] = "1234"
-
-
-def prod_config() -> None:
-    default_config()
-    os.environ["DATA_FOLDER_PATH"] = "/data/"
-
-
-def dev_config() -> None:
-    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"
-        )
-    data_folder_path = os.environ.get("DATA_FOLDER_PATH")
-    if data_folder_path and not os.path.exists(data_folder_path):
-        os.mkdir(data_folder_path)
-
-
-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:
-            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() -> None:
-    default_config()
-    if "DATA_FOLDER_PATH" not in os.environ:
-        data_path = os.path.join(os.path.dirname(__file__), "..", "..", "tests", "data")
-        os.environ["DATA_FOLDER_PATH"] = os.path.abspath(data_path)
-
-    data_path = os.environ["DATA_FOLDER_PATH"]
-    if not os.path.exists(data_path):
-        os.makedirs(data_path, exist_ok=True)
-
-    db_file = os.path.join(data_path, "project.db")
-    if not os.path.exists(db_file):
-        open(db_file, "a").close()