OpenGeodeWeb-Back 5.10.4rc1__tar.gz → 5.10.5rc1__tar.gz

{opengeodeweb_back-5.10.4rc1/src/OpenGeodeWeb_Back.egg-info → opengeodeweb_back-5.10.5rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.10.4rc1
+Version: 5.10.5rc1
 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.0
 Requires-Dist: opengeode-inspector==6.8.1
 Requires-Dist: opengeode-io==7.4.0
 Requires-Dist: werkzeug==3.1.2
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.4
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.5rc1
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-5.10.4rc1 → opengeodeweb_back-5.10.5rc1}/pyproject.toml

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

@@ -60,4 +60,4 @@ werkzeug==3.1.2
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.0.4
+opengeodeweb-microservice==1.*,>=1.0.5rc1

{opengeodeweb_back-5.10.4rc1 → opengeodeweb_back-5.10.5rc1/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.10.4rc1
+Version: 5.10.5rc1
 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.0
 Requires-Dist: opengeode-inspector==6.8.1
 Requires-Dist: opengeode-io==7.4.0
 Requires-Dist: werkzeug==3.1.2
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.4
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.5rc1
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-5.10.4rc1 → opengeodeweb_back-5.10.5rc1}/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -14,4 +14,4 @@ opengeode-geosciencesio==5.8.0
 opengeode-inspector==6.8.1
 opengeode-io==7.4.0
 werkzeug==3.1.2
-opengeodeweb-microservice==1.*,>=1.0.4
+opengeodeweb-microservice==1.*,>=1.0.5rc1

{opengeodeweb_back-5.10.4rc1 → opengeodeweb_back-5.10.5rc1}/src/opengeodeweb_back/app.py

@@ -14,7 +14,7 @@ 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_microservice.database.connection import init_database
+from opengeodeweb_microservice.database import connection
 
 
 """ Global config """
@@ -39,6 +39,16 @@ SECONDS_BETWEEN_SHUTDOWNS: float = float(
 )
 
 
+@app.before_request
+def before_request() -> None:
+    utils_functions.before_request(flask.current_app)
+
+
+@app.teardown_request
+def teardown_request(exception: BaseException | None) -> None:
+    utils_functions.teardown_request(flask.current_app, exception)
+
+
 app.register_blueprint(
     blueprint_routes.routes,
     url_prefix="/opengeodeweb_back",
@@ -146,7 +156,7 @@ def run_server() -> None:
     app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{db_path}"
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 
-    init_database(db_path)
+    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-5.10.4rc1 → opengeodeweb_back-5.10.5rc1}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -16,20 +16,6 @@ from .models import blueprint_models
 routes = flask.Blueprint("routes", __name__, url_prefix="/opengeodeweb_back")
 
 
