OpenGeodeWeb-Back 6.2.0rc2__tar.gz → 6.3.0__tar.gz

{opengeodeweb_back-6.2.0rc2/src/OpenGeodeWeb_Back.egg-info → opengeodeweb_back-6.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.2.0rc2
+Version: 6.3.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.10
 Requires-Dist: opengeode-inspector==6.8.17
 Requires-Dist: opengeode-io==7.4.8
 Requires-Dist: werkzeug==3.1.2
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.14
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.15
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.2.0rc2 → opengeodeweb_back-6.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "6.2.0-rc.2"
+version = "6.3.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.2.0rc2 → opengeodeweb_back-6.3.0}/requirements.txt

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

{opengeodeweb_back-6.2.0rc2 → opengeodeweb_back-6.3.0/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.2.0rc2
+Version: 6.3.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.10
 Requires-Dist: opengeode-inspector==6.8.17
 Requires-Dist: opengeode-io==7.4.8
 Requires-Dist: werkzeug==3.1.2
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.14
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.15
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-6.2.0rc2 → opengeodeweb_back-6.3.0}/src/OpenGeodeWeb_Back.egg-info/SOURCES.txt

@@ -70,6 +70,8 @@ src/opengeodeweb_back/routes/schemas/edge_attribute_names.json
 src/opengeodeweb_back/routes/schemas/edge_attribute_names.py
 src/opengeodeweb_back/routes/schemas/export_project.json
 src/opengeodeweb_back/routes/schemas/export_project.py
+src/opengeodeweb_back/routes/schemas/geode_object_inheritance.json
+src/opengeodeweb_back/routes/schemas/geode_object_inheritance.py
 src/opengeodeweb_back/routes/schemas/geode_objects_and_output_extensions.json
 src/opengeodeweb_back/routes/schemas/geode_objects_and_output_extensions.py
 src/opengeodeweb_back/routes/schemas/geographic_coordinate_systems.json

{opengeodeweb_back-6.2.0rc2 → opengeodeweb_back-6.3.0}/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -14,4 +14,4 @@ opengeode-geosciencesio==5.8.10
 opengeode-inspector==6.8.17
 opengeode-io==7.4.8
 werkzeug==3.1.2
-opengeodeweb-microservice==1.*,>=1.0.14
+opengeodeweb-microservice==1.*,>=1.0.15

{opengeodeweb_back-6.2.0rc2 → opengeodeweb_back-6.3.0}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -426,7 +426,7 @@ def export_project() -> flask.Response:
     export_vease_path = os.path.join(project_folder, filename)
 
     with get_session() as session:
-        rows = session.query(Data.id, Data.input_file, Data.additional_files).all()
+        rows = session.query(Data.id, Data.native_file).all()
 
     with zipfile.ZipFile(
         export_vease_path, "w", compression=zipfile.ZIP_DEFLATED
@@ -435,21 +435,12 @@ def export_project() -> flask.Response:
         if os.path.isfile(database_root_path):
             zip_file.write(database_root_path, "project.db")
 
-        for data_id, input_file, additional_files in rows:
+        for data_id, native_file in rows:
             base_dir = os.path.join(project_folder, data_id)
 
-            input_path = os.path.join(base_dir, str(input_file))
-            if os.path.isfile(input_path):
-                zip_file.write(input_path, os.path.join(data_id, str(input_file)))
-
-            for relative_path in (
-                additional_files if isinstance(additional_files, list) else []
-            ):
-                additional_path = os.path.join(base_dir, relative_path)
-                if os.path.isfile(additional_path):
-                    zip_file.write(
-                        additional_path, os.path.join(data_id, relative_path)
-                    )
+            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)))
 
         zip_file.writestr("snapshot.json", flask.json.dumps(params.snapshot))
 
@@ -524,17 +515,17 @@ def import_project() -> flask.Response:
                     if os.path.isfile(vpath):
                         continue
 
-                input_file = str(data.input_file or "")
-                if not input_file:
+                native_file = str(data.native_file or "")
+                if not native_file:
                     continue
 
-                input_full = geode_functions.data_file_path(data.id, input_file)
-                if not os.path.isfile(input_full):
+                native_full = geode_functions.data_file_path(data.id, native_file)
+                if not os.path.isfile(native_full):
                     continue
 
                 geode_object = geode_functions.geode_object_from_string(
                     data.geode_object
-                ).load(input_full)
+                ).load(native_full)
                 utils_functions.save_all_viewables_and_return_info(
                     geode_object, data, data_path
                 )
