Merge branch 'users/jterrazas/google-adk-support' of https://github.com/microsoft/Agent365-python into users/jterrazas/google-adk-support

Author: Jesus Terrazas

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

@@ -20,7 +20,6 @@ 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,
@@ -51,7 +50,6 @@ Google ADK Agent with MCP tools
 | 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 |

libraries/microsoft-agents-a365-tooling-extensions-google/pyproject.toml

@@ -65,6 +65,10 @@ target-version = ['py311']
 line-length = 100
 target-version = "py311"
 
+[tool.ruff.lint.flake8-copyright]
+notice-rgx = "# Copyright \\(c\\) Microsoft Corporation\\.\\r?\\n# Licensed under the MIT License\\."
+min-file-size = 1
+
 [tool.mypy]
 python_version = "3.11"
 strict = true

libraries/microsoft-agents-a365-tooling-extensions-google/setup.py

@@ -15,14 +15,13 @@
 
 from setup_utils import get_dynamic_dependencies  # noqa: E402
 
-# Use minimum version strategy:
-# - Internal packages get: >= current_base_version (e.g., >= 0.1.0)
-# - Automatically updates when you build new versions
-# - Consumers can upgrade to any higher version
+# Use exact version matching for internal dependencies:
+# - Internal packages get: == current_version (e.g., == 1.2.3)
+# - Ensures all SDK packages must be at the same version
+# - Prevents incompatibility issues from version mismatches
 setup(
     version=package_version,
     install_requires=get_dynamic_dependencies(
-        use_compatible_release=False,  # No upper bound
-        use_exact_match=False,  # Not exact match
+        use_exact_match=True,
     ),
 )

tests/tooling/extensions/google/test_mcp_tool_registration_service.py

@@ -11,6 +11,7 @@
 class TestMcpToolRegistrationServiceInit:
     """Tests for McpToolRegistrationService initialization."""
 
+    @pytest.mark.unit
     def test_init_default_logger(self):
         """Test initialization with default logger."""
         with patch(
@@ -24,6 +25,7 @@ def test_init_default_logger(self):
             assert service.config_service is not None
             assert service._connected_servers == []
 
+    @pytest.mark.unit
     def test_init_custom_logger(self):
         """Test initialization with custom logger."""
         import logging
@@ -39,6 +41,7 @@ def test_init_custom_logger(self):
 
             assert service._logger is custom_logger
 
+    @pytest.mark.unit
     def test_orchestrator_name(self):
         """Test that orchestrator name is set correctly."""
         with patch(
@@ -91,6 +94,7 @@ def mock_server_config(self):
         return mock
 
     @pytest.mark.asyncio
+    @pytest.mark.unit
     async def test_add_tool_servers_exchanges_token_when_not_provided(
         self, mock_agent, mock_authorization, mock_turn_context
     ):
@@ -136,6 +140,7 @@ async def test_add_tool_servers_exchanges_token_when_not_provided(
             mock_authorization.exchange_token.assert_called_once()
 
     @pytest.mark.asyncio
+    @pytest.mark.unit
     async def test_add_tool_servers_uses_provided_token(
         self, mock_agent, mock_authorization, mock_turn_context
     ):
@@ -178,6 +183,7 @@ async def test_add_tool_servers_uses_provided_token(
             mock_authorization.exchange_token.assert_not_called()
 
     @pytest.mark.asyncio
+    @pytest.mark.unit
     async def test_add_tool_servers_creates_mcp_toolsets(
         self, mock_agent, mock_authorization, mock_turn_context, mock_server_config
     ):
@@ -229,6 +235,7 @@ async def test_add_tool_servers_creates_mcp_toolsets(
             assert mock_toolset in mock_agent.tools
 
     @pytest.mark.asyncio
+    @pytest.mark.unit
     async def test_add_tool_servers_modifies_agent_in_place(
         self, mock_agent, mock_authorization, mock_turn_context
     ):
@@ -271,6 +278,7 @@ async def test_add_tool_servers_modifies_agent_in_place(
             assert existing_tool in mock_agent.tools
 
     @pytest.mark.asyncio
+    @pytest.mark.unit
     async def test_add_tool_servers_handles_toolset_creation_error(
         self, mock_agent, mock_authorization, mock_turn_context, mock_server_config
     ):
@@ -325,6 +333,7 @@ class TestCleanup:
     """Tests for cleanup method."""
 
     @pytest.mark.asyncio
+    @pytest.mark.unit
     async def test_cleanup_closes_connected_servers(self):
         """Test that cleanup closes all connected servers."""
         with patch(
@@ -351,6 +360,7 @@ async def test_cleanup_closes_connected_servers(self):
             assert service._connected_servers == []
 
     @pytest.mark.asyncio
+    @pytest.mark.unit
     async def test_cleanup_handles_close_errors(self):
         """Test that cleanup handles errors during close gracefully."""
         with patch(
@@ -373,6 +383,7 @@ async def test_cleanup_handles_close_errors(self):
             assert service._connected_servers == []
 
     @pytest.mark.asyncio
+    @pytest.mark.unit
     async def test_cleanup_handles_servers_without_close(self):
         """Test that cleanup handles servers without close method."""
         with patch(