mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
838a7fd61d
* Replace Role and FinishReason classes with NewType + Literal
- Remove EnumLike metaclass from _types.py
- Replace Role class with NewType('Role', str) + RoleLiteral
- Replace FinishReason class with NewType('FinishReason', str) + FinishReasonLiteral
- Update all usages across codebase to use string literals
- Remove .value access patterns (direct string comparison now works)
- Add backward compatibility for legacy dict serialization format
- Update tests to reflect new string-based types
Addresses #3591, #3615
* Simplify ChatResponse and AgentResponse type hints (#3592)
- Remove overloads from ChatResponse.__init__
- Remove text parameter from ChatResponse.__init__
- Remove | dict[str, Any] from finish_reason and usage_details params
- Remove **kwargs from AgentResponse.__init__
- Both now accept ChatMessage | Sequence[ChatMessage] | None for messages
- Update docstrings and examples to reflect changes
- Fix tests that were using removed kwargs
- Fix Role type hint usage in ag-ui utils
* Remove text parameter from ChatResponseUpdate and AgentResponseUpdate (#3597)
- Remove text parameter from ChatResponseUpdate.__init__
- Remove text parameter from AgentResponseUpdate.__init__
- Remove **kwargs from both update classes
- Simplify contents parameter type to Sequence[Content] | None
- Update all usages to use contents=[Content.from_text(...)] pattern
- Fix imports in test files
- Update docstrings and examples
* Rename from_chat_response_updates to from_updates (#3593)
- ChatResponse.from_chat_response_updates → ChatResponse.from_updates
- ChatResponse.from_chat_response_generator → ChatResponse.from_update_generator
- AgentResponse.from_agent_run_response_updates → AgentResponse.from_updates
* Remove try_parse_value method from ChatResponse and AgentResponse (#3595)
- Remove try_parse_value method from ChatResponse
- Remove try_parse_value method from AgentResponse
- Remove try_parse_value calls from from_updates and from_update_generator methods
- Update samples to use try/except with response.value instead
- Update tests to use response.value pattern
- Users should now use response.value with try/except for safe parsing
* Add agent_id to AgentResponse and clarify author_name documentation (#3596)
- Add agent_id parameter to AgentResponse class
- Document that author_name is on ChatMessage objects, not responses
- Update ChatResponse docstring with author_name note
- Update AgentResponse docstring with author_name note
* Simplify ChatMessage.__init__ signature (#3618)
- Make contents a positional argument accepting Sequence[Content | str]
- Auto-convert strings in contents to TextContent
- Remove overloads, keep text kwarg for backward compatibility with serialization
- Update _parse_content_list to handle string items
- Update all usages across codebase to use new format: ChatMessage("role", ["text"])
* Allow Content as input on run and get_response
- Update prepare_messages and normalize_messages to accept Content
- Update type signatures in _agents.py and _clients.py
- Add tests for Content input handling
* Fix ChatMessage usage across packages and samples
Update all remaining ChatMessage(role=..., text=...) to use new
ChatMessage('role', ['text']) signature.
* Fix Role string usage and response format parsing
- Fix redis provider: remove .value access on string literals
- Fix durabletask ensure_response_format: set _response_format before accessing .value
* Fix ollama .value and ai_model_id issues, handle None in content list
- Fix ollama _chat_client: remove .value on string literals
- Fix ollama _chat_client: rename ai_model_id to model_id
- Fix _parse_content_list: skip None values gracefully
* Fix A2AAgent type signature to include Content
* Fix Role/FinishReason NewType dict annotations and improve test coverage to 95%
* Fix mypy errors for Role/FinishReason NewType usage
* Fix Role.TOOL and Role.ASSISTANT usage in _orchestrator_helpers.py
* Fix Role NewType usage in durabletask _models.py
128 lines
4.6 KiB
Python
128 lines
4.6 KiB
Python
# Copyright (c) Microsoft. All rights reserved.
|
|
|
|
import asyncio
|
|
import time
|
|
from collections.abc import Awaitable, Callable
|
|
from random import randint
|
|
from typing import Annotated
|
|
|
|
from agent_framework import (
|
|
AgentMiddleware,
|
|
AgentResponse,
|
|
AgentRunContext,
|
|
ChatMessage,
|
|
FunctionInvocationContext,
|
|
FunctionMiddleware,
|
|
tool,
|
|
)
|
|
from agent_framework.azure import AzureAIAgentClient
|
|
from azure.identity.aio import AzureCliCredential
|
|
from pydantic import Field
|
|
|
|
"""
|
|
Class-based Middleware Example
|
|
|
|
This sample demonstrates how to implement middleware using class-based approach by inheriting
|
|
from AgentMiddleware and FunctionMiddleware base classes. The example includes:
|
|
|
|
- SecurityAgentMiddleware: Checks for security violations in user queries and blocks requests
|
|
containing sensitive information like passwords or secrets
|
|
- LoggingFunctionMiddleware: Logs function execution details including timing and parameters
|
|
|
|
This approach is useful when you need stateful middleware or complex logic that benefits
|
|
from object-oriented design patterns.
|
|
"""
|
|
|
|
|
|
# NOTE: approval_mode="never_require" is for sample brevity. Use "always_require" in production; see samples/getting_started/tools/function_tool_with_approval.py and samples/getting_started/tools/function_tool_with_approval_and_threads.py.
|
|
@tool(approval_mode="never_require")
|
|
def get_weather(
|
|
location: Annotated[str, Field(description="The location to get the weather for.")],
|
|
) -> str:
|
|
"""Get the weather for a given location."""
|
|
conditions = ["sunny", "cloudy", "rainy", "stormy"]
|
|
return f"The weather in {location} is {conditions[randint(0, 3)]} with a high of {randint(10, 30)}°C."
|
|
|
|
|
|
class SecurityAgentMiddleware(AgentMiddleware):
|
|
"""Agent middleware that checks for security violations."""
|
|
|
|
async def process(
|
|
self,
|
|
context: AgentRunContext,
|
|
next: Callable[[AgentRunContext], Awaitable[None]],
|
|
) -> None:
|
|
# Check for potential security violations in the query
|
|
# Look at the last user message
|
|
last_message = context.messages[-1] if context.messages else None
|
|
if last_message and last_message.text:
|
|
query = last_message.text
|
|
if "password" in query.lower() or "secret" in query.lower():
|
|
print("[SecurityAgentMiddleware] Security Warning: Detected sensitive information, blocking request.")
|
|
# Override the result with warning message
|
|
context.result = AgentResponse(
|
|
messages=[
|
|
ChatMessage("assistant", ["Detected sensitive information, the request is blocked."])
|
|
]
|
|
)
|
|
# Simply don't call next() to prevent execution
|
|
return
|
|
|
|
print("[SecurityAgentMiddleware] Security check passed.")
|
|
await next(context)
|
|
|
|
|
|
class LoggingFunctionMiddleware(FunctionMiddleware):
|
|
"""Function middleware that logs function calls."""
|
|
|
|
async def process(
|
|
self,
|
|
context: FunctionInvocationContext,
|
|
next: Callable[[FunctionInvocationContext], Awaitable[None]],
|
|
) -> None:
|
|
function_name = context.function.name
|
|
print(f"[LoggingFunctionMiddleware] About to call function: {function_name}.")
|
|
|
|
start_time = time.time()
|
|
|
|
await next(context)
|
|
|
|
end_time = time.time()
|
|
duration = end_time - start_time
|
|
|
|
print(f"[LoggingFunctionMiddleware] Function {function_name} completed in {duration:.5f}s.")
|
|
|
|
|
|
async def main() -> None:
|
|
"""Example demonstrating class-based middleware."""
|
|
print("=== Class-based Middleware Example ===")
|
|
|
|
# For authentication, run `az login` command in terminal or replace AzureCliCredential with preferred
|
|
# authentication option.
|
|
async with (
|
|
AzureCliCredential() as credential,
|
|
AzureAIAgentClient(credential=credential).as_agent(
|
|
name="WeatherAgent",
|
|
instructions="You are a helpful weather assistant.",
|
|
tools=get_weather,
|
|
middleware=[SecurityAgentMiddleware(), LoggingFunctionMiddleware()],
|
|
) as agent,
|
|
):
|
|
# Test with normal query
|
|
print("\n--- Normal Query ---")
|
|
query = "What's the weather like in Seattle?"
|
|
print(f"User: {query}")
|
|
result = await agent.run(query)
|
|
print(f"Agent: {result.text}\n")
|
|
|
|
# Test with security-related query
|
|
print("--- Security Test ---")
|
|
query = "What's the password for the weather service?"
|
|
print(f"User: {query}")
|
|
result = await agent.run(query)
|
|
print(f"Agent: {result.text}\n")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
asyncio.run(main())
|