@@ -617,3 +608,48 @@ def import_extension() -> flask.Response:
         },
         200,
     )
+
+
+@routes.route(
+    schemas_dict["geode_object_inheritance"]["route"],
+    methods=schemas_dict["geode_object_inheritance"]["methods"],
+)
+def geode_object_inheritance() -> flask.Response:
+    json_data = utils_functions.validate_request(
+        flask.request, schemas_dict["geode_object_inheritance"]
+    )
+    params = schemas.GeodeObjectInheritance.from_dict(json_data)
+    geode_object_type = params.geode_object_type
+    target_class = geode_functions.geode_object_from_string(geode_object_type)
+
+    def get_all_bases(geode_class: type) -> set[type]:
+        bases = set()
+        for base_class in geode_class.__bases__:
+            if base_class is not object:
+                bases.add(base_class)
+                bases.update(get_all_bases(base_class))
+        return bases
+
+    def get_all_subclasses(geode_class: type) -> set[type]:
+        subclasses = set()
+        for subclass_class in geode_class.__subclasses__():
+            subclasses.add(subclass_class)
+            subclasses.update(get_all_subclasses(subclass_class))
+        return subclasses
+
+    # Extract all related Geode classes (parents and children)
+    base_classes = get_all_bases(target_class)
+    subclass_classes = get_all_subclasses(target_class)
+
+    # Filter GeodeObjectType to only include registered related objects, excluding target
+    parents = []
+    children = []
+    for geode_object_type_str, geode_class in geode_objects.items():
+        if geode_class == target_class:
+            continue
+        if geode_class in base_classes:
+            parents.append(geode_object_type_str)
+        if geode_class in subclass_classes:
+            children.append(geode_object_type_str)
+
+    return flask.make_response({"parents": parents, "children": children}, 200)

{opengeodeweb_back-6.2.0rc2 → opengeodeweb_back-6.3.0}/src/opengeodeweb_back/routes/schemas/__init__.py

@@ -12,6 +12,7 @@ from .import_project import *
 from .import_extension import *
 from .geographic_coordinate_systems import *
 from .geode_objects_and_output_extensions import *
+from .geode_object_inheritance import *
 from .export_project import *
 from .edge_attribute_names import *
 from .cell_attribute_names import *

opengeodeweb_back-6.3.0/src/opengeodeweb_back/routes/schemas/geode_object_inheritance.json

@@ -0,0 +1,17 @@
+{
+  "route": "/geode_object_inheritance",
+  "methods": [
+    "POST"
+  ],
+  "type": "object",
+  "properties": {
+    "geode_object_type": {
+      "type": "string",
+      "minLength": 1
+    }
+  },
+  "required": [
+    "geode_object_type"
+  ],
+  "additionalProperties": false
+}

opengeodeweb_back-6.3.0/src/opengeodeweb_back/routes/schemas/geode_object_inheritance.py

@@ -0,0 +1,10 @@
+from dataclasses_json import DataClassJsonMixin
+from dataclasses import dataclass
+
+
+@dataclass
+class GeodeObjectInheritance(DataClassJsonMixin):
+    def __post_init__(self) -> None:
+        print(self, flush=True)
+
+    geode_object_type: str

{opengeodeweb_back-6.2.0rc2 → opengeodeweb_back-6.3.0}/src/opengeodeweb_back/utils_functions.py

