From ebec6cd426457e3be024fe4ebfeef6e366083cb5 Mon Sep 17 00:00:00 2001
From: LuoChen <luochen1990@gmail.com>
Date: Mon, 14 Oct 2024 08:52:59 +0800
Subject: [PATCH] add: OPENAI_MODEL_LIST_TIMEOUT

---
 backend/open_webui/apps/openai/main.py |  4 ++--
 backend/open_webui/env.py              | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/backend/open_webui/apps/openai/main.py b/backend/open_webui/apps/openai/main.py
index 70cefb29c..fc3b01ab2 100644
--- a/backend/open_webui/apps/openai/main.py
+++ b/backend/open_webui/apps/openai/main.py
@@ -18,7 +18,7 @@ from open_webui.config import (
     OPENAI_API_KEYS,
     AppConfig,
 )
-from open_webui.env import AIOHTTP_CLIENT_TIMEOUT
+from open_webui.env import AIOHTTP_CLIENT_TIMEOUT, OPENAI_MODEL_LIST_TIMEOUT
 
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.env import SRC_LOG_LEVELS
@@ -179,7 +179,7 @@ async def speech(request: Request, user=Depends(get_verified_user)):
 
 
 async def fetch_url(url, key):
-    timeout = aiohttp.ClientTimeout(total=3)
+    timeout = aiohttp.ClientTimeout(total=OPENAI_MODEL_LIST_TIMEOUT)
     try:
         headers = {"Authorization": f"Bearer {key}"}
         async with aiohttp.ClientSession(timeout=timeout, trust_env=True) as session:
diff --git a/backend/open_webui/env.py b/backend/open_webui/env.py
index a291bb188..34b67e9de 100644
--- a/backend/open_webui/env.py
+++ b/backend/open_webui/env.py
@@ -363,6 +363,16 @@ else:
     except Exception:
         AIOHTTP_CLIENT_TIMEOUT = 300
 
+OPENAI_MODEL_LIST_TIMEOUT = os.environ.get("OPENAI_MODEL_LIST_TIMEOUT", "")
+
+if OPENAI_MODEL_LIST_TIMEOUT == "":
+    OPENAI_MODEL_LIST_TIMEOUT = None
+else:
+    try:
+        OPENAI_MODEL_LIST_TIMEOUT = int(OPENAI_MODEL_LIST_TIMEOUT)
+    except Exception:
+        OPENAI_MODEL_LIST_TIMEOUT = 3
+
 ####################################
 # OFFLINE_MODE
 ####################################