microsoft-agents-a365-tooling 0.2.0.dev5__tar.gz → 0.2.1.dev2__tar.gz

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-a365-tooling
-Version: 0.2.0.dev5
+Version: 0.2.1.dev2
 Summary: Agent 365 Tooling SDK, providing functionality to work with Agent 365 Tools.
 Author-email: Microsoft <support@microsoft.com>
 License: MIT
@@ -20,6 +20,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: typing-extensions>=4.0.0
+Requires-Dist: microsoft-agents-hosting-core<0.6.0,>=0.4.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.21.0; extra == "dev"

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/microsoft_agents_a365/tooling/__init__.py

@@ -27,3 +27,6 @@ __all__ = [
     "get_mcp_base_url",
     "build_mcp_server_url",
 ]
+
+# Enable namespace package extension for tooling-extensions-* packages
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)

microsoft_agents_a365_tooling-0.2.1.dev2/microsoft_agents_a365/tooling/extensions/__init__.py

@@ -0,0 +1,28 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+"""Microsoft Agent 365 Tooling Extensions namespace package.
+
+This file enables the `microsoft_agents_a365.tooling.extensions` namespace
+to span multiple installed packages (e.g., extensions-openai, extensions-agentframework).
+"""
+
+import sys
+from pkgutil import extend_path
+
+# Standard pkgutil-style namespace extension
+__path__ = extend_path(__path__, __name__)
+
+# For editable installs with custom finders, manually discover extension paths
+for finder in sys.meta_path:
+    if hasattr(finder, "find_spec"):
+        try:
+            spec = finder.find_spec(__name__, None)
+            if spec is not None and spec.submodule_search_locations:
+                for path in spec.submodule_search_locations:
+                    if path not in __path__ and not path.endswith(".__path_hook__"):
+                        __path__.append(path)
+        except (ImportError, TypeError):
+            # Some meta path finders may not support this namespace and can raise
+            # ImportError or TypeError; ignore these and continue discovering paths.
+            pass

microsoft_agents_a365_tooling-0.2.1.dev2/microsoft_agents_a365/tooling/models/__init__.py

@@ -0,0 +1,15 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+"""
+Common models for MCP tooling.
+
+This module defines data models used across the MCP tooling framework.
+"""
+
+from .chat_history_message import ChatHistoryMessage
+from .chat_message_request import ChatMessageRequest
+from .mcp_server_config import MCPServerConfig
+from .tool_options import ToolOptions
+
+__all__ = ["MCPServerConfig", "ToolOptions", "ChatHistoryMessage", "ChatMessageRequest"]

microsoft_agents_a365_tooling-0.2.1.dev2/microsoft_agents_a365/tooling/models/chat_history_message.py

@@ -0,0 +1,49 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+"""Chat history message model."""
+
+from datetime import datetime
+from typing import Literal, Optional
+
+from pydantic import BaseModel, ConfigDict, Field, field_validator
+
+
+class ChatHistoryMessage(BaseModel):
+    """
+    Represents a single message in the chat history.
+
+    This model is used to capture individual messages exchanged between
+    users and the AI assistant for threat protection analysis and
+    compliance monitoring.
+
+    Attributes:
+        id: Optional unique identifier for the message.
+        role: The role of the message sender (user, assistant, or system).
+        content: The text content of the message.
+        timestamp: Optional timestamp when the message was created.
+
+    Example:
+        >>> message = ChatHistoryMessage(role="user", content="Hello, how can you help?")
+        >>> print(message.role)
+        'user'
+        >>> print(message.content)
+        'Hello, how can you help?'
+    """
+
+    model_config = ConfigDict(populate_by_name=True)
+
+    id: Optional[str] = Field(default=None, description="Unique message identifier")
+    role: Literal["user", "assistant", "system"] = Field(
+        ..., description="The role of the message sender"
+    )
+    content: str = Field(..., description="The message content")
+    timestamp: Optional[datetime] = Field(default=None, description="When the message was created")
+
+    @field_validator("content")
+    @classmethod
+    def content_not_empty(cls, v: str) -> str:
+        """Validate that content is not empty or whitespace-only."""
+        if not v or not v.strip():
+            raise ValueError("content cannot be empty or whitespace")
+        return v

