From 7f68516bfe48e62fe5eb8ab38188053a8862f47d Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Mon, 21 Oct 2024 11:21:13 +0200 Subject: [PATCH 1/5] remove python-dotenv --- requirements.in | 1 - src/opengeodeweb_viewer/vtkw_server.py | 14 +++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/requirements.in b/requirements.in index 8254995..7520d92 100644 --- a/requirements.in +++ b/requirements.in @@ -1,4 +1,3 @@ jsonschema -python-dotenv wslink websocket-client \ No newline at end of file diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py index a4de26e..6cc1ce6 100644 --- a/src/opengeodeweb_viewer/vtkw_server.py +++ b/src/opengeodeweb_viewer/vtkw_server.py @@ -28,6 +28,10 @@ def add_arguments(parser): "--data_folder_path", default=os.environ.get("DATA_FOLDER_PATH"), help="Path to the folder where data is stored" ) + parser.add_argument( + "--host", default=os.environ.get("DEFAULT_HOST"), help="Host to run on" + ) + @staticmethod def configure(args): # Standard args @@ -81,10 +85,6 @@ def initialize(self): def run_server(): - basedir = os.path.abspath(os.path.dirname(__file__)) - dot_env_path = os.path.join(basedir, "../../.env") - if os.path.isfile(dot_env_path): - dotenv.load_dotenv(dot_env_path) PYTHON_ENV = os.environ.get("PYTHON_ENV", default="prod").strip().lower() if PYTHON_ENV == "prod": prod_config() @@ -96,11 +96,15 @@ def run_server(): _Server.add_arguments(parser) args = parser.parse_args() + print("COUCOU", flush=True) + if not "host" in args: + print(f"Defaulting to {os.environ.get('DEFAULT_HOST')}", flush=True) + args.host = os.environ.get("DEFAULT_HOST") if not "port" in args or args.port == 8080: args.port = os.environ.get("DEFAULT_PORT") if "data_folder_path" in args: os.environ["DATA_FOLDER_PATH"] = args.data_folder_path - args.host = os.environ.get("HOST") + print(f"{args=}", flush=True) _Server.configure(args) server.start_webserver(options=args, protocol=_Server) From c698b561209d8c07a4e895845a013af4d33e2ff2 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Mon, 21 Oct 2024 11:21:33 +0200 Subject: [PATCH 2/5] fix(host): default localhost --- src/opengeodeweb_viewer/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengeodeweb_viewer/config.py b/src/opengeodeweb_viewer/config.py index 1892b88..7e0d38d 100644 --- a/src/opengeodeweb_viewer/config.py +++ b/src/opengeodeweb_viewer/config.py @@ -3,7 +3,7 @@ def default_config(): - os.environ["HOST"] = "0.0.0.0" + os.environ["DEFAULT_HOST"] = "localhost" os.environ["DEFAULT_PORT"] = "1234" From ed2b895e3a5759e21afc55a6fdda74c1c19b12f4 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Mon, 21 Oct 2024 13:01:40 +0200 Subject: [PATCH 3/5] test remove host argument --- src/opengeodeweb_viewer/vtkw_server.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py index 6cc1ce6..db4ad42 100644 --- a/src/opengeodeweb_viewer/vtkw_server.py +++ b/src/opengeodeweb_viewer/vtkw_server.py @@ -28,9 +28,9 @@ def add_arguments(parser): "--data_folder_path", default=os.environ.get("DATA_FOLDER_PATH"), help="Path to the folder where data is stored" ) - parser.add_argument( - "--host", default=os.environ.get("DEFAULT_HOST"), help="Host to run on" - ) + # parser.add_argument( + # "--host", default=os.environ.get("DEFAULT_HOST"), help="Host to run on" + # ) @staticmethod def configure(args): @@ -96,10 +96,6 @@ def run_server(): _Server.add_arguments(parser) args = parser.parse_args() - print("COUCOU", flush=True) - if not "host" in args: - print(f"Defaulting to {os.environ.get('DEFAULT_HOST')}", flush=True) - args.host = os.environ.get("DEFAULT_HOST") if not "port" in args or args.port == 8080: args.port = os.environ.get("DEFAULT_PORT") if "data_folder_path" in args: From 5dd2f7ce5b49bc9907db1e1e3ee7639ea94ccdda Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Mon, 21 Oct 2024 13:06:41 +0200 Subject: [PATCH 4/5] args.port --- src/opengeodeweb_viewer/vtkw_server.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py index db4ad42..1ed4342 100644 --- a/src/opengeodeweb_viewer/vtkw_server.py +++ b/src/opengeodeweb_viewer/vtkw_server.py @@ -28,10 +28,6 @@ def add_arguments(parser): "--data_folder_path", default=os.environ.get("DATA_FOLDER_PATH"), help="Path to the folder where data is stored" ) - # parser.add_argument( - # "--host", default=os.environ.get("DEFAULT_HOST"), help="Host to run on" - # ) - @staticmethod def configure(args): # Standard args @@ -96,6 +92,9 @@ def run_server(): _Server.add_arguments(parser) args = parser.parse_args() + + if "host" in args: + args.port = os.environ["DEFAULT_HOST"] if not "port" in args or args.port == 8080: args.port = os.environ.get("DEFAULT_PORT") if "data_folder_path" in args: From a8d54a88fef494f7985cc6266a9106bec69a6d40 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Mon, 21 Oct 2024 13:11:24 +0200 Subject: [PATCH 5/5] typo --- src/opengeodeweb_viewer/vtkw_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py index 1ed4342..191b523 100644 --- a/src/opengeodeweb_viewer/vtkw_server.py +++ b/src/opengeodeweb_viewer/vtkw_server.py @@ -94,7 +94,7 @@ def run_server(): args = parser.parse_args() if "host" in args: - args.port = os.environ["DEFAULT_HOST"] + args.host = os.environ["DEFAULT_HOST"] if not "port" in args or args.port == 8080: args.port = os.environ.get("DEFAULT_PORT") if "data_folder_path" in args: