kagent-adk 0.6.19__py3-none-any.whl → 0.6.21__py3-none-any.whl

kagent/adk/_a2a.py

@@ -7,10 +7,13 @@ 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 fastapi import FastAPI, Request
 from fastapi.responses import PlainTextResponse
 from google.adk.agents import BaseAgent
+from google.adk.apps import App
 from google.adk.runners import Runner
 from google.adk.sessions import InMemorySessionService
 from google.genai import types
@@ -21,7 +24,19 @@ from ._agent_executor import A2aAgentExecutor
 from ._session_service import KAgentSessionService
 from ._token import KAgentTokenService
 
+
 # --- Configure Logging ---
+def configure_logging() -> None:
+    """Configure logging based on LOG_LEVEL environment variable."""
+    log_level = os.getenv("LOG_LEVEL", "INFO").upper()
+    numeric_level = getattr(logging, log_level, logging.INFO)
+    logging.basicConfig(
+        level=numeric_level,
+    )
+    logging.info(f"Logging configured with level: {log_level}")
+
+
+configure_logging()
 logger = logging.getLogger(__name__)
 
 
@@ -39,6 +54,7 @@ def thread_dump(request: Request) -> PlainTextResponse:
 
 
 kagent_url_override = os.getenv("KAGENT_URL")
+sts_well_known_uri = os.getenv("STS_WELL_KNOWN_URI")
 
 
 class KAgentApp:
@@ -61,10 +77,17 @@ class KAgentApp:
         )
         session_service = KAgentSessionService(http_client)
 
+        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 Runner(
-                agent=self.root_agent,
-                app_name=self.app_name,
+            return ADKRunner(
+                app=adk_app,
                 session_service=session_service,
             )
 
@@ -96,6 +119,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/_agent_executor.py

@@ -156,6 +156,10 @@ class A2aAgentExecutor(AgentExecutor):
         # Convert the a2a request to ADK run args
         run_args = convert_a2a_request_to_adk_run_args(context)
 
+        # set request headers to session state
+        headers = context.call_context.state.get("headers", {})
+        run_args["headers"] = headers
+
         # ensure the session exists
         session = await self._prepare_session(context, run_args, runner)
 
@@ -256,12 +260,26 @@ class A2aAgentExecutor(AgentExecutor):
             session_id=session_id,
         )
         if session is None:
+            # Extract session name from the first TextPart (like the UI does)
+            session_name = None
+            if context.message and context.message.parts:
+                for part in context.message.parts:
+                    # A2A parts have a .root property that contains the actual part (TextPart, FilePart, etc.)
+                    if isinstance(part, Part):
+                        root_part = part.root
+                        if isinstance(root_part, TextPart) and root_part.text:
+                            # Take first 20 chars + "..." if longer (matching UI behavior)
+                            text = root_part.text.strip()
+                            session_name = text[:20] + ("..." if len(text) > 20 else "")
+                            break
+
             session = await runner.session_service.create_session(
                 app_name=runner.app_name,
                 user_id=user_id,
-                state={},
+                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/_session_service.py

@@ -40,6 +40,8 @@ class KAgentSessionService(BaseSessionService):
         }
         if session_id:
             request_data["id"] = session_id
