ADK Middleware Integration

typescript-sdk/integrations/adk-middleware/CHANGELOG.md

@@ -29,10 +29,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Enhanced tool call ID extraction from ADK context for proper protocol bridging
 - Cleaned up debug logging statements throughout codebase
 
-### Added (Previous Release)
-- GitHub Actions CI workflow for automated testing on pull requests
-- CI runs pytest for all 185 tests when ADK middleware files are modified
-- Path-specific triggering to avoid unnecessary test runs
 
 ## [0.4.0] - 2025-07-11
 

typescript-sdk/integrations/adk-middleware/README.md

@@ -203,6 +203,68 @@ agent = ADKAgent(
 - **Comprehensive**: Applies to all session deletions (timeout, user limits, manual)
 - **Performance**: Preserves conversation history without manual intervention
 
+### Memory Tools Integration
+
+To enable memory functionality in your ADK agents, you need to add Google ADK's memory tools to your agents (not to the ADKAgent middleware):
+
+```python
+from google.adk.agents import Agent
+from google.adk import tools as adk_tools
+
+# Create agent with memory tools - THIS IS CORRECT
+my_agent = Agent(
+    name="assistant",
+    model="gemini-2.0-flash", 
+    instruction="You are a helpful assistant.",
+    tools=[adk_tools.preload_memory_tool.PreloadMemoryTool()]  # Add memory tools here
+)
+
+# Register the agent
+registry = AgentRegistry.get_instance()
+registry.set_default_agent(my_agent)
+
+# Create middleware WITHOUT tools parameter - THIS IS CORRECT  
+adk_agent = ADKAgent(
+    app_name="my_app",
+    user_id="user123",
+    memory_service=shared_memory_service  # Memory service enables automatic session memory
+)
+```
+
+**⚠️ Important**: The `tools` parameter belongs to the ADK agent (like `Agent` or `LlmAgent`), **not** to the `ADKAgent` middleware. The middleware automatically handles any tools defined on the registered agents.
+
+### Memory Testing Configuration
+
+For testing memory functionality across sessions, you may want to shorten the default session timeouts:
+
+```python
+# Normal production settings (default)
+adk_agent = ADKAgent(
+    app_name="my_app",
+    user_id="user123",
+    memory_service=shared_memory_service
+    # session_timeout_seconds=1200,    # 20 minutes (default)
+    # cleanup_interval_seconds=300     # 5 minutes (default)
+)
+
+# Short timeouts for memory testing
+adk_agent = ADKAgent(
+    app_name="my_app", 
+    user_id="user123",
+    memory_service=shared_memory_service,
+    session_timeout_seconds=60,     # 1 minute for quick testing
+    cleanup_interval_seconds=30     # 30 seconds cleanup for quick testing
+)
+```
+
+**Testing Memory Workflow:**
+1. Start a conversation and provide information (e.g., "My name is John")
+2. Wait for session timeout + cleanup interval (up to 90 seconds with testing config: 60s timeout + up to 30s for next cleanup cycle)
+3. Start a new conversation and ask about the information ("What's my name?") 
+4. The agent should remember the information from the previous session
+
+**⚠️ Note**: Always revert to production timeouts (defaults) for actual deployments.
+
 ## Tool Support
 
 The middleware provides complete bidirectional tool support, enabling AG-UI Protocol tools to execute within Google ADK agents through an advanced **hybrid execution model** that bridges AG-UI's stateless runs with ADK's stateful execution.

typescript-sdk/integrations/adk-middleware/examples/complete_setup.py

@@ -1,10 +1,7 @@
 #!/usr/bin/env python
 """Complete setup example for ADK middleware with AG-UI."""
 
-import sys
 import logging
-from pathlib import Path
-sys.path.insert(0, str(Path(__file__).parent.parent / "src"))
 
 import asyncio
 import uvicorn
@@ -19,20 +16,26 @@
 
 # Configure component-specific logging levels using standard Python logging
 # Can be overridden with PYTHONPATH or programmatically
-logging.getLogger('adk_agent').setLevel(logging.DEBUG)
+logging.getLogger('adk_agent').setLevel(logging.WARNING)
 logging.getLogger('event_translator').setLevel(logging.WARNING)
-logging.getLogger('endpoint').setLevel(logging.DEBUG)  # Changed to INFO for debugging
+logging.getLogger('endpoint').setLevel(logging.WARNING)  
 logging.getLogger('session_manager').setLevel(logging.WARNING)
-logging.getLogger('agent_registry').setLevel(logging.DEBUG)  # Changed to INFO for debugging
+logging.getLogger('agent_registry').setLevel(logging.WARNING)  
 
 # from adk_agent import ADKAgent
 # from agent_registry import AgentRegistry
 # from endpoint import add_adk_fastapi_endpoint
 from adk_middleware import ADKAgent, AgentRegistry, add_adk_fastapi_endpoint
 # Import Google ADK components
 from google.adk.agents import Agent
+from google.adk import tools as adk_tools
 import os
 
+# Ensure session_manager logger is set to DEBUG after import
+logging.getLogger('adk_middleware.session_manager').setLevel(logging.DEBUG)
+# Also explicitly set adk_agent logger to DEBUG
+logging.getLogger('adk_middleware.adk_agent').setLevel(logging.DEBUG)
+
 
 async def setup_and_run():
     """Complete setup and run the server."""
@@ -47,7 +50,12 @@ async def setup_and_run():
     # The API key will be automatically picked up from the environment
 
 
-    # Step 2: Create your ADK agent(s)
+    # Step 2: Create shared memory service
+    print("🧠 Creating shared memory service...")
+    from google.adk.memory import InMemoryMemoryService
+    shared_memory_service = InMemoryMemoryService()
+
+    # Step 3: Create your ADK agent(s)
     print("🤖 Creating ADK agents...")
 
     # Create a versatile assistant
@@ -62,10 +70,10 @@ async def setup_and_run():
         - Provide step-by-step explanations
         - Admit when you don't know something
 
-        Always be friendly and professional."""
+        Always be friendly and professional.""",
+        tools=[adk_tools.preload_memory_tool.PreloadMemoryTool()]
     )
 
