Resolving comments

Author: abdulanu0

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

@@ -23,7 +23,6 @@
 from microsoft_agents_a365.tooling.models.mcp_server_config import MCPServerConfig
 from microsoft_agents_a365.tooling.utils.constants import Constants
 from microsoft_agents_a365.tooling.utils.utility import (
-    get_tools_mode,
     get_mcp_platform_authentication_scope,
 )
 
@@ -112,25 +111,12 @@ async def add_tool_servers_to_agent(
         )
         self._logger.info(f"🔧 Adding MCP tools from {len(servers)} servers")
 
-        # Get tools mode
-        tools_mode = get_tools_mode()
-
-        # Process each server (matching C# foreach pattern)
+        # Process each server
         for server in servers:
             try:
-                if tools_mode == "HardCodedTools":
-                    await self._add_hardcoded_tools_for_server(kernel, server)
-                    continue
-
-                headers = {}
-
-                if tools_mode == "MockMCPServer":
-                    if mock_auth_header := os.getenv("MOCK_MCP_AUTHORIZATION"):
-                        headers[Constants.Headers.AUTHORIZATION] = mock_auth_header
-                else:
-                    headers = {
-                        Constants.Headers.AUTHORIZATION: f"{Constants.Headers.BEARER_PREFIX} {auth_token}",
-                    }
+                headers = {
+                    Constants.Headers.AUTHORIZATION: f"{Constants.Headers.BEARER_PREFIX} {auth_token}",
+                }
 
                 plugin = MCPStreamableHttpPlugin(
                     name=server.mcp_server_name,
@@ -151,7 +137,7 @@ async def add_tool_servers_to_agent(
                 self._connected_plugins.append(plugin)
 
                 self._logger.info(
-                    f"✅ Connected and added MCP plugin ({tools_mode}) for: {server.mcp_server_name}"
+                    f"✅ Connected and added MCP plugin for: {server.mcp_server_name}"
                 )
 
             except Exception as e:
@@ -172,29 +158,6 @@ def _validate_inputs(self, kernel: Any, agentic_app_id: str, auth_token: str) ->
         if not auth_token or not auth_token.strip():
             raise ValueError("auth_token cannot be null or empty")
 
-    async def _add_hardcoded_tools_for_server(self, kernel: Any, server: MCPServerConfig) -> None:
-        """Add hardcoded tools for a specific server (equivalent to C# hardcoded tool logic)."""
-        server_name = server.mcp_server_name
-
-        if server_name.lower() == "mcp_mailtools":
-            # TODO: Implement hardcoded mail tools
-            # kernel.plugins.add(KernelPluginFactory.create_from_type(HardCodedMailTools, server.mcp_server_name, self._service_provider))
-            self._logger.info(f"Adding hardcoded mail tools for {server_name}")
-        elif server_name.lower() == "mcp_sharepointtools":
-            # TODO: Implement hardcoded SharePoint tools
-            # kernel.plugins.add(KernelPluginFactory.create_from_type(HardCodedSharePointTools, server.mcp_server_name, self._service_provider))
-            self._logger.info(f"Adding hardcoded SharePoint tools for {server_name}")
-        elif server_name.lower() == "onedrivemcpserver":
-            # TODO: Implement hardcoded OneDrive tools
-            # kernel.plugins.add(KernelPluginFactory.create_from_type(HardCodedOneDriveTools, server.mcp_server_name, self._service_provider))
-            self._logger.info(f"Adding hardcoded OneDrive tools for {server_name}")
-        elif server_name.lower() == "wordmcpserver":
-            # TODO: Implement hardcoded Word tools
-            # kernel.plugins.add(KernelPluginFactory.create_from_type(HardCodedWordTools, server.mcp_server_name, self._service_provider))
-            self._logger.info(f"Adding hardcoded Word tools for {server_name}")
-        else:
-            self._logger.warning(f"No hardcoded tools available for server: {server_name}")
-
     # ============================================================================
     # Private Methods - Kernel Function Creation
     # ============================================================================

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

@@ -10,13 +10,13 @@
     get_tooling_gateway_for_digital_worker,
     get_mcp_base_url,
     build_mcp_server_url,
-    get_ppapi_token_scope,
+    get_mcp_platform_authentication_scope,
 )
 
 __all__ = [
     "Constants",
     "get_tooling_gateway_for_digital_worker",
     "get_mcp_base_url",
     "build_mcp_server_url",
-    "get_ppapi_token_scope",
+    "get_mcp_platform_authentication_scope",
 ]

libraries/microsoft-agents-a365-tooling/microsoft_agents_a365/tooling/utils/utility.py

@@ -5,7 +5,6 @@
 """
 
 import os
-from enum import Enum
 
 
 # Constants for base URLs
@@ -15,13 +14,6 @@
 PROD_MCP_PLATFORM_AUTHENTICATION_SCOPE = "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/.default"
 
 
-class ToolsMode(Enum):
-    """Enum for different tools modes."""
-
-    MCP_PLATFORM = 1
-    MOCK_MCP_SERVER = 2
-
-
 def get_tooling_gateway_for_digital_worker(agentic_app_id: str) -> str:
     """
     Gets the tooling gateway URL for the specified digital worker.
@@ -43,13 +35,6 @@ def get_mcp_base_url() -> str:
     Returns:
         str: The base URL for MCP servers.
     """
-    environment = _get_current_environment().lower()
-
-    if environment == "development":
-        tools_mode = get_tools_mode()
-        if tools_mode == ToolsMode.MOCK_MCP_SERVER:
-            return os.getenv("MOCK_MCP_SERVER_URL", "http://localhost:5309/mcp-mock/agents/servers")
-
     return f"{_get_mcp_platform_base_url()}/agents/servers"
 
 
@@ -91,21 +76,6 @@ def _get_mcp_platform_base_url() -> str:
     return MCP_PLATFORM_PROD_BASE_URL
 
 
-def get_tools_mode() -> ToolsMode:
-    """
-    Gets the tools mode for the application.
-
-    Returns:
-        ToolsMode: The tools mode enum value.
-    """
-    tools_mode = os.getenv("TOOLS_MODE", "MCPPlatform").lower()
-
-    if tools_mode == "mockmcpserver":
-        return ToolsMode.MOCK_MCP_SERVER
-    else:
-        return ToolsMode.MCP_PLATFORM
-
-
 def get_mcp_platform_authentication_scope():
     """
     Gets the MCP platform authentication scope based on the current environment.

tests/microsoft-agents-a365-tooling-unittest/utils/test_utility.py

@@ -13,10 +13,10 @@
     build_mcp_server_url,
     _get_current_environment,
     _get_mcp_platform_base_url,
-    get_ppapi_token_scope,
+    get_mcp_platform_authentication_scope,
     MCP_PLATFORM_PROD_BASE_URL,
     PPAPI_TOKEN_SCOPE,
-    PPAPI_TEST_TOKEN_SCOPE,
+    PROD_MCP_PLATFORM_AUTHENTICATION_SCOPE,
 )
 
 
