From af4c97e2dce8db00cf226ce6f16a580f54ec3abe Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Fri, 6 Feb 2026 17:14:10 +0100 Subject: [PATCH 1/3] fix(DefaultUploadFolder): get UPLOAD_FOLDER from config --- src/opengeodeweb_back/app.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/opengeodeweb_back/app.py b/src/opengeodeweb_back/app.py index 432cc4f3..25649fed 100644 --- a/src/opengeodeweb_back/app.py +++ b/src/opengeodeweb_back/app.py @@ -24,16 +24,14 @@ def create_app(name: str) -> flask.Flask: ) if FLASK_DEBUG == False: app.config.from_object(app_config.ProdConfig) - else: - app.config.from_object(app_config.DevConfig) - - if FLASK_DEBUG == False: SECONDS_BETWEEN_SHUTDOWNS: float = float( app.config.get("SECONDS_BETWEEN_SHUTDOWNS") or 60.0 ) utils_functions.set_interval( utils_functions.kill_task, SECONDS_BETWEEN_SHUTDOWNS, app ) + else: + app.config.from_object(app_config.DevConfig) @app.before_request def before_request() -> flask.Response | None: @@ -134,7 +132,7 @@ def run_server(app: Flask) -> None: "-ufp", "--upload_folder_path", type=str, - default=app.config.get("DEFAULT_DATA_FOLDER_PATH"), + default=app.config.get("UPLOAD_FOLDER"), help="Path to the folder where uploads are stored", ) parser.add_argument( @@ -157,12 +155,7 @@ def run_server(app: Flask) -> None: app.config.update(UPLOAD_FOLDER=args.upload_folder_path) app.config.update(MINUTES_BEFORE_TIMEOUT=args.timeout) flask_cors.CORS(app, origins=args.allowed_origins) - print( - f"Host: {args.host}, Port: {args.port}, Debug: {args.debug}, " - f"Data folder path: {args.data_folder_path}, Timeout: {args.timeout}, " - f"Origins: {args.allowed_origins}", - flush=True, - ) + print(f"{args=}", flush=True, sep="\n") db_filename: str = app.config.get("DATABASE_FILENAME") or "project.db" db_path = os.path.join(str(args.data_folder_path), db_filename) From 1ee5ba6571c1658de7da2e1870296568579f7219 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Fri, 6 Feb 2026 17:17:22 +0100 Subject: [PATCH 2/3] fix(DefaultUploadFolder): get UPLOAD_FOLDER from config --- 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 25649fed..2e5e6cdb 100644 --- a/src/opengeodeweb_back/app.py +++ b/src/opengeodeweb_back/app.py @@ -155,7 +155,7 @@ def run_server(app: Flask) -> None: app.config.update(UPLOAD_FOLDER=args.upload_folder_path) app.config.update(MINUTES_BEFORE_TIMEOUT=args.timeout) flask_cors.CORS(app, origins=args.allowed_origins) - print(f"{args=}", flush=True, sep="\n") + print(f"{args=}", flush=True) db_filename: str = app.config.get("DATABASE_FILENAME") or "project.db" db_path = os.path.join(str(args.data_folder_path), db_filename) From c53e187245651b6e891dba361e011568f2b26a3d Mon Sep 17 00:00:00 2001 From: JulienChampagnol <91873154+JulienChampagnol@users.noreply.github.com> Date: Fri, 6 Feb 2026 16:18:25 +0000 Subject: [PATCH 3/3] Apply prepare changes --- requirements.txt | 1 - src/opengeodeweb_back/app.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3dd352e5..08d64bdf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -60,4 +60,3 @@ werkzeug==3.1.2 # flask # flask-cors -opengeodeweb-microservice==1.*,>=1.0.14rc1 diff --git a/src/opengeodeweb_back/app.py b/src/opengeodeweb_back/app.py index 2e5e6cdb..72eec40e 100644 --- a/src/opengeodeweb_back/app.py +++ b/src/opengeodeweb_back/app.py @@ -31,7 +31,7 @@ def create_app(name: str) -> flask.Flask: utils_functions.kill_task, SECONDS_BETWEEN_SHUTDOWNS, app ) else: - app.config.from_object(app_config.DevConfig) + app.config.from_object(app_config.DevConfig) @app.before_request def before_request() -> flask.Response | None: