UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2024-11-25 21:38:43 +00:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

refac: OPENAI_MODEL_LIST_TIMEOUT -> AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST

Browse Source
This commit is contained in:
Timothy J. Baek 2024-10-13 22:56:33 -07:00
parent ebec6cd426
commit ee8b8220f0
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/open_webui/apps/openai/main.py
View File

@ -18,7 +18,10 @@ from open_webui.config import (
OPENAI_API_KEYS, OPENAI_API_KEYS,
AppConfig, AppConfig,
) )
from open_webui.env import AIOHTTP_CLIENT_TIMEOUT, OPENAI_MODEL_LIST_TIMEOUT from open_webui.env import (
AIOHTTP_CLIENT_TIMEOUT,
AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST,
)
from open_webui.constants import ERROR_MESSAGES from open_webui.constants import ERROR_MESSAGES
from open_webui.env import SRC_LOG_LEVELS from open_webui.env import SRC_LOG_LEVELS
@ -179,7 +182,7 @@ async def speech(request: Request, user=Depends(get_verified_user)):
async def fetch_url(url, key): async def fetch_url(url, key):
timeout = aiohttp.ClientTimeout(total=OPENAI_MODEL_LIST_TIMEOUT) timeout = aiohttp.ClientTimeout(total=AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST)
try: try:
headers = {"Authorization": f"Bearer {key}"} headers = {"Authorization": f"Bearer {key}"}
async with aiohttp.ClientSession(timeout=timeout, trust_env=True) as session: async with aiohttp.ClientSession(timeout=timeout, trust_env=True) as session:

14
backend/open_webui/env.py
View File

@ -363,15 +363,19 @@ else:
except Exception: except Exception:
AIOHTTP_CLIENT_TIMEOUT = 300 AIOHTTP_CLIENT_TIMEOUT = 300
OPENAI_MODEL_LIST_TIMEOUT = os.environ.get("OPENAI_MODEL_LIST_TIMEOUT", "") AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST = os.environ.get(
"AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST", "3"
)
if OPENAI_MODEL_LIST_TIMEOUT == "": if AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST == "":
OPENAI_MODEL_LIST_TIMEOUT = None AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST = None
else: else:
try: try:
OPENAI_MODEL_LIST_TIMEOUT = int(OPENAI_MODEL_LIST_TIMEOUT) AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST = int(
AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST
)
except Exception: except Exception:
OPENAI_MODEL_LIST_TIMEOUT = 3 AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST = None
#################################### ####################################
# OFFLINE_MODE # OFFLINE_MODE