Skip to content

Changes made to the MCP tool registration service #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Koolsiddude wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Changes made to the MCP tool registration service #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
444237b
changes made to the MCP tool registration service
Koolsiddude Feb 27, 2026
bfa667f
Edited! Updated the dependency to the latest on the root pyproject.to…
Koolsiddude Mar 2, 2026
ef0835c
Merge branch 'main' into changes
Koolsiddude Mar 2, 2026
ada5896
Update pyproject.toml
Koolsiddude Mar 2, 2026
ab73f90
Merge branch 'main' into changes
Koolsiddude Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 35 additions & 23 deletions ...t_agents_a365/tooling/extensions/agentframework/services/mcp_tool_registration_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
from datetime import datetime, timezone
from typing import Any, List, Optional, Sequence, Union

from agent_framework import ChatAgent, ChatMessage, ChatMessageStoreProtocol, MCPStreamableHTTPTool
from agent_framework import (
Agent,
Message,
BaseHistoryProvider,
MCPStreamableHTTPTool,
)
from agent_framework.azure import AzureOpenAIChatClient
from agent_framework.openai import OpenAIChatClient
import httpx
Expand Down Expand Up @@ -55,19 +60,19 @@ def __init__(self, logger: Optional[logging.Logger] = None):

async def add_tool_servers_to_agent(
self,
chat_client: Union[OpenAIChatClient, AzureOpenAIChatClient],
client: Union[OpenAIChatClient, AzureOpenAIChatClient],
agent_instructions: str,
initial_tools: List[Any],
auth: Authorization,
auth_handler_name: str,
turn_context: TurnContext,
auth_token: Optional[str] = None,
) -> Optional[ChatAgent]:
) -> Optional[Agent]:
"""
Add MCP tool servers to a chat agent (mirrors .NET implementation).

Args:
chat_client: The chat client instance (Union[OpenAIChatClient, AzureOpenAIChatClient])
client: The chat client instance (Union[OpenAIChatClient, AzureOpenAIChatClient])
agent_instructions: Instructions for the agent behavior
initial_tools: List of initial tools to add to the agent
auth: Authorization context for token exchange
Expand All @@ -76,7 +81,7 @@ async def add_tool_servers_to_agent(
auth_token: Optional bearer token for authentication

Returns:
ChatAgent instance with MCP tools registered, or None if creation failed
Agent instance with MCP tools registered, or None if creation failed
"""
try:
# Exchange token if not provided
Expand Down Expand Up @@ -148,9 +153,9 @@ async def add_tool_servers_to_agent(
)
continue

# Create the ChatAgent
agent = ChatAgent(
chat_client=chat_client,
# Create the Agent
agent = Agent(
client=client,
tools=all_tools,
instructions=agent_instructions,
)
Expand All @@ -164,7 +169,7 @@ async def add_tool_servers_to_agent(

def _convert_chat_messages_to_history(
self,
chat_messages: Sequence[ChatMessage],
chat_messages: Sequence[Message],
) -> List[ChatHistoryMessage]:
"""
Convert Agent Framework ChatMessage objects to ChatHistoryMessage format.
Expand Down Expand Up @@ -195,7 +200,8 @@ def _convert_chat_messages_to_history(
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
"Skipping message %s with missing role during conversion",
message_id,
)
continue
# Defensive handling: use .value if role is an enum, otherwise convert to string
Expand All @@ -205,7 +211,8 @@ def _convert_chat_messages_to_history(
# 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
"Skipping message %s with empty content during conversion",
message_id,
)
continue

Expand All @@ -218,14 +225,16 @@ def _convert_chat_messages_to_history(
history_messages.append(history_message)

self._logger.debug(
"Converted message %s with role '%s' to ChatHistoryMessage", message_id, role
"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],
chat_messages: Sequence[Message],
turn_context: TurnContext,
tool_options: Optional[ToolOptions] = None,
) -> OperationResult:
Expand Down Expand Up @@ -304,42 +313,45 @@ async def send_chat_history_messages(

async def send_chat_history_from_store(
self,
chat_message_store: ChatMessageStoreProtocol,
history_provider: BaseHistoryProvider,
turn_context: TurnContext,
session_id: Optional[str] = None,
tool_options: Optional[ToolOptions] = None,
) -> OperationResult:
"""
Send chat history from a ChatMessageStore to the MCP platform.
Send chat history from a history provider to the MCP platform.

This is a convenience method that extracts messages from the store
This is a convenience method that extracts messages from a history provider
and delegates to send_chat_history_messages().

Args:
chat_message_store: ChatMessageStore containing the conversation history.
history_provider: History provider containing conversation history.
turn_context: TurnContext from the Agents SDK containing conversation info.
session_id: Optional session ID used by the history provider.
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.
ValueError: If history_provider or turn_context is None.

Example:
>>> service = McpToolRegistrationService()
>>> history_provider = InMemoryHistoryProvider()
>>> result = await service.send_chat_history_from_store(
... thread.chat_message_store, turn_context
... history_provider, turn_context, session_id="session-123"
... )
"""
# Input validation
if chat_message_store is None:
raise ValueError("chat_message_store cannot be None")
if history_provider is None:
raise ValueError("history_provider 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()
# Extract messages from the history provider
messages = history_provider.get_messages(session_id=session_id)

# Delegate to the primary implementation
return await self.send_chat_history_messages(
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ constraint-dependencies = [
"azure-monitor-opentelemetry-exporter >= 1.0.0b39",

# --- AI Frameworks ---
"agent-framework-azure-ai >= 1.0.0b251114",
"agent-framework-azure-ai >= 1.0.0rc2",
"langchain >= 0.1.0",
"langchain-core >= 0.1.0",
"openai-agents >= 0.2.6",
Expand Down