microsoft_agents_a365_tooling-0.2.1.dev2/microsoft_agents_a365/tooling/models/chat_message_request.py

@@ -0,0 +1,64 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+"""Chat message request model."""
+
+from typing import List
+
+from pydantic import BaseModel, ConfigDict, Field, field_validator
+
+from .chat_history_message import ChatHistoryMessage
+
+
+class ChatMessageRequest(BaseModel):
+    """
+    Request payload for sending chat history to MCP platform.
+
+    This model represents the complete request body sent to the MCP platform's
+    chat history endpoint for threat protection analysis. It includes the
+    current conversation context and historical messages.
+
+    The model uses field aliases to serialize to camelCase JSON format
+    as required by the MCP platform API.
+
+    Attributes:
+        conversation_id: Unique identifier for the conversation.
+        message_id: Unique identifier for the current message.
+        user_message: The current user message being processed.
+        chat_history: List of previous messages in the conversation.
+
+    Example:
+        >>> from microsoft_agents_a365.tooling.models import ChatHistoryMessage
+        >>> request = ChatMessageRequest(
+        ...     conversation_id="conv-123",
+        ...     message_id="msg-456",
+        ...     user_message="What is the weather today?",
+        ...     chat_history=[
+        ...         ChatHistoryMessage(role="user", content="Hello"),
+        ...         ChatHistoryMessage(role="assistant", content="Hi there!"),
+        ...     ]
+        ... )
+        >>> # Serialize to camelCase JSON
+        >>> json_dict = request.model_dump(by_alias=True)
+        >>> print(json_dict["conversationId"])
+        'conv-123'
+    """
+
+    model_config = ConfigDict(populate_by_name=True)
+
+    conversation_id: str = Field(
+        ..., alias="conversationId", description="Unique conversation identifier"
+    )
+    message_id: str = Field(..., alias="messageId", description="Current message identifier")
+    user_message: str = Field(..., alias="userMessage", description="The current user message")
+    chat_history: List[ChatHistoryMessage] = Field(
+        ..., alias="chatHistory", description="Previous messages in the conversation"
+    )
+
+    @field_validator("conversation_id", "message_id", "user_message")
+    @classmethod
+    def not_empty(cls, v: str) -> str:
+        """Validate that string fields are not empty or whitespace-only."""
+        if not v or not v.strip():
+            raise ValueError("Field cannot be empty or whitespace")
+        return v

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/microsoft_agents_a365/tooling/models/mcp_server_config.py

@@ -1,10 +1,12 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 """
 MCP Server Configuration model.
 """
 
 from dataclasses import dataclass
+from typing import Optional
 
 
 @dataclass
@@ -19,6 +21,10 @@ class MCPServerConfig:
     #: Gets or sets the unique name of the MCP server.
     mcp_server_unique_name: str
 
+    #: Gets or sets the custom URL for the MCP server. If provided, this URL will be used
+    #: instead of constructing the URL from the base URL and unique name.
+    url: Optional[str] = None
+
     def __post_init__(self):
         """Validate the configuration after initialization."""
         if not self.mcp_server_name:

microsoft_agents_a365_tooling-0.2.1.dev2/microsoft_agents_a365/tooling/models/tool_options.py

