Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into perf/model-components

Author: BotellaA

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