microsoft-agents-a365-tooling-extensions-agentframework 0.2.0.dev5__py3-none-any.whl → 0.2.1.dev2__py3-none-any.whl

microsoft_agents_a365/tooling/extensions/agentframework/__init__.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 """
 Agent 365 Tooling Agent Framework Extensions

microsoft_agents_a365/tooling/extensions/agentframework/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 Agent Framework tooling.

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

@@ -1,20 +1,24 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-from typing import Optional, List, Any, Union
 import logging
+import uuid
+from datetime import datetime, timezone
+from typing import Any, List, Optional, Sequence, Union
 
-from agent_framework import ChatAgent, MCPStreamableHTTPTool
+from agent_framework import ChatAgent, ChatMessage, ChatMessageStoreProtocol, MCPStreamableHTTPTool
 from agent_framework.azure import AzureOpenAIChatClient
 from agent_framework.openai import OpenAIChatClient
 
 from microsoft_agents.hosting.core import Authorization, TurnContext
 
+from microsoft_agents_a365.runtime import OperationResult
 from microsoft_agents_a365.runtime.utility import Utility
+from microsoft_agents_a365.tooling.models import ChatHistoryMessage, ToolOptions
 from microsoft_agents_a365.tooling.services.mcp_tool_server_configuration_service import (
     McpToolServerConfigurationService,
 )
 from microsoft_agents_a365.tooling.utils.constants import Constants
-
 from microsoft_agents_a365.tooling.utils.utility import (
     get_mcp_platform_authentication_scope,
 )
@@ -28,6 +32,8 @@ class McpToolRegistrationService:
     tool servers with Agent Framework agents.
     """
 