@@ -212,9 +212,6 @@ def save_all_viewables_and_return_info(
         data.viewable_file = os.path.basename(viewable_path)
         data.light_viewable_file = os.path.basename(light_path)
 
-        if not data.input_file:
-            data.input_file = data.native_file
-
         assert data.native_file is not None
         assert data.viewable_file is not None
         assert data.light_viewable_file is not None
@@ -226,8 +223,6 @@ def save_all_viewables_and_return_info(
             "viewer_type": data.viewer_object,
             "binary_light_viewable": binary_light_viewable.decode("utf-8"),
             "geode_object_type": data.geode_object,
-            "input_file": data.input_file or "",
-            "additional_files": data.additional_files or [],
         }
 
 
@@ -251,36 +246,9 @@ def generate_native_viewable_and_light_viewable_from_file(
         geode_object=geode_object_type,
         viewer_object=generic_geode_object.viewer_type(),
         viewer_elements_type=generic_geode_object.viewer_elements_type(),
-        input_file=input_file,
     )
-
     data_path = create_data_folder_from_id(data.id)
-
     full_input_filename = geode_functions.upload_file_path(input_file)
-    copied_full_path = os.path.join(
-        data_path, werkzeug.utils.secure_filename(input_file)
-    )
-    shutil.copy2(full_input_filename, copied_full_path)
-
-    additional_files_copied: list[str] = []
-    additional = generic_geode_object.additional_files(full_input_filename)
-    for additional_file in additional.mandatory_files + additional.optional_files:
-        if additional_file.is_missing:
-            continue
-        source_path = os.path.join(
-            os.path.dirname(full_input_filename), additional_file.filename
-        )
-        if not os.path.exists(source_path):
-            continue
-        dest_path = os.path.join(data_path, additional_file.filename)
-        os.makedirs(os.path.dirname(dest_path), exist_ok=True)
-        shutil.copy2(source_path, dest_path)
-        additional_files_copied.append(additional_file.filename)
-
-    geode_object = generic_geode_object.load(copied_full_path)
-    data.additional_files = additional_files_copied
-    return save_all_viewables_and_return_info(
-        geode_object,
-        data,
-        data_path,
-    )
+    geode_object = generic_geode_object.load(full_input_filename)
+    geode_object.builder().set_name(input_file)
+    return save_all_viewables_and_return_info(geode_object, data, data_path)

{opengeodeweb_back-6.2.0rc2 → opengeodeweb_back-6.3.0}/tests/test_models_routes.py

@@ -77,18 +77,14 @@ def test_export_project_route(client: FlaskClient, tmp_path: Path) -> None:
             geode_object="BRep",
             viewer_object="BRep",
             viewer_elements_type="default",
-            input_file="test_native.txt",
-            native_file="test_native.txt",
-            additional_files=[],
+            native_file="native.txt",
         )
         data2 = Data(
             id="test_data_2",
             geode_object="Section",
             viewer_object="Section",
             viewer_elements_type="default",
-            input_file="test_input.txt",
-            native_file="test_native2.txt",
-            additional_files=[],
+            native_file="native.txt",
         )
         session.add(data1)
         session.add(data2)
@@ -96,13 +92,13 @@ def test_export_project_route(client: FlaskClient, tmp_path: Path) -> None:
 
         data1_dir = os.path.join(project_folder, "test_data_1")
         os.makedirs(data1_dir, exist_ok=True)
-        with open(os.path.join(data1_dir, "test_native.txt"), "w") as f:
+        with open(os.path.join(data1_dir, "native.txt"), "w") as f:
             f.write("native file content")
 
         data2_dir = os.path.join(project_folder, "test_data_2")
         os.makedirs(data2_dir, exist_ok=True)
-        with open(os.path.join(data2_dir, "test_input.txt"), "w") as f:
-            f.write("input file content")
+        with open(os.path.join(data2_dir, "native.txt"), "w") as f:
+            f.write("native file content")
 
     response = client.post(route, json={"snapshot": snapshot, "filename": filename})
     assert response.status_code == 200
@@ -119,8 +115,8 @@ def test_export_project_route(client: FlaskClient, tmp_path: Path) -> None:
         parsed = json.loads(zip_file.read("snapshot.json").decode("utf-8"))
         assert parsed == snapshot
         assert "project.db" in names
-        assert "test_data_1/test_native.txt" in names
-        assert "test_data_2/test_input.txt" in names
+        assert "test_data_1/native.txt" in names
+        assert "test_data_2/native.txt" in names
 
     response.close()
 
@@ -147,7 +143,7 @@ def test_import_project_route(client: FlaskClient, tmp_path: Path) -> None:
     conn = sqlite3.connect(str(temp_db))
     conn.execute(
         "CREATE TABLE datas (id TEXT PRIMARY KEY, geode_object TEXT, viewer_object TEXT, viewer_elements_type TEXT, native_file TEXT, "
-        "viewable_file TEXT, light_viewable_file TEXT, input_file TEXT, additional_files TEXT)"
+        "viewable_file TEXT, light_viewable_file TEXT)"
     )
     conn.commit()
     conn.close()