@@ -0,0 +1,17 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+"""
+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]

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/microsoft_agents_a365/tooling/services/__init__.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 """
 MCP tooling services package.

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/microsoft_agents_a365/tooling/services/mcp_tool_server_configuration_service.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 """
 MCP Tool Server Configuration Service.
@@ -17,20 +18,42 @@ The service supports both development and production scenarios:
 # ==============================================================================
 
 # Standard library imports
+import asyncio
 import json
 import logging
 import os
 import sys
 from pathlib import Path
 from typing import Any, Dict, List, Optional
+from urllib.parse import urlparse
 
 # Third-party imports
 import aiohttp
+from microsoft_agents.hosting.core import TurnContext
 
 # Local imports
-from ..models import MCPServerConfig
+from ..models import ChatHistoryMessage, ChatMessageRequest, MCPServerConfig, ToolOptions
 from ..utils import Constants
-from ..utils.utility import get_tooling_gateway_for_digital_worker, build_mcp_server_url
+from ..utils.utility import (
+    get_tooling_gateway_for_digital_worker,
+    build_mcp_server_url,
+    get_chat_history_endpoint,
+)
+
+# Runtime Imports
+from microsoft_agents_a365.runtime import OperationError, OperationResult
+from microsoft_agents_a365.runtime.utility import Utility as RuntimeUtility
+
+
+# ==============================================================================
+# CONSTANTS
+# ==============================================================================
+
+# HTTP timeout in seconds for request operations
+DEFAULT_REQUEST_TIMEOUT_SECONDS = 30
+
+# HTTP status code for successful response
+HTTP_STATUS_OK = 200
 
 
 # ==============================================================================
@@ -66,7 +89,7 @@ class McpToolServerConfigurationService:
     # --------------------------------------------------------------------------
 
     async def list_tool_servers(
-        self, agentic_app_id: str, auth_token: str
+        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.
@@ -74,6 +97,7 @@ class McpToolServerConfigurationService:
         Args:
             agentic_app_id: Agentic App ID for the agent.
             auth_token: Authentication token to access the MCP servers.
+            options: Optional ToolOptions instance containing optional parameters.
 
         Returns:
             List[MCPServerConfig]: Returns the list of MCP Servers that are configured.
@@ -85,13 +109,17 @@ class McpToolServerConfigurationService:
         # 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)
+            return await self._load_servers_from_gateway(agentic_app_id, auth_token, options)
 
     # --------------------------------------------------------------------------
     # ENVIRONMENT DETECTION
@@ -275,7 +303,7 @@ class McpToolServerConfigurationService:
     # --------------------------------------------------------------------------
 
     async def _load_servers_from_gateway(
-        self, agentic_app_id: str, auth_token: str
+        self, agentic_app_id: str, auth_token: str, options: ToolOptions
     ) -> List[MCPServerConfig]:
         """
         Reads MCP server configurations from tooling gateway endpoint for production scenario.
@@ -283,6 +311,7 @@ class McpToolServerConfigurationService:
         Args:
             agentic_app_id: Agentic App ID for the agent.
             auth_token: Authentication token to access the tooling gateway.
+            options: ToolOptions instance containing optional parameters.
 
         Returns:
             List[MCPServerConfig]: List of MCP server configurations from tooling gateway.
@@ -294,7 +323,7 @@ class McpToolServerConfigurationService:
 
         try:
             config_endpoint = get_tooling_gateway_for_digital_worker(agentic_app_id)
-            headers = self._prepare_gateway_headers(auth_token)
+            headers = self._prepare_gateway_headers(auth_token, options)
 
             self._logger.info(f"Calling tooling gateway endpoint: {config_endpoint}")
 
@@ -323,18 +352,22 @@ class McpToolServerConfigurationService:
 
         return mcp_servers
 