@@ -31,6 +31,7 @@ def setup_method(self):
             for key in [
                 "ENVIRONMENT",
                 "MCP_PLATFORM_ENDPOINT",
+                "MCP_PLATFORM_AUTHENTICATION_SCOPE",
             ]
         }
 
@@ -52,7 +53,7 @@ def test_get_tooling_gateway_for_digital_worker(self):
         result = get_tooling_gateway_for_digital_worker(agent_user_id)
 
         # Assert
-        expected = f"{MCP_PLATFORM_PROD_BASE_URL}/agentGateway/agentApplicationInstances/{agent_user_id}/mcpServers"
+        expected = f"{MCP_PLATFORM_PROD_BASE_URL}/agents/{agent_user_id}/mcpServers"
         assert result == expected
 
     @patch.dict(os.environ, {"MCP_PLATFORM_ENDPOINT": "https://custom.endpoint.com"}, clear=False)
@@ -65,7 +66,7 @@ def test_get_tooling_gateway_with_custom_endpoint(self):
         result = get_tooling_gateway_for_digital_worker(agent_user_id)
 
         # Assert
-        expected = "https://custom.endpoint.com/agentGateway/agentApplicationInstances/test-agent-456/mcpServers"
+        expected = "https://custom.endpoint.com/agents/test-agent-456/mcpServers"
         assert result == expected
 
     def test_get_mcp_base_url_production(self):
@@ -77,7 +78,7 @@ def test_get_mcp_base_url_production(self):
         result = get_mcp_base_url()
 
         # Assert
-        expected = f"{MCP_PLATFORM_PROD_BASE_URL}/mcp/environments"
+        expected = f"{MCP_PLATFORM_PROD_BASE_URL}/agents/servers"
         assert result == expected
 
     @patch.dict(os.environ, {"MCP_PLATFORM_ENDPOINT": "https://custom.endpoint.com"}, clear=False)
@@ -87,38 +88,19 @@ def test_get_mcp_base_url_with_custom_endpoint(self):
         result = get_mcp_base_url()
 
         # Assert
-        expected = "https://custom.endpoint.com/mcp/environments"
+        expected = "https://custom.endpoint.com/agents/servers"
         assert result == expected
 
     def test_build_mcp_server_url_production(self):
         """Test build_mcp_server_url in production environment."""
         # Arrange
-        environment_id = "prod-env-123"
         server_name = "mail_server"
 
         # Act
