diff --git a/requirements.txt b/requirements.txt index b855bc40..4504a827 100644 --- a/requirements.txt +++ b/requirements.txt @@ -60,4 +60,3 @@ werkzeug==3.1.2 # flask # flask-cors -opengeodeweb-microservice==1.*,>=1.0.15 diff --git a/src/opengeodeweb_back/geode_functions.py b/src/opengeodeweb_back/geode_functions.py index fb884f6c..791ebbaa 100644 --- a/src/opengeodeweb_back/geode_functions.py +++ b/src/opengeodeweb_back/geode_functions.py @@ -4,12 +4,15 @@ # 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: diff --git a/src/opengeodeweb_back/geode_objects/__init__.py b/src/opengeodeweb_back/geode_objects/__init__.py index bb32b69d..d1329a1d 100644 --- a/src/opengeodeweb_back/geode_objects/__init__.py +++ b/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 diff --git a/src/opengeodeweb_back/geode_objects/geode_brep.py b/src/opengeodeweb_back/geode_objects/geode_brep.py index 5cb32453..44fdfb16 100644 --- a/src/opengeodeweb_back/geode_objects/geode_brep.py +++ b/src/opengeodeweb_back/geode_objects/geode_brep.py @@ -6,9 +6,9 @@ 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_cross_section.py b/src/opengeodeweb_back/geode_objects/geode_cross_section.py index bfeda2c6..e88f0336 100644 --- a/src/opengeodeweb_back/geode_objects/geode_cross_section.py +++ b/src/opengeodeweb_back/geode_objects/geode_cross_section.py @@ -5,9 +5,9 @@ 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_edged_curve2d.py b/src/opengeodeweb_back/geode_objects/geode_edged_curve2d.py index a0124882..4edbe682 100644 --- a/src/opengeodeweb_back/geode_objects/geode_edged_curve2d.py +++ b/src/opengeodeweb_back/geode_objects/geode_edged_curve2d.py @@ -6,9 +6,9 @@ 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_edged_curve3d.py b/src/opengeodeweb_back/geode_objects/geode_edged_curve3d.py index 632da9a7..3b05c58d 100644 --- a/src/opengeodeweb_back/geode_objects/geode_edged_curve3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_edged_curve3d.py @@ -6,9 +6,9 @@ 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_graph.py b/src/opengeodeweb_back/geode_objects/geode_graph.py index 35d02e8f..ea394866 100644 --- a/src/opengeodeweb_back/geode_objects/geode_graph.py +++ b/src/opengeodeweb_back/geode_objects/geode_graph.py @@ -3,9 +3,12 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_grid2d.py b/src/opengeodeweb_back/geode_objects/geode_grid2d.py index 61134d67..8c73c877 100644 --- a/src/opengeodeweb_back/geode_objects/geode_grid2d.py +++ b/src/opengeodeweb_back/geode_objects/geode_grid2d.py @@ -4,10 +4,10 @@ # 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): diff --git a/src/opengeodeweb_back/geode_objects/geode_grid3d.py b/src/opengeodeweb_back/geode_objects/geode_grid3d.py index 757620f2..e28f229c 100644 --- a/src/opengeodeweb_back/geode_objects/geode_grid3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_grid3d.py @@ -4,10 +4,10 @@ # 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): diff --git a/src/opengeodeweb_back/geode_objects/geode_hybrid_solid3d.py b/src/opengeodeweb_back/geode_objects/geode_hybrid_solid3d.py index f9921935..ab31fb8a 100644 --- a/src/opengeodeweb_back/geode_objects/geode_hybrid_solid3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_hybrid_solid3d.py @@ -4,9 +4,9 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_implicit_cross_section.py b/src/opengeodeweb_back/geode_objects/geode_implicit_cross_section.py index 8f9a4e41..261f740a 100644 --- a/src/opengeodeweb_back/geode_objects/geode_implicit_cross_section.py +++ b/src/opengeodeweb_back/geode_objects/geode_implicit_cross_section.py @@ -5,9 +5,9 @@ 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_implicit_structural_model.py b/src/opengeodeweb_back/geode_objects/geode_implicit_structural_model.py index 45900daa..e92946ed 100644 --- a/src/opengeodeweb_back/geode_objects/geode_implicit_structural_model.py +++ b/src/opengeodeweb_back/geode_objects/geode_implicit_structural_model.py @@ -5,9 +5,9 @@ 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_light_regular_grid2d.py b/src/opengeodeweb_back/geode_objects/geode_light_regular_grid2d.py index 4e7de6a9..19930238 100644 --- a/src/opengeodeweb_back/geode_objects/geode_light_regular_grid2d.py +++ b/src/opengeodeweb_back/geode_objects/geode_light_regular_grid2d.py @@ -4,9 +4,9 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_light_regular_grid3d.py b/src/opengeodeweb_back/geode_objects/geode_light_regular_grid3d.py index 2854cf89..6dce7733 100644 --- a/src/opengeodeweb_back/geode_objects/geode_light_regular_grid3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_light_regular_grid3d.py @@ -4,9 +4,9 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_mesh.py b/src/opengeodeweb_back/geode_objects/geode_mesh.py index 68b7512f..737b29fe 100644 --- a/src/opengeodeweb_back/geode_objects/geode_mesh.py +++ b/src/opengeodeweb_back/geode_objects/geode_mesh.py @@ -4,9 +4,9 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_model.py b/src/opengeodeweb_back/geode_objects/geode_model.py index 14d867b3..537c32da 100644 --- a/src/opengeodeweb_back/geode_objects/geode_model.py +++ b/src/opengeodeweb_back/geode_objects/geode_model.py @@ -4,9 +4,9 @@ # 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]] diff --git a/src/opengeodeweb_back/geode_objects/geode_object.py b/src/opengeodeweb_back/geode_objects/geode_object.py index 1dcd42b6..f6fbc0a3 100644 --- a/src/opengeodeweb_back/geode_objects/geode_object.py +++ b/src/opengeodeweb_back/geode_objects/geode_object.py @@ -5,9 +5,13 @@ # 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): diff --git a/src/opengeodeweb_back/geode_objects/geode_point_set2d.py b/src/opengeodeweb_back/geode_objects/geode_point_set2d.py index 2a35b97a..99616c81 100644 --- a/src/opengeodeweb_back/geode_objects/geode_point_set2d.py +++ b/src/opengeodeweb_back/geode_objects/geode_point_set2d.py @@ -6,9 +6,9 @@ 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_point_set3d.py b/src/opengeodeweb_back/geode_objects/geode_point_set3d.py index 1c490b59..7532f5a3 100644 --- a/src/opengeodeweb_back/geode_objects/geode_point_set3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_point_set3d.py @@ -6,9 +6,9 @@ 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_polygonal_surface2d.py b/src/opengeodeweb_back/geode_objects/geode_polygonal_surface2d.py index 884866d8..6588bcf0 100644 --- a/src/opengeodeweb_back/geode_objects/geode_polygonal_surface2d.py +++ b/src/opengeodeweb_back/geode_objects/geode_polygonal_surface2d.py @@ -4,9 +4,9 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_polygonal_surface3d.py b/src/opengeodeweb_back/geode_objects/geode_polygonal_surface3d.py index 2ba68194..b2103d5e 100644 --- a/src/opengeodeweb_back/geode_objects/geode_polygonal_surface3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_polygonal_surface3d.py @@ -4,9 +4,9 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_polyhedral_solid3d.py b/src/opengeodeweb_back/geode_objects/geode_polyhedral_solid3d.py index 40232d2d..7ef8d837 100644 --- a/src/opengeodeweb_back/geode_objects/geode_polyhedral_solid3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_polyhedral_solid3d.py @@ -4,9 +4,9 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_raster_image2d.py b/src/opengeodeweb_back/geode_objects/geode_raster_image2d.py index 04787605..b03c063c 100644 --- a/src/opengeodeweb_back/geode_objects/geode_raster_image2d.py +++ b/src/opengeodeweb_back/geode_objects/geode_raster_image2d.py @@ -4,9 +4,12 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_raster_image3d.py b/src/opengeodeweb_back/geode_objects/geode_raster_image3d.py index a01bacfc..4947ee83 100644 --- a/src/opengeodeweb_back/geode_objects/geode_raster_image3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_raster_image3d.py @@ -4,9 +4,12 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_regular_grid2d.py b/src/opengeodeweb_back/geode_objects/geode_regular_grid2d.py index 7fa45e07..1bfe5f44 100644 --- a/src/opengeodeweb_back/geode_objects/geode_regular_grid2d.py +++ b/src/opengeodeweb_back/geode_objects/geode_regular_grid2d.py @@ -5,9 +5,9 @@ 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_regular_grid3d.py b/src/opengeodeweb_back/geode_objects/geode_regular_grid3d.py index 8f158ca4..2bc65a65 100644 --- a/src/opengeodeweb_back/geode_objects/geode_regular_grid3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_regular_grid3d.py @@ -5,9 +5,9 @@ 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_section.py b/src/opengeodeweb_back/geode_objects/geode_section.py index 7f2b7dc6..83b228f6 100644 --- a/src/opengeodeweb_back/geode_objects/geode_section.py +++ b/src/opengeodeweb_back/geode_objects/geode_section.py @@ -6,9 +6,9 @@ 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_solid_mesh3d.py b/src/opengeodeweb_back/geode_objects/geode_solid_mesh3d.py index 2978272a..32e866f3 100644 --- a/src/opengeodeweb_back/geode_objects/geode_solid_mesh3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_solid_mesh3d.py @@ -5,10 +5,10 @@ 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): diff --git a/src/opengeodeweb_back/geode_objects/geode_structural_model.py b/src/opengeodeweb_back/geode_objects/geode_structural_model.py index e81466b4..2c03068d 100644 --- a/src/opengeodeweb_back/geode_objects/geode_structural_model.py +++ b/src/opengeodeweb_back/geode_objects/geode_structural_model.py @@ -5,9 +5,9 @@ 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_surface_mesh2d.py b/src/opengeodeweb_back/geode_objects/geode_surface_mesh2d.py index d0b72597..3a3d7b7b 100644 --- a/src/opengeodeweb_back/geode_objects/geode_surface_mesh2d.py +++ b/src/opengeodeweb_back/geode_objects/geode_surface_mesh2d.py @@ -5,10 +5,10 @@ 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): diff --git a/src/opengeodeweb_back/geode_objects/geode_surface_mesh3d.py b/src/opengeodeweb_back/geode_objects/geode_surface_mesh3d.py index f84c0854..04f424fb 100644 --- a/src/opengeodeweb_back/geode_objects/geode_surface_mesh3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_surface_mesh3d.py @@ -5,10 +5,10 @@ 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): diff --git a/src/opengeodeweb_back/geode_objects/geode_tetrahedral_solid3d.py b/src/opengeodeweb_back/geode_objects/geode_tetrahedral_solid3d.py index 15bf2e53..9b8d9143 100644 --- a/src/opengeodeweb_back/geode_objects/geode_tetrahedral_solid3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_tetrahedral_solid3d.py @@ -4,9 +4,9 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_triangulated_surface2d.py b/src/opengeodeweb_back/geode_objects/geode_triangulated_surface2d.py index 14e448c2..1f9e3589 100644 --- a/src/opengeodeweb_back/geode_objects/geode_triangulated_surface2d.py +++ b/src/opengeodeweb_back/geode_objects/geode_triangulated_surface2d.py @@ -4,9 +4,9 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_triangulated_surface3d.py b/src/opengeodeweb_back/geode_objects/geode_triangulated_surface3d.py index d5c998f8..26fc0f68 100644 --- a/src/opengeodeweb_back/geode_objects/geode_triangulated_surface3d.py +++ b/src/opengeodeweb_back/geode_objects/geode_triangulated_surface3d.py @@ -4,9 +4,9 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/geode_vertex_set.py b/src/opengeodeweb_back/geode_objects/geode_vertex_set.py index 26b3ecd8..6acc2538 100644 --- a/src/opengeodeweb_back/geode_objects/geode_vertex_set.py +++ b/src/opengeodeweb_back/geode_objects/geode_vertex_set.py @@ -3,9 +3,12 @@ # 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 diff --git a/src/opengeodeweb_back/geode_objects/types.py b/src/opengeodeweb_back/geode_objects/types.py deleted file mode 100644 index 0faa76be..00000000 --- a/src/opengeodeweb_back/geode_objects/types.py +++ /dev/null @@ -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"] diff --git a/src/opengeodeweb_back/routes/blueprint_routes.py b/src/opengeodeweb_back/routes/blueprint_routes.py index fbc14653..2d4cc9d8 100644 --- a/src/opengeodeweb_back/routes/blueprint_routes.py +++ b/src/opengeodeweb_back/routes/blueprint_routes.py @@ -17,13 +17,13 @@ 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 diff --git a/src/opengeodeweb_back/utils_functions.py b/src/opengeodeweb_back/utils_functions.py index 1943c77f..d77e32df 100644 --- a/src/opengeodeweb_back/utils_functions.py +++ b/src/opengeodeweb_back/utils_functions.py @@ -17,11 +17,11 @@ 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 diff --git a/tests/test_geode_functions.py b/tests/test_geode_functions.py index ee9325da..10d98bf5 100644 --- a/tests/test_geode_functions.py +++ b/tests/test_geode_functions.py @@ -3,11 +3,11 @@ 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")