refac

backend/open_webui/utils/headers.py

@@ -16,3 +16,25 @@ def include_user_info_headers(headers, user):
         FORWARD_USER_INFO_HEADER_USER_EMAIL: user.email,
         FORWARD_USER_INFO_HEADER_USER_ROLE: user.role,
     }
+
+def get_custom_headers(custom_headers: dict, user=None, metadata: dict = None) -> dict:
+    if not custom_headers or not isinstance(custom_headers, dict):
+        return {}
+
+    metadata = metadata or {}
+    template_vars = {
+        '{{CHAT_ID}}': metadata.get('chat_id', '') or '',
+        '{{MESSAGE_ID}}': metadata.get('message_id', '') or '',
+        '{{USER_ID}}': (user.id if user else '') or '',
+        '{{USER_NAME}}': (user.name if user else '') or '',
+    }
+    
+    parsed_headers = {}
+    for key, value in custom_headers.items():
+        if not isinstance(value, str):
+            value = str(value)
+        for token, val in template_vars.items():
+            value = value.replace(token, val)
+        parsed_headers[key] = value
+        
+    return parsed_headers

backend/open_webui/utils/tools.py

@@ -54,7 +54,7 @@ from open_webui.env import (
     FORWARD_SESSION_INFO_HEADER_MESSAGE_ID,
     REDIS_KEY_PREFIX,
 )
-from open_webui.utils.headers import include_user_info_headers
+from open_webui.utils.headers import include_user_info_headers, get_custom_headers
 from open_webui.tools.builtin import (
     search_web,
     fetch_url,
@@ -337,8 +337,9 @@ async def get_tools(request: Request, tool_ids: list[str], user: UserModel, extr
 
                         connection_headers = tool_server_connection.get('headers', None)
                         if connection_headers and isinstance(connection_headers, dict):
-                            for key, value in connection_headers.items():
-                                headers[key] = value
+                            metadata = extra_params.get('__metadata__', {})
+                            custom_headers = get_custom_headers(connection_headers, user, metadata)
+                            headers.update(custom_headers)
 
                         # Add user info headers if enabled
                         if ENABLE_FORWARD_USER_INFO_HEADERS and user: