Skip to content

Commit ab3e5d5

Browse files
author
Jesus Terrazas
committed
format
1 parent e33a550 commit ab3e5d5

File tree

3 files changed

+66
-44
lines changed

3 files changed

+66
-44
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,7 @@ async def add_tool_servers_to_agent(
115115

116116
except Exception as tool_ex:
117117
server_name = getattr(server_config, "mcp_server_name", "Unknown")
118-
self._logger.warning(
119-
f"Failed to create MCP toolset for {server_name}: {tool_ex}"
120-
)
118+
self._logger.warning(f"Failed to create MCP toolset for {server_name}: {tool_ex}")
121119
continue
122120

123121
# Combine existing tools with new MCP servers

‎pyproject.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ constraint-dependencies = [
7878
"langchain-core >= 0.1.0",
7979
"openai-agents >= 0.2.6",
8080
"semantic-kernel >= 1.0.0",
81+
"google-adk >= 1.0.0",
8182

8283
# --- Microsoft Agents SDK ---
8384
"microsoft-agents-activity >= 0.4.0",

‎tests/tooling/extensions/google/test_mcp_tool_registration_service.py‎

Lines changed: 64 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,20 @@ async def test_add_tool_servers_exchanges_token_when_not_provided(
9595
self, mock_agent, mock_authorization, mock_turn_context
9696
):
9797
"""Test that token is exchanged when not provided."""
98-
with patch(
99-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolServerConfigurationService"
100-
) as mock_config_service_class, patch(
101-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Utility"
102-
) as mock_utility, patch(
103-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.get_mcp_platform_authentication_scope"
104-
) as mock_get_scope, patch(
105-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Agent"
106-
) as mock_agent_class:
98+
with (
99+
patch(
100+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolServerConfigurationService"
101+
) as mock_config_service_class,
102+
patch(
103+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Utility"
104+
) as mock_utility,
105+
patch(
106+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.get_mcp_platform_authentication_scope"
107+
) as mock_get_scope,
108+
patch(
109+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Agent"
110+
) as mock_agent_class,
111+
):
107112
# Setup mocks
108113
mock_get_scope.return_value = ["https://test.scope/.default"]
109114
mock_utility.resolve_agent_identity.return_value = "agent-123"
@@ -135,13 +140,17 @@ async def test_add_tool_servers_uses_provided_token(
135140
self, mock_agent, mock_authorization, mock_turn_context
136141
):
137142
"""Test that provided token is used instead of exchanging."""
138-
with patch(
139-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolServerConfigurationService"
140-
) as mock_config_service_class, patch(
141-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Utility"
142-
) as mock_utility, patch(
143-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Agent"
144-
) as mock_agent_class:
143+
with (
144+
patch(
145+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolServerConfigurationService"
146+
) as mock_config_service_class,
147+
patch(
148+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Utility"
149+
) as mock_utility,
150+
patch(
151+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Agent"
152+
) as mock_agent_class,
153+
):
145154
# Setup mocks
146155
mock_utility.resolve_agent_identity.return_value = "agent-123"
147156
mock_utility.get_user_agent_header.return_value = "Agent365SDK/1.0"
@@ -173,15 +182,20 @@ async def test_add_tool_servers_creates_mcp_toolsets(
173182
self, mock_agent, mock_authorization, mock_turn_context, mock_server_config
174183
):
175184
"""Test that MCP toolsets are created for each server config."""
176-
with patch(
177-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolServerConfigurationService"
178-
) as mock_config_service_class, patch(
179-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Utility"
180-
) as mock_utility, patch(
181-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolset"
182-
) as mock_toolset_class, patch(
183-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Agent"
184-
) as mock_agent_class:
185+
with (
186+
patch(
187+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolServerConfigurationService"
188+
) as mock_config_service_class,
189+
patch(
190+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Utility"
191+
) as mock_utility,
192+
patch(
193+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolset"
194+
) as mock_toolset_class,
195+
patch(
196+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Agent"
197+
) as mock_agent_class,
198+
):
185199
# Setup mocks
186200
mock_utility.resolve_agent_identity.return_value = "agent-123"
187201
mock_utility.get_user_agent_header.return_value = "Agent365SDK/1.0"
@@ -217,13 +231,17 @@ async def test_add_tool_servers_returns_new_agent(
217231
self, mock_agent, mock_authorization, mock_turn_context
218232
):
219233
"""Test that a new Agent instance is returned."""
220-
with patch(
221-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolServerConfigurationService"
222-
) as mock_config_service_class, patch(
223-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Utility"
224-
) as mock_utility, patch(
225-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Agent"
226-
) as mock_agent_class:
234+
with (
235+
patch(
236+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolServerConfigurationService"
237+
) as mock_config_service_class,
238+
patch(
239+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Utility"
240+
) as mock_utility,
241+
patch(
242+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Agent"
243+
) as mock_agent_class,
244+
):
227245
# Setup mocks
228246
mock_utility.resolve_agent_identity.return_value = "agent-123"
229247
mock_utility.get_user_agent_header.return_value = "Agent365SDK/1.0"
@@ -262,15 +280,20 @@ async def test_add_tool_servers_handles_toolset_creation_error(
262280
self, mock_agent, mock_authorization, mock_turn_context, mock_server_config
263281
):
264282
"""Test that errors during toolset creation are handled gracefully."""
265-
with patch(
266-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolServerConfigurationService"
267-
) as mock_config_service_class, patch(
268-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Utility"
269-
) as mock_utility, patch(
270-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolset"
271-
) as mock_toolset_class, patch(
272-
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Agent"
273-
) as mock_agent_class:
283+
with (
284+
patch(
285+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolServerConfigurationService"
286+
) as mock_config_service_class,
287+
patch(
288+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Utility"
289+
) as mock_utility,
290+
patch(
291+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.McpToolset"
292+
) as mock_toolset_class,
293+
patch(
294+
"microsoft_agents_a365.tooling.extensions.google.services.mcp_tool_registration_service.Agent"
295+
) as mock_agent_class,
296+
):
274297
# Setup mocks
275298
mock_utility.resolve_agent_identity.return_value = "agent-123"
276299
mock_utility.get_user_agent_header.return_value = "Agent365SDK/1.0"

0 commit comments

Comments
 (0)