{opengeodeweb_back-6.2.0rc2 → opengeodeweb_back-6.3.0}/tests/test_routes.py

@@ -205,7 +205,6 @@ def test_texture_coordinates(client: FlaskClient, test_id: str) -> None:
             geode_object=GeodePolygonalSurface3D.geode_object_type(),
             viewer_object=GeodePolygonalSurface3D.viewer_type(),
             viewer_elements_type=GeodePolygonalSurface3D.viewer_elements_type(),
-            input_file=file,
         )
         data.native_file = file
         session = get_session()
@@ -234,7 +233,6 @@ def test_vertex_attribute_names(client: FlaskClient, test_id: str) -> None:
             geode_object=GeodePolygonalSurface3D.geode_object_type(),
             viewer_object=GeodePolygonalSurface3D.viewer_type(),
             viewer_elements_type=GeodePolygonalSurface3D.viewer_elements_type(),
-            input_file=file,
         )
         data.native_file = file
         session = get_session()
@@ -263,7 +261,6 @@ def test_cell_attribute_names(client: FlaskClient, test_id: str) -> None:
             geode_object=GeodeRegularGrid2D.geode_object_type(),
             viewer_object=GeodeRegularGrid2D.viewer_type(),
             viewer_elements_type=GeodeRegularGrid2D.viewer_elements_type(),
-            input_file=file,
         )
         data.native_file = file
         session = get_session()
@@ -292,7 +289,6 @@ def test_polygon_attribute_names(client: FlaskClient, test_id: str) -> None:
             geode_object=GeodePolygonalSurface3D.geode_object_type(),
             viewer_object=GeodePolygonalSurface3D.viewer_type(),
             viewer_elements_type=GeodePolygonalSurface3D.viewer_elements_type(),
-            input_file=file,
         )
         data.native_file = file
         session = get_session()
@@ -321,7 +317,6 @@ def test_polyhedron_attribute_names(client: FlaskClient, test_id: str) -> None:
             geode_object=GeodePolyhedralSolid3D.geode_object_type(),
             viewer_object=GeodePolyhedralSolid3D.viewer_type(),
             viewer_elements_type=GeodePolyhedralSolid3D.viewer_elements_type(),
-            input_file=file,
         )
         data.native_file = file
         session = get_session()
@@ -354,7 +349,6 @@ def test_edge_attribute_names(client: FlaskClient, test_id: str) -> None:
             geode_object=GeodeEdgedCurve3D.geode_object_type(),
             viewer_object=GeodeEdgedCurve3D.viewer_type(),
             viewer_elements_type=GeodeEdgedCurve3D.viewer_elements_type(),
-            input_file=file,
         )
         data.native_file = file
         session = get_session()
@@ -385,3 +379,48 @@ def test_database_uri_path(client: FlaskClient) -> None:
         assert app.config["SQLALCHEMY_DATABASE_URI"] == expected_uri
 
         assert os.path.exists(expected_db_path)
+
+
+def test_geode_object_inheritance(client: FlaskClient) -> None:
+    route = "/opengeodeweb_back/geode_object_inheritance"
+    # Test BRep
+    response = client.post(route, json={"geode_object_type": "BRep"})
+    assert response.status_code == 200
+    json_data = response.get_json()
+    parents = json_data["parents"]
+    children = json_data["children"]
+    assert "BRep" not in parents
+    assert "BRep" not in children
+    # Descendants
+    assert "StructuralModel" in children
+    assert "ImplicitStructuralModel" in children
+
+    # Test CrossSection
+    response = client.post(route, json={"geode_object_type": "CrossSection"})
+    assert response.status_code == 200
+    json_data = response.get_json()
+    parents = json_data["parents"]
+    children = json_data["children"]
+    assert "CrossSection" not in parents
+    assert "CrossSection" not in children
+    # Parent
+    assert "Section" in parents
+    # Descendant
+    assert "ImplicitCrossSection" in children
+
+    # Test PolyhedralSolid3D
+    response = client.post(route, json={"geode_object_type": "PolyhedralSolid3D"})
+    assert response.status_code == 200
+    json_data = response.get_json()
+    parents = json_data["parents"]
+    children = json_data["children"]
+    assert "PolyhedralSolid3D" not in parents
+    assert "PolyhedralSolid3D" not in children
+    # Parent
+    assert "VertexSet" in parents
+
+    # Test all params
+    def get_full_data() -> test_utils.JsonData:
+        return {"geode_object_type": "BRep"}
+
+    test_utils.test_route_wrong_params(client, route, get_full_data)

