OpenGeodeWeb-Back 6.5.2rc7__tar.gz → 6.6.0__tar.gz

{opengeodeweb_back-6.5.2rc7/src/OpenGeodeWeb_Back.egg-info → opengeodeweb_back-6.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.5.2rc7
+Version: 6.6.0
 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
@@ -27,7 +27,7 @@ Requires-Dist: opengeode-geosciencesio==5.8.11
 Requires-Dist: opengeode-inspector==6.8.18
 Requires-Dist: opengeode-io==7.4.9
 Requires-Dist: werkzeug==3.1.2
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.3
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.5.2rc7 → opengeodeweb_back-6.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "6.5.2-rc.7"
+version = "6.6.0"
 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.5.2rc7 → opengeodeweb_back-6.6.0}/requirements.txt

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

{opengeodeweb_back-6.5.2rc7 → opengeodeweb_back-6.6.0/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.5.2rc7
+Version: 6.6.0
 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
@@ -27,7 +27,7 @@ Requires-Dist: opengeode-geosciencesio==5.8.11
 Requires-Dist: opengeode-inspector==6.8.18
 Requires-Dist: opengeode-io==7.4.9
 Requires-Dist: werkzeug==3.1.2
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.3
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.5.2rc7 → opengeodeweb_back-6.6.0}/src/OpenGeodeWeb_Back.egg-info/SOURCES.txt

@@ -52,8 +52,10 @@ src/opengeodeweb_back/geode_objects/geode_vertex_set.py
 src/opengeodeweb_back/routes/blueprint_routes.py
 src/opengeodeweb_back/routes/create/blueprint_create.py
 src/opengeodeweb_back/routes/create/schemas/__init__.py
-src/opengeodeweb_back/routes/create/schemas/point.json
-src/opengeodeweb_back/routes/create/schemas/point.py
+src/opengeodeweb_back/routes/create/schemas/edged_curve.json
+src/opengeodeweb_back/routes/create/schemas/edged_curve.py
+src/opengeodeweb_back/routes/create/schemas/point_set.json
+src/opengeodeweb_back/routes/create/schemas/point_set.py
 src/opengeodeweb_back/routes/schemas/__init__.py
 src/opengeodeweb_back/routes/schemas/allowed_files.json
 src/opengeodeweb_back/routes/schemas/allowed_files.py

{opengeodeweb_back-6.5.2rc7 → opengeodeweb_back-6.6.0}/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -14,4 +14,4 @@ opengeode-geosciencesio==5.8.11
 opengeode-inspector==6.8.18
 opengeode-io==7.4.9
 werkzeug==3.1.2
-opengeodeweb-microservice==1.*,>=1.1.1
+opengeodeweb-microservice==1.*,>=1.1.3

{opengeodeweb_back-6.5.2rc7 → opengeodeweb_back-6.6.0}/src/opengeodeweb_back/app.py

@@ -145,7 +145,7 @@ def run_server(app: Flask) -> None:
         default=app.config.get("MINUTES_BEFORE_TIMEOUT"),
         help="Number of minutes before the server times out",
     )
