OpenGeodeWeb-Back 6.14.0rc3__tar.gz → 6.14.0rc4__tar.gz

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.14.0rc3
+Version: 6.14.0rc4
 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
@@ -28,7 +28,7 @@ Requires-Dist: opengeode-inspector==6.12.1
 Requires-Dist: opengeode-inspector-geosciences==1.2.1
 Requires-Dist: opengeode-io==7.8.3
 Requires-Dist: werkzeug==3.1.8
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.3.0rc1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.3.0rc2
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "6.14.0-rc.3"
+version = "6.14.0-rc.4"
 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.14.0rc3 → opengeodeweb_back-6.14.0rc4}/requirements.txt

@@ -66,4 +66,4 @@ werkzeug==3.1.8
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.3.0rc1
+opengeodeweb-microservice==1.*,>=1.3.0rc2

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/OpenGeodeWeb_Back.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.14.0rc3
+Version: 6.14.0rc4
 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
@@ -28,7 +28,7 @@ Requires-Dist: opengeode-inspector==6.12.1
 Requires-Dist: opengeode-inspector-geosciences==1.2.1
 Requires-Dist: opengeode-io==7.8.3
 Requires-Dist: werkzeug==3.1.8
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.3.0rc1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.3.0rc2
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -15,4 +15,4 @@ opengeode-inspector==6.12.1
 opengeode-inspector-geosciences==1.2.1
 opengeode-io==7.8.3
 werkzeug==3.1.8
-opengeodeweb-microservice==1.*,>=1.3.0rc1
+opengeodeweb-microservice==1.*,>=1.3.0rc2

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -649,7 +649,8 @@ def geode_object_inheritance(
         return bases
 
     def get_all_subclasses(geode_class: type) -> set[type]:
-        subclasses = set()
+        subclasses: set[type] = set()
+        subclass_class: type
         for subclass_class in geode_class.__subclasses__():
             subclasses.add(subclass_class)
             subclasses.update(get_all_subclasses(subclass_class))

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/create/schemas/edged_curve.json

@@ -60,7 +60,9 @@
         "type": "string"
       },
       "id": {
-        "type": "string"
+        "type": "string",
+        "minLength": 32,
+        "maxLength": 32
       },
       "name": {
         "type": "string"
@@ -92,7 +94,9 @@
               "type": "integer"
             },
             "geode_id": {
-              "type": "string"
+              "type": "string",
+              "minLength": 36,
+              "maxLength": 36
             },
             "name": {
               "type": "string"
@@ -103,13 +107,17 @@
             "boundaries": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "minLength": 36,
+                "maxLength": 36
               }
             },
             "internals": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "minLength": 36,
+                "maxLength": 36
               }
             },
             "is_active": {
@@ -134,7 +142,9 @@
           "type": "object",
           "properties": {
             "geode_id": {
-              "type": "string"
+              "type": "string",
+              "minLength": 36,
+              "maxLength": 36
             },
             "name": {
               "type": "string"
@@ -145,7 +155,9 @@
             "items": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "minLength": 36,
+                "maxLength": 36
               }
             },
             "is_active": {
@@ -161,6 +173,11 @@
           ],
           "additionalProperties": false
         }
+      },
+      "geode_id": {
+        "type": "string",
+        "minLength": 36,
+        "maxLength": 36
       }
     },
     "required": [
@@ -169,7 +186,8 @@
       "name",
       "viewer_type",
       "is_viewable",
-      "geode_object_type"
+      "geode_object_type",
+      "geode_id"
     ],
     "additionalProperties": false
   }

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/create/schemas/edged_curve.py

@@ -57,6 +57,7 @@ class EdgedCurveResponse(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print_dataclass(self)
 
+    geode_id: str
     geode_object_type: str
     id: str
     is_viewable: bool

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/create/schemas/point_set.json

@@ -46,7 +46,9 @@
         "type": "string"
       },
       "id": {
-        "type": "string"
+        "type": "string",
+        "minLength": 32,
+        "maxLength": 32
       },
       "name": {
         "type": "string"
@@ -78,7 +80,9 @@
               "type": "integer"
             },
             "geode_id": {
-              "type": "string"
+              "type": "string",
+              "minLength": 36,
+              "maxLength": 36
             },
             "name": {
               "type": "string"
@@ -89,13 +93,17 @@
             "boundaries": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "minLength": 36,
+                "maxLength": 36
               }
             },
             "internals": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "minLength": 36,
+                "maxLength": 36
               }
             },
             "is_active": {
@@ -120,7 +128,9 @@
           "type": "object",
           "properties": {
             "geode_id": {
-              "type": "string"
+              "type": "string",
+              "minLength": 36,
+              "maxLength": 36
             },
             "name": {
               "type": "string"
@@ -131,7 +141,9 @@
             "items": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "minLength": 36,
+                "maxLength": 36
               }
             },
             "is_active": {
@@ -147,6 +159,11 @@
           ],
           "additionalProperties": false
         }
+      },
+      "geode_id": {
+        "type": "string",
+        "minLength": 36,
+        "maxLength": 36
       }
     },
     "required": [
@@ -155,7 +172,8 @@
       "name",
       "viewer_type",
       "is_viewable",
-      "geode_object_type"
+      "geode_object_type",
+      "geode_id"
     ],
     "additionalProperties": false
   }

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/create/schemas/point_set.py

@@ -56,6 +56,7 @@ class PointSetResponse(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print_dataclass(self)
 
+    geode_id: str
     geode_object_type: str
     id: str
     is_viewable: bool

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/create/schemas/polygonal_surface.json

@@ -59,7 +59,9 @@
         "type": "string"
       },
       "id": {
-        "type": "string"
+        "type": "string",
+        "minLength": 32,
+        "maxLength": 32
       },
       "name": {
         "type": "string"
@@ -91,7 +93,9 @@
               "type": "integer"
             },
             "geode_id": {
-              "type": "string"
+              "type": "string",
+              "minLength": 36,
+              "maxLength": 36
             },
             "name": {
               "type": "string"
@@ -102,13 +106,17 @@
             "boundaries": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "minLength": 36,
+                "maxLength": 36
               }
             },
             "internals": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "minLength": 36,
+                "maxLength": 36
               }
             },
             "is_active": {
@@ -133,7 +141,9 @@
           "type": "object",
           "properties": {
             "geode_id": {
-              "type": "string"
+              "type": "string",
+              "minLength": 36,
+              "maxLength": 36
             },
             "name": {
               "type": "string"
@@ -144,7 +154,9 @@
             "items": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "minLength": 36,
+                "maxLength": 36
               }
             },
             "is_active": {
@@ -160,6 +172,11 @@
           ],
           "additionalProperties": false
         }
+      },
+      "geode_id": {
+        "type": "string",
+        "minLength": 36,
+        "maxLength": 36
       }
     },
     "required": [
@@ -168,7 +185,8 @@
       "name",
       "viewer_type",
       "is_viewable",
-      "geode_object_type"
+      "geode_object_type",
+      "geode_id"
     ],
     "additionalProperties": false
   }

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/create/schemas/polygonal_surface.py

