Resolving PR review comments

Author: abdulanu0

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

@@ -9,7 +9,6 @@
     get_tooling_gateway_for_digital_worker,
     get_mcp_base_url,
     build_mcp_server_url,
-    get_tools_mode,
     get_ppapi_token_scope,
 )
 
@@ -18,6 +17,5 @@
     "get_tooling_gateway_for_digital_worker",
     "get_mcp_base_url",
     "build_mcp_server_url",
-    "get_tools_mode",
     "get_ppapi_token_scope",
 ]

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

@@ -5,14 +5,6 @@
 """
 
 import os
-from enum import Enum
-
-
-class ToolsMode(Enum):
-    """Enumeration for different tools modes."""
-
-    MOCK_MCP_SERVER = "MockMCPServer"
-    MCP_PLATFORM = "MCPPlatform"
 
 
 # Constants for base URLs
@@ -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()}/mcp/environments"
 
 
@@ -65,12 +50,7 @@ def build_mcp_server_url(environment_id: str, server_name: str) -> str:
         str: The full MCP server URL.
     """
     base_url = get_mcp_base_url()
-    environment = _get_current_environment().lower()
-
-    if environment == "development" and base_url.endswith("servers"):
-        return f"{base_url}/{server_name}"
-    else:
-        return f"{base_url}/{environment_id}/servers/{server_name}"
+    return f"{base_url}/{environment_id}/servers/{server_name}"
 
 
 def _get_current_environment() -> str:
@@ -96,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_ppapi_token_scope():
     """
     Gets the PPAI token scope based on the current environment.

tests/microsoft-agents-a365-notification/models/test_agent_notification.py

@@ -98,24 +98,6 @@ def test_init_with_enum_subchannels(self):
         assert "email" in agent_notification._known_subchannels
         assert "word" in agent_notification._known_subchannels
 
-    def test_normalize_subchannel_with_string(self):
-        """Test _normalize_subchannel with string input"""
-        # Arrange & Act & Assert
-        assert AgentNotification._normalize_subchannel("EMAIL") == "email"
-        assert AgentNotification._normalize_subchannel("  Word  ") == "word"
-        assert AgentNotification._normalize_subchannel("custom") == "custom"
-
-    def test_normalize_subchannel_with_enum(self):
-        """Test _normalize_subchannel with enum input"""
-        # Arrange & Act & Assert
-        assert AgentNotification._normalize_subchannel(AgentSubChannel.EMAIL) == "email"
-        assert AgentNotification._normalize_subchannel(AgentSubChannel.WORD) == "word"
-
-    def test_normalize_subchannel_with_none(self):
-        """Test _normalize_subchannel with None input"""
-        # Arrange & Act & Assert
-        assert AgentNotification._normalize_subchannel(None) == ""
-
     def test_on_agent_notification_decorator_creation(self):
         """Test that on_agent_notification creates proper decorator"""
         # Arrange