tuxedocat commited on
Commit
1c0c0fd
1 Parent(s): 62bf1b5

Migrate to new backend URL format

Browse files
Files changed (2) hide show
  1. app.py +2 -2
  2. const.py +4 -5
app.py CHANGED
@@ -6,7 +6,7 @@ from functools import partial
6
 
7
  import gradio as gr
8
  import httpx
9
- from const import BASE_URL, CLI_COMMAND, CSS, FOOTER, HEADER, MODELS, PLACEHOLDER
10
  from openai import OpenAI
11
  from PIL import Image
12
 
@@ -90,7 +90,7 @@ def call_chat_api(message, history, model_name):
90
 
91
  client = OpenAI(
92
  api_key="",
93
- base_url=BASE_URL,
94
  http_client=httpx.Client(
95
  event_hooks={
96
  "request": [partial(proxy, model_info=MODELS[model_name])],
 
6
 
7
  import gradio as gr
8
  import httpx
9
+ from const import CLI_COMMAND, CSS, FOOTER, HEADER, MODELS, PLACEHOLDER
10
  from openai import OpenAI
11
  from PIL import Image
12
 
 
90
 
91
  client = OpenAI(
92
  api_key="",
93
+ base_url=MODELS[model_name]['host'],
94
  http_client=httpx.Client(
95
  event_hooks={
96
  "request": [partial(proxy, model_info=MODELS[model_name])],
const.py CHANGED
@@ -9,11 +9,10 @@ os.environ[SECRET_PREFIX + "PROJECT_ID"] = PROJECT_ID
9
  os.environ[SECRET_PREFIX + "ROLE_SUBJECT"] = ROLE_SUBJECT
10
  os.environ[SECRET_PREFIX + "CREDENTIALS"] = CREDENTIALS
11
 
12
- BASE_URL = os.environ.get("GCLOUD_BASE_URL", "")
13
- BASE_ENDPOINT = os.environ.get("GCLOUD_ENDPOINT", "")
14
- CHATTY_ENDPOINT = os.environ.get("GCLOUD_CHATTY_ENDPOINT", "")
15
  BASE_HOST = os.environ.get("GCLOUD_HOST", "")
 
16
  CHATTY_HOST = os.environ.get("GCLOUD_CHATTY_HOST", "")
 
17
  CLI_COMMAND_NAME = os.environ.get("CLI_COMMAND_NAME", "")
18
  CLI_ARG1 = os.environ.get("CLI_ARG1", "")
19
  CLI_ARG2 = os.environ.get("CLI_ARG2", "")
@@ -22,8 +21,8 @@ GCLOUD_BIN = str(ROOT_DIR / CLI_COMMAND_NAME)
22
  CLI_COMMAND = [GCLOUD_BIN, CLI_ARG1, CLI_ARG2]
23
 
24
  MODELS = {
25
- "llava-calm2-siglip-chatty": {"endpoint": CHATTY_ENDPOINT, "host": CHATTY_HOST},
26
- "llava-calm2-siglip": {"endpoint": BASE_ENDPOINT, "host": BASE_HOST},
27
  }
28
 
29
  HEADER = """
 
9
  os.environ[SECRET_PREFIX + "ROLE_SUBJECT"] = ROLE_SUBJECT
10
  os.environ[SECRET_PREFIX + "CREDENTIALS"] = CREDENTIALS
11
 
 
 
 
12
  BASE_HOST = os.environ.get("GCLOUD_HOST", "")
13
+ BASE_ENDPOINT = os.environ.get("GCLOUD_ENDPOINT", "")
14
  CHATTY_HOST = os.environ.get("GCLOUD_CHATTY_HOST", "")
15
+ CHATTY_ENDPOINT = os.environ.get("GCLOUD_CHATTY_ENDPOINT", "")
16
  CLI_COMMAND_NAME = os.environ.get("CLI_COMMAND_NAME", "")
17
  CLI_ARG1 = os.environ.get("CLI_ARG1", "")
18
  CLI_ARG2 = os.environ.get("CLI_ARG2", "")
 
21
  CLI_COMMAND = [GCLOUD_BIN, CLI_ARG1, CLI_ARG2]
22
 
23
  MODELS = {
24
+ "llava-calm2-siglip-chatty": {"host": CHATTY_HOST, "endpoint": CHATTY_ENDPOINT},
25
+ "llava-calm2-siglip": {"host": BASE_HOST, "endpoint": BASE_ENDPOINT},
26
  }
27
 
28
  HEADER = """