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

kagent_adk-0.6.17/.python-version

@@ -0,0 +1 @@
+3.13.7

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kagent-adk
-Version: 0.6.15
+Version: 0.6.17
 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.15 → kagent_adk-0.6.17}/pyproject.toml

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

{kagent_adk-0.6.15 → kagent_adk-0.6.17}/src/kagent/adk/_agent_executor.py

@@ -22,6 +22,7 @@ from a2a.types import (
     TextPart,
 )
 from google.adk.runners import Runner
+from google.adk.utils.context_utils import Aclosing
 from opentelemetry import trace
 from pydantic import BaseModel
 from typing_extensions import override
@@ -145,17 +146,6 @@ class A2aAgentExecutor(AgentExecutor):
                 )
             except Exception as enqueue_error:
                 logger.error("Failed to publish failure event: %s", enqueue_error, exc_info=True)
-        finally:
-            # Shield cleanup from external cancellation so toolsets (e.g., MCP) can
-            # gracefully close their sessions without being torn down mid-flight.
-            try:
-                await asyncio.wait_for(asyncio.shield(runner.close()), timeout=15.0)
-            except asyncio.CancelledError:
-                # Suppress cancellation during cleanup to avoid noisy tracebacks
-                # from libraries that assume non-cancelled close semantics.
-                logger.warning("Runner.close() was cancelled; suppressing during cleanup")
-            except Exception as close_error:
-                logger.error("Error during runner.close(): %s", close_error, exc_info=True)
 
     async def _handle_request(
         self,
@@ -203,12 +193,13 @@ class A2aAgentExecutor(AgentExecutor):
         )
 
         task_result_aggregator = TaskResultAggregator()
