New Google ADK Tooling Extension

libraries/LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

libraries/microsoft-agents-a365-tooling-extensions-google/README.md

@@ -0,0 +1,33 @@
+# microsoft-agents-a365-tooling-extensions-google
+
+[![PyPI](https://img.shields.io/pypi/v/microsoft-agents-a365-tooling-extensions-google?label=PyPI&logo=pypi)](https://pypi.org/project/microsoft-agents-a365-tooling-extensions-google)
+[![PyPI Downloads](https://img.shields.io/pypi/dm/microsoft-agents-a365-tooling-extensions-google?label=Downloads&logo=pypi)](https://pypi.org/project/microsoft-agents-a365-tooling-extensions-google)
+
+Google ADK (Agent Development Kit) specific tools and services for AI agent development. Provides MCP (Model Context Protocol) tool registration service for dynamically adding MCP servers to Google ADK-based agents.
+
+## Installation
+
+```bash
+pip install microsoft-agents-a365-tooling-extensions-google
+```
+
+## Usage
+
+For usage examples and detailed documentation, see the [Tooling documentation](https://learn.microsoft.com/microsoft-agent-365/developer/tooling?tabs=python) on Microsoft Learn.
+
+## Support
+
+For issues, questions, or feedback:
+
+- File issues in the [GitHub Issues](https://github.com/microsoft/Agent365-python/issues) section
+- See the [main documentation](../../README.md) for more information
+
+## Trademarks
+
+*Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries. The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks. Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.*
+
+## License
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Licensed under the MIT License - see the [LICENSE](../../LICENSE.md) file for details.

libraries/microsoft-agents-a365-tooling-extensions-google/docs/design.md

@@ -0,0 +1,89 @@
+# Tooling Extensions - Google ADK - Design Document
+
+This document describes the architecture and design of the `microsoft-agents-a365-tooling-extensions-google` package.
+
+## Overview
+
+This extension adapts MCP tool server configurations to Google's Agent Development Kit (ADK), enabling Google ADK-based agents to use MCP tools through the `McpToolset` interface.
+
+## Key Components
+
+### McpToolRegistrationService
+
+The main service for registering MCP tools with Google ADK agents.
+
+```python
+from microsoft_agents_a365.tooling.extensions.google import McpToolRegistrationService
+
+service = McpToolRegistrationService()
+
+# Create agent with MCP tools
+agent = await service.add_tool_servers_to_agent(
+    agent=existing_agent,
+    agentic_app_id="your-agent-id",
+    auth=auth_context,
+    auth_handler_name="graph",
+    context=turn_context,
+)
+```
+
+### Integration Flow
+
+```
+McpToolServerConfigurationService
+       │
+       ▼
+List MCPServerConfig objects
+       │
+       ▼
+McpToolRegistrationService.add_tool_servers_to_agent()
+       │
+       ├── Exchange token for MCP scope
+       ├── Create McpToolset for each server
+       └── Create new Agent with all tools
+       │
+       ▼
+Google ADK Agent with MCP tools
+```
+
+### add_tool_servers_to_agent Parameters
+
+| Parameter | Type | Description |
+|-----------|------|-------------|
+| `agent` | `Agent` | The existing Google ADK agent |
+| `agentic_app_id` | `str` | Agentic App ID for the agent |
+| `auth` | `Authorization` | Auth context for token exchange |
+| `auth_handler_name` | `str` | Name of auth handler |
+| `context` | `TurnContext` | Conversation context |
+| `auth_token` | `str \| None` | Optional pre-obtained token |
+
+### McpToolset Creation
+
+For each MCP server configuration:
+
+```python
+server_info = McpToolset(
+    connection_params=StreamableHTTPConnectionParams(
+        url=config.mcp_server_unique_name,
+        headers={
+            "Authorization": f"Bearer {token}"
+        }
+    )
+)
+```
+
+## File Structure
+
+```
+microsoft_agents_a365/tooling/extensions/google/
+├── __init__.py
+└── services/
+    ├── __init__.py
+    └── mcp_tool_registration_service.py
+```
+
+## Dependencies
+
+- `google-adk` - Google Agent Development Kit
+- `microsoft-agents-a365-tooling` - Core tooling service
+- `microsoft-agents-hosting-core` - Authorization and TurnContext

libraries/microsoft-agents-a365-tooling-extensions-google/microsoft_agents_a365/tooling/extensions/google/__init__.py

@@ -0,0 +1,27 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+"""
+Google ADK extensions for Microsoft Agent 365 Tooling SDK
+
+Google ADK (Agent Development Kit) specific tools and services for AI agent development.
+Provides MCP (Model Context Protocol) tool registration service for dynamically
+adding MCP servers to Google ADK-based agents.
+
+Main Service:
+- McpToolRegistrationService: Add MCP tool servers to Google ADK agents
+
+This module includes implementations for:
+- Google ADK agent creation with MCP (Model Context Protocol) server support
+- MCP tool registration service for dynamically adding MCP servers to agents
+- Authentication and authorization patterns for MCP server discovery
+"""
+
+__version__ = "1.0.0"
+
+# Import services from the services module
+from .services import McpToolRegistrationService
+
+__all__ = [
+    "McpToolRegistrationService",
+]

libraries/microsoft-agents-a365-tooling-extensions-google/microsoft_agents_a365/tooling/extensions/google/services/__init__.py

@@ -0,0 +1,15 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+"""
+Services module for Google ADK tooling.
+
+This package contains service implementations for MCP tool registration
+and management within the Google ADK framework.
+"""
+
+from .mcp_tool_registration_service import McpToolRegistrationService
+
+__all__ = [
+    "McpToolRegistrationService",
+]

libraries/microsoft-agents-a365-tooling-extensions-google/microsoft_agents_a365/tooling/extensions/google/services/mcp_tool_registration_service.py

@@ -0,0 +1,144 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+"""
+MCP Tool Registration Service for Google ADK.
+
+This service provides MCP (Model Context Protocol) tool registration
+capabilities for Google ADK-based agents.
+"""
+
+from typing import List, Optional
+import logging
+
+from google.adk.agents import Agent
+from google.adk.tools.mcp_tool.mcp_toolset import McpToolset, StreamableHTTPConnectionParams
+
+from microsoft_agents.hosting.core import Authorization, TurnContext
+
+from microsoft_agents_a365.runtime.utility import Utility
+from microsoft_agents_a365.tooling.services.mcp_tool_server_configuration_service import (
+    McpToolServerConfigurationService,
+)
+from microsoft_agents_a365.tooling.models import ToolOptions
+from microsoft_agents_a365.tooling.utils.constants import Constants
+from microsoft_agents_a365.tooling.utils.utility import (
+    get_mcp_platform_authentication_scope,
+)
+
+
+class McpToolRegistrationService:
+    """
+    Provides MCP tool registration services for Google ADK agents.
+
+    This service handles registration and management of MCP (Model Context Protocol)
+    tool servers with Google ADK agents.
+    """
+
+    _orchestrator_name: str = "GoogleADK"
+
+    def __init__(self, logger: Optional[logging.Logger] = None):
+        """
+        Initialize the MCP Tool Registration Service for Google ADK.
+
+        Args:
+            logger: Logger instance for logging operations.
+        """
+        self._logger = logger or logging.getLogger(self.__class__.__name__)
+        self.config_service = McpToolServerConfigurationService(logger=self._logger)
+        self._connected_servers: List[McpToolset] = []
+
+    async def add_tool_servers_to_agent(
+        self,
+        agent: Agent,
+        auth: Authorization,
+        auth_handler_name: str,
+        context: TurnContext,
+        auth_token: Optional[str] = None,
+    ) -> Agent:
+        """
+        Add new MCP servers to the agent by creating a new Agent instance.
+
+        Note: Due to Google ADK Agent design, this method creates a new Agent
+        instance with all MCP servers (existing + new) properly initialized.
+
+        Args:
+            agent: The existing agent to add servers to.
+            auth: Authorization object used to exchange tokens for MCP server access.
+            auth_handler_name: Name of the authorization handler.
+            context: TurnContext object representing the current turn/session context.
+            auth_token: Authentication token to access the MCP servers.
+                       If not provided, will be obtained using `auth` and `context`.
+
+        Returns:
+            New Agent instance with all MCP servers configured.
+        """
+        if not auth_token:
+            scopes = get_mcp_platform_authentication_scope()
+            auth_token_obj = await auth.exchange_token(context, scopes, auth_handler_name)
+            auth_token = auth_token_obj.token
+
+        agentic_app_id = Utility.resolve_agent_identity(context, auth_token)
+        self._logger.info(f"Listing MCP tool servers for agent {agentic_app_id}")
+
+        options = ToolOptions(orchestrator_name=self._orchestrator_name)
+        mcp_server_configs = await self.config_service.list_tool_servers(
+            agentic_app_id=agentic_app_id,
+            auth_token=auth_token,
+            options=options,
+        )
+
+        self._logger.info(f"Loaded {len(mcp_server_configs)} MCP server configurations")
+
+        # Convert MCP server configs to McpToolset objects
+        mcp_servers_info = []
+        mcp_server_headers = {
+            Constants.Headers.AUTHORIZATION: f"{Constants.Headers.BEARER_PREFIX} {auth_token}",
+            Constants.Headers.USER_AGENT: Utility.get_user_agent_header(self._orchestrator_name),
+        }
+
+        for server_config in mcp_server_configs:
+            try:
+                server_info = McpToolset(
+                    connection_params=StreamableHTTPConnectionParams(
+                        url=server_config.mcp_server_unique_name,
+                        headers=mcp_server_headers,
+                    )
+                )
+
+                mcp_servers_info.append(server_info)
+                self._connected_servers.append(server_info)
+                self._logger.info(
+                    f"Created MCP toolset for '{server_config.mcp_server_name}' "
+                    f"at {server_config.mcp_server_unique_name}"
+                )
+
+            except Exception as tool_ex:
+                server_name = getattr(server_config, "mcp_server_name", "Unknown")
+                self._logger.warning(f"Failed to create MCP toolset for {server_name}: {tool_ex}")
+                continue
+
+        # Combine existing tools with new MCP servers
+        all_tools = list(agent.tools) + mcp_servers_info
+
+        self._logger.info(f"Creating new agent with {len(all_tools)} total tools")
+
+        return Agent(
+            name=agent.name,
+            model=agent.model,
+            description=agent.description,
+            tools=all_tools,
+        )
+
+    async def cleanup(self):
+        """Clean up any resources used by the service."""
+        try:
+            for toolset in self._connected_servers:
+                try:
+                    if hasattr(toolset, "close"):
+                        await toolset.close()
+                except Exception as cleanup_ex:
+                    self._logger.debug(f"Error during cleanup: {cleanup_ex}")
+            self._connected_servers.clear()
+        except Exception as ex:
+            self._logger.debug(f"Error during service cleanup: {ex}")