-    args = parser.parse_args()
+    args, _ = parser.parse_known_args()
     app.config.update(DATA_FOLDER_PATH=args.data_folder_path)
     app.config.update(
         EXTENSIONS_FOLDER_PATH=os.path.join(str(args.data_folder_path), "extensions")

opengeodeweb_back-6.6.0/src/opengeodeweb_back/routes/create/blueprint_create.py

@@ -0,0 +1,64 @@
+# Standard library imports
+import os
+
+# Third party imports
+import flask
+import opengeode
+from opengeodeweb_microservice.schemas import get_schemas_dict
+
+# Local application imports
+from opengeodeweb_back import geode_functions, utils_functions
+import opengeodeweb_back.routes.create.schemas as schemas
+from opengeodeweb_back.geode_objects.geode_point_set3d import GeodePointSet3D
+from opengeodeweb_back.geode_objects.geode_edged_curve3d import GeodeEdgedCurve3D
+
+routes = flask.Blueprint("create", __name__, url_prefix="/create")
+schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
+
+
+@routes.route(
+    schemas_dict["point_set"]["route"],
+    methods=schemas_dict["point_set"]["methods"],
+)
+def point_set() -> flask.Response:
+    json_data = utils_functions.validate_request(
+        flask.request, schemas_dict["point_set"]
+    )
+    params = schemas.PointSet.from_dict(json_data)
+
+    pointset = GeodePointSet3D()
+    builder = pointset.builder()
+    builder.set_name(params.name)
+    for point in params.points:
+        builder.create_point(opengeode.Point3D([point.x, point.y, point.z]))
+
+    result = utils_functions.generate_native_viewable_and_light_viewable_from_object(
+        pointset
+    )
+    return flask.make_response(result, 200)
+
+
+@routes.route(
+    schemas_dict["edged_curve"]["route"],
+    methods=schemas_dict["edged_curve"]["methods"],
+)
+def edged_curve() -> flask.Response:
+    """Endpoint to create an edged curve in 3D space."""
+    json_data = utils_functions.validate_request(
+        flask.request, schemas_dict["edged_curve"]
+    )
+    params = schemas.EdgedCurve.from_dict(json_data)
+
+    edged_curve_obj = GeodeEdgedCurve3D()
+    builder = edged_curve_obj.builder()
+    builder.set_name(params.name)
+    for point in params.points:
+        builder.create_point(opengeode.Point3D([point.x, point.y, point.z]))
+
+    for edge in params.edges:
+        builder.create_edge_with_vertices(edge[0], edge[1])
+
+    result = utils_functions.generate_native_viewable_and_light_viewable_from_object(
+        edged_curve_obj
+    )
+    return flask.make_response(result, 200)

opengeodeweb_back-6.6.0/src/opengeodeweb_back/routes/create/schemas/__init__.py

@@ -0,0 +1,2 @@
+from .point_set import *
+from .edged_curve import *

opengeodeweb_back-6.6.0/src/opengeodeweb_back/routes/create/schemas/edged_curve.json

@@ -0,0 +1,38 @@
+{
+  "route": "/edged_curve",
+  "methods": ["POST"],
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "minLength": 1
+    },
+    "points": {
+      "type": "array",
+      "items": {
+        "title": "EdgedCurvePoint",
+        "type": "object",
+        "properties": {
+          "x": { "type": "number" },
+          "y": { "type": "number" },
+          "z": { "type": "number" }
+        },
+        "required": ["x", "y", "z"],
+        "additionalProperties": false
+      },
+      "minItems": 2
+    },
+    "edges": {
+      "type": "array",
+      "items": {
+        "type": "array",
+        "items": { "type": "integer" },
+        "minItems": 2,
+        "maxItems": 2
+      },
+      "minItems": 1
+    }
+  },
+  "required": ["name", "points", "edges"],
+  "additionalProperties": false
+}

opengeodeweb_back-6.6.0/src/opengeodeweb_back/routes/create/schemas/edged_curve.py

@@ -0,0 +1,23 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+from typing import List
+
+
+@dataclass
+class EdgedCurvePoint(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    x: float
+    y: float
+    z: float
+
+
+@dataclass
+class EdgedCurve(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    edges: List[List[int]]
+    name: str
+    points: List[EdgedCurvePoint]

opengeodeweb_back-6.6.0/src/opengeodeweb_back/routes/create/schemas/point_set.json

@@ -0,0 +1,27 @@
+{
+  "route": "/point_set",
+  "methods": ["POST"],
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "minLength": 1
+    },
+    "points": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "x": { "type": "number" },
+          "y": { "type": "number" },
+          "z": { "type": "number" }
+        },
+        "required": ["x", "y", "z"],
+        "additionalProperties": false
+      },
+      "minItems": 1
+    }
+  },
+  "required": ["name", "points"],
+  "additionalProperties": false
+}

opengeodeweb_back-6.5.2rc7/src/opengeodeweb_back/routes/create/schemas/point.py → opengeodeweb_back-6.6.0/src/opengeodeweb_back/routes/create/schemas/point_set.py

@@ -1,5 +1,6 @@
 from dataclasses_json import DataClassJsonMixin
 from dataclasses import dataclass
+from typing import List
 
 
 @dataclass
