phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-12-03 18:00:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed _convert_authorization_to_headers

Browse source
This commit is contained in:
Omar Abdelwahab 2025-11-04 12:46:52 -08:00
parent abc717ed1d
commit 1db14ca4a3
2 changed files with 6 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/llama_stack/providers/inline/agents/meta_reference/responses/streaming.py
View file

@ -80,18 +80,6 @@ from .utils import (
logger = get_logger(name=__name__, category="agents::meta_reference") logger = get_logger(name=__name__, category="agents::meta_reference")
def _convert_authorization_to_headers(authorization: str) -> dict[str, str]:
"""Convert authorization string to HTTP headers.
Args:
authorization: Authorization header value (e.g., "Bearer token")
Returns:
Dictionary of HTTP headers with Authorization header
"""
return {"Authorization": authorization}
def convert_tooldef_to_chat_tool(tool_def): def convert_tooldef_to_chat_tool(tool_def):
"""Convert a ToolDef to OpenAI ChatCompletionToolParam format. """Convert a ToolDef to OpenAI ChatCompletionToolParam format.
@ -1094,12 +1082,10 @@ class StreamingResponseOrchestrator:
# Prepare headers with authorization from tool config # Prepare headers with authorization from tool config
headers = dict(mcp_tool.headers or {}) headers = dict(mcp_tool.headers or {})
if mcp_tool.authorization: if mcp_tool.authorization:
auth_headers = _convert_authorization_to_headers(mcp_tool.authorization) # Don't override existing Authorization header (case-insensitive check)
# Don't override existing headers (case-insensitive check)
existing_keys_lower = {k.lower() for k in headers.keys()} existing_keys_lower = {k.lower() for k in headers.keys()}
for key, value in auth_headers.items(): if "authorization" not in existing_keys_lower:
if key.lower() not in existing_keys_lower: headers["Authorization"] = mcp_tool.authorization
headers[key] = value
async with tracing.span("list_mcp_tools", attributes): async with tracing.span("list_mcp_tools", attributes):
tool_defs = await list_mcp_tools( tool_defs = await list_mcp_tools(

20
src/llama_stack/providers/inline/agents/meta_reference/responses/tool_executor.py
View file

@ -47,18 +47,6 @@ from .types import ChatCompletionContext, ToolExecutionResult
logger = get_logger(name=__name__, category="agents::meta_reference") logger = get_logger(name=__name__, category="agents::meta_reference")
def _convert_authorization_to_headers(authorization: str) -> dict[str, str]:
"""Convert authorization string to HTTP headers.
Args:
authorization: Authorization header value (e.g., "Bearer token")
Returns:
Dictionary of HTTP headers with Authorization header
"""
return {"Authorization": authorization}
class ToolExecutor: class ToolExecutor:
def __init__( def __init__(
self, self,
@ -314,12 +302,10 @@ class ToolExecutor:
# Prepare headers with authorization from tool config # Prepare headers with authorization from tool config
headers = dict(mcp_tool.headers or {}) headers = dict(mcp_tool.headers or {})
if mcp_tool.authorization: if mcp_tool.authorization:
auth_headers = _convert_authorization_to_headers(mcp_tool.authorization) # Don't override existing Authorization header (case-insensitive check)
# Don't override existing headers (case-insensitive check)
existing_keys_lower = {k.lower() for k in headers.keys()} existing_keys_lower = {k.lower() for k in headers.keys()}
for key, value in auth_headers.items(): if "authorization" not in existing_keys_lower:
if key.lower() not in existing_keys_lower: headers["Authorization"] = mcp_tool.authorization
headers[key] = value
async with tracing.span("invoke_mcp_tool", attributes): async with tracing.span("invoke_mcp_tool", attributes):
result = await invoke_mcp_tool( result = await invoke_mcp_tool(