OpenGeodeWeb-Back 5.10.5rc1__py3-none-any.whl → 5.11.0rc1__py3-none-any.whl

opengeodeweb_back/app.py

@@ -4,30 +4,26 @@ import argparse
 import os
 import time
 from typing import Any
-
 import flask
 import flask_cors  # type: ignore
 from flask import Flask, Response
 from flask_cors import cross_origin
 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
 
-
 """ Global config """
 app: Flask = flask.Flask(__name__)
 
 """ Config variables """
 FLASK_DEBUG = True if os.environ.get("FLASK_DEBUG", default=None) == "True" else False
-
 if FLASK_DEBUG == False:
     app.config.from_object(app_config.ProdConfig)
 else:
     app.config.from_object(app_config.DevConfig)
-
 DEFAULT_HOST: str = app.config.get("DEFAULT_HOST") or "localhost"
 DEFAULT_PORT: int = int(app.config.get("DEFAULT_PORT") or 5000)
 DEFAULT_DATA_FOLDER_PATH: str = app.config.get("DEFAULT_DATA_FOLDER_PATH") or "./data"
@@ -54,12 +50,16 @@ app.register_blueprint(
     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",
+    name="opengeodeweb_create",
+)
 
 if FLASK_DEBUG == False:
     utils_functions.set_interval(
@@ -72,6 +72,11 @@ def errorhandler(e: HTTPException) -> tuple[dict[str, Any], int] | Response:
     return utils_functions.handle_exception(e)
 
 
+@app.errorhandler(Exception)
+def handle_generic_exception(e: Exception) -> Response:
+    return flask.make_response({"error": str(e)}, 500)
+
+
 @app.route(
     "/error",
     methods=["POST"],
@@ -136,13 +141,10 @@ def run_server() -> None:
         help="Number of minutes before the server times out",
     )
     args = parser.parse_args()
-
     app.config.update(DATA_FOLDER_PATH=args.data_folder_path)
     app.config.update(UPLOAD_FOLDER=args.upload_folder_path)
     app.config.update(MINUTES_BEFORE_TIMEOUT=args.timeout)
-
     flask_cors.CORS(app, origins=args.allowed_origins)
-
     print(
         f"Host: {args.host}, Port: {args.port}, Debug: {args.debug}, "
         f"Data folder path: {args.data_folder_path}, Timeout: {args.timeout}, "
@@ -158,7 +160,6 @@ def run_server() -> None:
 
     connection.init_database(db_path)
     print(f"Database initialized at: {db_path}", flush=True)
-
     app.run(debug=args.debug, host=args.host, port=args.port, ssl_context=SSL)
 
 

opengeodeweb_back/routes/blueprint_routes.py

@@ -10,7 +10,8 @@ import werkzeug
 
 # Local application imports
 from .. import geode_functions, utils_functions
-
+from opengeodeweb_microservice.database.data import Data
+from opengeodeweb_microservice.database.connection import get_session
 from .models import blueprint_models
 
 routes = flask.Blueprint("routes", __name__, url_prefix="/opengeodeweb_back")
@@ -22,7 +23,6 @@ routes.register_blueprint(
     name=blueprint_models.routes.name,
 )
 
-
 schemas = os.path.join(os.path.dirname(__file__), "schemas")
 
 with open(
@@ -244,30 +244,6 @@ def save_viewable_file():
     )
 
 
-with open(os.path.join(schemas, "create_point.json"), "r") as file:
-    create_point_json = json.load(file)
-
-
-@routes.route(create_point_json["route"], methods=create_point_json["methods"])
-def create_point():
-    utils_functions.validate_request(flask.request, create_point_json)
-    title = flask.request.get_json()["title"]
-    x = flask.request.get_json()["x"]
-    y = flask.request.get_json()["y"]
-    z = flask.request.get_json()["z"]
-    class_ = geode_functions.geode_object_class("PointSet3D")
-    PointSet3D = class_.create()
-    builder = geode_functions.create_builder("PointSet3D", PointSet3D)
-    builder.create_point(opengeode.Point3D([x, y, z]))
-    builder.set_name(title)
-    return flask.make_response(
-        utils_functions.generate_native_viewable_and_light_viewable_from_object(
-            "PointSet3D", PointSet3D
-        ),
-        200,
-    )
-
-
 with open(os.path.join(schemas, "texture_coordinates.json"), "r") as file:
     texture_coordinates_json = json.load(file)
 

opengeodeweb_back/routes/create/blueprint_create.py

@@ -0,0 +1,117 @@
+# Standard library imports
+import json
+import os
+from typing import Any, TypedDict
+
+# Third party imports
+import flask
+import opengeode
+
+# Local application imports
+from opengeodeweb_back import geode_functions, utils_functions
+
+routes = flask.Blueprint("create", __name__, url_prefix="/create")
+schemas = os.path.join(os.path.dirname(__file__), "schemas")
+
+# --- Type definitions ---
+type SchemaDict = dict[str, Any]
+
+
+class PointDict(TypedDict):
+    x: float
+    y: float
+
+
+class CreatePointParams(TypedDict):
+    name: str
+    x: float
+    y: float
+    z: float
+
+
+class CreateAOIParams(TypedDict):
+    name: str
+    points: list[PointDict]
+    z: float
+
+
+# Load schemas
+with open(os.path.join(schemas, "create_point.json"), "r") as file:
+    create_point_json: SchemaDict = json.load(file)
+
+
+@routes.route(create_point_json["route"], methods=create_point_json["methods"])
+def create_point() -> flask.Response:
+    """Endpoint to create a single point in 3D space."""
+    print(f"create_point : {flask.request=}", flush=True)
+    utils_functions.validate_request(flask.request, create_point_json)
+
+    # Extract and validate data from request
+    params: CreatePointParams = flask.request.get_json()
+    name = params["name"]
+    x = params["x"]
+    y = params["y"]
+    z = params["z"]
+
+    # Create the point
+    class_ = geode_functions.geode_object_class("PointSet3D")
+    pointset = class_.create()
+    builder = geode_functions.create_builder("PointSet3D", pointset)
+    builder.set_name(name)
+    builder.create_point(opengeode.Point3D([x, y, z]))
+
+    # Save and get info
+    result = utils_functions.generate_native_viewable_and_light_viewable_from_object(
+        geode_object="PointSet3D",
+        data=pointset,
+    )
+    result["name"] = name
+    return flask.make_response(result, 200)
+
+
+# Load schema for AOI creation
+with open(os.path.join(schemas, "create_aoi.json"), "r") as file:
+    create_aoi_json: SchemaDict = json.load(file)
+
+
+@routes.route(create_aoi_json["route"], methods=create_aoi_json["methods"])
+def create_aoi() -> flask.Response:
+    """Endpoint to create an Area of Interest (AOI) as an EdgedCurve3D."""
+    print(f"create_aoi : {flask.request=}", flush=True)
+    utils_functions.validate_request(flask.request, create_aoi_json)
+
+    # Extract and validate data from request
+    params: CreateAOIParams = flask.request.get_json()
+    name = params["name"]
+    points = params["points"]
+    z = params["z"]
+
+    # Create the edged curve
+    class_ = geode_functions.geode_object_class("EdgedCurve3D")
+    edged_curve = class_.create()
+    builder = geode_functions.create_builder("EdgedCurve3D", edged_curve)
+    builder.set_name(name)
+
+    # Create vertices first
+    vertex_indices: list[int] = []
+    for point in points:
+        vertex_id = builder.create_point(opengeode.Point3D([point["x"], point["y"], z]))
+        vertex_indices.append(vertex_id)
+
+    # Create edges between consecutive vertices and close the loop
+    num_vertices = len(vertex_indices)
+    for i in range(num_vertices):
+        next_i = (i + 1) % num_vertices
+        edge_id = builder.create_edge()
+        builder.set_edge_vertex(opengeode.EdgeVertex(edge_id, 0), vertex_indices[i])
+        builder.set_edge_vertex(
+            opengeode.EdgeVertex(edge_id, 1), vertex_indices[next_i]
+        )
+
+    # Save and get info
+    result = utils_functions.generate_native_viewable_and_light_viewable_from_object(
+        geode_object="EdgedCurve3D",
+        data=edged_curve,
+    )
+    result["name"] = name
+    return flask.make_response(result, 200)

opengeodeweb_back/routes/create/schemas/create_aoi.json

@@ -0,0 +1,46 @@
+{
+    "route": "/create_aoi",
+    "methods": [
+        "POST"
+    ],
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string",
+            "description": "Name of the AOI"
+        },
+        "points": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "x": {
+                        "type": "number"
+                    },
+                    "y": {
+                        "type": "number"
+                    }
+                },
+                "required": [
+                    "x",
+                    "y"
+                ],
+                "additionalProperties": false
+            },
+            "minItems": 4,
+            "maxItems": 4
+        },
+        "z": {
+            "type": "number"
+        },
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "name",
+        "points",
+        "z"
+    ],
+    "additionalProperties": false
+}

opengeodeweb_back/routes/create/schemas/create_point.json

@@ -0,0 +1,29 @@
+{
+    "route": "/create_point",
+    "methods": [
+        "POST"
+    ],
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string",
+            "minLength": 1
+        },
+        "x": {
+            "type": "number"
+        },
+        "y": {
+            "type": "number"
+        },
+        "z": {
+            "type": "number"
+        }
+    },
+    "required": [
+        "name",
+        "x",
+        "y",
+        "z"
+    ],
+    "additionalProperties": false
+}

opengeodeweb_back/utils_functions.py

@@ -211,6 +211,7 @@ def save_all_viewables_and_return_info(
             "native_file_name": data_entry.native_file_name,
             "viewable_file_name": data_entry.viewable_file_name,
             "id": data_entry.id,
+            "name": data.name(),  # type: ignore
             "object_type": geode_functions.get_object_type(geode_object),
             "binary_light_viewable": binary_light_viewable.decode("utf-8"),
             "geode_object": data_entry.geode_object,

{opengeodeweb_back-5.10.5rc1.dist-info → opengeodeweb_back-5.11.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.10.5rc1
+Version: 5.11.0rc1
 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
@@ -16,18 +16,18 @@ Requires-Dist: blinker>=1
 Requires-Dist: click>=8
 Requires-Dist: flask[async]>=3
 Requires-Dist: flask-cors==6.0.1
-Requires-Dist: geode-common==33.11.0
-Requires-Dist: geode-viewables==3.3.0
+Requires-Dist: geode-common==33.11.3
+Requires-Dist: geode-viewables==3.3.2
 Requires-Dist: itsdangerous>=2
 Requires-Dist: jinja2>=3
 Requires-Dist: markupsafe>=3
-Requires-Dist: opengeode-core==15.27.4
-Requires-Dist: opengeode-geosciences==9.4.1
-Requires-Dist: opengeode-geosciencesio==5.8.0
-Requires-Dist: opengeode-inspector==6.8.1
-Requires-Dist: opengeode-io==7.4.0
+Requires-Dist: opengeode-core==15.29.2
+Requires-Dist: opengeode-geosciences==9.5.0
+Requires-Dist: opengeode-geosciencesio==5.8.1
+Requires-Dist: opengeode-inspector==6.8.2
+Requires-Dist: opengeode-io==7.4.2
 Requires-Dist: werkzeug==3.1.2
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.5rc1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.5
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-5.10.5rc1.dist-info → opengeodeweb_back-5.11.0rc1.dist-info}/RECORD

@@ -1,18 +1,20 @@
 opengeodeweb_back/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-opengeodeweb_back/app.py,sha256=_ws9UCqbR-_Hd4kE-Xh7FaGSulVRd7Au3KbOM3GUQ8I,4766
+opengeodeweb_back/app.py,sha256=SX7csXbWxlfeazrgSYuplJu9Z4LxupCd5T8O6bFN36g,5090
 opengeodeweb_back/app_config.py,sha256=z-omTiGj3-y0BZ1IchAM6EoTdC7vAX6B4OymEnuM0T4,843
 opengeodeweb_back/geode_functions.py,sha256=NzELy9s6AETDnm7tyA_uM2N89zrfeLdblRhzYrBONmw,10804
 opengeodeweb_back/geode_objects.py,sha256=_NclGPa024kCwUHdORkFuXYtiZBmQpgq6sO3LRkBhe8,27776
 opengeodeweb_back/py.typed,sha256=la67KBlbjXN-_-DfGNcdOcjYumVpKG_Tkw-8n5dnGB4,8
 opengeodeweb_back/test_utils.py,sha256=18AbRW9-tfKkPcmRGilTTHXI7S3armYyV7Vdy5UvUKM,794
-opengeodeweb_back/utils_functions.py,sha256=tHU6VjyW-QwohDihdcoVSiD2TdGLeB0EtBjCorvVb8I,9327
-opengeodeweb_back/routes/blueprint_routes.py,sha256=eTEKwKt9qc6cH1MDQ3lwmcnzLLxU_W8cYwu8HcUbXxo,10998
+opengeodeweb_back/utils_functions.py,sha256=gGhNENDyx9ooO1Mb7KWLfgGCJ9F2DZMRpp9EXzEmb9A,9376
+opengeodeweb_back/routes/blueprint_routes.py,sha256=xOcC_Urp8C62zX1XJ4ILQPicObPhoYBI-38ObGYH-UA,10251
+opengeodeweb_back/routes/create/blueprint_create.py,sha256=rHZbpIJ0dhpWCe8agWMFJCg1uSFiTBGjCO9bnktYyUY,3557
+opengeodeweb_back/routes/create/schemas/create_aoi.json,sha256=bFL5ZqhKAKsBmGwIQANzdIp1vGeH5WAHnRpZYsUZ1tQ,999
+opengeodeweb_back/routes/create/schemas/create_point.json,sha256=ddfDzWKj4cMYhF6oJzvRh0bpTiQo1hqLFODK-vJjxHQ,484
 opengeodeweb_back/routes/models/blueprint_models.py,sha256=Jo9pUDeu1nO3_IbBiuHGk57cc4_fhwxjM0EKNyv1FT0,1874
 opengeodeweb_back/routes/models/schemas/mesh_components.json,sha256=JmQUvpy7HpGS6FlThZLx1YjHqiInRTqUZ_Ft5MfOzEE,239
 opengeodeweb_back/routes/models/schemas/vtm_component_indices.json,sha256=0XILVxhAxi0RhQFDZZoUeGcAnBMroWz3kNJS7-6_dKQ,239
 opengeodeweb_back/routes/schemas/allowed_files.json,sha256=pRsGf39LiJpl3zEGLg4IqvRtm7iUx3Wq4Tb4tSFXGV0,234
 opengeodeweb_back/routes/schemas/allowed_objects.json,sha256=oy_YYpFzgDICx-keWqNIUpQM3zzB4eE3H6mPNxH9rWc,361
-opengeodeweb_back/routes/schemas/create_point.json,sha256=XjmXLMkr4jgWYHUKSwAhsxz1oLDZi8r8J0SY-QuEvks,386
 opengeodeweb_back/routes/schemas/geode_objects_and_output_extensions.json,sha256=tp83tPQaxTltQrdL8D3TnG8pqY_2fgAaYVeTWPXO0qI,371
 opengeodeweb_back/routes/schemas/geographic_coordinate_systems.json,sha256=lnPqevRRlUASF4ObmpG8ChH3c2LHNB99Si292S3OsLU,279
 opengeodeweb_back/routes/schemas/inspect_file.json,sha256=WoFF2hgZCUfqSDFJRq1sLpivjCQ6TCvSHPH8pKFY6KM,348
@@ -25,9 +27,9 @@ opengeodeweb_back/routes/schemas/save_viewable_file.json,sha256=pvvEdaC7bNASPMrl
 opengeodeweb_back/routes/schemas/texture_coordinates.json,sha256=2uQueIl1jOmxFG_gIi_vJETR4IurrwuSf8GAnzphk9g,237
 opengeodeweb_back/routes/schemas/upload_file.json,sha256=LJ3U3L5ApKuQDVFIpVT_y2alq4HW_suTvZ3HUucNbhg,219
 opengeodeweb_back/routes/schemas/vertex_attribute_names.json,sha256=ECIflohiqPZNsflAdkfEzksL4we0JvZhIxUd84Ubctg,240
-opengeodeweb_back-5.10.5rc1.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
-opengeodeweb_back-5.10.5rc1.dist-info/METADATA,sha256=6LnIyanx13uNBllBS48qFz4J41ZJ7nAOZDnPu9nIyKs,2668
-opengeodeweb_back-5.10.5rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-opengeodeweb_back-5.10.5rc1.dist-info/entry_points.txt,sha256=3W_t5GFc9ROHSIZ55IGvYU3DLHUFQmYOM4Bm9u3Z0cE,71
-opengeodeweb_back-5.10.5rc1.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
-opengeodeweb_back-5.10.5rc1.dist-info/RECORD,,
+opengeodeweb_back-5.11.0rc1.dist-info/licenses/LICENSE,sha256=LoTB-aqQvzTGxoTRXNnhNV0LKiqdk2bQv6MB34l8zkI,1079
+opengeodeweb_back-5.11.0rc1.dist-info/METADATA,sha256=jdzZkfKMcjHdsyvxvlq9UsJ-p6PsFNOUKmvV6lxyOSg,2665
+opengeodeweb_back-5.11.0rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opengeodeweb_back-5.11.0rc1.dist-info/entry_points.txt,sha256=3W_t5GFc9ROHSIZ55IGvYU3DLHUFQmYOM4Bm9u3Z0cE,71
+opengeodeweb_back-5.11.0rc1.dist-info/top_level.txt,sha256=tN1FZeLIVBrdja2-pbmhg5-tK-JILmmT9OeIBnhlUrQ,18
+opengeodeweb_back-5.11.0rc1.dist-info/RECORD,,

opengeodeweb_back/routes/schemas/create_point.json

@@ -1,29 +0,0 @@
-{
-  "route": "/create_point",
-  "methods": [
-    "POST"
-  ],
-  "type": "object",
-  "properties": {
-    "title": {
-      "type": "string",
-      "minLength": 1
-    },
-    "x": {
-      "type": "number"
-    },
-    "y": {
-      "type": "number"
-    },
-    "z": {
-      "type": "number"
-    }
-  },
-  "required": [
-    "title",
-    "x",
-    "y",
-    "z"
-  ],
-  "additionalProperties": false
-}