kagent-adk 0.6.5__py3-none-any.whl → 0.6.7__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of kagent-adk might be problematic. Click here for more details.
- kagent_adk/_agent_executor.py +9 -0
- kagent_adk/cli.py +0 -2
- kagent_adk/models.py +0 -4
- {kagent_adk-0.6.5.dist-info → kagent_adk-0.6.7.dist-info}/METADATA +3 -3
- kagent_adk-0.6.7.dist-info/RECORD +12 -0
- kagent_adk-0.6.5.dist-info/RECORD +0 -12
- {kagent_adk-0.6.5.dist-info → kagent_adk-0.6.7.dist-info}/WHEEL +0 -0
- {kagent_adk-0.6.5.dist-info → kagent_adk-0.6.7.dist-info}/entry_points.txt +0 -0
kagent_adk/_agent_executor.py
CHANGED
|
@@ -25,6 +25,7 @@ from google.adk.a2a.converters.request_converter import convert_a2a_request_to_a
|
|
|
25
25
|
from google.adk.a2a.converters.utils import _get_adk_metadata_key
|
|
26
26
|
from google.adk.a2a.executor.task_result_aggregator import TaskResultAggregator
|
|
27
27
|
from google.adk.runners import Runner
|
|
28
|
+
from opentelemetry import trace
|
|
28
29
|
from pydantic import BaseModel
|
|
29
30
|
from typing_extensions import override
|
|
30
31
|
|
|
@@ -166,6 +167,14 @@ class A2aAgentExecutor(AgentExecutor):
|
|
|
166
167
|
# ensure the session exists
|
|
167
168
|
session = await self._prepare_session(context, run_args, runner)
|
|
168
169
|
|
|
170
|
+
current_span = trace.get_current_span()
|
|
171
|
+
if run_args["user_id"]:
|
|
172
|
+
current_span.set_attribute("kagent.user_id", run_args["user_id"])
|
|
173
|
+
if context.task_id:
|
|
174
|
+
current_span.set_attribute("gen_ai.task.id", context.task_id)
|
|
175
|
+
if run_args["session_id"]:
|
|
176
|
+
current_span.set_attribute("gen_ai.converstation.id", run_args["session_id"])
|
|
177
|
+
|
|
169
178
|
# create invocation context
|
|
170
179
|
invocation_context = runner._new_invocation_context(
|
|
171
180
|
session=session,
|
kagent_adk/cli.py
CHANGED
|
@@ -12,7 +12,6 @@ from opentelemetry import _logs, trace
|
|
|
12
12
|
from opentelemetry.exporter.otlp.proto.grpc._log_exporter import OTLPLogExporter
|
|
13
13
|
from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
|
|
14
14
|
from opentelemetry.instrumentation.anthropic import AnthropicInstrumentor
|
|
15
|
-
from opentelemetry.instrumentation.httpx import HTTPXClientInstrumentor
|
|
16
15
|
from opentelemetry.instrumentation.openai import OpenAIInstrumentor
|
|
17
16
|
from opentelemetry.sdk._events import EventLoggerProvider
|
|
18
17
|
from opentelemetry.sdk._logs import LoggerProvider
|
|
@@ -83,7 +82,6 @@ def configure_tracing():
|
|
|
83
82
|
processor = BatchSpanProcessor(OTLPSpanExporter())
|
|
84
83
|
tracer_provider.add_span_processor(processor)
|
|
85
84
|
trace.set_tracer_provider(tracer_provider)
|
|
86
|
-
HTTPXClientInstrumentor().instrument()
|
|
87
85
|
|
|
88
86
|
# Configure logging if enabled
|
|
89
87
|
if logging_enabled:
|
kagent_adk/models.py
CHANGED
|
@@ -76,7 +76,6 @@ class AgentConfig(BaseModel):
|
|
|
76
76
|
instruction: str
|
|
77
77
|
http_tools: list[HttpMcpServerConfig] | None = None # tools, always MCP
|
|
78
78
|
sse_tools: list[SseMcpServerConfig] | None = None # tools, always MCP
|
|
79
|
-
agents: list[Self] | None = None # agent names
|
|
80
79
|
remote_agents: list[RemoteAgentConfig] | None = None # remote agents
|
|
81
80
|
|
|
82
81
|
def to_agent(self, name: str) -> Agent:
|
|
@@ -89,9 +88,6 @@ class AgentConfig(BaseModel):
|
|
|
89
88
|
if self.sse_tools:
|
|
90
89
|
for sse_tool in self.sse_tools: # add stdio tools
|
|
91
90
|
mcp_toolsets.append(MCPToolset(connection_params=sse_tool.params, tool_filter=sse_tool.tools))
|
|
92
|
-
if self.agents:
|
|
93
|
-
for agent in self.agents: # Add sub agents as tools
|
|
94
|
-
mcp_toolsets.append(AgentTool(agent.to_agent(name)))
|
|
95
91
|
remote_agents: list[BaseAgent] = []
|
|
96
92
|
if self.remote_agents:
|
|
97
93
|
for remote_agent in self.remote_agents: # Add remote agents as tools
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: kagent-adk
|
|
3
|
-
Version: 0.6.
|
|
3
|
+
Version: 0.6.7
|
|
4
4
|
Summary: kagent-adk is an sdk for integrating adk agents with kagent
|
|
5
5
|
Requires-Python: >=3.12.11
|
|
6
|
-
Requires-Dist: a2a-sdk>=0.
|
|
6
|
+
Requires-Dist: a2a-sdk>=0.3.1
|
|
7
7
|
Requires-Dist: aiofiles>=24.1.0
|
|
8
8
|
Requires-Dist: anthropic[vertex]>=0.49.0
|
|
9
9
|
Requires-Dist: anyio>=4.9.0
|
|
10
10
|
Requires-Dist: fastapi>=0.115.1
|
|
11
|
-
Requires-Dist: google-adk>=1.
|
|
11
|
+
Requires-Dist: google-adk>=1.11.0
|
|
12
12
|
Requires-Dist: google-auth>=2.40.2
|
|
13
13
|
Requires-Dist: google-genai>=1.21.1
|
|
14
14
|
Requires-Dist: httpx>=0.25.0
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
kagent_adk/__init__.py,sha256=3oB8gbSzsvVmqV8w-BGKkRlH3JPfK6o27AfOD6wAd8o,182
|
|
2
|
+
kagent_adk/_agent_executor.py,sha256=8NDMNUveFtewamYtBQ4MkCwFIRn5xDWeuDaMsW-QGF8,10806
|
|
3
|
+
kagent_adk/_session_service.py,sha256=A47gsfDVp8jITzeW987AHTJLEhcU_mU3ik_SFptFGIc,5815
|
|
4
|
+
kagent_adk/_task_store.py,sha256=3ApKbFfcDZmcEnwef6bCDhBhoGY9ZYwwyP671B1DHFo,889
|
|
5
|
+
kagent_adk/_token.py,sha256=M9TOxxC4RAWPup_MIYuLIYoklnfllJS0yV3dQOfr5ng,2486
|
|
6
|
+
kagent_adk/a2a.py,sha256=r8GgDkeKoZJx_qZmLfoaA0zSrP7t0Hn_VqEc-m0xIc8,5845
|
|
7
|
+
kagent_adk/cli.py,sha256=fqGRM6egX0Kb2AvZWWDCv4Ad7oJ8rh0UDOsV9BZKujQ,6858
|
|
8
|
+
kagent_adk/models.py,sha256=BCG7FdXnizGc28HyHne-GRkUUKoc-QII4b8xcIl_4Yc,4201
|
|
9
|
+
kagent_adk-0.6.7.dist-info/METADATA,sha256=LWyROW1gHg-SbR7va1aFGOBhSRUg1QD8wAWNWaUFCY8,1242
|
|
10
|
+
kagent_adk-0.6.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
|
11
|
+
kagent_adk-0.6.7.dist-info/entry_points.txt,sha256=bmqHEc9zPYkbRoK57wF3wi5ohHTMB6yHTslKfvuVpc4,50
|
|
12
|
+
kagent_adk-0.6.7.dist-info/RECORD,,
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
kagent_adk/__init__.py,sha256=3oB8gbSzsvVmqV8w-BGKkRlH3JPfK6o27AfOD6wAd8o,182
|
|
2
|
-
kagent_adk/_agent_executor.py,sha256=VJn3uQ3EITouzqiIzcN7MZgZ8ozannZIIqjVVyYO57k,10388
|
|
3
|
-
kagent_adk/_session_service.py,sha256=A47gsfDVp8jITzeW987AHTJLEhcU_mU3ik_SFptFGIc,5815
|
|
4
|
-
kagent_adk/_task_store.py,sha256=3ApKbFfcDZmcEnwef6bCDhBhoGY9ZYwwyP671B1DHFo,889
|
|
5
|
-
kagent_adk/_token.py,sha256=M9TOxxC4RAWPup_MIYuLIYoklnfllJS0yV3dQOfr5ng,2486
|
|
6
|
-
kagent_adk/a2a.py,sha256=r8GgDkeKoZJx_qZmLfoaA0zSrP7t0Hn_VqEc-m0xIc8,5845
|
|
7
|
-
kagent_adk/cli.py,sha256=MSdd38T1vsFEhpj3MEAg4IdQhlrcumnSbRi-8xUKXVE,6977
|
|
8
|
-
kagent_adk/models.py,sha256=ZR1Hbc6fjA82fGdgrfa5-HyWOkXQTrjX2FiS57_O8i4,4411
|
|
9
|
-
kagent_adk-0.6.5.dist-info/METADATA,sha256=jsDVC2SBgeJ72jX0yHjrg0tYD6BkTlBy91eGaam7LDw,1242
|
|
10
|
-
kagent_adk-0.6.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
|
11
|
-
kagent_adk-0.6.5.dist-info/entry_points.txt,sha256=bmqHEc9zPYkbRoK57wF3wi5ohHTMB6yHTslKfvuVpc4,50
|
|
12
|
-
kagent_adk-0.6.5.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|