-    def _prepare_gateway_headers(self, auth_token: str) -> Dict[str, str]:
+    def _prepare_gateway_headers(self, auth_token: str, options: ToolOptions) -> Dict[str, str]:
         """
         Prepares headers for tooling gateway requests.
 
         Args:
             auth_token: Authentication token.
+            options: ToolOptions instance containing optional parameters.
 
         Returns:
             Dictionary of HTTP headers.
         """
         return {
-            "Authorization": f"{Constants.Headers.BEARER_PREFIX} {auth_token}",
+            Constants.Headers.AUTHORIZATION: f"{Constants.Headers.BEARER_PREFIX} {auth_token}",
+            Constants.Headers.USER_AGENT: RuntimeUtility.get_user_agent_header(
+                options.orchestrator_name
+            ),
         }
 
     async def _parse_gateway_response(
@@ -379,16 +412,26 @@ class McpToolServerConfigurationService:
             MCPServerConfig object or None if parsing fails.
         """
         try:
-            name = self._extract_server_name(server_element)
-            server_name = self._extract_server_unique_name(server_element)
+            mcp_server_name = self._extract_server_name(server_element)
+            mcp_server_unique_name = self._extract_server_unique_name(server_element)
 
-            if not self._validate_server_strings(name, server_name):
+            if not self._validate_server_strings(mcp_server_name, mcp_server_unique_name):
                 return None
 
-            # Construct full URL using environment utilities
-            full_url = build_mcp_server_url(server_name)
+            # Check if a URL is provided
+            endpoint = self._extract_server_url(server_element)
 
-            return MCPServerConfig(mcp_server_name=name, mcp_server_unique_name=full_url)
+            # Use mcp_server_name if available, otherwise fall back to mcp_server_unique_name for URL construction
+            server_name = mcp_server_name or mcp_server_unique_name
+
+            # Determine the final URL: use custom URL if provided, otherwise construct it
+            final_url = endpoint if endpoint else build_mcp_server_url(server_name)
+
+            return MCPServerConfig(
+                mcp_server_name=mcp_server_name,
+                mcp_server_unique_name=mcp_server_unique_name,
+                url=final_url,
+            )
 
         except Exception:
             return None
@@ -406,13 +449,26 @@ class McpToolServerConfigurationService:
             MCPServerConfig object or None if parsing fails.
         """
         try:
-            name = self._extract_server_name(server_element)
-            endpoint = self._extract_server_unique_name(server_element)
+            mcp_server_name = self._extract_server_name(server_element)
+            mcp_server_unique_name = self._extract_server_unique_name(server_element)
 
-            if not self._validate_server_strings(name, endpoint):
+            if not self._validate_server_strings(mcp_server_name, mcp_server_unique_name):
                 return None
 
-            return MCPServerConfig(mcp_server_name=name, mcp_server_unique_name=endpoint)
+            # Check if a URL is provided by the gateway
+            endpoint = self._extract_server_url(server_element)
+
+            # Use mcp_server_name if available, otherwise fall back to mcp_server_unique_name for URL construction
+            server_name = mcp_server_name or mcp_server_unique_name
+
+            # Determine the final URL: use custom URL if provided, otherwise construct it
+            final_url = endpoint if endpoint else build_mcp_server_url(server_name)
+
+            return MCPServerConfig(
+                mcp_server_name=mcp_server_name,
+                mcp_server_unique_name=mcp_server_unique_name,
+                url=final_url,
+            )
 
         except Exception:
             return None
@@ -467,6 +523,21 @@ class McpToolServerConfigurationService:
             return server_element["mcpServerUniqueName"]
         return None
 
+    def _extract_server_url(self, server_element: Dict[str, Any]) -> Optional[str]:
+        """
+        Extracts custom server URL from configuration element.
+
+        Args:
+            server_element: Configuration dictionary.
+
+        Returns:
+            Server URL string or None.
+        """
+        # Check for 'url' field in both manifest and gateway responses
+        if "url" in server_element and isinstance(server_element["url"], str):
+            return server_element["url"]
+        return None
+
     def _validate_server_strings(self, name: Optional[str], unique_name: Optional[str]) -> bool:
         """
         Validates that server name and unique name are valid strings.
@@ -479,3 +550,154 @@ class McpToolServerConfigurationService:
             True if both strings are valid, False otherwise.
         """
         return name is not None and name.strip() and unique_name is not None and unique_name.strip()
+
+    # --------------------------------------------------------------------------
+    # SEND CHAT HISTORY
+    # --------------------------------------------------------------------------
+
+    async def send_chat_history(
+        self,
+        turn_context: TurnContext,
+        chat_history_messages: List[ChatHistoryMessage],
+        options: Optional[ToolOptions] = None,
+    ) -> OperationResult:
+        """
+        Sends chat history to the MCP platform for real-time threat protection.
+
+        Args:
+            turn_context: TurnContext from the Agents SDK containing conversation information.
+                          Must have a valid activity with conversation.id, activity.id, and
+                          activity.text.
+            chat_history_messages: List of ChatHistoryMessage objects representing the chat
+                                   history. May be empty - an empty list will still send a
+                                   request to the MCP platform with empty chat history.
+            options: Optional ToolOptions instance containing optional parameters.
+
+        Returns:
+            OperationResult: An OperationResult indicating success or failure.
+                             On success, returns OperationResult.success().
+                             On failure, returns OperationResult.failed() with error details.
+
+        Raises:
+            ValueError: If turn_context is None, chat_history_messages is None,
+                        turn_context.activity is None, or any of the required fields
+                        (conversation.id, activity.id, activity.text) are missing or empty.
+
+        Note:
+            Even if chat_history_messages is empty, 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:
+            >>> from datetime import datetime, timezone
+            >>> from microsoft_agents_a365.tooling.models import ChatHistoryMessage
+            >>>
+            >>> history = [
+            ...     ChatHistoryMessage("msg-1", "user", "Hello", datetime.now(timezone.utc)),
+            ...     ChatHistoryMessage("msg-2", "assistant", "Hi!", datetime.now(timezone.utc))
+            ... ]
+            >>>
+            >>> service = McpToolServerConfigurationService()
+            >>> result = await service.send_chat_history(turn_context, history)
+            >>> if result.succeeded:
+            ...     print("Chat history sent successfully")
+        """
+        # Validate input parameters
+        if turn_context is None:
+            raise ValueError("turn_context cannot be None")
+        if chat_history_messages is None:
+            raise ValueError("chat_history_messages cannot be None")
+
+        # Note: Empty chat_history_messages is allowed - we still send the request to MCP platform
+        # The platform needs to receive the request even with empty chat history
+
+        # Extract required information from turn context
+        if not turn_context.activity:
+            raise ValueError("turn_context.activity cannot be None")
+
+        conversation_id: Optional[str] = (
+            turn_context.activity.conversation.id if turn_context.activity.conversation else None
+        )
+        message_id: Optional[str] = turn_context.activity.id
+        user_message: Optional[str] = turn_context.activity.text
+
+        if conversation_id is None or (
+            isinstance(conversation_id, str) and not conversation_id.strip()
+        ):
+            raise ValueError(
+                "conversation_id cannot be empty or None (from turn_context.activity.conversation.id)"
+            )
+        if message_id is None or (isinstance(message_id, str) and not message_id.strip()):
+            raise ValueError("message_id cannot be empty or None (from turn_context.activity.id)")
+        if user_message is None or (isinstance(user_message, str) and not user_message.strip()):
+            raise ValueError(
+                "user_message cannot be empty or None (from turn_context.activity.text)"
+            )
+
+        # Use default options if none provided
+        if options is None:
+            options = ToolOptions(orchestrator_name=None)
+
+        # Get the endpoint URL
+        endpoint = get_chat_history_endpoint()
+
+        # Log only the URL path to avoid accidentally exposing sensitive data in query strings
+        parsed_url = urlparse(endpoint)
+        self._logger.debug(f"Sending chat history to endpoint path: {parsed_url.path}")
+
+        # Create the request payload
+        request = ChatMessageRequest(
+            conversation_id=conversation_id,
+            message_id=message_id,
+            user_message=user_message,
+            chat_history=chat_history_messages,
+        )
+
+        try:
+            # Prepare headers (no authentication required)
+            headers = {
+                Constants.Headers.USER_AGENT: RuntimeUtility.get_user_agent_header(
+                    options.orchestrator_name
+                ),
+                "Content-Type": "application/json",
+            }
+
+            # Convert request to JSON (using Pydantic's model_dump with aliases for camelCase)
+            json_data = json.dumps(request.model_dump(by_alias=True, mode="json"))
+
+            # Send POST request with timeout to prevent indefinite hangs
+            timeout = aiohttp.ClientTimeout(total=DEFAULT_REQUEST_TIMEOUT_SECONDS)
+            async with aiohttp.ClientSession(timeout=timeout) as session:
+                async with session.post(endpoint, headers=headers, data=json_data) as response:
+                    if response.status == HTTP_STATUS_OK:
+                        self._logger.info("Successfully sent chat history to MCP platform")
+                        return OperationResult.success()
+                    else:
+                        error_text = await response.text()
+                        self._logger.error(
+                            f"HTTP error sending chat history: HTTP {response.status}. "
+                            f"Response: {error_text[:500]}"
+                        )
+                        # Use ClientResponseError for consistent error handling
+                        http_error = aiohttp.ClientResponseError(
+                            request_info=response.request_info,
+                            history=response.history,
+                            status=response.status,
+                            message=error_text,
+                            headers=response.headers,
+                        )
+                        return OperationResult.failed(OperationError(http_error))
+
+        except asyncio.TimeoutError as timeout_ex:
+            # Catch TimeoutError before ClientError since aiohttp.ServerTimeoutError
+            # inherits from both asyncio.TimeoutError and aiohttp.ClientError
+            self._logger.error(
+                f"Request timeout sending chat history to '{endpoint}': {str(timeout_ex)}"
+            )
+            return OperationResult.failed(OperationError(timeout_ex))
+        except aiohttp.ClientError as http_ex:
+            self._logger.error(f"HTTP error sending chat history to '{endpoint}': {str(http_ex)}")
+            return OperationResult.failed(OperationError(http_ex))
+        except Exception as ex:
+            self._logger.error(f"Failed to send chat history to '{endpoint}': {str(ex)}")
+            return OperationResult.failed(OperationError(ex))

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/microsoft_agents_a365/tooling/utils/__init__.py

@@ -10,7 +10,6 @@ from .utility import (
     get_tooling_gateway_for_digital_worker,
     get_mcp_base_url,
     build_mcp_server_url,
-    get_tools_mode,
     get_mcp_platform_authentication_scope,
 )
 
@@ -19,6 +18,5 @@ __all__ = [
     "get_tooling_gateway_for_digital_worker",
     "get_mcp_base_url",
     "build_mcp_server_url",
-    "get_tools_mode",
     "get_mcp_platform_authentication_scope",
 ]

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/microsoft_agents_a365/tooling/utils/constants.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 """
 Provides constant values used throughout the Tooling components.
@@ -20,3 +21,6 @@ class Constants:
 
         #: The prefix used for Bearer authentication tokens in HTTP headers.
         BEARER_PREFIX = "Bearer"
+
+        #: The header name for User-Agent information.
+        USER_AGENT = "User-Agent"

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/microsoft_agents_a365/tooling/utils/utility.py

@@ -1,23 +1,19 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 """
 Provides utility functions for the Tooling components.
 """
 
 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
 MCP_PLATFORM_PROD_BASE_URL = "https://agent365.svc.cloud.microsoft"
 
+# API endpoint paths
+CHAT_HISTORY_ENDPOINT_PATH = "/agents/real-time-threat-protection/chat-message"
+
 PPAPI_TOKEN_SCOPE = "https://api.powerplatform.com"
 PROD_MCP_PLATFORM_AUTHENTICATION_SCOPE = "ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/.default"
 
@@ -43,13 +39,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"
 
 
@@ -85,39 +74,33 @@ def _get_mcp_platform_base_url() -> str:
     Returns:
         str: The base URL for MCP platform.
     """
-    if os.getenv("MCP_PLATFORM_ENDPOINT") is not None:
-        return os.getenv("MCP_PLATFORM_ENDPOINT")
+    endpoint = os.getenv("MCP_PLATFORM_ENDPOINT")
+    if endpoint is not None:
+        return endpoint
 
     return MCP_PLATFORM_PROD_BASE_URL
 
 
-def get_tools_mode() -> ToolsMode:
+def get_mcp_platform_authentication_scope() -> list[str]:
     """
-    Gets the tools mode for the application.
+    Gets the MCP platform authentication scope.
 
     Returns:
-        ToolsMode: The tools mode enum value.
+        list[str]: A list containing the appropriate MCP platform authentication scope.
     """
-    tools_mode = os.getenv("TOOLS_MODE", "MCPPlatform").lower()
+    env_scope = os.getenv("MCP_PLATFORM_AUTHENTICATION_SCOPE", "")
 
-    if tools_mode == "mockmcpserver":
-        return ToolsMode.MOCK_MCP_SERVER
-    else:
-        return ToolsMode.MCP_PLATFORM
+    if env_scope:
+        return [env_scope]
+
+    return [PROD_MCP_PLATFORM_AUTHENTICATION_SCOPE]
 
 
-def get_mcp_platform_authentication_scope():
+def get_chat_history_endpoint() -> str:
     """
-    Gets the MCP platform authentication scope based on the current environment.
+    Gets the chat history endpoint URL for sending chat history to the MCP platform.
 
     Returns:
-        list: A list containing the appropriate MCP platform authentication scope.
+        str: The chat history endpoint URL.
     """
-    environment = _get_current_environment().lower()
-
-    envScope = os.getenv("MCP_PLATFORM_AUTHENTICATION_SCOPE", "")
-
-    if envScope:
-        return [envScope]
-
-    return [PROD_MCP_PLATFORM_AUTHENTICATION_SCOPE]
+    return f"{_get_mcp_platform_base_url()}{CHAT_HISTORY_ENDPOINT_PATH}"

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/microsoft_agents_a365_tooling.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-a365-tooling
-Version: 0.2.0.dev5
+Version: 0.2.1.dev2
 Summary: Agent 365 Tooling SDK, providing functionality to work with Agent 365 Tools.
 Author-email: Microsoft <support@microsoft.com>
 License: MIT
@@ -20,6 +20,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: typing-extensions>=4.0.0
+Requires-Dist: microsoft-agents-hosting-core<0.6.0,>=0.4.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.21.0; extra == "dev"

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/microsoft_agents_a365_tooling.egg-info/SOURCES.txt

@@ -2,8 +2,13 @@ README.md
 pyproject.toml
 setup.py
 microsoft_agents_a365/tooling/__init__.py
+microsoft_agents_a365/tooling/py.typed
+microsoft_agents_a365/tooling/extensions/__init__.py
 microsoft_agents_a365/tooling/models/__init__.py
+microsoft_agents_a365/tooling/models/chat_history_message.py
+microsoft_agents_a365/tooling/models/chat_message_request.py
 microsoft_agents_a365/tooling/models/mcp_server_config.py
+microsoft_agents_a365/tooling/models/tool_options.py
 microsoft_agents_a365/tooling/services/__init__.py
 microsoft_agents_a365/tooling/services/mcp_tool_server_configuration_service.py
 microsoft_agents_a365/tooling/utils/__init__.py

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/microsoft_agents_a365_tooling.egg-info/requires.txt

@@ -1,5 +1,6 @@
 pydantic>=2.0.0
 typing-extensions>=4.0.0
+microsoft-agents-hosting-core<0.6.0,>=0.4.0
 
 [dev]
 pytest>=7.0.0

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/microsoft_agents_a365_tooling.egg-info/top_level.txt

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

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/pyproject.toml

@@ -25,6 +25,7 @@ license = {text = "MIT"}
 dependencies = [
     "pydantic >= 2.0.0",
     "typing-extensions >= 4.0.0",
+    "microsoft-agents-hosting-core >= 0.4.0, < 0.6.0",
 ]
 
 [project.urls]
@@ -51,6 +52,7 @@ include-package-data = true
 
 [tool.setuptools.package-data]
 "*" = ["../../LICENSE"]
+"microsoft_agents_a365.tooling" = ["py.typed"]
 
 [tool.black]
 line-length = 100
@@ -60,6 +62,10 @@ target-version = ['py311']
 line-length = 100
 target-version = "py311"
 
+[tool.ruff.lint.flake8-copyright]
+notice-rgx = "# Copyright \\(c\\) Microsoft Corporation\\.\\r?\\n# Licensed under the MIT License\\."
+min-file-size = 1
+
 [tool.mypy]
 python_version = "3.11"
 strict = true

{microsoft_agents_a365_tooling-0.2.0.dev5 → microsoft_agents_a365_tooling-0.2.1.dev2}/setup.py

@@ -13,7 +13,7 @@ package_version = environ.get("AGENT365_PYTHON_SDK_PACKAGE_VERSION", "0.0.0")
 helper_path = Path(__file__).parent.parent.parent / "versioning" / "helper"
 sys.path.insert(0, str(helper_path))
 
-from setup_utils import get_dynamic_dependencies
+from setup_utils import get_dynamic_dependencies  # noqa: E402
 
 # Use minimum version strategy:
 # - Internal packages get: >= current_base_version (e.g., >= 0.1.0)

microsoft_agents_a365_tooling-0.2.0.dev5/microsoft_agents_a365/tooling/models/__init__.py

@@ -1,11 +0,0 @@
-# Copyright (c) Microsoft. All rights reserved.
-
-"""
-Common models for MCP tooling.
-
-This module defines data models used across the MCP tooling framework.
-"""
-
-from .mcp_server_config import MCPServerConfig
-
-__all__ = ["MCPServerConfig"]