-
     # Step 3: Register agents
     print("📝 Registering agents...")
     registry = AgentRegistry.get_instance()
@@ -110,7 +118,7 @@ def extract_user_id(input_data):
         for ctx in input_data.context:
             if ctx.description == "user":
                 return ctx.value
-        return f"anonymous_{input_data.thread_id}"
+        return "test_user"  # Static user ID for memory testing
 
     def extract_app_name(input_data):
         """Extract app name from context."""
@@ -122,10 +130,10 @@ def extract_app_name(input_data):
     adk_agent = ADKAgent(
         app_name_extractor=extract_app_name,
         user_id_extractor=extract_user_id,
-        use_in_memory_services=True
-        # Uses default session manager with 20 min timeout, auto cleanup enabled
+        use_in_memory_services=True,
+        memory_service=shared_memory_service,  # Use the same memory service as the ADK agent
+        # Defaults: 1200s timeout (20 min), 300s cleanup (5 min)
     )
-
 
     # Step 5: Create FastAPI app
     print("🌐 Creating FastAPI app...")
@@ -198,7 +206,7 @@ async def list_agents():
     print("\n✅ Setup complete! Starting server...\n")
     print("🔗 Chat endpoint: http://localhost:8000/chat")
     print("📚 API documentation: http://localhost:8000/docs")
-    print("🔍 Health check: http://localhost:8000/health")
+    print("🏥 Health check: http://localhost:8000/health")
     print("\n🔧 Logging Control:")
     print("   # Set logging level for specific components:")
     print("   logging.getLogger('event_translator').setLevel(logging.DEBUG)")

typescript-sdk/integrations/adk-middleware/examples/fastapi_server.py

@@ -19,6 +19,7 @@
 
     from adk_middleware import ADKAgent, AgentRegistry, add_adk_fastapi_endpoint
     from google.adk.agents import LlmAgent
+    from google.adk import tools as adk_tools
 
     # Set up the agent registry
     registry = AgentRegistry.get_instance()
@@ -27,7 +28,8 @@
     sample_agent = LlmAgent(
         name="assistant",
         model="gemini-2.0-flash",
-        instruction="You are a helpful assistant."
+        instruction="You are a helpful assistant.",
+        tools=[adk_tools.preload_memory_tool.PreloadMemoryTool()]
     )
 
     # Register the agent

typescript-sdk/integrations/adk-middleware/requirements.txt

@@ -1,6 +1,6 @@
 # Core dependencies
 ag-ui-protocol>=0.1.7
-google-adk>=1.5.0
+google-adk>=1.6.1
 pydantic>=2.11.7
 asyncio>=3.4.3
 fastapi>=0.115.2

typescript-sdk/integrations/adk-middleware/setup.py

@@ -36,7 +36,7 @@
     python_requires=">=3.8",
     install_requires=[
         "ag-ui-protocol>=0.1.7",
-        "google-adk>=1.5.0",
+        "google-adk>=1.6.1",
         "pydantic>=2.11.7",
         "asyncio>=3.4.3",
         "fastapi>=0.115.2",

typescript-sdk/integrations/adk-middleware/src/adk_middleware/adk_agent.py

@@ -35,14 +35,6 @@
 import logging
 logger = logging.getLogger(__name__)
 
-# Set up debug logging
-if not logger.handlers:
-    handler = logging.StreamHandler()
-    handler.setLevel(logging.DEBUG)
-    formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-    handler.setFormatter(formatter)
-    logger.addHandler(handler)
-    logger.setLevel(logging.DEBUG)
 
 
 class ADKAgent:
@@ -75,7 +67,10 @@ def __init__(
         # Tool configuration
         execution_timeout_seconds: int = 600,  # 10 minutes
         tool_timeout_seconds: int = 300,  # 5 minutes
-        max_concurrent_executions: int = 10
+        max_concurrent_executions: int = 10,
+
+        # Session cleanup configuration
+        cleanup_interval_seconds: int = 300  # 5 minutes default
     ):
         """Initialize the ADKAgent.
 
@@ -129,9 +124,9 @@ def __init__(
 
         self._session_manager = SessionManager.get_instance(
             session_service=session_service,
-            memory_service=memory_service,  # Pass memory service for automatic session memory
+            memory_service=self._memory_service,  # Pass memory service for automatic session memory
             session_timeout_seconds=session_timeout_seconds,  # 20 minutes default
-            cleanup_interval_seconds=300,  # 5 minutes default
+            cleanup_interval_seconds=cleanup_interval_seconds,
             max_sessions_per_user=None,    # No limit by default
             auto_cleanup=True              # Enable by default
         )

typescript-sdk/integrations/adk-middleware/src/adk_middleware/client_proxy_tool.py

@@ -20,14 +20,6 @@
 
 logger = logging.getLogger(__name__)
 
-# Set up debug logging
-if not logger.handlers:
-    handler = logging.StreamHandler()
-    handler.setLevel(logging.DEBUG)
-    formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-    handler.setFormatter(formatter)
-    logger.addHandler(handler)
-    logger.setLevel(logging.DEBUG)
 
 
 class ClientProxyTool(BaseTool):
@@ -111,9 +103,6 @@ def _get_declaration(self) -> Optional[types.FunctionDeclaration]:
         # Convert AG-UI parameters (JSON Schema) to ADK format
         parameters = self.ag_ui_tool.parameters
 
-        # Debug: Show the raw parameters
-        print(f"🔍 TOOL PARAMS DEBUG: Tool '{self.ag_ui_tool.name}' parameters: {parameters}")
-        print(f"🔍 TOOL PARAMS DEBUG: Parameters type: {type(parameters)}")
 
         # Ensure it's a proper object schema
         if not isinstance(parameters, dict):
@@ -161,11 +150,20 @@ async def _execute_proxy_tool(self, args: Dict[str, Any], tool_context: Any) ->
         Returns:
             None for long-running tools
         """
-        logger.debug(f"🛠️  PROXY TOOL EXECUTION: {self.ag_ui_tool.name}")
-        logger.debug(f"🛠️  Arguments received: {args}")
+        logger.debug(f"Proxy tool execution: {self.ag_ui_tool.name}")
+        logger.debug(f"Arguments received: {args}")
+        logger.debug(f"Tool context type: {type(tool_context)}")
 
-        # Generate a unique tool call ID
-        tool_call_id = f"call_{uuid.uuid4().hex[:8]}"
+        # Extract ADK-generated function call ID if available
+        adk_function_call_id = None
+        if tool_context and hasattr(tool_context, 'function_call_id'):
+            adk_function_call_id = tool_context.function_call_id
+            logger.debug(f"Using ADK function_call_id: {adk_function_call_id}")
+
+        # Use ADK ID if available, otherwise fall back to generated ID
+        tool_call_id = adk_function_call_id or f"call_{uuid.uuid4().hex[:8]}"
+        if not adk_function_call_id:
+            logger.warning(f"ADK function_call_id not available, generated: {tool_call_id}")
 
         try:
             # Emit TOOL_CALL_START event
@@ -175,7 +173,7 @@ async def _execute_proxy_tool(self, args: Dict[str, Any], tool_context: Any) ->
                 tool_call_name=self.ag_ui_tool.name
             )
             await self.event_queue.put(start_event)
-            logger.debug(f"🛠️  Emitted TOOL_CALL_START for {tool_call_id}")
+            logger.debug(f"Emitted TOOL_CALL_START for {tool_call_id}")
 
             # Emit TOOL_CALL_ARGS event
             args_json = json.dumps(args)
@@ -185,22 +183,22 @@ async def _execute_proxy_tool(self, args: Dict[str, Any], tool_context: Any) ->
                 delta=args_json
             )
             await self.event_queue.put(args_event)
-            logger.debug(f"🛠️  Emitted TOOL_CALL_ARGS for {tool_call_id}")
+            logger.debug(f"Emitted TOOL_CALL_ARGS for {tool_call_id}")
 
             # Emit TOOL_CALL_END event
             end_event = ToolCallEndEvent(
                 type=EventType.TOOL_CALL_END,
                 tool_call_id=tool_call_id
             )
             await self.event_queue.put(end_event)
-            logger.debug(f"🛠️  Emitted TOOL_CALL_END for {tool_call_id}")
+            logger.debug(f"Emitted TOOL_CALL_END for {tool_call_id}")
 
             # Return None for long-running tools - client handles the actual execution
-            logger.debug(f"🛠️  Returning None for long-running tool {tool_call_id}")
+            logger.debug(f"Returning None for long-running tool {tool_call_id}")
             return None
 
         except Exception as e:
-            logger.error(f"🛠️  Error in proxy tool execution for {tool_call_id}: {e}")
+            logger.error(f"Error in proxy tool execution for {tool_call_id}: {e}")
             raise
 
     def __repr__(self) -> str: