Преглед изворни кода

fix: default openai api value

Timothy J. Baek пре 1 година
родитељ
комит
df49e4e1cc
3 измењених фајлова са 4 додато и 3 уклоњено
  1. 0 1
      .dockerignore
  2. 1 2
      backend/apps/openai/main.py
  3. 3 0
      backend/config.py

+ 0 - 1
.dockerignore

@@ -7,7 +7,6 @@ node_modules
 /package
 /package
 .env
 .env
 .env.*
 .env.*
-!.env.example
 vite.config.js.timestamp-*
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
 vite.config.ts.timestamp-*
 __pycache__
 __pycache__

+ 1 - 2
backend/apps/openai/main.py

@@ -175,8 +175,7 @@ async def get_all_models():
         for idx, url in enumerate(app.state.OPENAI_API_BASE_URLS)
         for idx, url in enumerate(app.state.OPENAI_API_BASE_URLS)
     ]
     ]
     responses = await asyncio.gather(*tasks)
     responses = await asyncio.gather(*tasks)
-    responses = list(filter(lambda x: x is not None, responses))
-
+    responses = list(filter(lambda x: x is not None and "error" not in x, responses))
     models = {
     models = {
         "data": merge_models_lists(
         "data": merge_models_lists(
             list(map(lambda response: response["data"], responses))
             list(map(lambda response: response["data"], responses))

+ 3 - 0
backend/config.py

@@ -234,6 +234,9 @@ OLLAMA_BASE_URLS = [url.strip() for url in OLLAMA_BASE_URLS.split(";")]
 OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY", "")
 OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY", "")
 OPENAI_API_BASE_URL = os.environ.get("OPENAI_API_BASE_URL", "")
 OPENAI_API_BASE_URL = os.environ.get("OPENAI_API_BASE_URL", "")
 
 
+if OPENAI_API_KEY == "":
+    OPENAI_API_KEY = "none"
+
 if OPENAI_API_BASE_URL == "":
 if OPENAI_API_BASE_URL == "":
     OPENAI_API_BASE_URL = "https://api.openai.com/v1"
     OPENAI_API_BASE_URL = "https://api.openai.com/v1"