From b8545c3f4b5903b75a2993220737523021d7fc50 Mon Sep 17 00:00:00 2001 From: MaxNumerique Date: Mon, 6 Oct 2025 14:40:14 +0200 Subject: [PATCH 01/11] init_database with database path only --- tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 04a50e0..aa2d6c6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -36,7 +36,7 @@ def configure_test_environment() -> Generator[None, None, None]: print("Current working directory:", os.getcwd()) print("Directory contents:", os.listdir(".")) - init_database(app, db_path) + init_database(db_path) os.environ["TEST_DB_PATH"] = str(db_path) yield From 1ed880455efb361909f9710a1544b93b10deee1a Mon Sep 17 00:00:00 2001 From: MaxNumerique Date: Mon, 6 Oct 2025 15:09:04 +0200 Subject: [PATCH 02/11] input file type None or str --- src/opengeodeweb_back/utils_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengeodeweb_back/utils_functions.py b/src/opengeodeweb_back/utils_functions.py index 92633d0..40826c6 100644 --- a/src/opengeodeweb_back/utils_functions.py +++ b/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: From 271e6a1822405c9179094dc0c59072b97a0df454 Mon Sep 17 00:00:00 2001 From: MaxNumerique Date: Mon, 6 Oct 2025 16:27:25 +0200 Subject: [PATCH 03/11] init_database takes 1 parameter : db_path --- src/opengeodeweb_back/app.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/opengeodeweb_back/app.py b/src/opengeodeweb_back/app.py index 4838115..7b6b1b4 100644 --- a/src/opengeodeweb_back/app.py +++ b/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") 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) From 6867d5072de26339033b9dc975e8e57b96905e14 Mon Sep 17 00:00:00 2001 From: MaxNumerique Date: Tue, 7 Oct 2025 17:13:13 +0200 Subject: [PATCH 04/11] session.commit() --- src/opengeodeweb_back/utils_functions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/opengeodeweb_back/utils_functions.py b/src/opengeodeweb_back/utils_functions.py index 40826c6..a0c9484 100644 --- a/src/opengeodeweb_back/utils_functions.py +++ b/src/opengeodeweb_back/utils_functions.py @@ -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, From f18549bfd766a1651d66a952690791f8ff00d5a4 Mon Sep 17 00:00:00 2001 From: MaxNumerique <144453705+MaxNumerique@users.noreply.github.com> Date: Thu, 9 Oct 2025 07:26:14 +0000 Subject: [PATCH 05/11] Apply prepare changes --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 40ef1f3..80417d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,3 @@ flask[async]==3.1.2 flask-cors==6.0.1 werkzeug==3.1.2 flask-sqlalchemy==3.1.1 -opengeodeweb-microservice~=1.0 From 5a5a3082d1de2af664d1ce74651cac67a132c1ce Mon Sep 17 00:00:00 2001 From: MaxNumerique Date: Thu, 9 Oct 2025 09:28:45 +0200 Subject: [PATCH 06/11] fix(database): fix database init with only str of database path From 15918427dc399041dad564cb187f83856b1812d2 Mon Sep 17 00:00:00 2001 From: MaxNumerique Date: Thu, 9 Oct 2025 10:02:43 +0200 Subject: [PATCH 07/11] need to have a defalut value for db_filename --- src/opengeodeweb_back/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengeodeweb_back/app.py b/src/opengeodeweb_back/app.py index 7b6b1b4..1c5e977 100644 --- a/src/opengeodeweb_back/app.py +++ b/src/opengeodeweb_back/app.py @@ -140,7 +140,7 @@ def run_server() -> None: flush=True, ) - db_filename: str = app.config.get("DATABASE_FILENAME") + 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}" From 6c6a2f2b8d2afe67434137513a3b6f991257fe0c Mon Sep 17 00:00:00 2001 From: MaxNumerique <144453705+MaxNumerique@users.noreply.github.com> Date: Thu, 9 Oct 2025 14:19:51 +0000 Subject: [PATCH 08/11] Apply prepare changes --- requirements.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3423e77..11ae818 100644 --- a/requirements.txt +++ b/requirements.txt @@ -64,4 +64,8 @@ sqlalchemy==2.0.43 typing-extensions==4.15.0 # via sqlalchemy werkzeug==3.1.2 -flask-sqlalchemy==3.1.1 + # via + # -r requirements.in + # flask + # flask-cors + From 72cc36555a179f7de6283f07da40a8ff7b773082 Mon Sep 17 00:00:00 2001 From: MaxNumerique <144453705+MaxNumerique@users.noreply.github.com> Date: Mon, 13 Oct 2025 14:52:09 +0000 Subject: [PATCH 09/11] Apply prepare changes --- requirements.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 17a0c71..86b6a19 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,13 +4,13 @@ # # pip-compile --output-file=./requirements.txt ./requirements.in # -asgiref>=3.10 +asgiref>=3 # via flask -blinker>=1.9 +blinker>=1 # via flask -click>=8.3 +click>=8 # via flask -flask[async]>=3.1 +flask[async]>=3 # via # -r requirements.in # flask-cors @@ -25,13 +25,13 @@ geode-common==33.11.0 # geode-viewables geode-viewables==3.3.0 # via -r requirements.in -greenlet>=3.2 +greenlet>=3 # via sqlalchemy -itsdangerous>=2.2 +itsdangerous>=2 # via flask -jinja2>=3.1 +jinja2>=3 # via flask -markupsafe>=3.0 +markupsafe>=3 # via # flask # jinja2 @@ -59,9 +59,9 @@ opengeode-io==7.4.0 # -r requirements.in # geode-viewables # opengeode-geosciencesio -sqlalchemy>=2.0 +sqlalchemy>=2 # via flask-sqlalchemy -typing-extensions>=4.15 +typing-extensions>=4 # via sqlalchemy werkzeug==3.1.2 # via From 68af1f3ad5cf56d6308e6bb85492c41bd7a1dcbe Mon Sep 17 00:00:00 2001 From: MaxNumerique Date: Tue, 14 Oct 2025 13:51:22 +0200 Subject: [PATCH 10/11] removed flask-sqlalchemy dep --- requirements.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 1a55b76..f8fcddc 100644 --- a/requirements.in +++ b/requirements.in @@ -7,5 +7,4 @@ geode-common==33.11.0 geode-viewables==3.3.0 flask[async]==3.1.2 flask-cors==6.0.1 -werkzeug==3.1.2 -flask-sqlalchemy==3.1.1 \ No newline at end of file +werkzeug==3.1.2 \ No newline at end of file From 9dd51b78d30b2f9dfb6c9631d7bd4682be52c697 Mon Sep 17 00:00:00 2001 From: MaxNumerique <144453705+MaxNumerique@users.noreply.github.com> Date: Tue, 14 Oct 2025 11:52:45 +0000 Subject: [PATCH 11/11] Apply prepare changes --- requirements.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 86b6a19..1972ac0 100644 --- a/requirements.txt +++ b/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