+    _orchestrator_name: str = "AgentFramework"
+
     def __init__(self, logger: Optional[logging.Logger] = None):
         """
         Initialize the MCP Tool Registration Service for Agent Framework.
@@ -77,10 +83,13 @@ class McpToolRegistrationService:
 
             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,
+                options=options,
             )
 
             self._logger.info(f"Loaded {len(server_configs)} MCP server configurations")
@@ -90,14 +99,10 @@ class McpToolRegistrationService:
 
             # Add servers as MCPStreamableHTTPTool instances
             for config in server_configs:
-                try:
-                    server_url = getattr(config, "server_url", None) or getattr(
-                        config, "mcp_server_unique_name", None
-                    )
-                    if not server_url:
-                        self._logger.warning(f"MCP server config missing server_url: {config}")
-                        continue
+                # Use mcp_server_name if available (not None or empty), otherwise fall back to mcp_server_unique_name
+                server_name = config.mcp_server_name or config.mcp_server_unique_name
 
+                try:
                     # Prepare auth headers
                     headers = {}
                     if auth_token:
@@ -105,18 +110,20 @@ class McpToolRegistrationService:
                             f"{Constants.Headers.BEARER_PREFIX} {auth_token}"
                         )
 
-                    server_name = getattr(config, "mcp_server_name", "Unknown")
+                    headers[Constants.Headers.USER_AGENT] = Utility.get_user_agent_header(
+                        self._orchestrator_name
+                    )
 
                     # Create and configure MCPStreamableHTTPTool
                     mcp_tools = MCPStreamableHTTPTool(
                         name=server_name,
-                        url=server_url,
+                        url=config.url,
                         headers=headers,
                         description=f"MCP tools from {server_name}",
                     )
 
                     # Let Agent Framework handle the connection automatically
-                    self._logger.info(f"Created MCP plugin for '{server_name}' at {server_url}")
+                    self._logger.info(f"Created MCP plugin for '{server_name}' at {config.url}")
 
                     all_tools.append(mcp_tools)
                     self._connected_servers.append(mcp_tools)
@@ -124,7 +131,6 @@ class McpToolRegistrationService:
                     self._logger.info(f"Added MCP plugin '{server_name}' to agent tools")
 
                 except Exception as tool_ex:
-                    server_name = getattr(config, "mcp_server_name", "Unknown")
                     self._logger.warning(
                         f"Failed to create MCP plugin for {server_name}: {tool_ex}"
                     )
@@ -144,6 +150,192 @@ class McpToolRegistrationService:
             self._logger.error(f"Failed to add tool servers to agent: {ex}")
             raise
 
+    def _convert_chat_messages_to_history(
+        self,
+        chat_messages: Sequence[ChatMessage],
+    ) -> List[ChatHistoryMessage]:
+        """
+        Convert Agent Framework ChatMessage objects to ChatHistoryMessage format.
+
+        This internal helper method transforms Agent Framework's native ChatMessage
+        objects into the ChatHistoryMessage format expected by the MCP platform's
+        real-time threat protection endpoint.
+
+        Args:
+            chat_messages: Sequence of ChatMessage objects to convert.
+
+        Returns:
+            List of ChatHistoryMessage objects ready for the MCP platform.
+
+        Note:
+            - If message_id is None, a new UUID is generated
+            - Role is extracted via the .value property of the Role object
+            - Timestamp is set to current UTC time (ChatMessage has no timestamp)
+            - Messages with empty or whitespace-only content are filtered out and
+              logged at WARNING level. This is because ChatHistoryMessage requires
+              non-empty content for validation. The filtered messages will not be
+              sent to the MCP platform.
+        """
+        history_messages: List[ChatHistoryMessage] = []
+        current_time = datetime.now(timezone.utc)
+
+        for msg in chat_messages:
+            message_id = msg.message_id if msg.message_id is not None else str(uuid.uuid4())
+            if msg.role is None:
+                self._logger.warning(
+                    "Skipping message %s with missing role during conversion", message_id
+                )
+                continue
+            # Defensive handling: use .value if role is an enum, otherwise convert to string
+            role = msg.role.value if hasattr(msg.role, "value") else str(msg.role)
+            content = msg.text if msg.text is not None else ""
+
+            # Skip messages with empty content as ChatHistoryMessage validates non-empty content
+            if not content.strip():
+                self._logger.warning(
+                    "Skipping message %s with empty content during conversion", message_id
+                )
+                continue
+
+            history_message = ChatHistoryMessage(
+                id=message_id,
+                role=role,
+                content=content,
+                timestamp=current_time,
+            )
+            history_messages.append(history_message)
+
+            self._logger.debug(
+                "Converted message %s with role '%s' to ChatHistoryMessage", message_id, role
+            )
+
+        return history_messages
+
+    async def send_chat_history_messages(
+        self,
+        chat_messages: Sequence[ChatMessage],
+        turn_context: TurnContext,
+        tool_options: Optional[ToolOptions] = None,
+    ) -> OperationResult:
+        """
+        Send chat history messages to the MCP platform for real-time threat protection.
+
+        This is the primary implementation method that handles message conversion
+        and delegation to the core tooling service.
+
+        Args:
+            chat_messages: Sequence of Agent Framework ChatMessage objects to send.
+                           Can be empty - the request will still be sent to register
+                           the user message from turn_context.activity.text.
+            turn_context: TurnContext from the Agents SDK containing conversation info.
+            tool_options: Optional configuration for the request. Defaults to
+                          AgentFramework-specific options if not provided.
+
+        Returns:
+            OperationResult indicating success or failure of the operation.
+
+        Raises:
+            ValueError: If chat_messages or turn_context is None.
+
+        Note:
+            Even if chat_messages is empty or all messages are filtered during
+            conversion, the request will still be sent to the MCP platform. This
+            ensures the user message from turn_context.activity.text is registered
+            correctly for real-time threat protection.
+
+        Example:
+            >>> service = McpToolRegistrationService()
+            >>> messages = [ChatMessage(role=Role.USER, text="Hello")]
+            >>> result = await service.send_chat_history_messages(messages, turn_context)
+            >>> if result.succeeded:
+            ...     print("Chat history sent successfully")
+        """
+        # Input validation
+        if chat_messages is None:
+            raise ValueError("chat_messages cannot be None")
+
+        if turn_context is None:
+            raise ValueError("turn_context cannot be None")
+
+        self._logger.info(f"Send chat history initiated with {len(chat_messages)} messages")
+
+        # Use default options if not provided
+        if tool_options is None:
+            tool_options = ToolOptions(orchestrator_name=self._orchestrator_name)
+
+        # Convert messages to ChatHistoryMessage format
+        history_messages = self._convert_chat_messages_to_history(chat_messages)
+
+        # Call core service even with empty history_messages to register
+        # the user message from turn_context.activity.text in the MCP platform.
+        if len(history_messages) == 0:
+            self._logger.info(
+                "Empty history messages (either no input or all filtered), "
+                "still sending to register user message"
+            )
+
+        # Delegate to core service
+        result = await self._mcp_server_configuration_service.send_chat_history(
+            turn_context=turn_context,
+            chat_history_messages=history_messages,
+            options=tool_options,
+        )
+
+        if result.succeeded:
+            self._logger.info(
+                f"Chat history sent successfully with {len(history_messages)} messages"
+            )
+        else:
+            self._logger.error(f"Failed to send chat history: {result}")
+
+        return result
+
+    async def send_chat_history_from_store(
+        self,
+        chat_message_store: ChatMessageStoreProtocol,
+        turn_context: TurnContext,
+        tool_options: Optional[ToolOptions] = None,
+    ) -> OperationResult:
+        """
+        Send chat history from a ChatMessageStore to the MCP platform.
+
+        This is a convenience method that extracts messages from the store
+        and delegates to send_chat_history_messages().
+
+        Args:
+            chat_message_store: ChatMessageStore containing the conversation history.
+            turn_context: TurnContext from the Agents SDK containing conversation info.
+            tool_options: Optional configuration for the request.
+
+        Returns:
+            OperationResult indicating success or failure of the operation.
+
+        Raises:
+            ValueError: If chat_message_store or turn_context is None.
+
+        Example:
+            >>> service = McpToolRegistrationService()
+            >>> result = await service.send_chat_history_from_store(
+            ...     thread.chat_message_store, turn_context
+            ... )
+        """
+        # Input validation
+        if chat_message_store is None:
+            raise ValueError("chat_message_store cannot be None")
+
+        if turn_context is None:
+            raise ValueError("turn_context cannot be None")
+
+        # Extract messages from the store
+        messages = await chat_message_store.list_messages()
+
+        # Delegate to the primary implementation
+        return await self.send_chat_history_messages(
+            chat_messages=messages,
+            turn_context=turn_context,
+            tool_options=tool_options,
+        )
+
     async def cleanup(self):
         """Clean up any resources used by the service."""
         try:

{microsoft_agents_a365_tooling_extensions_agentframework-0.2.0.dev5.dist-info → microsoft_agents_a365_tooling_extensions_agentframework-0.2.1.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-a365-tooling-extensions-agentframework
-Version: 0.2.0.dev5
+Version: 0.2.1.dev2
 Summary: Agent Framework integration tools for Agent 365 AI agent tooling
 Author-email: Microsoft <support@microsoft.com>
 License: MIT

microsoft_agents_a365_tooling_extensions_agentframework-0.2.1.dev2.dist-info/RECORD

@@ -0,0 +1,7 @@
+microsoft_agents_a365/tooling/extensions/agentframework/__init__.py,sha256=f_v_Uqi-rG_ramG91wrw-u8hzANbn5qS2wbp62S_bNw,905
+microsoft_agents_a365/tooling/extensions/agentframework/services/__init__.py,sha256=Xw_MZvaAiiPCFnTTU59FnG6AS6FxVj5qN2vxazB1I50,363
+microsoft_agents_a365/tooling/extensions/agentframework/services/mcp_tool_registration_service.py,sha256=cKIEJFW8xRI74MF_SY67mxr8Bk2XWP5C7OnUuQXEB9Y,14053
+microsoft_agents_a365_tooling_extensions_agentframework-0.2.1.dev2.dist-info/METADATA,sha256=4yEAdTEKGJlJaVDN0ntMja3LHFEbKvpad1i6n_qTEmc,3492
+microsoft_agents_a365_tooling_extensions_agentframework-0.2.1.dev2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+microsoft_agents_a365_tooling_extensions_agentframework-0.2.1.dev2.dist-info/top_level.txt,sha256=G3c2_4sy5_EM_BWO67SbK2tKj4G8XFn-QXRbh8g9Lgk,22
+microsoft_agents_a365_tooling_extensions_agentframework-0.2.1.dev2.dist-info/RECORD,,

{microsoft_agents_a365_tooling_extensions_agentframework-0.2.0.dev5.dist-info → microsoft_agents_a365_tooling_extensions_agentframework-0.2.1.dev2.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_agentframework-0.2.0.dev5.dist-info/RECORD

@@ -1,7 +0,0 @@
-microsoft_agents_a365/tooling/extensions/agentframework/__init__.py,sha256=IPaHio1uop6iVK6KYeI5ERhTm3uPQRO6__21SYQqpQ4,880
-microsoft_agents_a365/tooling/extensions/agentframework/services/__init__.py,sha256=TcxL8IstydK8bZ2H3hFVKRvO67VYDqY7JOTBEA9ylXc,338
-microsoft_agents_a365/tooling/extensions/agentframework/services/mcp_tool_registration_service.py,sha256=Ic_yrUMQZs-Vc5IcSKMMdZCX1oZVJZw1EkDzyX14Q2c,6237
-microsoft_agents_a365_tooling_extensions_agentframework-0.2.0.dev5.dist-info/METADATA,sha256=uBTGpOFgmKdHrFzOXY-tT7Va8rejcGQYl43wuF___RE,3492
-microsoft_agents_a365_tooling_extensions_agentframework-0.2.0.dev5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-microsoft_agents_a365_tooling_extensions_agentframework-0.2.0.dev5.dist-info/top_level.txt,sha256=G3c2_4sy5_EM_BWO67SbK2tKj4G8XFn-QXRbh8g9Lgk,22
-microsoft_agents_a365_tooling_extensions_agentframework-0.2.0.dev5.dist-info/RECORD,,