scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-03 02:22:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 81

fix(a2a): skip merge for non-A2A agents and align pydantic-ai result shape

Browse source 
The agent create/update/patch handlers ran the LiteLLM-fronting merge
unconditionally, so registrations that did not provide
agent_card_params still ended up with a synthesised card carrying
supportedInterfaces, securitySchemes, and default skills. Gate the
merge on a non-empty agent_card_params so plain chat/LLM agents stay
non-A2A in the registry.

Also move kind: 'message' inside the a2a_message dict in the Pydantic
AI non-streaming response so its construction matches the completion
bridge rather than spreading kind on top of a separate dict.
This commit is contained in:
mateo-berri 2026-05-28 03:23:54 +00:00
parent ac6bc79e54
commit 42b44498e3
No known key found for this signature in database
2 changed files with 47 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
litellm/a2a_protocol/providers/pydantic_ai_agents/transformation.py
View file

@ -316,6 +316,7 @@ class PydanticAITransformation:
# Build standard A2A message
a2a_message = {
"kind": "message",
"role": "agent",
"parts": parts if parts else [{"kind": "text", "text": full_text}],
"messageId": message_id,
@ -325,10 +326,7 @@ class PydanticAITransformation:
return {
"jsonrpc": "2.0",
"id": request_id,
"result": {
"kind": "message",
**a2a_message,
},
"result": a2a_message,
}
@staticmethod

75
litellm/proxy/agent_endpoints/endpoints.py
View file

@ -373,22 +373,29 @@ async def create_agent(
detail=f"Agent with name {request.get('agent_name')} already exists",
)
# Apply the LiteLLM-fronting merge so the stored card already advertises
# the proxy URL, LiteLLMKey auth, and the filtered capability set. We
# pre-generate the agent_id so the merged card can reference it in
# ``supportedInterfaces`` before the DB row exists.
new_agent_id = str(uuid.uuid4())
merged_card = _build_merged_agent_card(
request.get("agent_card_params"),
agent_id=new_agent_id,
http_request=http_request,
agent_name=request.get("agent_name"),
description=(request.get("agent_card_params") or {}).get("description"),
)
merged_request: AgentConfig = {**request, "agent_card_params": merged_card} # type: ignore[typeddict-item]
# Apply the LiteLLM-fronting merge only when the admin actually
# provided an agent card. Plain chat/LLM agents register without
# ``agent_card_params``, and synthesising a default A2A card for them
# would advertise capabilities (``supportedInterfaces``, security
# schemes, default skills) the agent doesn't actually expose.
upstream_card = request.get("agent_card_params")
agent_to_create: AgentConfig = request
new_agent_id: Optional[str] = None
if upstream_card:
# Pre-generate the agent_id so the merged card can reference it
# in ``supportedInterfaces`` before the DB row exists.
new_agent_id = str(uuid.uuid4())
merged_card = _build_merged_agent_card(
upstream_card,
agent_id=new_agent_id,
http_request=http_request,
agent_name=request.get("agent_name"),
description=upstream_card.get("description"),
)
agent_to_create = {**request, "agent_card_params": merged_card} # type: ignore[typeddict-item]
result = await AGENT_REGISTRY.add_agent_to_db(
agent=merged_request,
agent=agent_to_create,
prisma_client=prisma_client,
created_by=created_by,
agent_id=new_agent_id,
@ -581,19 +588,24 @@ async def update_agent(
# Re-apply the LiteLLM-fronting merge — an update is a re-registration,
# so any new upstream card the admin pasted must go through the same
# transformation as initial create.
merged_card = _build_merged_agent_card(
request.get("agent_card_params"),
agent_id=agent_id,
http_request=http_request,
agent_name=request.get("agent_name"),
description=(request.get("agent_card_params") or {}).get("description"),
)
merged_request: AgentConfig = {**request, "agent_card_params": merged_card} # type: ignore[typeddict-item]
# transformation as initial create. Plain agents without an
# ``agent_card_params`` skip the merge so we don't synthesise an A2A
# card for them.
upstream_card = request.get("agent_card_params")
agent_to_update: AgentConfig = request
if upstream_card:
merged_card = _build_merged_agent_card(
upstream_card,
agent_id=agent_id,
http_request=http_request,
agent_name=request.get("agent_name"),
description=upstream_card.get("description"),
)
agent_to_update = {**request, "agent_card_params": merged_card} # type: ignore[typeddict-item]
result = await AGENT_REGISTRY.update_agent_in_db(
agent_id=agent_id,
agent=merged_request,
agent=agent_to_update,
prisma_client=prisma_client,
updated_by=updated_by,
)
@ -685,17 +697,20 @@ async def patch_agent(
# Get the user ID from the API key auth
updated_by = user_api_key_dict.user_id or "unknown"
# Re-merge only when the patch actually touches agent_card_params; a
# patch updating just litellm_params/rate limits shouldn't rewrite the
# stored card.
# Re-merge only when the patch actually touches agent_card_params with
# a non-empty card; a patch updating just litellm_params/rate limits
# shouldn't rewrite the stored card, and a patch clearing
# ``agent_card_params`` shouldn't synthesise a default A2A card for
# what is effectively a non-A2A agent.
patch_payload: PatchAgentRequest = request
if "agent_card_params" in request:
upstream_card = request.get("agent_card_params")
if upstream_card:
merged_card = _build_merged_agent_card(
request.get("agent_card_params"),
upstream_card,
agent_id=agent_id,
http_request=http_request,
agent_name=request.get("agent_name"),
description=(request.get("agent_card_params") or {}).get("description"),
description=upstream_card.get("description"),
)
patch_payload = {**request, "agent_card_params": merged_card} # type: ignore[typeddict-item]