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 the MCPAuthorization class relying on bearer token

Browse source
This commit is contained in:
Omar Abdelwahab 2025-11-03 19:57:58 -08:00
parent 376f0fcd23
commit 9dbeeaca97
7 changed files with 24 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,6 @@ from typing import Any
from llama_stack.apis.agents.openai_responses import (
AllowedToolsFilter,
ApprovalFilter,
MCPAuthorization,
MCPListToolsTool,
OpenAIResponseContentPartOutputText,
OpenAIResponseContentPartReasoningText,
@ -83,32 +82,16 @@ from .utils import (
logger = get_logger(name=__name__, category="agents::meta_reference")
def _convert_authentication_to_headers(auth: MCPAuthorization) -> dict[str, str]:
"""Convert MCPAuthorization config to HTTP headers.
def _convert_authorization_to_headers(authorization: str) -> dict[str, str]:
"""Convert authorization string to HTTP headers.
Args:
auth: Authorization configuration
authorization: Authorization header value (e.g., "Bearer token")
Returns:
Dictionary of HTTP headers for authorization
Dictionary of HTTP headers with Authorization header
"""
headers = {}
if auth.type == "bearer":
if auth.token:
headers["Authorization"] = f"Bearer {auth.token}"
elif auth.type == "basic":
if auth.username and auth.password:
import base64
credentials = f"{auth.username}:{auth.password}"
encoded = base64.b64encode(credentials.encode()).decode()
headers["Authorization"] = f"Basic {encoded}"
elif auth.type == "api_key":
if auth.api_key:
headers[auth.header_name] = auth.api_key
return headers
return {"Authorization": authorization}
def convert_tooldef_to_chat_tool(tool_def):
@ -1131,7 +1114,7 @@ class StreamingResponseOrchestrator:
# Prepare headers with authorization from tool config
headers = dict(mcp_tool.headers or {})
if mcp_tool.authorization:
auth_headers = _convert_authentication_to_headers(mcp_tool.authorization)
auth_headers = _convert_authorization_to_headers(mcp_tool.authorization)
# Don't override existing headers (case-insensitive check)
existing_keys_lower = {k.lower() for k in headers.keys()}
for key, value in auth_headers.items():

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

@ -10,7 +10,6 @@ from collections.abc import AsyncIterator
from typing import Any
from llama_stack.apis.agents.openai_responses import (
MCPAuthorization,
OpenAIResponseInputToolFileSearch,
OpenAIResponseInputToolMCP,
OpenAIResponseObjectStreamResponseFileSearchCallCompleted,
@ -45,32 +44,16 @@ from .types import ChatCompletionContext, ToolExecutionResult
logger = get_logger(name=__name__, category="agents::meta_reference")
def _convert_authentication_to_headers(auth: MCPAuthorization) -> dict[str, str]:
"""Convert MCPAuthorization config to HTTP headers.
def _convert_authorization_to_headers(authorization: str) -> dict[str, str]:
"""Convert authorization string to HTTP headers.
Args:
auth: Authentication configuration
authorization: Authorization header value (e.g., "Bearer token")
Returns:
Dictionary of HTTP headers for authentication
Dictionary of HTTP headers with Authorization header
"""
headers = {}
if auth.type == "bearer":
if auth.token:
headers["Authorization"] = f"Bearer {auth.token}"
elif auth.type == "basic":
if auth.username and auth.password:
import base64
credentials = f"{auth.username}:{auth.password}"
encoded = base64.b64encode(credentials.encode()).decode()
headers["Authorization"] = f"Basic {encoded}"
elif auth.type == "api_key":
if auth.api_key:
headers[auth.header_name] = auth.api_key
return headers
return {"Authorization": authorization}
class ToolExecutor:
@ -347,7 +330,7 @@ class ToolExecutor:
# Prepare headers with authorization from tool config
headers = dict(mcp_tool.headers or {})
if mcp_tool.authorization:
auth_headers = _convert_authentication_to_headers(mcp_tool.authorization)
auth_headers = _convert_authorization_to_headers(mcp_tool.authorization)
# Don't override existing headers (case-insensitive check)
existing_keys_lower = {k.lower() for k in headers.keys()}
for key, value in auth_headers.items():