kagent-adk 0.6.12__tar.gz → 0.6.15__tar.gz

{kagent_adk-0.6.12 → kagent_adk-0.6.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kagent-adk
-Version: 0.6.12
+Version: 0.6.15
 Summary: kagent-adk is an sdk for integrating adk agents with kagent
 Requires-Python: >=3.12.11
 Requires-Dist: a2a-sdk>=0.3.1

{kagent_adk-0.6.12 → kagent_adk-0.6.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "kagent-adk"
-version = "0.6.12"
+version = "0.6.15"
 description = "kagent-adk is an sdk for integrating adk agents with kagent"
 readme = "README.md"
 requires-python = ">=3.12.11"

{kagent_adk-0.6.12 → kagent_adk-0.6.15}/src/kagent/adk/_session_service.py

@@ -24,10 +24,6 @@ class KAgentSessionService(BaseSessionService):
         super().__init__()
         self.client = client
 
-    async def _get_user_id(self) -> str:
-        """Get the default user ID. Override this method to implement custom user ID logic."""
-        return "admin@kagent.dev"
-
     @override
     async def create_session(
         self,

{kagent_adk-0.6.12 → kagent_adk-0.6.15}/src/kagent/adk/models/_openai.py

@@ -395,7 +395,7 @@ class AzureOpenAI(BaseOpenAI):
     @cached_property
     def _client(self) -> AsyncAzureOpenAI:
         """Get the Azure OpenAI client."""
-        api_version = self.api_version or os.environ.get("AZURE_OPENAI_API_VERSION", "2024-02-15-preview")
+        api_version = self.api_version or os.environ.get("OPENAI_API_VERSION", "2024-02-15-preview")
         azure_endpoint = self.azure_endpoint or os.environ.get("AZURE_OPENAI_ENDPOINT")
         api_key = self.api_key or os.environ.get("AZURE_OPENAI_API_KEY")
 

{kagent_adk-0.6.12 → kagent_adk-0.6.15}/src/kagent/adk/types.py

@@ -1,10 +1,12 @@
+import httpx
 import logging
-from typing import Literal, Self, Union
+
+from typing import Literal, Any, Union
 
 from google.adk.agents import Agent
 from google.adk.agents.base_agent import BaseAgent
 from google.adk.agents.llm_agent import ToolUnion
-from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH, RemoteA2aAgent
+from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH, DEFAULT_TIMEOUT, RemoteA2aAgent
 from google.adk.models.anthropic_llm import Claude as ClaudeLLM
 from google.adk.models.google_llm import Gemini as GeminiLLM
 from google.adk.models.lite_llm import LiteLlm
@@ -31,6 +33,8 @@ class SseMcpServerConfig(BaseModel):
 class RemoteAgentConfig(BaseModel):
     name: str
     url: str
+    headers: dict[str, Any] | None = None
+    timeout: float = DEFAULT_TIMEOUT
     description: str = ""
 
 
@@ -77,29 +81,38 @@ class AgentConfig(BaseModel):
     )
     description: str
     instruction: str
-    http_tools: list[HttpMcpServerConfig] | None = None  # tools, always MCP
-    sse_tools: list[SseMcpServerConfig] | None = None  # tools, always MCP
+    http_tools: list[HttpMcpServerConfig] | None = None  # Streamable HTTP MCP tools
+    sse_tools: list[SseMcpServerConfig] | None = None  # SSE MCP tools
     remote_agents: list[RemoteAgentConfig] | None = None  # remote agents
 
     def to_agent(self, name: str) -> Agent:
         if name is None or not str(name).strip():
             raise ValueError("Agent name must be a non-empty string.")
-        mcp_toolsets: list[ToolUnion] = []
+        tools: list[ToolUnion] = []
         if self.http_tools:
             for http_tool in self.http_tools:  # add http tools
-                mcp_toolsets.append(MCPToolset(connection_params=http_tool.params, tool_filter=http_tool.tools))
+                tools.append(MCPToolset(connection_params=http_tool.params, tool_filter=http_tool.tools))
         if self.sse_tools:
             for sse_tool in self.sse_tools:  # add stdio tools
-                mcp_toolsets.append(MCPToolset(connection_params=sse_tool.params, tool_filter=sse_tool.tools))
+                tools.append(MCPToolset(connection_params=sse_tool.params, tool_filter=sse_tool.tools))
         if self.remote_agents:
             for remote_agent in self.remote_agents:  # Add remote agents as tools
-                remote_agent = RemoteA2aAgent(
+                client = None
+
+                if remote_agent.headers:
+                    client = httpx.AsyncClient(
+                        headers=remote_agent.headers, timeout=httpx.Timeout(timeout=remote_agent.timeout)
+                    )
+
+                remote_a2a_agent = RemoteA2aAgent(
                     name=remote_agent.name,
                     agent_card=f"{remote_agent.url}/{AGENT_CARD_WELL_KNOWN_PATH}",
                     description=remote_agent.description,
+                    httpx_client=client,
                 )
-                mcp_toolsets.append(
-                    AgentTool(agent=remote_agent, skip_summarization=True)
+
+                tools.append(
+                    AgentTool(agent=remote_a2a_agent, skip_summarization=True)
                 )  # Get headers from model config
 
         extra_headers = self.model.headers or {}
@@ -127,5 +140,5 @@ class AgentConfig(BaseModel):
             model=model,
             description=self.description,
             instruction=self.instruction,
-            tools=mcp_toolsets,
+            tools=tools,
         )