-@routes.before_request
-def before_request():
-    if "ping" not in flask.request.path:
-        utils_functions.increment_request_counter(flask.current_app)
-
-
-@routes.teardown_request
-def teardown_request(exception):
-
-    if "ping" not in flask.request.path:
-        utils_functions.decrement_request_counter(flask.current_app)
-        utils_functions.update_last_request_time(flask.current_app)
-
-
 routes.register_blueprint(
     blueprint_models.routes,
     url_prefix=blueprint_models.routes.url_prefix,

{opengeodeweb_back-5.10.4rc1 → opengeodeweb_back-5.10.5rc1}/src/opengeodeweb_back/utils_functions.py

@@ -4,7 +4,6 @@ import threading
 import time
 import zipfile
 from collections.abc import Callable
-from typing import Any
 from concurrent.futures import ThreadPoolExecutor
 
 # Third party imports
@@ -41,13 +40,28 @@ def update_last_request_time(current_app: flask.Flask) -> None:
         current_app.config.update(LAST_REQUEST_TIME=LAST_REQUEST_TIME)
 
 
+def terminate_session(exception: BaseException | None) -> None:
+    session = flask.g.pop("session", None)
+    if session is None:
+        return
+    if exception is None:
+        session.commit()
+    else:
+        session.rollback()
+    session.close()
+
+
 def before_request(current_app: flask.Flask) -> None:
     increment_request_counter(current_app)
+    flask.g.session = get_session()
 
 
-def teardown_request(current_app: flask.Flask) -> None:
+def teardown_request(
+    current_app: flask.Flask, exception: BaseException | None = None
+) -> None:
     decrement_request_counter(current_app)
     update_last_request_time(current_app)
+    terminate_session(exception)
 
 
 def kill_task(current_app: flask.Flask) -> None:
@@ -97,7 +111,7 @@ def validate_request(request: flask.Request, schema: dict[str, str]) -> None:
 
 
 def set_interval(
-    function: Callable[[Any], None], seconds: float, args: Any
+    function: Callable[[flask.Flask], None], seconds: float, args: flask.Flask
 ) -> threading.Timer:
     def function_wrapper() -> None:
         set_interval(function, seconds, args)
@@ -114,7 +128,7 @@ def extension_from_filename(filename: str) -> str:
 
 
 def send_file(
-    upload_folder: str, saved_files: str, new_file_name: str
+    upload_folder: str, saved_files: list[str], new_file_name: str
 ) -> flask.Response:
     if len(saved_files) == 1:
         mimetype = "application/octet-binary"
@@ -162,19 +176,10 @@ def create_data_folder_from_id(data_id: str) -> str:
 
 def save_all_viewables_and_return_info(
     geode_object: str,
-    data: Any,
-    input_file: str | None = None,
-    additional_files: list[str] | None = None,
-) -> dict[str, Any]:
-    if additional_files is None:
-        additional_files = []
-
-    data_entry = Data.create(
-        geode_object=geode_object,
-        input_file=input_file,
-        additional_files=additional_files,
-    )
-    data_path = create_data_folder_from_id(data_entry.id)
+    data: object,
+    data_entry: Data,
+    data_path: str,
+) -> dict[str, str | list[str]]:
     with ThreadPoolExecutor() as executor:
         native_future = executor.submit(
             geode_functions.save,
@@ -202,10 +207,6 @@ def save_all_viewables_and_return_info(
         data_entry.viewable_file_name = os.path.basename(saved_viewable_file_path)
         data_entry.light_viewable = os.path.basename(saved_light_viewable_file_path)
 
-        session = get_session()
-        if session:
-            session.commit()
-
         return {
             "native_file_name": data_entry.native_file_name,
             "viewable_file_name": data_entry.viewable_file_name,
@@ -219,23 +220,29 @@ def save_all_viewables_and_return_info(
 
 
 def generate_native_viewable_and_light_viewable_from_object(
-    geode_object: str, data: Any
-) -> dict[str, Any]:
-    return save_all_viewables_and_return_info(geode_object, data, input_file="")
+    geode_object: str, data: object
+) -> dict[str, str | list[str]]:
+    data_entry = Data.create(
+        geode_object=geode_object,
+        viewer_object=geode_functions.get_object_type(geode_object),
+        input_file="",
+        additional_files=[],
+    )
+    data_path = create_data_folder_from_id(data_entry.id)
+    return save_all_viewables_and_return_info(geode_object, data, data_entry, data_path)
 
 
 def generate_native_viewable_and_light_viewable_from_file(
     geode_object: str, input_filename: str
-) -> dict[str, Any]:
-
-    session = get_session()
-    temp_data_entry = Data.create(
+) -> dict[str, str | list[str]]:
+    data_entry = Data.create(
         geode_object=geode_object,
+        viewer_object=geode_functions.get_object_type(geode_object),
         input_file=input_filename,
         additional_files=[],
     )
 
-    data_path = create_data_folder_from_id(temp_data_entry.id)
+    data_path = create_data_folder_from_id(data_entry.id)
 
     full_input_filename = geode_functions.upload_file_path(input_filename)
     copied_full_path = os.path.join(
@@ -260,14 +267,10 @@ def generate_native_viewable_and_light_viewable_from_file(
 
     data = geode_functions.load(geode_object, copied_full_path)
 
-    if session:
-        session.delete(temp_data_entry)
-        session.flush()
-        session.commit()
-
+    data_entry.additional_files = additional_files_copied
     return save_all_viewables_and_return_info(
         geode_object,
         data,
-        input_file=input_filename,
-        additional_files=additional_files_copied,
+        data_entry,
+        data_path,
     )

{opengeodeweb_back-5.10.4rc1 → opengeodeweb_back-5.10.5rc1}/tests/test_models_routes.py

@@ -35,6 +35,7 @@ def test_extract_brep_uuids(client, test_id):
     with client.application.app_context():
         data_entry = Data.create(
             geode_object="BRep",
+            viewer_object=geode_functions.get_object_type("BRep"),
             input_file=brep_filename,
         )
         data_entry.native_file_name = brep_filename

{opengeodeweb_back-5.10.4rc1 → opengeodeweb_back-5.10.5rc1}/tests/test_routes.py

@@ -171,7 +171,11 @@ def test_save_viewable_file(client):
 
 def test_texture_coordinates(client, test_id):
     with client.application.app_context():
-        data = Data.create(geode_object="PolygonalSurface3D", input_file="hat.vtp")
+        data = Data.create(
+            geode_object="PolygonalSurface3D",
+            viewer_object=geode_functions.get_object_type("PolygonalSurface3D"),
+            input_file="hat.vtp",
+        )
         data.native_file_name = "hat.vtp"
         session = get_session()
         if session:
@@ -195,7 +199,11 @@ def test_vertex_attribute_names(client, test_id):
     route = f"/opengeodeweb_back/vertex_attribute_names"
 
     with client.application.app_context():
-        data = Data.create(geode_object="PolygonalSurface3D", input_file="test.vtp")
+        data = Data.create(
+            geode_object="PolygonalSurface3D",
+            viewer_object=geode_functions.get_object_type("PolygonalSurface3D"),
+            input_file="test.vtp",
+        )
         data.native_file_name = "test.vtp"
         session = get_session()
         if session:
@@ -217,7 +225,11 @@ def test_polygon_attribute_names(client, test_id):
     route = f"/opengeodeweb_back/polygon_attribute_names"
 
     with client.application.app_context():
-        data = Data.create(geode_object="PolygonalSurface3D", input_file="test.vtp")
+        data = Data.create(
+            geode_object="PolygonalSurface3D",
+            viewer_object=geode_functions.get_object_type("PolygonalSurface3D"),
+            input_file="test.vtp",
+        )
         data.native_file_name = "test.vtp"
         session = get_session()
         if session:
@@ -239,7 +251,11 @@ def test_polyhedron_attribute_names(client, test_id):
     route = f"/opengeodeweb_back/polyhedron_attribute_names"
 
     with client.application.app_context():
-        data = Data.create(geode_object="PolyhedralSolid3D", input_file="test.vtu")
+        data = Data.create(
+            geode_object="PolyhedralSolid3D",
+            viewer_object=geode_functions.get_object_type("PolyhedralSolid3D"),
+            input_file="test.vtu",
+        )
         data.native_file_name = "test.vtu"
         session = get_session()
         if session:

{opengeodeweb_back-5.10.4rc1 → opengeodeweb_back-5.10.5rc1}/tests/test_utils_functions.py

@@ -103,8 +103,16 @@ def test_save_all_viewables_and_return_info(client):
         input_file = "test.og_brep"
         additional_files = ["additional_file.txt"]
 
+        data_entry = Data.create(
+            geode_object=geode_object,
+            viewer_object=geode_functions.get_object_type(geode_object),
+            input_file=input_file,
+            additional_files=additional_files,
+        )
+        data_path = utils_functions.create_data_folder_from_id(data_entry.id)
+
         result = utils_functions.save_all_viewables_and_return_info(
-            geode_object, data, input_file, additional_files
+            geode_object, data, data_entry, data_path
         )
 
         assert isinstance(result, dict)
@@ -136,20 +144,22 @@ def test_save_all_viewables_commits_to_db(client):
         geode_object = "BRep"
         data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
         input_file = "test.og_brep"
+
+        data_entry = Data.create(
+            geode_object=geode_object,
+            viewer_object=geode_functions.get_object_type(geode_object),
+            input_file=input_file,
+            additional_files=[],
+        )
+        data_path = utils_functions.create_data_folder_from_id(data_entry.id)
+
         result = utils_functions.save_all_viewables_and_return_info(
-            geode_object, data, input_file
+            geode_object, data, data_entry, data_path
         )
         data_id = result["id"]
         db_entry_before = Data.get(data_id)
         assert db_entry_before is not None
         assert db_entry_before.native_file_name == result["native_file_name"]
-        session = get_session()
-        session.rollback()
-        db_entry_after = Data.get(data_id)
-        assert (
-            db_entry_after is not None
-        ), "database.session.commit() was not called - entry missing after rollback"
-        assert db_entry_after.native_file_name == result["native_file_name"]
 
 
 def test_generate_native_viewable_and_light_viewable_from_object(client):