refac

backend/open_webui/functions.py

@@ -221,10 +221,11 @@ async def generate_function_chat_completion(
 
     oauth_token = None
     try:
-        oauth_token = request.app.state.oauth_manager.get_oauth_token(
-            user.id,
-            request.cookies.get("oauth_session_id", None),
-        )
+        if request.cookies.get("oauth_session_id", None):
+            oauth_token = request.app.state.oauth_manager.get_oauth_token(
+                user.id,
+                request.cookies.get("oauth_session_id", None),
+            )
     except Exception as e:
         log.error(f"Error getting OAuth token: {e}")
 

backend/open_webui/main.py

@@ -1418,14 +1418,6 @@ async def chat_completion(
     model_item = form_data.pop("model_item", {})
     tasks = form_data.pop("background_tasks", None)
 
-    oauth_token = None
-    try:
-        oauth_token = request.app.state.oauth_manager.get_oauth_token(
-            user.id, request.cookies.get("oauth_session_id", None)
-        )
-    except Exception as e:
-        log.error(f"Error getting OAuth token: {e}")
-
     metadata = {}
     try:
         if not model_item.get("direct", False):

backend/open_webui/routers/openai.py

@@ -171,10 +171,11 @@ def get_headers_and_cookies(
 
         oauth_token = None
         try:
-            oauth_token = request.app.state.oauth_manager.get_oauth_token(
-                user.id,
-                request.cookies.get("oauth_session_id", None),
-            )
+            if request.cookies.get("oauth_session_id", None):
+                oauth_token = request.app.state.oauth_manager.get_oauth_token(
+                    user.id,
+                    request.cookies.get("oauth_session_id", None),
+                )
         except Exception as e:
             log.error(f"Error getting OAuth token: {e}")
 

backend/open_webui/utils/middleware.py

@@ -817,10 +817,11 @@ async def process_chat_payload(request, form_data, user, metadata, model):
 
     oauth_token = None
     try:
-        oauth_token = request.app.state.oauth_manager.get_oauth_token(
-            user.id,
-            request.cookies.get("oauth_session_id", None),
-        )
+        if request.cookies.get("oauth_session_id", None):
+            oauth_token = request.app.state.oauth_manager.get_oauth_token(
+                user.id,
+                request.cookies.get("oauth_session_id", None),
+            )
     except Exception as e:
         log.error(f"Error getting OAuth token: {e}")
 
@@ -1496,10 +1497,11 @@ async def process_chat_response(
 
     oauth_token = None
     try:
-        oauth_token = request.app.state.oauth_manager.get_oauth_token(
-            user.id,
-            request.cookies.get("oauth_session_id", None),
-        )
+        if request.cookies.get("oauth_session_id", None):
+            oauth_token = request.app.state.oauth_manager.get_oauth_token(
+                user.id,
+                request.cookies.get("oauth_session_id", None),
+            )
     except Exception as e:
         log.error(f"Error getting OAuth token: {e}")