OpenGeodeWeb-Back 6.3.1rc2__tar.gz → 6.3.2__tar.gz

{opengeodeweb_back-6.3.1rc2/src/OpenGeodeWeb_Back.egg-info → opengeodeweb_back-6.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.3.1rc2
+Version: 6.3.2
 Summary: OpenGeodeWeb-Back 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-Back
@@ -27,7 +27,7 @@ Requires-Dist: opengeode-geosciencesio==5.8.11
 Requires-Dist: opengeode-inspector==6.8.18
 Requires-Dist: opengeode-io==7.4.9
 Requires-Dist: werkzeug==3.1.2
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.15
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.16rc1
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/pyproject.toml

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

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/requirements.txt

@@ -60,4 +60,4 @@ werkzeug==3.1.2
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.0.15
+opengeodeweb-microservice==1.*,>=1.0.16rc1

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.3.1rc2
+Version: 6.3.2
 Summary: OpenGeodeWeb-Back 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-Back
@@ -27,7 +27,7 @@ Requires-Dist: opengeode-geosciencesio==5.8.11
 Requires-Dist: opengeode-inspector==6.8.18
 Requires-Dist: opengeode-io==7.4.9
 Requires-Dist: werkzeug==3.1.2
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.15
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.16rc1
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/OpenGeodeWeb_Back.egg-info/SOURCES.txt

@@ -49,7 +49,6 @@ src/opengeodeweb_back/geode_objects/geode_tetrahedral_solid3d.py
 src/opengeodeweb_back/geode_objects/geode_triangulated_surface2d.py
 src/opengeodeweb_back/geode_objects/geode_triangulated_surface3d.py
 src/opengeodeweb_back/geode_objects/geode_vertex_set.py
-src/opengeodeweb_back/geode_objects/types.py
 src/opengeodeweb_back/routes/blueprint_routes.py
 src/opengeodeweb_back/routes/create/blueprint_create.py
 src/opengeodeweb_back/routes/create/schemas/__init__.py

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -14,4 +14,4 @@ opengeode-geosciencesio==5.8.11
 opengeode-inspector==6.8.18
 opengeode-io==7.4.9
 werkzeug==3.1.2
-opengeodeweb-microservice==1.*,>=1.0.15
+opengeodeweb-microservice==1.*,>=1.0.16rc1

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_functions.py

@@ -4,12 +4,15 @@ import os
 # Third party imports
 import werkzeug
 import flask
+from opengeodeweb_microservice.database.data import Data
+from opengeodeweb_microservice.database.data_types import (
+    GeodeObjectType,
+    geode_object_type,
+)
 
 # Local application imports
 from .geode_objects import geode_objects
-from .geode_objects.types import GeodeObjectType, geode_object_type
 from .geode_objects.geode_object import GeodeObject
-from opengeodeweb_microservice.database.data import Data
 
 
 def data_file_path(data_id: str, filename: str | None = None) -> str:

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/__init__.py

@@ -2,9 +2,9 @@
 from __future__ import annotations
 
 # Third party imports
+from opengeodeweb_microservice.database.data_types import GeodeObjectType
 
 # Local application imports
-from .types import GeodeObjectType
 from .geode_object import GeodeObject
 from .geode_brep import GeodeBRep
 from .geode_vertex_set import GeodeVertexSet

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_brep.py

@@ -6,9 +6,9 @@ import opengeode as og
 import opengeode_geosciences as og_geosciences
 import opengeode_inspector as og_inspector
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeModelType
 
 # Local application imports
-from .types import GeodeModelType
 from .geode_model import GeodeModel, ComponentRegistry
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_cross_section.py

@@ -5,9 +5,9 @@ from __future__ import annotations
 import opengeode as og
 import opengeode_geosciences as og_geosciences
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeModelType
 
 # Local application imports
-from .types import GeodeModelType
 from .geode_section import GeodeSection
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_edged_curve2d.py

@@ -6,9 +6,9 @@ import opengeode as og
 import opengeode_geosciences as og_geosciences
 import opengeode_inspector as og_inspector
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_graph import GeodeGraph
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_edged_curve3d.py

@@ -6,9 +6,9 @@ import opengeode as og
 import opengeode_geosciences as og_geosciences
 import opengeode_inspector as og_inspector
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_graph import GeodeGraph
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_graph.py

@@ -3,9 +3,12 @@ from __future__ import annotations
 
 # Third party imports
 import opengeode as og
+from opengeodeweb_microservice.database.data_types import (
+    GeodeMeshType,
+    ViewerElementsType,
+)
 
 # Local application imports
-from .types import GeodeMeshType, ViewerElementsType
 from .geode_vertex_set import GeodeVertexSet
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_grid2d.py

@@ -4,10 +4,10 @@ from abc import abstractmethod
 
 # Third party imports
 import opengeode as og
+from opengeodeweb_microservice.database.data_types import ViewerElementsType
 
 # Local application imports
 from .geode_mesh import GeodeMesh
-from .types import ViewerElementsType
 
 
 class GeodeGrid2D(GeodeMesh):

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_grid3d.py

@@ -4,10 +4,10 @@ from abc import abstractmethod
 
 # Third party imports
 import opengeode as og
+from opengeodeweb_microservice.database.data_types import ViewerElementsType
 
 # Local application imports
 from .geode_mesh import GeodeMesh
-from .types import ViewerElementsType
 
 
 class GeodeGrid3D(GeodeMesh):

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_hybrid_solid3d.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 # Third party imports
 import opengeode as og
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_solid_mesh3d import GeodeSolidMesh3D
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_implicit_cross_section.py

@@ -5,9 +5,9 @@ from __future__ import annotations
 import opengeode as og
 import opengeode_geosciences as og_geosciences
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeModelType
 
 # Local application imports
-from .types import GeodeModelType
 from .geode_cross_section import GeodeCrossSection
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_implicit_structural_model.py

@@ -5,9 +5,9 @@ from __future__ import annotations
 import opengeode as og
 import opengeode_geosciences as og_geosciences
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeModelType
 
 # Local application imports
-from .types import GeodeModelType
 from .geode_structural_model import GeodeStructuralModel
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_light_regular_grid2d.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 # Third party imports
 import opengeode as og
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_grid2d import GeodeGrid2D
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_light_regular_grid3d.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 # Third party imports
 import opengeode as og
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_grid3d import GeodeGrid3D
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_mesh.py

@@ -4,9 +4,9 @@ from abc import abstractmethod
 
 # Third party imports
 import opengeode as og
+from opengeodeweb_microservice.database.data_types import ViewerType
 
 # Local application imports
-from .types import ViewerType
 from .geode_object import GeodeObject
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_model.py

@@ -4,9 +4,9 @@ from abc import abstractmethod
 
 # Third party imports
 import opengeode as og
+from opengeodeweb_microservice.database.data_types import ViewerType, ViewerElementsType
 
 # Local application imports
-from .types import ViewerType, ViewerElementsType
 from .geode_object import GeodeObject
 
 ComponentRegistry = dict[og.ComponentType, list[og.uuid]]

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_object.py

@@ -5,9 +5,13 @@ from typing import Any
 
 # Third party imports
 import opengeode as og
+from opengeodeweb_microservice.database.data_types import (
+    GeodeObjectType,
+    ViewerType,
+    ViewerElementsType,
+)
 
 # Local application imports
-from .types import GeodeObjectType, ViewerType, ViewerElementsType
 
 
 class GeodeObject(ABC):

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_point_set2d.py

@@ -6,9 +6,9 @@ import opengeode as og
 import opengeode_geosciences as og_geosciences
 import opengeode_inspector as og_inspector
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_vertex_set import GeodeVertexSet
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_point_set3d.py

@@ -6,9 +6,9 @@ import opengeode as og
 import opengeode_geosciences as og_geosciences
 import opengeode_inspector as og_inspector
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_vertex_set import GeodeVertexSet
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_polygonal_surface2d.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 # Third party imports
 import opengeode as og
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_surface_mesh2d import GeodeSurfaceMesh2D
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_polygonal_surface3d.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 # Third party imports
 import opengeode as og
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_surface_mesh3d import GeodeSurfaceMesh3D
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_polyhedral_solid3d.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 # Third party imports
 import opengeode as og
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_solid_mesh3d import GeodeSolidMesh3D
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_raster_image2d.py

@@ -4,9 +4,12 @@ from __future__ import annotations
 # Third party imports
 import opengeode as og
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import (
+    GeodeMeshType,
+    ViewerElementsType,
+)
 
 # Local application imports
-from .types import GeodeMeshType, ViewerElementsType
 from .geode_mesh import GeodeMesh
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_raster_image3d.py

@@ -4,9 +4,12 @@ from __future__ import annotations
 # Third party imports
 import opengeode as og
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import (
+    GeodeMeshType,
+    ViewerElementsType,
+)
 
 # Local application imports
-from .types import GeodeMeshType, ViewerElementsType
 from .geode_mesh import GeodeMesh
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_regular_grid2d.py

@@ -5,9 +5,9 @@ from __future__ import annotations
 import opengeode as og
 import opengeode_inspector as og_inspector
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_surface_mesh2d import GeodeSurfaceMesh2D
 from .geode_grid2d import GeodeGrid2D
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_regular_grid3d.py

@@ -5,9 +5,9 @@ from __future__ import annotations
 import opengeode as og
 import opengeode_inspector as og_inspector
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_solid_mesh3d import GeodeSolidMesh3D
 from .geode_grid3d import GeodeGrid3D
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_section.py

@@ -6,9 +6,9 @@ import opengeode as og
 import opengeode_geosciences as og_geosciences
 import opengeode_inspector as og_inspector
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeModelType
 
 # Local application imports
-from .types import GeodeModelType
 from .geode_model import GeodeModel, ComponentRegistry
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_solid_mesh3d.py

@@ -5,10 +5,10 @@ from __future__ import annotations
 import opengeode as og
 import opengeode_geosciences as og_geosciences
 import opengeode_inspector as og_inspector
+from opengeodeweb_microservice.database.data_types import ViewerElementsType
 
 # Local application imports
 from .geode_vertex_set import GeodeVertexSet
-from .types import ViewerElementsType
 
 
 class GeodeSolidMesh3D(GeodeVertexSet):

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_structural_model.py

@@ -5,9 +5,9 @@ from __future__ import annotations
 import opengeode as og
 import opengeode_geosciences as og_geosciences
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeModelType
 
 # Local application imports
-from .types import GeodeModelType
 from .geode_brep import GeodeBRep
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_surface_mesh2d.py

@@ -5,10 +5,10 @@ from __future__ import annotations
 import opengeode as og
 import opengeode_geosciences as og_geosciences
 import opengeode_inspector as og_inspector
+from opengeodeweb_microservice.database.data_types import ViewerElementsType
 
 # Local application imports
 from .geode_vertex_set import GeodeVertexSet
-from .types import ViewerElementsType
 
 
 class GeodeSurfaceMesh2D(GeodeVertexSet):

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_surface_mesh3d.py

@@ -5,10 +5,10 @@ from __future__ import annotations
 import opengeode as og
 import opengeode_geosciences as og_geosciences
 import opengeode_inspector as og_inspector
+from opengeodeweb_microservice.database.data_types import ViewerElementsType
 
 # Local application imports
 from .geode_vertex_set import GeodeVertexSet
-from .types import ViewerElementsType
 
 
 class GeodeSurfaceMesh3D(GeodeVertexSet):

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_tetrahedral_solid3d.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 # Third party imports
 import opengeode as og
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_solid_mesh3d import GeodeSolidMesh3D
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_triangulated_surface2d.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 # Third party imports
 import opengeode as og
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_surface_mesh2d import GeodeSurfaceMesh2D
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_triangulated_surface3d.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 # Third party imports
 import opengeode as og
 import geode_viewables as viewables
+from opengeodeweb_microservice.database.data_types import GeodeMeshType
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_surface_mesh3d import GeodeSurfaceMesh3D
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/geode_objects/geode_vertex_set.py

@@ -3,9 +3,12 @@ from __future__ import annotations
 
 # Third party imports
 import opengeode as og
+from opengeodeweb_microservice.database.data_types import (
+    GeodeMeshType,
+    ViewerElementsType,
+)
 
 # Local application imports
-from .types import GeodeMeshType, ViewerElementsType
 from .geode_mesh import GeodeMesh
 
 

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -17,13 +17,13 @@ from opengeodeweb_microservice.schemas import get_schemas_dict
 from opengeodeweb_microservice.database.data import Data
 from opengeodeweb_microservice.database.connection import get_session
 from opengeodeweb_microservice.database import connection
+from opengeodeweb_microservice.database.data_types import geode_object_type
 
 # Local application imports
 from opengeodeweb_back import geode_functions, utils_functions
 from opengeodeweb_back.routes import schemas
 from opengeodeweb_back.routes.models import blueprint_models
 from opengeodeweb_back.geode_objects import geode_objects
-from opengeodeweb_back.geode_objects.types import geode_object_type
 from opengeodeweb_back.geode_objects.geode_mesh import GeodeMesh
 from opengeodeweb_back.geode_objects.geode_graph import GeodeGraph
 from opengeodeweb_back.geode_objects.geode_grid2d import GeodeGrid2D

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/src/opengeodeweb_back/utils_functions.py

@@ -17,11 +17,11 @@ import werkzeug
 from opengeodeweb_microservice.schemas import SchemaDict
 from opengeodeweb_microservice.database.data import Data
 from opengeodeweb_microservice.database.connection import get_session
+from opengeodeweb_microservice.database.data_types import GeodeObjectType
 
 # Local application imports
 from . import geode_functions
 from .geode_objects import geode_objects
-from .geode_objects.types import GeodeObjectType
 from .geode_objects.geode_object import GeodeObject
 
 
@@ -59,6 +59,7 @@ def terminate_session(exception: BaseException | None) -> None:
 def before_request(current_app: flask.Flask) -> None:
     increment_request_counter(current_app)
     flask.g.session = get_session()
+    flask.g.start_time = time.perf_counter()
 
 
 def teardown_request(
@@ -67,6 +68,12 @@ def teardown_request(
     decrement_request_counter(current_app)
     update_last_request_time(current_app)
     terminate_session(exception)
+    if flask.has_request_context():
+        message = "Request to " + str(flask.request.endpoint) + " completed"
+        if hasattr(flask.g, "start_time"):
+            duration = time.perf_counter() - flask.g.start_time
+            message += " in " + str(duration) + "s"
+        print(message, flush=True)
 
 
 def kill_task(current_app: flask.Flask) -> None:

{opengeodeweb_back-6.3.1rc2 → opengeodeweb_back-6.3.2}/tests/test_geode_functions.py

@@ -3,11 +3,11 @@ import os
 import uuid
 
 # Third party imports
+from opengeodeweb_microservice.database.data_types import GeodeObjectType_values
 
 # Local application imports
 from opengeodeweb_back import geode_functions
 from opengeodeweb_back.geode_objects import geode_objects
-from opengeodeweb_back.geode_objects.types import GeodeObjectType_values
 
 data_folder = os.path.join(os.path.dirname(__file__), "data")
 

opengeodeweb_back-6.3.1rc2/src/opengeodeweb_back/geode_objects/types.py

@@ -1,77 +0,0 @@
-# Standard library imports
-from typing import Literal, get_args, cast
-
-# Third party imports
-
-# Local application imports
-
-GeodePointMeshType = Literal[
-    "PointSet2D",
-    "PointSet3D",
-]
-GeodeEdgeMeshType = Literal[
-    "EdgedCurve2D",
-    "EdgedCurve3D",
-]
-GeodePolygonMeshType = Literal[
-    "RasterImage2D",
-    "PolygonalSurface2D",
-    "PolygonalSurface3D",
-    "TriangulatedSurface2D",
-    "TriangulatedSurface3D",
-    "RegularGrid2D",
-    "LightRegularGrid2D",
-]
-GeodePolyhedronMeshType = Literal[
-    "RasterImage3D",
-    "PolyhedralSolid3D",
-    "TetrahedralSolid3D",
-    "HybridSolid3D",
-    "RegularGrid3D",
-    "LightRegularGrid3D",
-]
-GeodeMeshType = (
-    Literal[
-        "VertexSet",
-        "Graph",
-    ]
-    | GeodePointMeshType
-    | GeodeEdgeMeshType
-    | GeodePolygonMeshType
-    | GeodePolyhedronMeshType
-)
-GeodeModelType = Literal[
-    "BRep",
-    "Section",
-    "StructuralModel",
-    "CrossSection",
-    "ImplicitStructuralModel",
-    "ImplicitCrossSection",
-]
-GeodeObjectType = GeodeMeshType | GeodeModelType
-
-
-def _flatten_literal_args(literal: object) -> tuple[str, ...]:
-    flattened: list[str] = []
-    for arg in get_args(literal):
-        if isinstance(arg, str):
-            flattened.append(arg)
-        else:
-            flattened.extend(_flatten_literal_args(arg))
-    return tuple(flattened)
-
-
-GeodeObjectType_values = _flatten_literal_args(GeodeObjectType)
-
-
-def geode_object_type(value: str) -> GeodeObjectType:
-    if value not in GeodeObjectType_values:
-        raise ValueError(
-            f"Invalid GeodeObjectType: {value!r}. Must be one of {GeodeObjectType_values}"
-        )
-    return cast(GeodeObjectType, value)
-
-
-ViewerType = Literal["mesh", "model"]
-
-ViewerElementsType = Literal["points", "edges", "polygons", "polyhedra", "default"]