OpenGeodeWeb-Back 5.10.3rc11__tar.gz → 5.10.3rc17__tar.gz

{opengeodeweb_back-5.10.3rc11 → opengeodeweb_back-5.10.3rc17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.10.3rc11
+Version: 5.10.3rc17
 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
@@ -11,27 +11,23 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: asgiref==3.10.0
-Requires-Dist: blinker==1.9.0
-Requires-Dist: click==8.3.0
-Requires-Dist: flask[async]==3.1.2
+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: flask-sqlalchemy==3.1.1
 Requires-Dist: geode-common==33.11.0
 Requires-Dist: geode-viewables==3.3.0
-Requires-Dist: greenlet==3.2.4
-Requires-Dist: itsdangerous==2.2.0
-Requires-Dist: jinja2==3.1.6
-Requires-Dist: markupsafe==3.0.3
+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: sqlalchemy==2.0.43
-Requires-Dist: typing-extensions==4.15.0
 Requires-Dist: werkzeug==3.1.2
-Requires-Dist: opengeodeweb-microservice~=1.0
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.4rc7
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-5.10.3rc11 → opengeodeweb_back-5.10.3rc17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "5.10.3-rc.11"
+version = "5.10.3-rc.17"
 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.3rc11 → opengeodeweb_back-5.10.3rc17}/requirements.txt

@@ -4,34 +4,29 @@
 #
 #    pip-compile --output-file=./requirements.txt ./requirements.in
 #
-asgiref==3.10.0
+asgiref>=3
     # via flask
-blinker==1.9.0
+blinker>=1
     # via flask
-click==8.3.0
+click>=8
     # via flask
-flask[async]==3.1.2
+flask[async]>=3
     # via
     #   -r requirements.in
     #   flask-cors
-    #   flask-sqlalchemy
 flask-cors==6.0.1
     # via -r requirements.in
-flask-sqlalchemy==3.1.1
-    # via -r requirements.in
 geode-common==33.11.0
     # via
     #   -r requirements.in
     #   geode-viewables
 geode-viewables==3.3.0
     # via -r requirements.in
-greenlet==3.2.4
-    # via sqlalchemy
-itsdangerous==2.2.0
+itsdangerous>=2
     # via flask
-jinja2==3.1.6
+jinja2>=3
     # via flask
-markupsafe==3.0.3
+markupsafe>=3
     # via
     #   flask
     #   jinja2
@@ -59,14 +54,10 @@ opengeode-io==7.4.0
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-geosciencesio
-sqlalchemy==2.0.43
-    # via flask-sqlalchemy
-typing-extensions==4.15.0
-    # via sqlalchemy
 werkzeug==3.1.2
     # via
     #   -r requirements.in
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice~=1.0
+opengeodeweb-microservice==1.*,>=1.0.4rc7

{opengeodeweb_back-5.10.3rc11 → opengeodeweb_back-5.10.3rc17}/src/OpenGeodeWeb_Back.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.10.3rc11
+Version: 5.10.3rc17
 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
@@ -11,27 +11,23 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <3.13,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: asgiref==3.10.0
-Requires-Dist: blinker==1.9.0
-Requires-Dist: click==8.3.0
-Requires-Dist: flask[async]==3.1.2
+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: flask-sqlalchemy==3.1.1
 Requires-Dist: geode-common==33.11.0
 Requires-Dist: geode-viewables==3.3.0
-Requires-Dist: greenlet==3.2.4
-Requires-Dist: itsdangerous==2.2.0
-Requires-Dist: jinja2==3.1.6
-Requires-Dist: markupsafe==3.0.3
+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: sqlalchemy==2.0.43
-Requires-Dist: typing-extensions==4.15.0
 Requires-Dist: werkzeug==3.1.2
-Requires-Dist: opengeodeweb-microservice~=1.0
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.4rc7
 Dynamic: license-file
 
 <h1 align="center">OpenGeodeWeb-Back<sup><i>by Geode-solutions</i></sup></h1>

{opengeodeweb_back-5.10.3rc11 → opengeodeweb_back-5.10.3rc17}/src/OpenGeodeWeb_Back.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ src/opengeodeweb_back/routes/schemas/create_point.json
 src/opengeodeweb_back/routes/schemas/geode_objects_and_output_extensions.json
 src/opengeodeweb_back/routes/schemas/geographic_coordinate_systems.json
 src/opengeodeweb_back/routes/schemas/inspect_file.json