+        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(

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(

kagent/adk/types.py

@@ -101,7 +101,7 @@ class AgentConfig(BaseModel):
             for http_tool in self.http_tools:  # add http 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
+            for sse_tool in self.sse_tools:  # add sse 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

{kagent_adk-0.6.19.dist-info → kagent_adk-0.6.21.dist-info}/METADATA

@@ -1,9 +1,11 @@
 Metadata-Version: 2.4
 Name: kagent-adk
-Version: 0.6.19
+Version: 0.6.21
 Summary: kagent-adk is an sdk for integrating adk agents with kagent
-Requires-Python: >=3.12.11
+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: aiofiles>=24.1.0
 Requires-Dist: anthropic[vertex]>=0.49.0
 Requires-Dist: anyio>=4.9.0

{kagent_adk-0.6.19.dist-info → kagent_adk-0.6.21.dist-info}/RECORD

@@ -1,10 +1,10 @@
 kagent/adk/__init__.py,sha256=Cam9hwhl6Z1tZ3WJIB1KATX24MwRMpiyBLYF64DTqQI,182
-kagent/adk/_a2a.py,sha256=HvduKJlfuUIKzYuPs_U_9A-xuhcMdQutZTzdLNaGORc,4406
-kagent/adk/_agent_executor.py,sha256=f6jYkEvp-JEIW34T09Md4B31Di-GblnisqPs7pGFXDY,10136
-kagent/adk/_session_service.py,sha256=Hm2P0NgH8LnfVHmiT-z2AHPHAxPrT9W_6vNkFfIzRK8,5644
+kagent/adk/_a2a.py,sha256=B1ZiVFJHNJyJ_6HsCbAG5w5-wF9xrNKhr3-ok9CCick,6424
+kagent/adk/_agent_executor.py,sha256=3aFMR41FwluDZZJGkpsL4yhz7JgqTTSbKtLeENrr0TE,11090
+kagent/adk/_session_service.py,sha256=7o2T4-572hAvpD3KZQn1ExPvI67aEuLcyHqQXB3b2JI,5757
 kagent/adk/_token.py,sha256=OL46m7U5vUTby1WWjVB7Jqzig4TWddzoAmLVLlfSdAg,2515
-kagent/adk/cli.py,sha256=Sdw9FXnUmeHfgJhdRDq1zpoNMf6GM7x35ZDz_OkQgJg,2963
-kagent/adk/types.py,sha256=AZBmCmDG-xpF9pkgzMnKmj4-JBVhVHwSWumq-ZvnSKo,5687
+kagent/adk/cli.py,sha256=_yluK6p7sbUld5juWCyIu3E8U1_Zys7eWxBabcHXXIo,3251
+kagent/adk/types.py,sha256=kcNpRwo6XcfMtgsOchgDuslYjMY-7pSlVnglihoUKss,5685
 kagent/adk/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kagent/adk/converters/error_mappings.py,sha256=1KUJPS8VrcaTv6yUKb5Whg-S2XX8YGJmtTIeZqnqvuw,2769
 kagent/adk/converters/event_converter.py,sha256=WKQRqREB11TbgGp6U_--mmukvJJgew6-VEkrGBqGVA4,10519
@@ -12,7 +12,7 @@ kagent/adk/converters/part_converter.py,sha256=8Ej9xGRYW8YoPnExGDnEUw1beurCfkNhA
 kagent/adk/converters/request_converter.py,sha256=iTmTmhlnyRfuYyFi4WmpTSXPz22xjjotbe750j-CvYA,1072
 kagent/adk/models/__init__.py,sha256=mqD0JhS9kT1rMpFNLq5-qnjstpp6lzT9xADaOfjrUKY,78
 kagent/adk/models/_openai.py,sha256=EpZTqxAEaKhgi-98sqyQhArckWwoGh-C34fC8MyClHk,17187
-kagent_adk-0.6.19.dist-info/METADATA,sha256=fxkYIMab0nxDUy_r5UX76mpLBb0ojCKLwaU7Qa-9LVs,944
-kagent_adk-0.6.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kagent_adk-0.6.19.dist-info/entry_points.txt,sha256=a1Q2Inc9L0dvXWEkwnCdf9cfXdpX5Dl2Q6DhNWNjhxw,50
-kagent_adk-0.6.19.dist-info/RECORD,,
+kagent_adk-0.6.21.dist-info/METADATA,sha256=oPN2egxeoRZpz_hOoBSH1f8GgDSjRbe6pczg3UhfiSc,1014
+kagent_adk-0.6.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kagent_adk-0.6.21.dist-info/entry_points.txt,sha256=a1Q2Inc9L0dvXWEkwnCdf9cfXdpX5Dl2Q6DhNWNjhxw,50
+kagent_adk-0.6.21.dist-info/RECORD,,