@@ -57,6 +57,7 @@ class PolygonalSurfaceResponse(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print_dataclass(self)
 
+    geode_id: str
     geode_object_type: str
     id: str
     is_viewable: bool

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/cell_attribute_names.json

@@ -7,7 +7,8 @@
   "properties": {
     "id": {
       "type": "string",
-      "minLength": 1
+      "minLength": 32,
+      "maxLength": 32
     }
   },
   "required": [

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/edge_attribute_names.json

@@ -7,7 +7,8 @@
   "properties": {
     "id": {
       "type": "string",
-      "minLength": 1
+      "minLength": 32,
+      "maxLength": 32
     }
   },
   "required": [

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/model_component_edge_attribute_names.json

@@ -7,13 +7,15 @@
   "properties": {
     "id": {
       "type": "string",
-      "minLength": 1
+      "minLength": 32,
+      "maxLength": 32
     },
     "component_ids": {
       "type": "array",
       "items": {
         "type": "string",
-        "minLength": 1
+        "minLength": 36,
+        "maxLength": 36
       },
       "minItems": 1
     }

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/model_component_polygon_attribute_names.json

@@ -7,13 +7,15 @@
   "properties": {
     "id": {
       "type": "string",
-      "minLength": 1
+      "minLength": 32,
+      "maxLength": 32
     },
     "component_ids": {
       "type": "array",
       "items": {
         "type": "string",
-        "minLength": 1
+        "minLength": 36,
+        "maxLength": 36
       },
       "minItems": 1
     }

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/model_component_polyhedron_attribute_names.json

@@ -7,13 +7,15 @@
   "properties": {
     "id": {
       "type": "string",
-      "minLength": 1
+      "minLength": 32,
+      "maxLength": 32
     },
     "component_ids": {
       "type": "array",
       "items": {
         "type": "string",
-        "minLength": 1
+        "minLength": 36,
+        "maxLength": 36
       },
       "minItems": 1
     }

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/model_component_vertex_attribute_names.json

@@ -7,13 +7,15 @@
   "properties": {
     "id": {
       "type": "string",
-      "minLength": 1
+      "minLength": 32,
+      "maxLength": 32
     },
     "component_ids": {
       "type": "array",
       "items": {
         "type": "string",
-        "minLength": 1
+        "minLength": 36,
+        "maxLength": 36
       },
       "minItems": 1
     }

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/polygon_attribute_names.json

@@ -7,7 +7,8 @@
   "properties": {
     "id": {
       "type": "string",
-      "minLength": 1
+      "minLength": 32,
+      "maxLength": 32
     }
   },
   "required": [

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/polyhedron_attribute_names.json

@@ -7,7 +7,8 @@
   "properties": {
     "id": {
       "type": "string",
-      "minLength": 1
+      "minLength": 32,
+      "maxLength": 32
     }
   },
   "required": [

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/save_viewable_file.json

@@ -26,7 +26,9 @@
         "type": "string"
       },
       "id": {
-        "type": "string"
+        "type": "string",
+        "minLength": 32,
+        "maxLength": 32
       },
       "name": {
         "type": "string"
@@ -58,7 +60,9 @@
               "type": "integer"
             },
             "geode_id": {
-              "type": "string"
+              "type": "string",
+              "minLength": 36,
+              "maxLength": 36
             },
             "name": {
               "type": "string"
@@ -69,13 +73,17 @@
             "boundaries": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "minLength": 36,
+                "maxLength": 36
               }
             },
             "internals": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "minLength": 36,
+                "maxLength": 36
               }
             },
             "is_active": {
@@ -100,7 +108,9 @@
           "type": "object",
           "properties": {
             "geode_id": {
-              "type": "string"
+              "type": "string",
+              "minLength": 36,
+              "maxLength": 36
             },
             "name": {
               "type": "string"
@@ -111,7 +121,9 @@
             "items": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "minLength": 36,
+                "maxLength": 36
               }
             },
             "is_active": {
@@ -127,6 +139,11 @@
           ],
           "additionalProperties": false
         }
+      },
+      "geode_id": {
+        "type": "string",
+        "minLength": 36,
+        "maxLength": 36
       }
     },
     "required": [
@@ -135,7 +152,8 @@
       "name",
       "viewer_type",
       "is_viewable",
-      "geode_object_type"
+      "geode_object_type",
+      "geode_id"
     ],
     "additionalProperties": false
   }

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/save_viewable_file.py

@@ -45,6 +45,7 @@ class SaveViewableFileResponse(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print_dataclass(self)
 
+    geode_id: str
     geode_object_type: str
     id: str
     is_viewable: bool

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/texture_coordinates.json

@@ -7,7 +7,8 @@
   "properties": {
     "id": {
       "type": "string",
-      "minLength": 1
+      "minLength": 32,
+      "maxLength": 32
     }
   },
   "required": [

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/validate.json

@@ -6,7 +6,9 @@
   "type": "object",
   "properties": {
     "id": {
-      "type": "string"
+      "type": "string",
+      "minLength": 32,
+      "maxLength": 32
     }
   },
   "required": [

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/routes/schemas/vertex_attribute_names.json

@@ -7,7 +7,8 @@
   "properties": {
     "id": {
       "type": "string",
-      "minLength": 1
+      "minLength": 32,
+      "maxLength": 32
     }
   },
   "required": [

{opengeodeweb_back-6.14.0rc3 → opengeodeweb_back-6.14.0rc4}/src/opengeodeweb_back/utils_functions.py

@@ -1,8 +1,10 @@
 # Standard library imports
 import base64
+import hashlib
 import os
 import threading
 import time
+import uuid
 import xml.etree.ElementTree as ET
 import zipfile
 from collections.abc import Callable
@@ -16,6 +18,7 @@ import importlib.metadata as metadata
 import shutil
 from werkzeug.exceptions import HTTPException
 import werkzeug
+import opengeode as og
 from opengeodeweb_microservice.schemas import ErrorResponse, SchemaDict
 from opengeodeweb_microservice.database.data import Data
 from opengeodeweb_microservice.database.connection import get_session
@@ -206,6 +209,12 @@ def create_data_folder_from_id(data_id: str) -> str:
     return data_path
 
 
+def content_based_uuid(file_path: str) -> og.uuid:
+    with open(file_path, "rb") as file:
+        digest = hashlib.file_digest(file, "sha256").hexdigest()
+    return og.uuid(str(uuid.uuid5(uuid.NAMESPACE_OID, digest)))
+
+
 def model_components(
     data_id: str, model: GeodeModel, viewable_file: str | None
 ) -> dict[str, Any]:
@@ -328,6 +337,7 @@ def save_all_viewables_and_return_info(
         response: dict[str, Any] = {
             "native_file": data.native_file,
             "id": data.id,
+            "geode_id": data.geode_id,
             "name": name,
             "viewer_type": data.viewer_object,
             "is_viewable": geode_object.is_viewable(),
@@ -347,6 +357,7 @@ def generate_files_from_object(
     geode_object: GeodeObject,
 ) -> dict[str, Any]:
     data = Data.create(
+        geode_id=geode_object.identifier.id().string(),
         geode_object=geode_object.geode_object_type(),
         viewer_object=geode_object.viewer_type(),
         viewer_elements_type=geode_object.viewer_elements_type(),
@@ -359,13 +370,16 @@ def generate_files_from_file(
     geode_object_type: GeodeObjectType, input_file: str
 ) -> dict[str, Any]:
     generic_geode_object = geode_objects[geode_object_type]
+    full_input_filename = geode_functions.upload_file_path(input_file)
+    geode_object = generic_geode_object.load(full_input_filename)
+    geode_object.builder().set_name(os.path.splitext(input_file)[0])
+    if not input_file.lower().endswith("." + geode_object.native_extension()):
+        geode_object.builder().set_id(content_based_uuid(full_input_filename))
     data = Data.create(
+        geode_id=geode_object.identifier.id().string(),
         geode_object=geode_object_type,
         viewer_object=generic_geode_object.viewer_type(),
         viewer_elements_type=generic_geode_object.viewer_elements_type(),
     )
     data_path = create_data_folder_from_id(data.id)
-    full_input_filename = geode_functions.upload_file_path(input_file)
-    geode_object = generic_geode_object.load(full_input_filename)
-    geode_object.builder().set_name(os.path.splitext(input_file)[0])
     return save_all_viewables_and_return_info(geode_object, data, data_path)