-        result = build_mcp_server_url(environment_id, server_name)
+        result = build_mcp_server_url(server_name)
 
         # Assert
-        expected = (
-            f"{MCP_PLATFORM_PROD_BASE_URL}/mcp/environments/{environment_id}/servers/{server_name}"
-        )
-        assert result == expected
-
-    @patch.dict(os.environ, {"ENVIRONMENT": "Development"}, clear=False)
-    def test_build_mcp_server_url_development_platform_mode(self):
-        """Test build_mcp_server_url in development with platform mode."""
-        # Arrange
-        environment_id = "dev-env-456"
-        server_name = "platform_server"
-
-        # Act
-        result = build_mcp_server_url(environment_id, server_name)
-
-        # Assert
-        expected = (
-            f"{MCP_PLATFORM_PROD_BASE_URL}/mcp/environments/{environment_id}/servers/{server_name}"
-        )
+        expected = f"{MCP_PLATFORM_PROD_BASE_URL}/agents/servers/{server_name}"
         assert result == expected
 
     def test_get_current_environment_default(self):
@@ -161,36 +143,34 @@ def test_get_mcp_platform_base_url_custom(self):
         # Assert
         assert result == "https://test.platform.com"
 
-    def test_get_ppapi_token_scope_production(self):
-        """Test get_ppapi_token_scope returns production scope."""
-        # Arrange - Set environment to production explicitly
-        os.environ.pop("ENVIRONMENT", None)
-        # The _get_current_environment defaults to "Development", so we need to set it to something else
-        os.environ["ENVIRONMENT"] = "Production"
+    def test_get_mcp_platform_authentication_scope_production(self):
+        """Test get_mcp_platform_authentication_scope returns production scope."""
+        # Arrange - Clear environment variable to use default
+        os.environ.pop("MCP_PLATFORM_AUTHENTICATION_SCOPE", None)
 
         # Act
-        result = get_ppapi_token_scope()
+        result = get_mcp_platform_authentication_scope()
 
         # Assert
-        expected = [PPAPI_TOKEN_SCOPE + "/.default"]
+        expected = [PROD_MCP_PLATFORM_AUTHENTICATION_SCOPE]
         assert result == expected
 
-    @patch.dict(os.environ, {"ENVIRONMENT": "Development"}, clear=False)
-    def test_get_ppapi_token_scope_development(self):
-        """Test get_ppapi_token_scope returns test scope in development."""
+    @patch.dict(os.environ, {"MCP_PLATFORM_AUTHENTICATION_SCOPE": "custom-scope/.default"}, clear=False)
+    def test_get_mcp_platform_authentication_scope_custom(self):
+        """Test get_mcp_platform_authentication_scope returns custom scope from environment."""
         # Act
-        result = get_ppapi_token_scope()
+        result = get_mcp_platform_authentication_scope()
 
         # Assert
-        expected = [PPAPI_TEST_TOKEN_SCOPE + "/.default"]
+        expected = ["custom-scope/.default"]
         assert result == expected
 
     def test_constants_values(self):
         """Test that constants have expected values."""
         # Assert
         assert MCP_PLATFORM_PROD_BASE_URL == "https://agent365.svc.cloud.microsoft"
         assert PPAPI_TOKEN_SCOPE == "https://api.powerplatform.com"
-        assert PPAPI_TEST_TOKEN_SCOPE == "https://api.test.powerplatform.com"
+        assert PROD_MCP_PLATFORM_AUTHENTICATION_SCOPE == "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/.default"
 
     def test_get_tooling_gateway_empty_agent_id(self):
         """Test get_tooling_gateway_for_digital_worker with empty agent ID."""
@@ -201,20 +181,17 @@ def test_get_tooling_gateway_empty_agent_id(self):
         result = get_tooling_gateway_for_digital_worker(agent_user_id)
 
         # Assert - Function should still work but produce invalid URL
-        expected = (
-            f"{MCP_PLATFORM_PROD_BASE_URL}/agentGateway/agentApplicationInstances//mcpServers"
-        )
+        expected = f"{MCP_PLATFORM_PROD_BASE_URL}/agents//mcpServers"
         assert result == expected
 
     def test_build_mcp_server_url_empty_params(self):
         """Test build_mcp_server_url with empty parameters."""
         # Arrange
-        environment_id = ""
         server_name = ""
 
         # Act
-        result = build_mcp_server_url(environment_id, server_name)
+        result = build_mcp_server_url(server_name)
 
         # Assert
-        expected = f"{MCP_PLATFORM_PROD_BASE_URL}/mcp/environments//servers/"
+        expected = f"{MCP_PLATFORM_PROD_BASE_URL}/agents/servers/"
         assert result == expected