Browse Source

fix: custom model action button issue

Timothy J. Baek 6 tháng trước cách đây
mục cha
commit
dce91a8557
2 tập tin đã thay đổi với 7 bổ sung5 xóa
  1. 1 1
      backend/open_webui/env.py
  2. 6 4
      backend/open_webui/main.py

+ 1 - 1
backend/open_webui/env.py

@@ -375,7 +375,7 @@ else:
             AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST
         )
     except Exception:
-        AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST = None
+        AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST = 3
 
 ####################################
 # OFFLINE_MODE

+ 6 - 4
backend/open_webui/main.py

@@ -990,11 +990,13 @@ async def get_all_models():
                     owned_by = model["owned_by"]
                     if "pipe" in model:
                         pipe = model["pipe"]
-
-                    if "info" in model and "meta" in model["info"]:
-                        action_ids.extend(model["info"]["meta"].get("actionIds", []))
                     break
 
+            if custom_model.meta:
+                meta = custom_model.meta.model_dump()
+                if "actionIds" in meta:
+                    action_ids.extend(meta["actionIds"])
+
             models.append(
                 {
                     "id": custom_model.id,
@@ -2385,7 +2387,7 @@ async def oauth_callback(provider: str, request: Request, response: Response):
         key="token",
         value=jwt_token,
         httponly=True,  # Ensures the cookie is not accessible via JavaScript
-        samesite=WEBUI_SESSION_COOKIE_SAME_SITE, 
+        samesite=WEBUI_SESSION_COOKIE_SAME_SITE,
         secure=WEBUI_SESSION_COOKIE_SECURE,
     )