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

Author: JulienChampagnol

opengeodeweb_back_schemas.json

@@ -32,26 +32,6 @@
         "additionalProperties": false
       }
     },
-    "models": {
-      "model_components": {
-        "$id": "opengeodeweb_back/models/model_components",
-        "route": "/model_components",
-        "methods": [
-          "POST"
-        ],
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string",
-            "minLength": 1
-          }
-        },
-        "required": [
-          "id"
-        ],
-        "additionalProperties": false
-      }
-    },
     "vertex_attribute_names": {
       "$id": "opengeodeweb_back/vertex_attribute_names",
       "route": "/vertex_attribute_names",

requirements.txt

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

src/opengeodeweb_back/app.py

@@ -10,7 +10,6 @@
 from werkzeug.exceptions import HTTPException
 from opengeodeweb_back import utils_functions, app_config
 from opengeodeweb_back.routes import blueprint_routes
-from opengeodeweb_back.routes.models import blueprint_models
 from opengeodeweb_back.routes.create import blueprint_create
 from opengeodeweb_microservice.database import connection
 
@@ -85,11 +84,6 @@ def register_ogw_back_blueprints(app: flask.Flask) -> None:
         url_prefix="/opengeodeweb_back",
         name="opengeodeweb_back",
     )
-    app.register_blueprint(
-        blueprint_models.routes,
-        url_prefix="/opengeodeweb_back/models",
-        name="opengeodeweb_models",
-    )
     app.register_blueprint(
         blueprint_create.routes,
         url_prefix="/opengeodeweb_back/create",

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