Clean up

app.py

@@ -1,30 +1,15 @@
 import base64
 import io
-import os
-import subprocess
 from functools import partial
 
 import gradio as gr
 import httpx
-from const import CLI_COMMAND, CSS, FOOTER, HEADER, MODELS, PLACEHOLDER
+from const import CSS, FOOTER, HEADER, MODELS, PLACEHOLDER
 from openai import OpenAI
 from PIL import Image
 from cycloud.auth import load_default_credentials
 
 
-def get_token() -> str:
-    return (
-        subprocess.run(
-            CLI_COMMAND,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.DEVNULL,
-            env=os.environ.copy(),
-        )
-        .stdout.decode("utf-8")
-        .strip()
-    )
-
-
 def get_headers(host: str) -> dict:
     creds = load_default_credentials()
     return {
@@ -93,7 +78,7 @@ def call_chat_api(message, history, model_name):
 
     client = OpenAI(
         api_key="",
-        base_url=MODELS[model_name]['host'],
+        base_url=MODELS[model_name]["host"],
         http_client=httpx.Client(
             event_hooks={
                 "request": [partial(proxy, model_info=MODELS[model_name])],

const.py

@@ -9,16 +9,11 @@ os.environ[SECRET_PREFIX + "PROJECT_ID"] = PROJECT_ID
 os.environ[SECRET_PREFIX + "ROLE_SUBJECT"] = ROLE_SUBJECT
 os.environ[SECRET_PREFIX + "CREDENTIALS"] = CREDENTIALS
 
-BASE_HOST = os.environ.get("GCLOUD_HOST", "")
-BASE_ENDPOINT = os.environ.get("GCLOUD_ENDPOINT", "")
-CHATTY_HOST = os.environ.get("GCLOUD_CHATTY_HOST", "")
-CHATTY_ENDPOINT = os.environ.get("GCLOUD_CHATTY_ENDPOINT", "")
-CLI_COMMAND_NAME = os.environ.get("CLI_COMMAND_NAME", "")
-CLI_ARG1 = os.environ.get("CLI_ARG1", "")
-CLI_ARG2 = os.environ.get("CLI_ARG2", "")
+BASE_HOST = os.environ.get("BASE_HOST", "")
+BASE_ENDPOINT = os.environ.get("BASE_ENDPOINT", "")
+CHATTY_HOST = os.environ.get("CHATTY_HOST", "")
+CHATTY_ENDPOINT = os.environ.get("CHATTY_ENDPOINT", "")
 ROOT_DIR = Path(__file__).parent.absolute()
-GCLOUD_BIN = str(ROOT_DIR / CLI_COMMAND_NAME)
-CLI_COMMAND = [GCLOUD_BIN, CLI_ARG1, CLI_ARG2]
 
 MODELS = {
     "llava-calm2-siglip-chatty": {"host": CHATTY_HOST, "endpoint": CHATTY_ENDPOINT},