OpenGeodeWeb-Back 6.6.0rc1__tar.gz → 6.7.0__tar.gz

{opengeodeweb_back-6.6.0rc1/src/OpenGeodeWeb_Back.egg-info → opengeodeweb_back-6.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.6.0rc1
+Version: 6.7.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
@@ -15,18 +15,18 @@ Requires-Dist: asgiref>=3
 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.20.0
-Requires-Dist: geode-viewables==3.3.5
+Requires-Dist: flask-cors==6.0.2
+Requires-Dist: geode-common==33.21.5
+Requires-Dist: geode-viewables==3.3.8
 Requires-Dist: itsdangerous>=2
 Requires-Dist: jinja2>=3
 Requires-Dist: markupsafe>=3
-Requires-Dist: opengeode-core==16.3.2
-Requires-Dist: opengeode-geosciences==9.5.11
-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: opengeode-core==17.0.1
+Requires-Dist: opengeode-geosciences==9.5.14
+Requires-Dist: opengeode-geosciencesio==5.8.14
+Requires-Dist: opengeode-inspector==6.8.21
+Requires-Dist: opengeode-io==7.6.2
+Requires-Dist: werkzeug==3.1.8
 Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.3
 Dynamic: license-file
 

{opengeodeweb_back-6.6.0rc1 → opengeodeweb_back-6.7.0}/pyproject.toml

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

@@ -14,13 +14,13 @@ flask[async]>=3
     # via
     #   -r requirements.in
     #   flask-cors
-flask-cors==6.0.1
+flask-cors==6.0.2
     # via -r requirements.in
-geode-common==33.20.0
+geode-common==33.21.5
     # via
     #   -r requirements.in
     #   geode-viewables
-geode-viewables==3.3.5
+geode-viewables==3.3.8
     # via -r requirements.in
 itsdangerous>=2
     # via flask
@@ -31,7 +31,7 @@ markupsafe>=3
     #   flask
     #   jinja2
     #   werkzeug
-opengeode-core==16.3.2
+opengeode-core==17.0.1
     # via
     #   -r requirements.in
     #   geode-common
@@ -40,21 +40,21 @@ opengeode-core==16.3.2
     #   opengeode-geosciencesio
     #   opengeode-inspector
     #   opengeode-io
-opengeode-geosciences==9.5.11
+opengeode-geosciences==9.5.14
     # via
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-geosciencesio
-opengeode-geosciencesio==5.8.11
+opengeode-geosciencesio==5.8.14
     # via -r requirements.in
-opengeode-inspector==6.8.18
+opengeode-inspector==6.8.21
     # via -r requirements.in
-opengeode-io==7.4.9
+opengeode-io==7.6.2
     # via
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-geosciencesio
-werkzeug==3.1.2
+werkzeug==3.1.8
     # via
     #   -r requirements.in
     #   flask

{opengeodeweb_back-6.6.0rc1 → opengeodeweb_back-6.7.0/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.6.0rc1
+Version: 6.7.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
@@ -15,18 +15,18 @@ Requires-Dist: asgiref>=3
 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.20.0
-Requires-Dist: geode-viewables==3.3.5
+Requires-Dist: flask-cors==6.0.2
+Requires-Dist: geode-common==33.21.5
+Requires-Dist: geode-viewables==3.3.8
 Requires-Dist: itsdangerous>=2
 Requires-Dist: jinja2>=3
 Requires-Dist: markupsafe>=3
-Requires-Dist: opengeode-core==16.3.2
-Requires-Dist: opengeode-geosciences==9.5.11
-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: opengeode-core==17.0.1
+Requires-Dist: opengeode-geosciences==9.5.14
+Requires-Dist: opengeode-geosciencesio==5.8.14
+Requires-Dist: opengeode-inspector==6.8.21
+Requires-Dist: opengeode-io==7.6.2
+Requires-Dist: werkzeug==3.1.8
 Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.3
 Dynamic: license-file
 

{opengeodeweb_back-6.6.0rc1 → opengeodeweb_back-6.7.0}/src/OpenGeodeWeb_Back.egg-info/SOURCES.txt

@@ -52,6 +52,8 @@ 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/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

opengeodeweb_back-6.7.0/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -0,0 +1,17 @@
+asgiref>=3
+blinker>=1
+click>=8
+flask[async]>=3
+flask-cors==6.0.2
+geode-common==33.21.5
+geode-viewables==3.3.8
+itsdangerous>=2
+jinja2>=3
+markupsafe>=3
+opengeode-core==17.0.1
+opengeode-geosciences==9.5.14
+opengeode-geosciencesio==5.8.14
+opengeode-inspector==6.8.21
+opengeode-io==7.6.2
+werkzeug==3.1.8
+opengeodeweb-microservice==1.*,>=1.1.3

{opengeodeweb_back-6.6.0rc1 → opengeodeweb_back-6.7.0}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -64,7 +64,10 @@ def upload_file() -> flask.Response:
         flask.abort(400, "Filename is required")
     filename = werkzeug.utils.secure_filename(os.path.basename(file.filename))
     print(f"{filename=}", flush=True)
-    file.save(os.path.join(UPLOAD_FOLDER, filename))
+    file_path = os.path.join(UPLOAD_FOLDER, filename)
+    file.save(file_path)
+    if filename.lower().endswith(".csv.json"):
+        shutil.copyfile(file_path, os.path.join(UPLOAD_FOLDER, filename[:-9] + ".json"))
     return flask.make_response({"message": "File uploaded"}, 201)
 
 
@@ -432,10 +435,11 @@ def export_project() -> flask.Response:
 
         for data_id, native_file in rows:
             base_dir = os.path.join(project_folder, data_id)
-
-            native_path = os.path.join(base_dir, str(native_file))
-            if os.path.isfile(native_path):
-                zip_file.write(native_path, os.path.join(data_id, str(native_file)))
+            if os.path.isdir(base_dir):
+                for f_name in os.listdir(base_dir):
+                    file_path = os.path.join(base_dir, f_name)
+                    if os.path.isfile(file_path):
+                        zip_file.write(file_path, os.path.join(data_id, f_name))
 
         zip_file.writestr("snapshot.json", flask.json.dumps(params.snapshot))
 

{opengeodeweb_back-6.6.0rc1 → opengeodeweb_back-6.7.0}/src/opengeodeweb_back/routes/create/blueprint_create.py

@@ -36,3 +36,29 @@ def point_set() -> flask.Response:
         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.7.0/src/opengeodeweb_back/routes/create/schemas/__init__.py

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

opengeodeweb_back-6.7.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.7.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.0rc1 → opengeodeweb_back-6.7.0}/tests/test_create_routes.py

@@ -14,6 +14,15 @@ 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"
@@ -74,3 +83,28 @@ def test_create_point_with_invalid_data(client: FlaskClient) -> None:
     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.6.0rc1/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -1,17 +0,0 @@
-asgiref>=3
-blinker>=1
-click>=8
-flask[async]>=3
-flask-cors==6.0.1
-geode-common==33.20.0
-geode-viewables==3.3.5
-itsdangerous>=2
-jinja2>=3
-markupsafe>=3
-opengeode-core==16.3.2
-opengeode-geosciences==9.5.11
-opengeode-geosciencesio==5.8.11
-opengeode-inspector==6.8.18
-opengeode-io==7.4.9
-werkzeug==3.1.2
-opengeodeweb-microservice==1.*,>=1.1.3

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

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