microsoft-agents-a365-tooling-extensions-semantickernel 0.2.0.dev5__py3-none-any.whl → 0.2.1.dev0__py3-none-any.whl

microsoft_agents_a365/tooling/extensions/semantickernel/services/__init__.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 """
 Services module for Semantic Kernel tooling.

microsoft_agents_a365/tooling/extensions/semantickernel/services/mcp_tool_registration_service.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 """
 MCP Tool Registration Service implementation for Semantic Kernel.
@@ -20,10 +21,9 @@ from microsoft_agents_a365.runtime.utility import Utility
 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 ToolOptions
 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,
 )
 
@@ -36,6 +36,8 @@ class McpToolRegistrationService:
     tool servers with Semantic Kernel agents.
     """
 
+    _orchestrator_name: str = "SemanticKernel"
+
     def __init__(
         self,
         logger: Optional[logging.Logger] = None,
@@ -107,42 +109,40 @@ class McpToolRegistrationService:
         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
+            agentic_app_id, auth_token, options
         )
         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)
         for server in servers:
             try:
-                if tools_mode == "HardCodedTools":
-                    await self._add_hardcoded_tools_for_server(kernel, server)
-                    continue
+                headers = {
+                    Constants.Headers.AUTHORIZATION: f"{Constants.Headers.BEARER_PREFIX} {auth_token}",
+                }
+
+                headers[Constants.Headers.USER_AGENT] = Utility.get_user_agent_header(
+                    self._orchestrator_name
+                )
 
-                headers = {}
+                # Use the URL from server (always populated by the configuration service)
+                server_url = server.url
 
-                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}",
-                    }
+                # Use mcp_server_name if available (not None or empty), otherwise fall back to mcp_server_unique_name
+                server_name = server.mcp_server_name or server.mcp_server_unique_name
 
                 plugin = MCPStreamableHttpPlugin(
-                    name=server.mcp_server_name,
-                    url=server.mcp_server_unique_name,
-                    headers=headers or None,
+                    name=server_name,
+                    url=server_url,
+                    headers=headers,
                 )
 
                 # Connect the plugin
                 await plugin.connect()
 
                 # Add plugin to kernel
-                kernel.add_plugin(plugin, server.mcp_server_name)
+                kernel.add_plugin(plugin, server_name)
 
                 # Store reference to keep plugin alive throughout application lifecycle
                 # By storing plugin references in _connected_plugins, we prevent Python's garbage collector from cleaning up the plugin objects
@@ -151,7 +151,7 @@ class McpToolRegistrationService:
                 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 +172,6 @@ class McpToolRegistrationService:
         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
     # ============================================================================

{microsoft_agents_a365_tooling_extensions_semantickernel-0.2.0.dev5.dist-info → microsoft_agents_a365_tooling_extensions_semantickernel-0.2.1.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-a365-tooling-extensions-semantickernel
-Version: 0.2.0.dev5
+Version: 0.2.1.dev0
 Summary: Semantic Kernel integration for Agent 365 Tooling SDK
 Author-email: Microsoft <support@microsoft.com>
 License: MIT

microsoft_agents_a365_tooling_extensions_semantickernel-0.2.1.dev0.dist-info/RECORD

@@ -0,0 +1,7 @@
+microsoft_agents_a365/tooling/extensions/semantickernel/__init__.py,sha256=IvWvvW3Yajk0vX0Il0zisWbN0F-2EIWBmSpAkTeEETw,398
+microsoft_agents_a365/tooling/extensions/semantickernel/services/__init__.py,sha256=gS6eaKMSKI0PCvXzjUt5gx8xvwMcy2Ym0XLj8cJOqvQ,373
+microsoft_agents_a365/tooling/extensions/semantickernel/services/mcp_tool_registration_service.py,sha256=kwl95y7yUfeWMXzy3eLWrIf8c58nVKNQ81gQd1AZcjY,8449
+microsoft_agents_a365_tooling_extensions_semantickernel-0.2.1.dev0.dist-info/METADATA,sha256=FowwmMCo-naJWr9kK_31ZXXJ0vyOMPxyLsLXhWwHrlo,3364
+microsoft_agents_a365_tooling_extensions_semantickernel-0.2.1.dev0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+microsoft_agents_a365_tooling_extensions_semantickernel-0.2.1.dev0.dist-info/top_level.txt,sha256=m90AvzRnjbL6fpi20mzOj6HUVkR2LWuf2JuXm4LL9LU,27
+microsoft_agents_a365_tooling_extensions_semantickernel-0.2.1.dev0.dist-info/RECORD,,

{microsoft_agents_a365_tooling_extensions_semantickernel-0.2.0.dev5.dist-info → microsoft_agents_a365_tooling_extensions_semantickernel-0.2.1.dev0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{microsoft_agents_a365_tooling_extensions_semantickernel-0.2.0.dev5.dist-info → microsoft_agents_a365_tooling_extensions_semantickernel-0.2.1.dev0.dist-info}/top_level.txt

@@ -1 +1,2 @@
+docs
 microsoft_agents_a365

microsoft_agents_a365_tooling_extensions_semantickernel-0.2.0.dev5.dist-info/RECORD

@@ -1,7 +0,0 @@
-microsoft_agents_a365/tooling/extensions/semantickernel/__init__.py,sha256=IvWvvW3Yajk0vX0Il0zisWbN0F-2EIWBmSpAkTeEETw,398
-microsoft_agents_a365/tooling/extensions/semantickernel/services/__init__.py,sha256=uao2omD_YpBZJFqHuK-Lnk7Hy0d2_3blvZcXWI-1dRg,348
-microsoft_agents_a365/tooling/extensions/semantickernel/services/mcp_tool_registration_service.py,sha256=sxPzkg41K0FjE4UaoAWrYm91_1iYuMGsc1b5BoJ0R5I,10095
-microsoft_agents_a365_tooling_extensions_semantickernel-0.2.0.dev5.dist-info/METADATA,sha256=ZUkzFBK4kXKubnKaKkWutxL1EPrUNyOk-KF32WG34IM,3364
-microsoft_agents_a365_tooling_extensions_semantickernel-0.2.0.dev5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-microsoft_agents_a365_tooling_extensions_semantickernel-0.2.0.dev5.dist-info/top_level.txt,sha256=G3c2_4sy5_EM_BWO67SbK2tKj4G8XFn-QXRbh8g9Lgk,22
-microsoft_agents_a365_tooling_extensions_semantickernel-0.2.0.dev5.dist-info/RECORD,,