-        async for adk_event in runner.run_async(**run_args):
-            for a2a_event in convert_event_to_a2a_events(
-                adk_event, invocation_context, context.task_id, context.context_id
-            ):
-                task_result_aggregator.process_event(a2a_event)
-                await event_queue.enqueue_event(a2a_event)
+        async with Aclosing(runner.run_async(**run_args)) as agen:
+            async for adk_event in agen:
+                for a2a_event in convert_event_to_a2a_events(
+                    adk_event, invocation_context, context.task_id, context.context_id
+                ):
+                    task_result_aggregator.process_event(a2a_event)
+                    await event_queue.enqueue_event(a2a_event)
 
         # publish the task result event - this is final
         if (

{kagent_adk-0.6.15 → kagent_adk-0.6.17}/src/kagent/adk/converters/part_converter.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 """
-module containing utilities for conversion betwen A2A Part and Google GenAI Part
+module containing utilities for conversion between A2A Part and Google GenAI Part
 """
 
 from __future__ import annotations
@@ -68,7 +68,7 @@ def convert_a2a_part_to_genai_part(
             return None
 
     if isinstance(part, a2a_types.DataPart):
-        # Conver the Data Part to funcall and function reponse.
+        # Convert the Data Part to funcall and function response.
         # This is mainly for converting human in the loop and auth request and
         # response.
         # TODO once A2A defined how to suervice such information, migrate below
@@ -148,7 +148,7 @@ def convert_genai_part_to_a2a_part(
 
         return a2a_types.Part(root=a2a_part)
 
-    # Conver the funcall and function reponse to A2A DataPart.
+    # Convert the funcall and function response to A2A DataPart.
     # This is mainly for converting human in the loop and auth request and
     # response.
     # TODO once A2A defined how to suervice such information, migrate below

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

@@ -276,10 +276,18 @@ class BaseOpenAI(BaseLlm):
     """Base class for OpenAI-compatible models."""
 
     model: str
-    base_url: Optional[str] = None
     api_key: Optional[str] = Field(default=None, exclude=True)
+    base_url: Optional[str] = None
+    frequency_penalty: Optional[float] = None
+    default_headers: Optional[dict[str, str]] = None
     max_tokens: Optional[int] = None
+    n: Optional[int] = None
+    presence_penalty: Optional[float] = None
+    reasoning_effort: Optional[str] = None
+    seed: Optional[int] = None
     temperature: Optional[float] = None
+    timeout: Optional[int] = None
+    top_p: Optional[float] = None
 
     @classmethod
     def supported_models(cls) -> list[str]:
@@ -289,13 +297,13 @@ class BaseOpenAI(BaseLlm):
     @cached_property
     def _client(self) -> AsyncOpenAI:
         """Get the OpenAI client."""
-        kwargs = {}
-        if self.base_url:
-            kwargs["base_url"] = self.base_url
-        if self.api_key:
-            kwargs["api_key"] = self.api_key
 
-        return AsyncOpenAI(**kwargs)
+        return AsyncOpenAI(
+            api_key=self.api_key,
+            base_url=self.base_url or None,
+            default_headers=self.default_headers,
+            timeout=self.timeout,
+        )
 
     async def generate_content_async(
         self, llm_request: LlmRequest, stream: bool = False
@@ -325,10 +333,22 @@ class BaseOpenAI(BaseLlm):
             "messages": messages,
         }
 
+        if self.frequency_penalty is not None:
+            kwargs["frequency_penalty"] = self.frequency_penalty
         if self.max_tokens:
             kwargs["max_tokens"] = self.max_tokens
+        if self.n is not None:
+            kwargs["n"] = self.n
+        if self.presence_penalty is not None:
+            kwargs["presence_penalty"] = self.presence_penalty
+        if self.reasoning_effort is not None:
+            kwargs["reasoning_effort"] = self.reasoning_effort
+        if self.seed is not None:
+            kwargs["seed"] = self.seed
         if self.temperature is not None:
             kwargs["temperature"] = self.temperature
+        if self.top_p is not None:
+            kwargs["top_p"] = self.top_p
 
         # Handle tools
         if llm_request.config and llm_request.config.tools:
@@ -369,19 +389,6 @@ class OpenAI(BaseOpenAI):
 
     type: Literal["openai"]
 
-    @cached_property
-    def _client(self) -> AsyncOpenAI:
-        """Get the OpenAI client."""
-        kwargs = {}
-        if self.base_url:
-            kwargs["base_url"] = self.base_url
-        if self.api_key:
-            kwargs["api_key"] = self.api_key
-        elif "OPENAI_API_KEY" in os.environ:
-            kwargs["api_key"] = os.environ["OPENAI_API_KEY"]
-
-        return AsyncOpenAI(**kwargs)
-
 
 class AzureOpenAI(BaseOpenAI):
     """Azure OpenAI model implementation."""
@@ -390,7 +397,6 @@ class AzureOpenAI(BaseOpenAI):
     api_version: Optional[str] = None
     azure_endpoint: Optional[str] = None
     azure_deployment: Optional[str] = None
-    headers: Optional[dict[str, str]] = None
 
     @cached_property
     def _client(self) -> AsyncAzureOpenAI:
@@ -409,8 +415,9 @@ class AzureOpenAI(BaseOpenAI):
                 "API key must be provided either via api_key parameter or AZURE_OPENAI_API_KEY environment variable"
             )
 
-        default_headers = self.headers or {}
-
         return AsyncAzureOpenAI(
-            api_version=api_version, azure_endpoint=azure_endpoint, api_key=api_key, default_headers=default_headers
+            api_key=api_key,
+            api_version=api_version,
+            azure_endpoint=azure_endpoint,
+            default_headers=self.default_headers,
         )

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

@@ -1,8 +1,7 @@
-import httpx
 import logging
+from typing import Any, Literal, Union
 
-from typing import Literal, Any, Union
-
+import httpx
 from google.adk.agents import Agent
 from google.adk.agents.base_agent import BaseAgent
 from google.adk.agents.llm_agent import ToolUnion
@@ -45,6 +44,15 @@ class BaseLLM(BaseModel):
 
 class OpenAI(BaseLLM):
     base_url: str | None = None
+    frequency_penalty: float | None = None
+    max_tokens: int | None = None
+    n: int | None = None
+    presence_penalty: float | None = None
+    reasoning_effort: str | None = None
+    seed: int | None = None
+    temperature: float | None = None
+    timeout: int | None = None
+    top_p: float | None = None
 
     type: Literal["openai"]
 
@@ -111,14 +119,26 @@ class AgentConfig(BaseModel):
                     httpx_client=client,
                 )
 
-                tools.append(
-                    AgentTool(agent=remote_a2a_agent, skip_summarization=True)
-                )  # Get headers from model config
+                tools.append(AgentTool(agent=remote_a2a_agent, skip_summarization=True))
 
         extra_headers = self.model.headers or {}
 
         if self.model.type == "openai":
-            model = OpenAINative(model=self.model.model, base_url=self.model.base_url, type="openai")
+            model = OpenAINative(
+                type="openai",
+                base_url=self.model.base_url,
+                default_headers=extra_headers,
+                frequency_penalty=self.model.frequency_penalty,
+                max_tokens=self.model.max_tokens,
+                model=self.model.model,
+                n=self.model.n,
+                presence_penalty=self.model.presence_penalty,
+                reasoning_effort=self.model.reasoning_effort,
+                seed=self.model.seed,
+                temperature=self.model.temperature,
+                timeout=self.model.timeout,
+                top_p=self.model.top_p,
+            )
         elif self.model.type == "anthropic":
             model = LiteLlm(
                 model=f"anthropic/{self.model.model}", base_url=self.model.base_url, extra_headers=extra_headers
@@ -130,7 +150,7 @@ class AgentConfig(BaseModel):
         elif self.model.type == "ollama":
             model = LiteLlm(model=f"ollama_chat/{self.model.model}", extra_headers=extra_headers)
         elif self.model.type == "azure_openai":
-            model = OpenAIAzure(model=self.model.model, type="azure_openai", headers=extra_headers)
+            model = OpenAIAzure(model=self.model.model, type="azure_openai", default_headers=extra_headers)
         elif self.model.type == "gemini":
             model = self.model.model
         else:

kagent_adk-0.6.15/.python-version

@@ -1 +0,0 @@
-3.13.5