@@ -7,7 +8,15 @@ class Point(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print(self, flush=True)
 
-    name: str
     x: float
     y: float
     z: float
+
+
+@dataclass
+class PointSet(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    name: str
+    points: List[Point]

opengeodeweb_back-6.6.0/tests/test_create_routes.py

@@ -0,0 +1,110 @@
+# Standard library imports
+import copy
+
+# Third party imports
+import pytest
+from flask.testing import FlaskClient
+
+# Local application imports
+from opengeodeweb_back import test_utils
+
+
+@pytest.fixture
+def point_data() -> test_utils.JsonData:
+    return {"name": "test_point", "points": [{"x": 1.0, "y": 2.0, "z": 3.0}]}
+
+
+@pytest.fixture
+def curve_data() -> test_utils.JsonData:
+    return {
+        "name": "test_curve",
+        "points": [{"x": 0.0, "y": 0.0, "z": 0.0}, {"x": 1.0, "y": 1.0, "z": 1.0}],
+        "edges": [[0, 1]],
+    }
+
+
+def test_create_point(client: FlaskClient, point_data: test_utils.JsonData) -> None:
+    """Test the creation of a point with valid data."""
+    route: str = "/opengeodeweb_back/create/point_set"
+
+    # Test with all required data
+    response = client.post(route, json=point_data)
+    assert response.status_code == 200
+
+    # Verify response data
+    response_data = response.get_json()
+    assert "viewable_file" in response_data
+    assert "id" in response_data
+    assert "name" in response_data
+    assert "native_file" in response_data
+    assert "viewer_type" in response_data
+    assert "geode_object_type" in response_data
+
+    assert response_data["name"] == point_data["name"]
+    assert response_data["viewer_type"] == "mesh"
+    assert response_data["geode_object_type"] == "PointSet3D"
+
+    # Test with missing parameters
+    test_utils.test_route_wrong_params(client, route, lambda: copy.deepcopy(point_data))
+
+
+def test_create_point_set_multiple(client: FlaskClient) -> None:
+    """Test the creation of a point set with multiple points."""
+    route: str = "/opengeodeweb_back/create/point_set"
+    data = {
+        "name": "multiple_points",
+        "points": [
+            {"x": 1.0, "y": 2.0, "z": 3.0},
+            {"x": 4.0, "y": 5.0, "z": 6.0},
+            {"x": 7.0, "y": 8.0, "z": 9.0},
+        ],
+    }
+    response = client.post(route, json=data)
+    assert response.status_code == 200
+
+    response_data = response.get_json()
+    assert response_data["name"] == data["name"]
+    assert response_data["geode_object_type"] == "PointSet3D"
+
+
+def test_create_point_with_invalid_data(client: FlaskClient) -> None:
+    """Test the point creation endpoint with invalid data."""
+    route: str = "/opengeodeweb_back/create/point_set"
+
+    # Test with non-numeric coordinates
+    invalid_data: test_utils.JsonData = {
+        "name": "invalid_point",
+        "points": [{"x": "not_a_number", "y": 2.0, "z": 3.0}],
+    }
+    response = client.post(route, json=invalid_data)
+    assert response.status_code == 400
+
+    # Test with missing coordinates
+    invalid_data = {"name": "invalid_point", "points": [{"y": 2.0, "z": 3.0}]}
+    response = client.post(route, json=invalid_data)
+    assert response.status_code == 400
+
+
+def test_create_curve(client: FlaskClient, curve_data: test_utils.JsonData) -> None:
+    """Test the creation of a curve with valid data."""
+    route: str = "/opengeodeweb_back/create/edged_curve"
+
+    # Test with all required data
+    response = client.post(route, json=curve_data)
+    assert response.status_code == 200
+
+    # Verify response data
+    response_data = response.get_json()
+    assert "viewable_file" in response_data
+    assert "id" in response_data
+    assert "name" in response_data
+    assert "native_file" in response_data
+    assert "viewer_type" in response_data
+    assert "geode_object_type" in response_data
+
+    assert response_data["name"] == curve_data["name"]
+    assert response_data["viewer_type"] == "mesh"
+    assert response_data["geode_object_type"] == "EdgedCurve3D"
+
+    # Test with missing parameters
+    test_utils.test_route_wrong_params(client, route, lambda: copy.deepcopy(curve_data))

{opengeodeweb_back-6.5.2rc7 → opengeodeweb_back-6.6.0}/tests/test_routes.py

@@ -583,12 +583,10 @@ def test_import_project_route(client: FlaskClient, tmp_path: Path) -> None:
 
 
 def test_save_viewable_workflow_from_object(client: FlaskClient) -> None:
-    route = "/opengeodeweb_back/create/point"
+    route = "/opengeodeweb_back/create/point_set"
     point_data = {
         "name": "workflow_point_3d",
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
+        "points": [{"x": 0.0, "y": 0.0, "z": 0.0}],
     }
 
     response = client.post(route, json=point_data)

opengeodeweb_back-6.5.2rc7/src/opengeodeweb_back/routes/create/blueprint_create.py

@@ -1,38 +0,0 @@
-# Standard library imports
-import os
-
-# Third party imports
-import flask
-import opengeode
-from opengeodeweb_microservice.schemas import get_schemas_dict
-
-# Local application imports
-from opengeodeweb_back import geode_functions, utils_functions
-import opengeodeweb_back.routes.create.schemas as schemas
-from opengeodeweb_back.geode_objects.geode_point_set3d import GeodePointSet3D
-from opengeodeweb_back.geode_objects.geode_edged_curve3d import GeodeEdgedCurve3D
-
-routes = flask.Blueprint("create", __name__, url_prefix="/create")
-schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
-
-
-@routes.route(
-    schemas_dict["point"]["route"],
-    methods=schemas_dict["point"]["methods"],
-)
-def point() -> flask.Response:
-    """Endpoint to create a single point in 3D space."""
-    json_data = utils_functions.validate_request(flask.request, schemas_dict["point"])
-    params = schemas.Point.from_dict(json_data)
-
-    # Create the point
-    pointset = GeodePointSet3D()
-    builder = pointset.builder()
-    builder.set_name(params.name)
-    builder.create_point(opengeode.Point3D([params.x, params.y, params.z]))
-
-    # Save and get info
-    result = utils_functions.generate_native_viewable_and_light_viewable_from_object(
-        pointset
-    )
-    return flask.make_response(result, 200)

opengeodeweb_back-6.5.2rc7/src/opengeodeweb_back/routes/create/schemas/__init__.py

@@ -1 +0,0 @@
-from .point import *

opengeodeweb_back-6.5.2rc7/src/opengeodeweb_back/routes/create/schemas/point.json

@@ -1,22 +0,0 @@
-{
-  "route": "/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-6.5.2rc7/tests/test_create_routes.py

@@ -1,59 +0,0 @@
-# Standard library imports
-import uuid
-
-# Third party imports
-import pytest
-from flask.testing import FlaskClient
-
-# Local application imports
-from opengeodeweb_back import test_utils
-
-
-@pytest.fixture
-def point_data() -> test_utils.JsonData:
-    return {"name": "test_point", "x": 1.0, "y": 2.0, "z": 3.0}
-
-
-def test_create_point(client: FlaskClient, point_data: test_utils.JsonData) -> None:
-    """Test the creation of a point with valid data."""
-    route: str = "/opengeodeweb_back/create/point"
-
-    # Test with all required data
-    response = client.post(route, json=point_data)
-    assert response.status_code == 200
-
-    # Verify response data
-    response_data = response.get_json()
-    assert "viewable_file" in response_data
-    assert "id" in response_data
-    assert "name" in response_data
-    assert "native_file" in response_data
-    assert "viewer_type" in response_data
-    assert "geode_object_type" in response_data
-
-    assert response_data["name"] == point_data["name"]
-    assert response_data["viewer_type"] == "mesh"
-    assert response_data["geode_object_type"] == "PointSet3D"
-
-    # Test with missing parameters
-    test_utils.test_route_wrong_params(client, route, lambda: point_data.copy())
-
-
-def test_create_point_with_invalid_data(client: FlaskClient) -> None:
-    """Test the point creation endpoint with invalid data."""
-    route: str = "/opengeodeweb_back/create/point"
-
-    # Test with non-numeric coordinates
-    invalid_data: test_utils.JsonData = {
-        "name": "invalid_point",
-        "x": "not_a_number",
-        "y": 2.0,
-        "z": 3.0,
-    }
-    response = client.post(route, json=invalid_data)
-    assert response.status_code == 400
-
-    # Test with missing coordinates
-    invalid_data = {"name": "invalid_point", "y": 2.0, "z": 3.0}
-    response = client.post(route, json=invalid_data)
-    assert response.status_code == 400