Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/extensions_config

Author: JulienChampagnol

requirements.txt

@@ -60,4 +60,4 @@ werkzeug==3.1.2
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.0.13
+opengeodeweb-microservice==1.*,>=1.0.14

src/opengeodeweb_back/app.py

@@ -24,16 +24,14 @@ def create_app(name: str) -> flask.Flask:
     )
     if FLASK_DEBUG == False:
         app.config.from_object(app_config.ProdConfig)
-    else:
-        app.config.from_object(app_config.DevConfig)
-
-    if FLASK_DEBUG == False:
         SECONDS_BETWEEN_SHUTDOWNS: float = float(
             app.config.get("SECONDS_BETWEEN_SHUTDOWNS") or 60.0
         )
         utils_functions.set_interval(
             utils_functions.kill_task, SECONDS_BETWEEN_SHUTDOWNS, app
         )
+    else:
+        app.config.from_object(app_config.DevConfig)
 
     @app.before_request
     def before_request() -> flask.Response | None:
@@ -134,7 +132,7 @@ def run_server(app: Flask) -> None:
         "-ufp",
         "--upload_folder_path",
         type=str,
-        default=app.config.get("DEFAULT_DATA_FOLDER_PATH"),
+        default=app.config.get("UPLOAD_FOLDER"),
         help="Path to the folder where uploads are stored",
     )
     parser.add_argument(
@@ -157,12 +155,7 @@ def run_server(app: Flask) -> None:
     app.config.update(UPLOAD_FOLDER=args.upload_folder_path)
     app.config.update(MINUTES_BEFORE_TIMEOUT=args.timeout)
     flask_cors.CORS(app, origins=args.allowed_origins)
-    print(
-        f"Host: {args.host}, Port: {args.port}, Debug: {args.debug}, "
-        f"Data folder path: {args.data_folder_path}, Timeout: {args.timeout}, "
-        f"Origins: {args.allowed_origins}",
-        flush=True,
-    )
+    print(f"{args=}", flush=True)
 
     db_filename: str = app.config.get("DATABASE_FILENAME") or "project.db"
     db_path = os.path.join(str(args.data_folder_path), db_filename)

src/opengeodeweb_back/geode_objects/geode_graph.py

@@ -5,7 +5,7 @@
 import opengeode as og
 
 # Local application imports
-from .types import GeodeMeshType
+from .types import GeodeMeshType, ViewerElementsType
 from .geode_vertex_set import GeodeVertexSet
 
 
@@ -20,6 +20,10 @@ def __init__(self, graph: og.Graph | None = None) -> None:
     def geode_object_type(cls) -> GeodeMeshType:
         return "Graph"
 
+    @classmethod
+    def viewer_elements_type(cls) -> ViewerElementsType:
+        return "edges"
+
     def native_extension(self) -> str:
         return self.graph.native_extension()
 

src/opengeodeweb_back/geode_objects/geode_grid2d.py

@@ -7,6 +7,7 @@
 
 # Local application imports
 from .geode_mesh import GeodeMesh
+from .types import ViewerElementsType
 
 
 class GeodeGrid2D(GeodeMesh):
@@ -18,6 +19,10 @@ def is_3D(cls) -> bool:
     def is_viewable(cls) -> bool:
         return True
 
+    @classmethod
+    def viewer_elements_type(cls) -> ViewerElementsType:
+        return "polygons"
+
     def builder(self) -> object:
         return None
 

src/opengeodeweb_back/geode_objects/geode_grid3d.py

@@ -7,6 +7,7 @@
 
 # Local application imports
 from .geode_mesh import GeodeMesh
+from .types import ViewerElementsType
 
 
 class GeodeGrid3D(GeodeMesh):
@@ -18,6 +19,10 @@ def is_3D(cls) -> bool:
     def is_viewable(cls) -> bool:
         return True
 
+    @classmethod
+    def viewer_elements_type(cls) -> ViewerElementsType:
+        return "polyhedra"
+
     def builder(self) -> object:
         return None
 

src/opengeodeweb_back/geode_objects/geode_model.py

@@ -6,7 +6,7 @@
 import opengeode as og
 
 # Local application imports
-from .types import ViewerType
+from .types import ViewerType, ViewerElementsType
 from .geode_object import GeodeObject
 
 ComponentRegistry = dict[og.ComponentType, list[og.uuid]]
@@ -17,5 +17,9 @@ class GeodeModel(GeodeObject):
     def viewer_type(cls) -> ViewerType:
         return "model"
 
+    @classmethod
+    def viewer_elements_type(cls) -> ViewerElementsType:
+        return "default"
+
     @abstractmethod
     def mesh_components(self) -> ComponentRegistry: ...

src/opengeodeweb_back/geode_objects/geode_object.py

@@ -7,7 +7,7 @@
 import opengeode as og
 
 # Local application imports
-from .types import GeodeObjectType, ViewerType
+from .types import GeodeObjectType, ViewerType, ViewerElementsType
 
 
 class GeodeObject(ABC):
@@ -24,6 +24,10 @@ def geode_object_type(cls) -> GeodeObjectType: ...
     @abstractmethod
     def viewer_type(cls) -> ViewerType: ...
 
+    @classmethod
+    @abstractmethod
+    def viewer_elements_type(cls) -> ViewerElementsType: ...
+
     @classmethod
     @abstractmethod
     def is_3D(cls) -> bool: ...

src/opengeodeweb_back/geode_objects/geode_raster_image2d.py

@@ -6,7 +6,7 @@
 import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeMeshType
+from .types import GeodeMeshType, ViewerElementsType
 from .geode_mesh import GeodeMesh
 
 
@@ -21,6 +21,10 @@ def __init__(self, raster_image: og.RasterImage2D) -> None:
     def geode_object_type(cls) -> GeodeMeshType:
         return "RasterImage2D"
 
+    @classmethod
+    def viewer_elements_type(cls) -> ViewerElementsType:
+        return "polygons"
+
     def native_extension(self) -> str:
         return self.raster_image.native_extension()
 

src/opengeodeweb_back/geode_objects/geode_raster_image3d.py

@@ -6,7 +6,7 @@
 import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeMeshType
+from .types import GeodeMeshType, ViewerElementsType
 from .geode_mesh import GeodeMesh
 
 
@@ -21,6 +21,10 @@ def __init__(self, raster_image: og.RasterImage3D) -> None:
     def geode_object_type(cls) -> GeodeMeshType:
         return "RasterImage3D"
 
+    @classmethod
+    def viewer_elements_type(cls) -> ViewerElementsType:
+        return "polyhedra"
+
     def native_extension(self) -> str:
         return self.raster_image.native_extension()
 

src/opengeodeweb_back/geode_objects/geode_solid_mesh3d.py

@@ -8,6 +8,7 @@
 
 # Local application imports
 from .geode_vertex_set import GeodeVertexSet
+from .types import ViewerElementsType
 
 
 class GeodeSolidMesh3D(GeodeVertexSet):
@@ -25,6 +26,10 @@ def is_3D(cls) -> bool:
     def is_viewable(cls) -> bool:
         return True
 
+    @classmethod
+    def viewer_elements_type(cls) -> ViewerElementsType:
+        return "polyhedra"
+
     def builder(self) -> og.SolidMeshBuilder3D:
         return og.SolidMeshBuilder3D.create(self.solid_mesh)