You've already forked adk-python
mirror of
https://github.com/encounter/adk-python.git
synced 2026-03-30 10:57:20 -07:00
ADK changes
PiperOrigin-RevId: 879030011
This commit is contained in:
committed by
Copybara-Service
parent
a61ccf36a2
commit
feefadfcc9
@@ -115,12 +115,6 @@ class BaseAgent(BaseModel):
|
||||
Agent name cannot be "user", since it's reserved for end-user's input.
|
||||
"""
|
||||
|
||||
version: str = ''
|
||||
"""The agent's version.
|
||||
|
||||
Version of the agent being invoked. Used to identify the Agent involved in telemetry.
|
||||
"""
|
||||
|
||||
description: str = ''
|
||||
"""Description about the agent's capability.
|
||||
|
||||
@@ -686,7 +680,6 @@ class BaseAgent(BaseModel):
|
||||
|
||||
kwargs: Dict[str, Any] = {
|
||||
'name': config.name,
|
||||
'version': config.version,
|
||||
'description': config.description,
|
||||
}
|
||||
if config.sub_agents:
|
||||
|
||||
@@ -55,10 +55,6 @@ class BaseAgentConfig(BaseModel):
|
||||
|
||||
name: str = Field(description='Required. The name of the agent.')
|
||||
|
||||
version: str = Field(
|
||||
default='', description='Optional. The version of the agent.'
|
||||
)
|
||||
|
||||
description: str = Field(
|
||||
default='', description='Optional. The description of the agent.'
|
||||
)
|
||||
|
||||
@@ -82,8 +82,6 @@ OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT = (
|
||||
|
||||
USER_CONTENT_ELIDED = '<elided>'
|
||||
|
||||
GEN_AI_AGENT_VERSION = 'gen_ai.agent.version'
|
||||
|
||||
# Needed to avoid circular imports
|
||||
if TYPE_CHECKING:
|
||||
from ..agents.base_agent import BaseAgent
|
||||
@@ -157,7 +155,6 @@ def trace_agent_invocation(
|
||||
span.set_attribute(GEN_AI_AGENT_DESCRIPTION, agent.description)
|
||||
|
||||
span.set_attribute(GEN_AI_AGENT_NAME, agent.name)
|
||||
span.set_attribute(GEN_AI_AGENT_VERSION, agent.version)
|
||||
span.set_attribute(GEN_AI_CONVERSATION_ID, ctx.session.id)
|
||||
|
||||
|
||||
@@ -458,7 +455,6 @@ def use_generate_content_span(
|
||||
USER_ID: invocation_context.session.user_id,
|
||||
'gcp.vertex.agent.event_id': model_response_event.id,
|
||||
'gcp.vertex.agent.invocation_id': invocation_context.invocation_id,
|
||||
GEN_AI_AGENT_VERSION: invocation_context.agent.version,
|
||||
}
|
||||
if (
|
||||
_is_gemini_agent(invocation_context.agent)
|
||||
@@ -493,7 +489,6 @@ async def use_inference_span(
|
||||
USER_ID: invocation_context.session.user_id,
|
||||
'gcp.vertex.agent.event_id': model_response_event.id,
|
||||
'gcp.vertex.agent.invocation_id': invocation_context.invocation_id,
|
||||
GEN_AI_AGENT_VERSION: invocation_context.agent.version,
|
||||
}
|
||||
if (
|
||||
_is_gemini_agent(invocation_context.agent)
|
||||
|
||||
@@ -24,7 +24,6 @@ from google.adk.models.llm_request import LlmRequest
|
||||
from google.adk.models.llm_response import LlmResponse
|
||||
from google.adk.sessions.in_memory_session_service import InMemorySessionService
|
||||
from google.adk.telemetry.tracing import ADK_CAPTURE_MESSAGE_CONTENT_IN_SPANS
|
||||
from google.adk.telemetry.tracing import GEN_AI_AGENT_VERSION
|
||||
from google.adk.telemetry.tracing import trace_agent_invocation
|
||||
from google.adk.telemetry.tracing import trace_call_llm
|
||||
from google.adk.telemetry.tracing import trace_inference_result
|
||||
@@ -120,33 +119,6 @@ async def test_trace_agent_invocation(mock_span_fixture):
|
||||
mock.call('gen_ai.operation.name', 'invoke_agent'),
|
||||
mock.call('gen_ai.agent.description', agent.description),
|
||||
mock.call('gen_ai.agent.name', agent.name),
|
||||
mock.call(GEN_AI_AGENT_VERSION, ''),
|
||||
mock.call(
|
||||
'gen_ai.conversation.id',
|
||||
invocation_context.session.id,
|
||||
),
|
||||
]
|
||||
mock_span_fixture.set_attribute.assert_has_calls(
|
||||
expected_calls, any_order=True
|
||||
)
|
||||
assert mock_span_fixture.set_attribute.call_count == len(expected_calls)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_trace_agent_invocation_with_version(mock_span_fixture):
|
||||
"""Test trace_agent_invocation sets span attributes correctly when version is provided."""
|
||||
agent = LlmAgent(name='test_llm_agent', model='gemini-pro')
|
||||
agent.description = 'Test agent description'
|
||||
agent.version = '1.0.0'
|
||||
invocation_context = await _create_invocation_context(agent)
|
||||
|
||||
trace_agent_invocation(mock_span_fixture, agent, invocation_context)
|
||||
|
||||
expected_calls = [
|
||||
mock.call('gen_ai.operation.name', 'invoke_agent'),
|
||||
mock.call('gen_ai.agent.description', agent.description),
|
||||
mock.call('gen_ai.agent.name', agent.name),
|
||||
mock.call(GEN_AI_AGENT_VERSION, agent.version),
|
||||
mock.call(
|
||||
'gen_ai.conversation.id',
|
||||
invocation_context.session.id,
|
||||
@@ -795,7 +767,6 @@ async def test_generate_content_span(
|
||||
|
||||
mock_span.set_attributes.assert_called_once_with({
|
||||
GEN_AI_AGENT_NAME: invocation_context.agent.name,
|
||||
GEN_AI_AGENT_VERSION: '',
|
||||
GEN_AI_CONVERSATION_ID: invocation_context.session.id,
|
||||
USER_ID: invocation_context.session.user_id,
|
||||
'gcp.vertex.agent.event_id': 'event-123',
|
||||
@@ -1116,7 +1087,6 @@ async def test_generate_content_span_with_experimental_semconv(
|
||||
|
||||
mock_span.set_attributes.assert_called_once_with({
|
||||
GEN_AI_AGENT_NAME: invocation_context.agent.name,
|
||||
GEN_AI_AGENT_VERSION: '',
|
||||
GEN_AI_CONVERSATION_ID: invocation_context.session.id,
|
||||
USER_ID: invocation_context.session.user_id,
|
||||
'gcp.vertex.agent.event_id': 'event-123',
|
||||
|
||||
Reference in New Issue
Block a user