k

backend/danswer/configs/model_configs.py

@@ -121,6 +121,8 @@
         )
 
 
+# List of headers to pass through to tool calls (e.g., API requests made by tools)
+# This allows for dynamic configuration of tool behavior based on incoming request headers
 TOOL_PASS_THROUGH_HEADERS: list[str] | None = None
 _TOOL_PASS_THROUGH_HEADERS_RAW = os.environ.get("TOOL_PASS_THROUGH_HEADERS")
 if _TOOL_PASS_THROUGH_HEADERS_RAW:

backend/danswer/server/query_and_chat/chat_backend.py

@@ -71,7 +71,7 @@
 from danswer.server.query_and_chat.models import SearchFeedbackRequest
 from danswer.server.query_and_chat.models import UpdateChatSessionThreadRequest
 from danswer.server.query_and_chat.token_limit import check_token_rate_limits
-from danswer.tools.headers import get_tool_additional_request_headers
+from danswer.tools.headers import get_tool_headers
 from danswer.utils.logger import setup_logger
 
 
@@ -334,9 +334,7 @@ def stream_generator() -> Generator[str, None, None]:
                 litellm_additional_headers=get_litellm_additional_request_headers(
                     request.headers
                 ),
-                tool_additional_headers=get_tool_additional_request_headers(
-                    request.headers
-                ),
+                tool_additional_headers=get_tool_headers(request.headers),
                 is_connected=is_disconnected_func,
             ):
                 yield json.dumps(packet) if isinstance(packet, dict) else packet

backend/danswer/tools/custom/custom_tool.py

@@ -55,12 +55,9 @@ def __init__(
 
         self._name = self._method_spec.name
         self._description = self._method_spec.summary
-        self.headers = (
-            {header["key"]: header["value"] for header in custom_headers}
-            if custom_headers
-            else {}
-        )
-        self.headers.update(tool_additional_headers or {})
+        self.headers = {
+            header["key"]: header["value"] for header in (custom_headers or [])
+        } | (tool_additional_headers or {})
 
     @property
     def name(self) -> str: