From 02cb41b2fd743b7a106de188420959360e0f12a5 Mon Sep 17 00:00:00 2001 From: frdel <38891707+frdel@users.noreply.github.com> Date: Thu, 14 Nov 2024 21:49:45 +0100 Subject: [PATCH] WIP: docker runtime --- docker/run/fs/exe/run_A0.sh | 2 +- models.py | 6 ++---- run_ui.py | 10 ++++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/run/fs/exe/run_A0.sh b/docker/run/fs/exe/run_A0.sh index e48bb566e..ea8394fa2 100644 --- a/docker/run/fs/exe/run_A0.sh +++ b/docker/run/fs/exe/run_A0.sh @@ -26,7 +26,7 @@ while true; do fi echo "Starting A0..." - python "$PYTHON_SCRIPT" --port 80 --host 0.0.0.0 + python "$PYTHON_SCRIPT" --port 80 --host "0.0.0.0" # Check the exit status if [ $? -ne 0 ]; then diff --git a/models.py b/models.py index fb54e450b..4211fe5c5 100644 --- a/models.py +++ b/models.py @@ -52,14 +52,12 @@ class ModelProvider(Enum): OPENAI_AZURE = "OpenAI Azure" OPENROUTER = "OpenRouter" SAMBANOVA = "Sambanova" - OTHER = "Other" + OTHER = "Other" # Utility function to get API keys from environment variables def get_api_key(service): - return os.getenv(f"API_KEY_{service.upper()}") or os.getenv( - f"{service.upper()}_API_KEY" - ) + return os.getenv(f"API_KEY_{service.upper()}") or os.getenv(f"{service.upper()}_API_KEY") or "None" def get_model(type: ModelType, provider: ModelProvider, name: str, **kwargs): diff --git a/run_ui.py b/run_ui.py index e5369cef0..6d4517348 100644 --- a/run_ui.py +++ b/run_ui.py @@ -25,6 +25,7 @@ app = Flask("app", static_folder=get_abs_path("./webui"), static_url_path="/") app.config["JSON_SORT_KEYS"] = False # Disable key sorting in jsonify lock = threading.Lock() +parser = argparse.ArgumentParser() # Set up basic authentication, name and password from .env variables app.config["BASIC_AUTH_USERNAME"] = ( @@ -571,10 +572,7 @@ def run(): def log_request(self, code="-", size="-"): pass # Override to suppress request logging - parser = argparse.ArgumentParser() - parser.add_argument("--port", type=int, default=0, help="Web UI port") - parser.add_argument("--host", type=int, default=0, help="Web UI host") - args = parser.parse_args() + args,_ = parser.parse_known_args() # Get configuration from environment port = args.port or int(os.environ.get("WEB_UI_PORT", 0)) or None @@ -605,4 +603,8 @@ def run(): # run the internal server if __name__ == "__main__": + + parser.add_argument("--port", type=int, default=0, help="Web UI port") + parser.add_argument("--host", type=str, default=0, help="Web UI host") + run()