kagent-adk 0.6.20__tar.gz → 0.7.0__tar.gz

{kagent_adk-0.6.20 → kagent_adk-0.7.0}/PKG-INFO

@@ -1,16 +1,16 @@
 Metadata-Version: 2.4
 Name: kagent-adk
-Version: 0.6.20
+Version: 0.7.0
 Summary: kagent-adk is an sdk for integrating adk agents with kagent
 Requires-Python: >=3.11.0
 Requires-Dist: a2a-sdk>=0.3.1
-Requires-Dist: agentsts-adk>=0.0.5
-Requires-Dist: agentsts-core>=0.0.5
+Requires-Dist: agentsts-adk>=0.0.6
+Requires-Dist: agentsts-core>=0.0.6
 Requires-Dist: aiofiles>=24.1.0
 Requires-Dist: anthropic[vertex]>=0.49.0
 Requires-Dist: anyio>=4.9.0
 Requires-Dist: fastapi>=0.115.1
-Requires-Dist: google-adk>=1.11.0
+Requires-Dist: google-adk>=1.16.0
 Requires-Dist: google-auth>=2.40.2
 Requires-Dist: google-genai>=1.21.1
 Requires-Dist: httpx>=0.25.0

{kagent_adk-0.6.20 → kagent_adk-0.7.0}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "hatchling.build"
 
 [project]
 name = "kagent-adk"
