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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 5.10.3rc16
+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
@@ -16,10 +16,8 @@ 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
 Requires-Dist: itsdangerous>=2
 Requires-Dist: jinja2>=3
 Requires-Dist: markupsafe>=3
@@ -28,8 +26,6 @@ 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
-Requires-Dist: typing-extensions>=4
 Requires-Dist: werkzeug==3.1.2
 Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.4rc7
 Dynamic: license-file

{opengeodeweb_back-5.10.3rc16 → 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.16"
+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.3rc16 → opengeodeweb_back-5.10.3rc17}/requirements.txt

@@ -14,19 +14,14 @@ 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
-    # via sqlalchemy
 itsdangerous>=2
     # via flask
 jinja2>=3
@@ -59,10 +54,6 @@ opengeode-io==7.4.0
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-geosciencesio
-sqlalchemy>=2
-    # via flask-sqlalchemy
-typing-extensions>=4
-    # via sqlalchemy
 werkzeug==3.1.2
     # via
     #   -r requirements.in

{opengeodeweb_back-5.10.3rc16 → 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.3rc16
+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
@@ -16,10 +16,8 @@ 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
 Requires-Dist: itsdangerous>=2
 Requires-Dist: jinja2>=3
 Requires-Dist: markupsafe>=3
@@ -28,8 +26,6 @@ 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
-Requires-Dist: typing-extensions>=4
 Requires-Dist: werkzeug==3.1.2
 Requires-Dist: opengeodeweb-microservice==1.*,>=1.0.4rc7
 Dynamic: license-file

{opengeodeweb_back-5.10.3rc16 → opengeodeweb_back-5.10.3rc17}/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -3,10 +3,8 @@ blinker>=1
 click>=8
 flask[async]>=3
 flask-cors==6.0.1
-flask-sqlalchemy==3.1.1
 geode-common==33.11.0
 geode-viewables==3.3.0
-greenlet>=3
 itsdangerous>=2
 jinja2>=3
 markupsafe>=3
@@ -15,7 +13,5 @@ opengeode-geosciences==9.4.1
 opengeode-geosciencesio==5.8.0
 opengeode-inspector==6.8.1
 opengeode-io==7.4.0
-sqlalchemy>=2
-typing-extensions>=4
 werkzeug==3.1.2
 opengeodeweb-microservice==1.*,>=1.0.4rc7

{opengeodeweb_back-5.10.3rc16 → 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.3rc16 → 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,