fix(Data): using Literals

requirements.txt

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

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:

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

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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):

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):

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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]]

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):

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 
 

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
 

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
 

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
 
 

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):

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
 
 

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):

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):

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
 
 

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