+src/opengeodeweb_back/routes/schemas/kill.json
 src/opengeodeweb_back/routes/schemas/missing_files.json
 src/opengeodeweb_back/routes/schemas/ping.json
 src/opengeodeweb_back/routes/schemas/polygon_attribute_names.json

opengeodeweb_back-5.10.3rc17/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -0,0 +1,17 @@
+asgiref>=3
+blinker>=1
+click>=8
+flask[async]>=3
+flask-cors==6.0.1
+geode-common==33.11.0
+geode-viewables==3.3.0
+itsdangerous>=2
+jinja2>=3
+markupsafe>=3
+opengeode-core==15.27.4
+opengeode-geosciences==9.4.1
+opengeode-geosciencesio==5.8.0
+opengeode-inspector==6.8.1
+opengeode-io==7.4.0
+werkzeug==3.1.2
+opengeodeweb-microservice==1.*,>=1.0.4rc7

{opengeodeweb_back-5.10.3rc11 → opengeodeweb_back-5.10.3rc17}/src/opengeodeweb_back/app.py

@@ -140,12 +140,13 @@ def run_server() -> None:
         flush=True,
     )
 
-    db_filename: str = app.config.get("DATABASE_FILENAME") or "database.db"
+    db_filename: str = app.config.get("DATABASE_FILENAME") or "project.db"
     db_path = os.path.join(args.data_folder_path, db_filename)
     os.makedirs(os.path.dirname(db_path), exist_ok=True)
     app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{db_path}"
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
-    init_database(app, db_filename)
+
+    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.3rc11 → opengeodeweb_back-5.10.3rc17}/src/opengeodeweb_back/routes/blueprint_routes.py

@@ -381,3 +381,17 @@ def ping():
     utils_functions.validate_request(flask.request, ping_json)
     flask.current_app.config.update(LAST_PING_TIME=time.time())
     return flask.make_response({"message": "Flask server is running"}, 200)
+
+
+with open(
+    os.path.join(schemas, "kill.json"),
+    "r",
+) as file:
+    kill_json = json.load(file)
+
+
+@routes.route(kill_json["route"], methods=kill_json["methods"])
+def kill() -> flask.Response:
+    print("Manual server kill, shutting down...", flush=True)
+    os._exit(0)
+    return flask.make_response({"message": "Flask server is dead"}, 200)

opengeodeweb_back-5.10.3rc17/src/opengeodeweb_back/routes/schemas/kill.json

@@ -0,0 +1,10 @@
+{
+  "route": "/kill",
+  "methods": [
+    "POST"
+  ],
+  "type": "object",
+  "properties": {},
+  "required": [],
+  "additionalProperties": false
+}

{opengeodeweb_back-5.10.3rc11 → opengeodeweb_back-5.10.3rc17}/src/opengeodeweb_back/utils_functions.py

@@ -163,7 +163,7 @@ 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,
+    input_file: str | None = None,
     additional_files: list[str] | None = None,
 ) -> dict[str, Any]:
     if additional_files is None:
@@ -227,6 +227,8 @@ def generate_native_viewable_and_light_viewable_from_object(
 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(
         geode_object=geode_object,
         input_file=input_filename,
@@ -258,10 +260,10 @@ def generate_native_viewable_and_light_viewable_from_file(
 
     data = geode_functions.load(geode_object, copied_full_path)
 
-    session = get_session()
     if session:
         session.delete(temp_data_entry)
         session.flush()
+        session.commit()
 
     return save_all_viewables_and_return_info(
         geode_object,

opengeodeweb_back-5.10.3rc11/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -1,21 +0,0 @@
-asgiref==3.10.0
-blinker==1.9.0
-click==8.3.0
-flask[async]==3.1.2
-flask-cors==6.0.1
-flask-sqlalchemy==3.1.1
-geode-common==33.11.0
-geode-viewables==3.3.0
-greenlet==3.2.4
-itsdangerous==2.2.0
-jinja2==3.1.6
-markupsafe==3.0.3
-opengeode-core==15.27.4
-opengeode-geosciences==9.4.1
-opengeode-geosciencesio==5.8.0
-opengeode-inspector==6.8.1
-opengeode-io==7.4.0
-sqlalchemy==2.0.43
-typing-extensions==4.15.0
-werkzeug==3.1.2
-opengeodeweb-microservice~=1.0