Add tool options

Author: Jesus Terrazas

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

@@ -13,6 +13,7 @@
 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 (
@@ -79,11 +80,13 @@ async def add_tool_servers_to_agent(
 
             self._logger.info(f"Listing MCP tool servers for agent {agentic_app_id}")
 
+            options = ToolOptions(orchestrator_name=self._orchestrator_name)
+
             # Get MCP server configurations
             server_configs = await self._mcp_server_configuration_service.list_tool_servers(
                 agentic_app_id=agentic_app_id,
                 auth_token=auth_token,
-                orchestrator_name=self._orchestrator_name,
+                options=options,
             )
 
             self._logger.info(f"Loaded {len(server_configs)} MCP server configurations")

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

@@ -21,6 +21,7 @@
 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
 
@@ -141,9 +142,10 @@ async def _get_mcp_tool_definitions_and_resources(
             return ([], None)
 
         # Get MCP server configurations
+        options = ToolOptions(orchestrator_name=self._orchestrator_name)
         try:
             servers = await self._mcp_server_configuration_service.list_tool_servers(
-                agentic_app_id, auth_token, self._orchestrator_name
+                agentic_app_id, auth_token, options
             )
         except Exception as ex:
             self._logger.error(

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

@@ -17,6 +17,7 @@
     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,
@@ -86,12 +87,13 @@ async def add_tool_servers_to_agent(
         # mcp_server_configs = []
         # TODO: radevika: Update once the common project is merged.
 
+        options = ToolOptions(orchestrator_name=self._orchestrator_name)
         agentic_app_id = Utility.resolve_agent_identity(context, auth_token)
         self._logger.info(f"Listing MCP tool servers for agent {agentic_app_id}")
         mcp_server_configs = await self.config_service.list_tool_servers(
             agentic_app_id=agentic_app_id,
             auth_token=auth_token,
-            orchestrator_name=self._orchestrator_name,
+            options=options,
         )
 
         self._logger.info(f"Loaded {len(mcp_server_configs)} MCP server configurations")

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

@@ -20,7 +20,7 @@
 from microsoft_agents_a365.tooling.services.mcp_tool_server_configuration_service import (
     McpToolServerConfigurationService,
 )
-from microsoft_agents_a365.tooling.models.mcp_server_config import MCPServerConfig
+from microsoft_agents_a365.tooling.models import MCPServerConfig, ToolOptions
 from microsoft_agents_a365.tooling.utils.constants import Constants
 from microsoft_agents_a365.tooling.utils.utility import (
     get_tools_mode,
@@ -109,8 +109,9 @@ async def add_tool_servers_to_agent(
         self._validate_inputs(kernel, agentic_app_id, auth_token)
 
         # Get and process servers
+        options = ToolOptions(orchestrator_name=self._orchestrator_name)
         servers = await self._mcp_server_configuration_service.list_tool_servers(
-            agentic_app_id, auth_token, self._orchestrator_name
+            agentic_app_id, auth_token, options
         )
         self._logger.info(f"🔧 Adding MCP tools from {len(servers)} servers")
 

libraries/microsoft-agents-a365-tooling/microsoft_agents_a365/tooling/models/__init__.py

@@ -8,4 +8,4 @@
 
 from .mcp_server_config import MCPServerConfig
 
-__all__ = ["MCPServerConfig"]
+__all__ = ["MCPServerConfig", "ToolOptions"]

libraries/microsoft-agents-a365-tooling/microsoft_agents_a365/tooling/models/tool_options.py

@@ -0,0 +1,16 @@
+# Copyright (c) Microsoft. All rights reserved.
+
+"""
+Tooling Options model.
+"""
+
+from dataclasses import dataclass
+from typing import Optional
+
+
+@dataclass
+class ToolOptions:
+    """Configuration options for tooling operations."""
+
+    #: Gets or sets the name of the orchestrator.
+    orchestrator_name: Optional[str]

libraries/microsoft-agents-a365-tooling/microsoft_agents_a365/tooling/services/mcp_tool_server_configuration_service.py

@@ -28,7 +28,7 @@
 import aiohttp
 
 # Local imports
-from ..models import MCPServerConfig
+from ..models import MCPServerConfig, ToolOptions
 from ..utils import Constants
 from ..utils.utility import get_tooling_gateway_for_digital_worker, build_mcp_server_url
 
@@ -69,15 +69,15 @@ def __init__(self, logger: Optional[logging.Logger] = None):
     # --------------------------------------------------------------------------
 
     async def list_tool_servers(
-        self, agentic_app_id: str, auth_token: str, orchestrator_name: Optional[str] = None
+        self, agentic_app_id: str, auth_token: str, options: Optional[ToolOptions] = None
     ) -> List[MCPServerConfig]:
         """
         Gets the list of MCP Servers that are configured for the agent.
 
         Args:
             agentic_app_id: Agentic App ID for the agent.
             auth_token: Authentication token to access the MCP servers.
-            orchestrator_name: Optional orchestrator name to include in User-Agent header.
+            options: Optional ToolOptions instance containing optional parameters.
 
         Returns:
             List[MCPServerConfig]: Returns the list of MCP Servers that are configured.
@@ -89,14 +89,18 @@ async def list_tool_servers(
         # Validate input parameters
         self._validate_input_parameters(agentic_app_id, auth_token)
 
+        # Use default options if none provided
+        if options is None:
+            options = ToolOptions(orchestrator_name=None)
+
         self._logger.info(f"Listing MCP tool servers for agent {agentic_app_id}")
 
         # Determine configuration source based on environment
         if self._is_development_scenario():
             return self._load_servers_from_manifest()
         else:
             return await self._load_servers_from_gateway(
-                agentic_app_id, auth_token, orchestrator_name
+                agentic_app_id, auth_token, options
             )
 
     # --------------------------------------------------------------------------
@@ -281,7 +285,7 @@ def _log_manifest_search_failure(self) -> None:
     # --------------------------------------------------------------------------
 
     async def _load_servers_from_gateway(
-        self, agentic_app_id: str, auth_token: str, orchestrator_name: Optional[str] = None
+        self, agentic_app_id: str, auth_token: str, options: ToolOptions
     ) -> List[MCPServerConfig]:
         """
         Reads MCP server configurations from tooling gateway endpoint for production scenario.
@@ -301,7 +305,7 @@ async def _load_servers_from_gateway(
 
         try:
             config_endpoint = get_tooling_gateway_for_digital_worker(agentic_app_id)
-            headers = self._prepare_gateway_headers(auth_token, orchestrator_name)
+            headers = self._prepare_gateway_headers(auth_token, options)
 
             self._logger.info(f"Calling tooling gateway endpoint: {config_endpoint}")
 
@@ -331,7 +335,7 @@ async def _load_servers_from_gateway(
         return mcp_servers
 
     def _prepare_gateway_headers(
-        self, auth_token: str, orchestrator_name: Optional[str] = None
+        self, auth_token: str, options: ToolOptions
     ) -> Dict[str, str]:
         """
         Prepares headers for tooling gateway requests.
@@ -345,7 +349,7 @@ def _prepare_gateway_headers(
         """
         return {
             Constants.Headers.AUTHORIZATION: f"{Constants.Headers.BEARER_PREFIX} {auth_token}",
-            Constants.Headers.USER_AGENT: RuntimeUtility.get_user_agent_header(orchestrator_name),
+            Constants.Headers.USER_AGENT: RuntimeUtility.get_user_agent_header(options.orchestrator_name),
         }
 
     async def _parse_gateway_response(