-version = "0.6.20"
+version = "0.7.0"
 description = "kagent-adk is an sdk for integrating adk agents with kagent"
 readme = "README.md"
 requires-python = ">=3.11.0"
 dependencies = [
-  "agentsts-adk >= 0.0.5",
-  "agentsts-core >= 0.0.5",
+  "agentsts-adk >= 0.0.6",
+  "agentsts-core >= 0.0.6",
   "kagent-core",
   "aiofiles>=24.1.0",
   "anyio>=4.9.0",
@@ -22,7 +22,7 @@ dependencies = [
   "anthropic[vertex]>=0.49.0",
   "fastapi>=0.115.1",
   "litellm>=1.74.3",
-  "google-adk>=1.11.0",
+  "google-adk>=1.16.0",
   "google-genai>=1.21.1",
   "google-auth>=2.40.2",
   "httpx>=0.25.0",

{kagent_adk-0.6.20 → kagent_adk-0.7.0}/src/kagent/adk/_a2a.py

@@ -7,8 +7,9 @@ from typing import Callable
 import httpx
 from a2a.server.apps import A2AFastAPIApplication
 from a2a.server.request_handlers import DefaultRequestHandler
+from a2a.server.tasks import InMemoryTaskStore
 from a2a.types import AgentCard
-from agentsts.adk import ADKRunner, ADKSessionService, ADKSTSIntegration, ADKTokenPropagationPlugin
+from agentsts.adk import ADKSTSIntegration, ADKTokenPropagationPlugin
 from fastapi import FastAPI, Request
 from fastapi.responses import PlainTextResponse
 from google.adk.agents import BaseAgent
@@ -79,13 +80,12 @@ class KAgentApp:
         plugins = []
         if sts_well_known_uri:
             sts_integration = ADKSTSIntegration(sts_well_known_uri)
-            session_service = ADKSessionService(sts_integration, session_service)
             plugins.append(ADKTokenPropagationPlugin(sts_integration))
 
         adk_app = App(name=self.app_name, root_agent=self.root_agent, plugins=plugins)
 
         def create_runner() -> Runner:
-            return ADKRunner(
+            return Runner(
                 app=adk_app,
                 session_service=session_service,
             )
@@ -118,6 +118,42 @@ class KAgentApp:
 
         return app
 
+    def build_local(self) -> FastAPI:
+        session_service = InMemorySessionService()
+
+        def create_runner() -> Runner:
+            return Runner(
+                agent=self.root_agent,
+                app_name=self.app_name,
+                session_service=session_service,
+            )
+
+        agent_executor = A2aAgentExecutor(
+            runner=create_runner,
+        )
+
+        task_store = InMemoryTaskStore()
+        request_context_builder = KAgentRequestContextBuilder(task_store=task_store)
+        request_handler = DefaultRequestHandler(
+            agent_executor=agent_executor,
+            task_store=task_store,
+            request_context_builder=request_context_builder,
+        )
+
+        a2a_app = A2AFastAPIApplication(
+            agent_card=self.agent_card,
+            http_handler=request_handler,
+        )
+
+        faulthandler.enable()
+        app = FastAPI()
+
+        app.add_route("/health", methods=["GET"], route=health_check)
+        app.add_route("/thread_dump", methods=["GET"], route=thread_dump)
+        a2a_app.add_routes_to_app(app)
+
+        return app
+
     async def test(self, task: str):
         session_service = InMemorySessionService()
         SESSION_ID = "12345"

{kagent_adk-0.6.20 → kagent_adk-0.7.0}/src/kagent/adk/_agent_executor.py

@@ -21,6 +21,7 @@ from a2a.types import (
     TaskStatusUpdateEvent,
     TextPart,
 )
+from google.adk.events import Event, EventActions
 from google.adk.runners import Runner
 from google.adk.utils.context_utils import Aclosing
 from opentelemetry import trace
@@ -156,12 +157,23 @@ class A2aAgentExecutor(AgentExecutor):
         # Convert the a2a request to ADK run args
         run_args = convert_a2a_request_to_adk_run_args(context)
 
+        # ensure the session exists
+        session = await self._prepare_session(context, run_args, runner)
+
         # set request headers to session state
         headers = context.call_context.state.get("headers", {})
-        run_args["headers"] = headers
+        state_changes = {
+            "headers": headers,
+        }
+
+        actions_with_update = EventActions(state_delta=state_changes)
+        system_event = Event(
+            invocation_id="header_update",
+            author="system",
+            actions=actions_with_update,
+        )
 
-        # ensure the session exists
-        session = await self._prepare_session(context, run_args, runner)
+        await runner.session_service.append_event(session, system_event)
 
         current_span = trace.get_current_span()
         if run_args["user_id"]:
@@ -259,6 +271,7 @@ class A2aAgentExecutor(AgentExecutor):
             user_id=user_id,
             session_id=session_id,
         )
+
         if session is None:
             # Extract session name from the first TextPart (like the UI does)
             session_name = None
@@ -273,21 +286,12 @@ class A2aAgentExecutor(AgentExecutor):
                             session_name = text[:20] + ("..." if len(text) > 20 else "")
                             break
 
-            # Prepare kwargs for create_session
-            create_session_kwargs = {
-                "app_name": runner.app_name,
-                "user_id": user_id,
-                "state": {},
-                "session_id": session_id,
-            }
-
-            if session_name is not None:
-                create_session_kwargs["session_name"] = session_name
-
-            # We pass the kwargs using ** to avoid issues with optional
-            # parameters like `session_name` that exist within
-            # `KAgentSessionService` but not in ADK `BaseSessionService`
-            session = await runner.session_service.create_session(**create_session_kwargs)
+            session = await runner.session_service.create_session(
+                app_name=runner.app_name,
+                user_id=user_id,
+                state={"session_name": session_name},
+                session_id=session_id,
+            )
 
             # Update run_args with the new session_id
             run_args["session_id"] = session.id

{kagent_adk-0.6.20 → kagent_adk-0.7.0}/src/kagent/adk/_session_service.py

@@ -32,7 +32,6 @@ class KAgentSessionService(BaseSessionService):
         user_id: str,
         state: Optional[dict[str, Any]] = None,
         session_id: Optional[str] = None,
-        session_name: Optional[str] = None,
     ) -> Session:
         # Prepare request data
         request_data = {
@@ -41,8 +40,8 @@ class KAgentSessionService(BaseSessionService):
         }
         if session_id:
             request_data["id"] = session_id
-        if session_name:
-            request_data["name"] = session_name
+        if state and state.get("session_name"):
+            request_data["name"] = state.get("session_name", "")
 
         # Make API call to create session
         response = await self.client.post(
@@ -109,13 +108,18 @@ class KAgentSessionService(BaseSessionService):
                 events.append(Event.model_validate_json(event_data["data"]))
 
             # Convert to ADK Session format
-            return Session(
+            session = Session(
                 id=session_data["id"],
                 user_id=session_data["user_id"],
                 events=events,
                 app_name=app_name,
-                state={},  # TODO: restore State
+                state={},
             )
+
+            for event in events:
+                await super().append_event(session, event)
+
+            return session
         except httpx.HTTPStatusError as e:
             if e.response.status_code == 404:
                 return None

{kagent_adk-0.6.20 → kagent_adk-0.7.0}/src/kagent/adk/cli.py

@@ -57,6 +57,9 @@ def run(
     host: str = "127.0.0.1",
     port: int = 8080,
     workers: int = 1,
+    local: Annotated[
+        bool, typer.Option("--local", help="Run with in-memory session service (for local development)")
+    ] = False,
 ):
     app_cfg = KAgentConfig()
 
@@ -66,8 +69,15 @@ def run(
     with open(os.path.join(working_dir, name, "agent-card.json"), "r") as f:
         agent_card = json.load(f)
     agent_card = AgentCard.model_validate(agent_card)
+
     kagent_app = KAgentApp(root_agent, agent_card, app_cfg.url, app_cfg.app_name)
-    server = kagent_app.build()
+
+    if local:
+        logger.info("Running in local mode with InMemorySessionService")
+        server = kagent_app.build_local()
+    else:
+        server = kagent_app.build()
+
     configure_tracing(server)
 
     uvicorn.run(