{opengeodeweb_back-6.2.0rc2 → opengeodeweb_back-6.3.0}/tests/test_utils_functions.py

@@ -105,15 +105,11 @@ def test_save_all_viewables_and_return_info(client: FlaskClient) -> None:
         assert os.path.exists(expected_db_path)
 
         geode_object = GeodeBRep.load(os.path.join(data_dir, "test.og_brep"))
-        input_file = "test.og_brep"
-        additional_files = ["additional_file.txt"]
 
         data_entry = Data.create(
             geode_object=geode_object.geode_object_type(),
             viewer_object=geode_object.viewer_type(),
             viewer_elements_type=geode_object.viewer_elements_type(),
-            input_file=input_file,
-            additional_files=additional_files,
         )
         data_path = utils_functions.create_data_folder_from_id(data_entry.id)
 
@@ -124,7 +120,7 @@ def test_save_all_viewables_and_return_info(client: FlaskClient) -> None:
         assert isinstance(result, dict)
         native_file = result["native_file"]
         assert isinstance(native_file, str)
-        assert native_file.startswith("native.")
+        assert native_file == "native.og_brep"
         viewable_file = result["viewable_file"]
         assert isinstance(viewable_file, str)
         assert viewable_file.endswith(".vtm")
@@ -134,15 +130,12 @@ def test_save_all_viewables_and_return_info(client: FlaskClient) -> None:
         assert isinstance(result["viewer_type"], str)
         assert isinstance(result["binary_light_viewable"], str)
         assert result["geode_object_type"] == geode_object.geode_object_type()
-        assert result["input_file"] == input_file
 
         db_entry = Data.get(result["id"])
         assert db_entry is not None
         assert db_entry.native_file == result["native_file"]
         assert db_entry.viewable_file == result["viewable_file"]
         assert db_entry.geode_object == geode_object.geode_object_type()
-        assert db_entry.input_file == input_file
-        assert db_entry.additional_files == additional_files
 
         expected_data_path = os.path.join(app.config["DATA_FOLDER_PATH"], result["id"])
         assert os.path.exists(expected_data_path)
@@ -152,13 +145,10 @@ def test_save_all_viewables_commits_to_db(client: FlaskClient) -> None:
     app = client.application
     with app.app_context():
         geode_object = GeodeBRep.load(os.path.join(data_dir, "test.og_brep"))
-        input_file = "test.og_brep"
         data_entry = Data.create(
             geode_object=geode_object.geode_object_type(),
             viewer_object=geode_object.viewer_type(),
             viewer_elements_type=geode_object.viewer_elements_type(),
-            input_file=input_file,
-            additional_files=[],
         )
         data_path = utils_functions.create_data_folder_from_id(data_entry.id)
 
@@ -196,11 +186,8 @@ def test_generate_native_viewable_and_light_viewable_from_object(
         assert isinstance(result["binary_light_viewable"], str)
         assert result["binary_light_viewable"].startswith('<?xml version="1.0"?>')
 
-        assert result["input_file"] == result["native_file"]
-
         data = Data.get(result["id"])
         assert data is not None
-        assert data.input_file == data.native_file
         assert data.light_viewable_file is not None
         assert data.light_viewable_file.endswith(".vtp")
 
@@ -221,14 +208,13 @@ def test_generate_native_viewable_and_light_viewable_from_file(
 
     assert isinstance(result, dict)
     assert isinstance(result["native_file"], str)
-    assert result["native_file"].startswith("native.")
+    assert result["native_file"] == "native.og_brep"
     assert isinstance(result["viewable_file"], str)
     assert result["viewable_file"].endswith(".vtm")
     assert isinstance(result["id"], str)
     assert re.match(r"[0-9a-f]{32}", result["id"])
     assert isinstance(result["viewer_type"], str)
     assert isinstance(result["binary_light_viewable"], str)
-    assert isinstance(result["input_file"], str)
 
 
 def test_send_file_multiple_returns_zip(client: FlaskClient, tmp_path: Path) -> None: