agent-framework-core 1.22.0__tar.gz → 1.23.0__tar.gz

{agent_framework_core-1.22.0 → agent_framework_core-1.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: agent-framework-core
-Version: 1.22.0
+Version: 1.23.0
 Summary: Microsoft Agent Framework for building AI Agents with Python. This is the core package that has all the core abstractions and implementations.
 Author-email: Microsoft <af-support@microsoft.com>
 Requires-Python: >=3.10
@@ -24,36 +24,37 @@ Requires-Dist: python-dotenv>=1,<2
 Requires-Dist: opentelemetry-api>=1.39.0,<2
 Requires-Dist: pyyaml>=6.0,<7.0
 Requires-Dist: regex>=2024.11.6
-Requires-Dist: mcp>=1.24.0,<2 ; extra == "all"
-Requires-Dist: agent-framework-a2a>=1.0.0b261015,<2 ; extra == "all"
-Requires-Dist: agent-framework-ag-ui>=1.6.0,<2 ; extra == "all"
-Requires-Dist: agent-framework-anthropic>=1.0.0b261015,<2 ; extra == "all"
+Requires-Dist: mcp>=2.2.0,<3 ; extra == "all"
+Requires-Dist: tenacity>=9.1.4,<9.2.0 ; extra == "all"
+Requires-Dist: agent-framework-a2a>=1.0.0b261022,<2 ; extra == "all"
+Requires-Dist: agent-framework-ag-ui>=1.7.0,<2 ; extra == "all"
+Requires-Dist: agent-framework-anthropic>=1.0.0b261022,<2 ; extra == "all"
 Requires-Dist: agent-framework-azure-ai-search>=1.0.0b261015,<2 ; extra == "all"
 Requires-Dist: agent-framework-azure-contentunderstanding>=1.0.0b261015,<2 ; extra == "all"
 Requires-Dist: agent-framework-azure-cosmos>=1.0.0b261015,<2 ; extra == "all"
 Requires-Dist: agent-framework-azurefunctions>=1.0.0b260922,<2 ; extra == "all"
-Requires-Dist: agent-framework-bedrock>=1.0.0b261015,<2 ; extra == "all"
+Requires-Dist: agent-framework-bedrock>=1.0.0b261022,<2 ; extra == "all"
 Requires-Dist: agent-framework-chatkit>=1.0.0b261015,<2 ; extra == "all"
 Requires-Dist: agent-framework-claude>=1.0.0b261015,<2 ; extra == "all"
 Requires-Dist: agent-framework-copilotstudio>=1.0.0b261015,<2 ; extra == "all"
-Requires-Dist: agent-framework-declarative>=1.3.0,<2 ; extra == "all"
-Requires-Dist: agent-framework-devui>=1.0.0b261015,<2 ; extra == "all"
+Requires-Dist: agent-framework-declarative>=1.4.0,<2 ; extra == "all"
+Requires-Dist: agent-framework-devui>=1.0.0b261022,<2 ; extra == "all"
 Requires-Dist: agent-framework-durabletask>=1.0.0b260922,<2 ; extra == "all"
 Requires-Dist: agent-framework-foundry>=1.15.0,<2 ; extra == "all"
-Requires-Dist: agent-framework-foundry-hosting>=1.0.0b261015,<2 ; extra == "all"
+Requires-Dist: agent-framework-foundry-hosting>=1.0.0b261022,<2 ; extra == "all"
 Requires-Dist: agent-framework-foundry-local>=1.0.0b261015,<2 ; extra == "all"
-Requires-Dist: agent-framework-gemini>=1.0.0b261015,<2 ; extra == "all"
+Requires-Dist: agent-framework-gemini>=1.0.0b261022,<2 ; extra == "all"
 Requires-Dist: agent-framework-github-copilot>=2.1.0,<3 ; extra == "all" and ( python_version >= '3.11')
-Requires-Dist: agent-framework-hyperlight>=1.0.0b261015,<2 ; extra == "all" and ( python_version < '3.15' and ((sys_platform == 'linux' and platform_machine == 'x86_64') or (sys_platform == 'win32' and platform_machine == 'AMD64')))
+Requires-Dist: agent-framework-hyperlight>=1.0.0b261022,<2 ; extra == "all" and ( (sys_platform == 'linux' and platform_machine == 'x86_64') or (sys_platform == 'win32' and platform_machine == 'AMD64'))
 Requires-Dist: agent-framework-mem0>=1.0.0b261015,<2 ; extra == "all"
 Requires-Dist: agent-framework-mistral>=1.0.0b261015,<2 ; extra == "all"
 Requires-Dist: agent-framework-monty>=1.0.0b261015,<2 ; extra == "all"
-Requires-Dist: agent-framework-ollama>=1.0.0b261015,<2 ; extra == "all"
+Requires-Dist: agent-framework-ollama>=1.0.0b261022,<2 ; extra == "all"
 Requires-Dist: agent-framework-openai>=1.17.0,<2 ; extra == "all"
-Requires-Dist: agent-framework-orchestrations>=1.3.2,<2 ; extra == "all"
+Requires-Dist: agent-framework-orchestrations>=1.4.0,<2 ; extra == "all"
 Requires-Dist: agent-framework-purview>=1.0.0b261015,<2 ; extra == "all"
-Requires-Dist: agent-framework-redis>=1.0.0b261015,<2 ; extra == "all" and ( python_version < '3.15')
-Requires-Dist: agent-framework-tools>=1.0.0b261015,<2 ; extra == "all"
+Requires-Dist: agent-framework-redis>=1.0.0b261022,<2 ; extra == "all" and ( python_version < '3.15')
+Requires-Dist: agent-framework-tools>=1.0.0b261022,<2 ; extra == "all"
 Project-URL: homepage, https://aka.ms/agent-framework
 Project-URL: issues, https://github.com/microsoft/agent-framework/issues
 Project-URL: release_notes, https://github.com/microsoft/agent-framework/releases?q=tag%3Apython-1&expanded=true

{agent_framework_core-1.22.0 → agent_framework_core-1.23.0}/agent_framework/_agents.py

@@ -1881,8 +1881,9 @@ class RawAgent(BaseAgent, Generic[OptionsCoT]):
         """
         try:
             from mcp import types
+            from mcp.server import ServerRequestContext
             from mcp.server.lowlevel import Server
-            from mcp.shared.exceptions import McpError
+            from mcp.shared.exceptions import MCPError
         except ModuleNotFoundError as exc:
             raise ModuleNotFoundError(
                 "`mcp` is required to use `Agent.as_mcp_server()`. Please install `mcp`."
@@ -1891,55 +1892,57 @@ class RawAgent(BaseAgent, Generic[OptionsCoT]):
 
         server_args: dict[str, Any] = {
             "name": server_name,
-            "version": version,
             "instructions": instructions,
         }
+
+        if version is not None:
+            server_args["version"] = version
+
         if lifespan:
             server_args["lifespan"] = lifespan
         if kwargs:
             server_args.update(kwargs)
 
-        server: Server[Any] = Server(**server_args)
-
         agent_tool = self.as_tool(name=self._get_agent_name())
 
-        async def _log(level: types.LoggingLevel, data: Any) -> None:
-            """Log a message to the server and logger."""
-            # Log to the local logger
+        async def _log(ctx: ServerRequestContext[dict[str, Any]], level: types.LoggingLevel, data: Any) -> None:
+            """Log locally and forward through the session handling this request."""
             logger.log(LOG_LEVEL_MAPPING[level], data)
-            if server and server.request_context and server.request_context.session:
-                try:
-                    await server.request_context.session.send_log_message(level=level, data=data)
-                except Exception as e:
-                    logger.error("Failed to send log message to server: %s", e)
-
-        @server.list_tools()
-        async def _list_tools() -> list[types.Tool]:
+            try:
+                await ctx.session.send_log_message(  # pyright: ignore[reportDeprecated]
+                    level=level,
+                    data=data,
+                )
+            except Exception as exc:
+                logger.error("Failed to send log message to MCP client: %s", exc)
+
+        async def _list_tools(
+            ctx: ServerRequestContext[dict[str, Any]], _params: types.PaginatedRequestParams | None
+        ) -> types.ListToolsResult:
             """List all tools in the agent."""
             schema = agent_tool.parameters()
 
             tool = types.Tool(
                 name=agent_tool.name,
                 description=agent_tool.description,
-                inputSchema=schema,
+                input_schema=schema,
             )
 
-            await _log(level="debug", data=f"Agent tool: {agent_tool}")
-            return [tool]
+            await _log(ctx, level="debug", data=f"Agent tool: {agent_tool}")
+            return types.ListToolsResult(tools=[tool])
 
-        @server.call_tool()
         async def _call_tool(
-            name: str, arguments: dict[str, Any]
-        ) -> Sequence[types.TextContent | types.ImageContent | types.AudioContent | types.EmbeddedResource]:
+            ctx: ServerRequestContext[dict[str, Any]], params: types.CallToolRequestParams
+        ) -> types.CallToolResult:
             """Call a tool in the agent."""
-            await _log(level="debug", data=f"Calling tool with args: {arguments}")
+            arguments = params.arguments or {}
+            name = params.name
+            await _log(ctx, level="debug", data=f"Calling tool with args: {arguments}")
 
             if name != agent_tool.name:
-                raise McpError(
-                    error=types.ErrorData(
-                        code=types.INTERNAL_ERROR,
-                        message=f"Tool {name} not found",
-                    ),
+                raise MCPError(
+                    code=types.INTERNAL_ERROR,
+                    message=f"Tool {name} not found",
                 )
 
             # Create an instance of the input model with the arguments
@@ -1949,17 +1952,15 @@ class RawAgent(BaseAgent, Generic[OptionsCoT]):
                 )
                 result = await agent_tool.invoke(arguments=args_instance)
             except Exception as e:
-                raise McpError(
-                    error=types.ErrorData(
-                        code=types.INTERNAL_ERROR,
-                        message=f"Error calling tool {name}: {e}",
-                    ),
+                raise MCPError(
+                    code=types.INTERNAL_ERROR,
+                    message=f"Error calling tool {name}: {e}",
                 ) from e
 
             # Convert result to MCP content.
             # Currently only text items are forwarded over MCP; rich content
             # (images, audio) is not yet supported in the MCP server path.
-            mcp_content: list[types.TextContent | types.ImageContent | types.EmbeddedResource] = []
+            mcp_content: list[types.ContentBlock] = []
             for c in result:
                 if c.type == "text" and c.text:
                     mcp_content.append(types.TextContent(type="text", text=c.text))
@@ -1968,15 +1969,22 @@ class RawAgent(BaseAgent, Generic[OptionsCoT]):
                         "MCP server does not yet forward rich content (images, audio) "
                         "in tool results. Rich content items will be omitted."
                     )
-            return mcp_content or [types.TextContent(type="text", text="")]
-
-        @server.set_logging_level()
-        async def _set_logging_level(level: types.LoggingLevel) -> None:
-            """Set the logging level for the server."""
-            logger.setLevel(LOG_LEVEL_MAPPING[level])
-            # emit this log with the new minimum level
-            await _log(level=level, data=f"Log level set to {level}")
-
+            return types.CallToolResult(content=mcp_content)
+
+        async def _set_logging_level(
+            ctx: ServerRequestContext[dict[str, Any]], params: types.SetLevelRequestParams
+        ) -> types.EmptyResult:
+            """Set the local threshold and confirm it through the requesting MCP session."""
+            logger.setLevel(LOG_LEVEL_MAPPING[params.level])
+            await _log(ctx, level=params.level, data=f"Log level set to {params.level}")
+            return types.EmptyResult()
+
+        server: Server[Any] = Server(  # pyright: ignore[reportDeprecated]
+            **server_args,
+            on_list_tools=_list_tools,
+            on_call_tool=_call_tool,
+            on_set_logging_level=_set_logging_level,
+        )
         return server
 
     def _get_agent_name(self) -> str:

{agent_framework_core-1.22.0 → agent_framework_core-1.23.0}/agent_framework/_feature_stage.py

@@ -60,7 +60,6 @@ class ExperimentalFeature(str, Enum):
     FOUNDRY_PREVIEW_TOOLS = "FOUNDRY_PREVIEW_TOOLS"
     FUNCTIONAL_WORKFLOWS = "FUNCTIONAL_WORKFLOWS"
     HARNESS = "HARNESS"
-    MCP_LONG_RUNNING_TASKS = "MCP_LONG_RUNNING_TASKS"
     MCP_SKILLS = "MCP_SKILLS"
     PROGRESSIVE_TOOLS = "PROGRESSIVE_TOOLS"
     SESSION_STORE = "SESSION_STORE"

{agent_framework_core-1.22.0 → agent_framework_core-1.23.0}/agent_framework/_filesystem.py

@@ -5,7 +5,9 @@
 from __future__ import annotations
 
 import hashlib
+import os
 import stat
+import uuid
 from base64 import b32encode
 from pathlib import Path
 
@@ -44,6 +46,33 @@ _MAX_ENCODED_STORAGE_KEY_SEGMENT_LENGTH = 180
 _DIGEST_SEGMENT_MARKER = "sha256-"
 
 
+def _atomic_write_text(path: Path, text: str, *, encoding: str = "utf-8") -> None:  # pyright: ignore[reportUnusedFunction]
+    """Atomically write text through a securely created sibling temporary file.
+
+    Exclusive creation prevents an existing file or symbolic link from redirecting the write.
+    """
+    path.parent.mkdir(parents=True, exist_ok=True)
+    temp_path = path.with_name(f".maf-state-{uuid.uuid4().hex}.tmp")
+    cleanup_path: Path | None = None
+    file_descriptor: int | None = None
+    try:
+        file_descriptor = os.open(temp_path, os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0o666)
+        cleanup_path = temp_path
+        file_handle = os.fdopen(file_descriptor, "w", encoding=encoding, closefd=False)
+        with file_handle:
+            file_handle.write(text)
+        descriptor_to_close = file_descriptor
+        file_descriptor = None
+        os.close(descriptor_to_close)
+        os.replace(temp_path, path)
+        cleanup_path = None
+    finally:
+        if file_descriptor is not None:
+            os.close(file_descriptor)
+        if cleanup_path is not None:
+            cleanup_path.unlink(missing_ok=True)
+
+
 def _is_link_or_reparse_point(path: Path) -> bool:  # pyright: ignore[reportUnusedFunction]
     """Return whether ``path`` is a symbolic link, junction, or other reparse point."""
     path_stat = path.lstat()

{agent_framework_core-1.22.0 → agent_framework_core-1.23.0}/agent_framework/_harness/_background_agents.py

@@ -229,7 +229,9 @@ def _finalize_task(
         else:
             task_info.status = BackgroundTaskStatus.COMPLETED
             task_info.result_text = completed_task.result().text
-    runtime.in_flight_tasks.pop(task_info.id, None)
+    # A stale waiter may observe a task ID already reused by a continuation.
+    if runtime.in_flight_tasks.get(task_info.id) is completed_task:
+        runtime.in_flight_tasks.pop(task_info.id, None)
 
 
 def _refresh_task_state(
@@ -559,18 +561,21 @@ class BackgroundAgentsProvider(ContextProvider):
 
             # Find which ID completed.
             completed_id: int | None = None
+            completed_task: asyncio.Task[AgentResponse[Any]] | None = None
             for tid, task in waitable:
                 if task in done:
                     completed_id = tid
+                    completed_task = task
                     break
 
             # Finalize the completed task.
             tasks = _get_tasks(provider_state)
             task_info = next((t for t in tasks if t.id == completed_id), None)
-            if task_info is not None and completed_id is not None:
-                completed_task = runtime.in_flight_tasks.get(completed_id)
-                if completed_task is not None:
-                    _finalize_task(task_info, completed_task, runtime)
+            if task_info is not None and completed_task is not None:
+                # Report the waited-on execution without overwriting a newer one.
+                is_current_task = runtime.in_flight_tasks.get(task_info.id) is completed_task
+                _finalize_task(task_info, completed_task, runtime)
+                if is_current_task:
                     _save_tasks(provider_state, tasks)
                     _save_provider_state(session, provider_state, source_id=source_id)
 

{agent_framework_core-1.22.0 → agent_framework_core-1.23.0}/agent_framework/_harness/_loop.py

@@ -654,10 +654,11 @@ class AgentLoopMiddleware(AgentMiddleware):
                                 f"got {type(inner).__name__}."
                             )
 
-                        async for update in inner:
-                            yield update
+                        async with inner:
+                            async for update in inner:
+                                yield update
 
-                        holder["final"] = await inner.get_final_response()
+                            holder["final"] = await inner.get_final_response()
                     except MiddlewareTermination:
                         # The pipeline's MiddlewareTermination suppression is no longer active once
                         # process() has returned (the stream is consumed lazily), so a termination

{agent_framework_core-1.22.0 → agent_framework_core-1.23.0}/agent_framework/_harness/_memory.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 import asyncio
 import json
 import logging
-import os
 import re
 import threading
 import weakref
@@ -20,7 +19,10 @@ from typing import Any, ClassVar, Final, cast
 from .._clients import SupportsChatGetResponse
 from .._compaction import group_messages
 from .._feature_stage import ExperimentalFeature, experimental
-from .._filesystem import _storage_key_segment  # pyright: ignore[reportPrivateUsage]
+from .._filesystem import (
+    _atomic_write_text,  # pyright: ignore[reportPrivateUsage]
+    _storage_key_segment,  # pyright: ignore[reportPrivateUsage]
+)
 from .._sessions import AgentSession, FileHistoryProvider, HistoryProvider, JsonDumps, JsonLoads, SessionContext
 from .._telemetry import FeatureIndex, mark_feature_used
 from .._tools import tool
@@ -122,22 +124,6 @@ def _unescape_markdown_line(line: str) -> str:
     return line
 
 
-def _atomic_write_text(path: Path, text: str, *, encoding: str = "utf-8") -> None:
-    """Write text to ``path`` atomically via a sibling temp file plus :func:`os.replace`.
-
-    A crash, OOM, or disk-full mid-write leaves the previous file (if any) intact instead of
-    producing a truncated file that breaks every subsequent read.
-    """
-    path.parent.mkdir(parents=True, exist_ok=True)
-    temp_path = path.with_name(f"{path.name}.tmp.{os.getpid()}")
-    try:
-        temp_path.write_text(text, encoding=encoding)
-        os.replace(temp_path, path)
-    finally:
-        if temp_path.exists():
-            temp_path.unlink(missing_ok=True)
-
-
 def _slugify_topic(topic: str) -> str:
     slug = re.sub(r"[^a-z0-9]+", "-", _normalize_topic(topic).lower()).strip("-")
     return slug or "memory-topic"
@@ -661,7 +647,11 @@ class MemoryStore(ABC):
 
 @experimental(feature_id=ExperimentalFeature.HARNESS)
 class MemoryFileStore(MemoryStore):
-    """Store memory files under ``MEMORY.md``, ``topics/``, and ``transcripts/``."""
+    """Store memory files under ``MEMORY.md``, ``topics/``, and ``transcripts/``.
+
+    The storage directory must not be writable by untrusted users, because they could
+    replace the final memory files independently of this store's secure temporary writes.
+    """
 
     def __init__(
         self,

{agent_framework_core-1.22.0 → agent_framework_core-1.23.0}/agent_framework/_harness/_todo.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import asyncio
 import json
-import os
 import weakref
 from abc import ABC, abstractmethod
 from collections.abc import Mapping, MutableMapping
@@ -15,6 +14,7 @@ from typing_extensions import NotRequired, TypedDict
 
 from .._feature_stage import ExperimentalFeature, experimental
 from .._filesystem import (
+    _atomic_write_text,  # pyright: ignore[reportPrivateUsage]
     _is_literal_storage_key_segment_safe,  # pyright: ignore[reportPrivateUsage]
     _storage_key_segment,  # pyright: ignore[reportPrivateUsage]
 )
@@ -289,7 +289,11 @@ class TodoSessionStore(TodoStore):
 
 @experimental(feature_id=ExperimentalFeature.HARNESS)
 class TodoFileStore(TodoStore):
-    """Store todo state in one JSON file per session and source ID."""
+    """Store todo state in one JSON file per session and source ID.
+
+    The storage directory must not be writable by untrusted users, because they could
+    replace the final todo files independently of this store's secure temporary writes.
+    """
 
     def __init__(
         self,
@@ -404,16 +408,7 @@ class TodoFileStore(TodoStore):
     @staticmethod
     def _save_state_sync(state_path: Path, payload: str) -> None:
         """Synchronous helper that atomically writes the JSON state file."""
-        state_path.parent.mkdir(parents=True, exist_ok=True)
-        # Write to a sibling temp file then atomically replace, so a crash mid-write cannot leave
-        # a truncated state file that breaks every subsequent tool call.
-        temp_path = state_path.with_name(f"{state_path.name}.tmp.{os.getpid()}")
-        try:
-            temp_path.write_text(payload, encoding="utf-8")
-            os.replace(temp_path, state_path)
-        finally:
-            if temp_path.exists():
-                temp_path.unlink(missing_ok=True)
+        _atomic_write_text(state_path, payload)
 
 
 class TodoProvider(ContextProvider):

{agent_framework_core-1.22.0 → agent_framework_core-1.23.0}/agent_framework/_harness/_tool_approval.py

@@ -130,10 +130,9 @@ class ToolApprovalRule(SerializationMixin):
             server_label: Optional hosted-tool server boundary. Hosted approvals
                 only match future approvals from the same server label.
         """
-        normalized_name = tool_name.strip()
-        if not normalized_name:
+        if not tool_name.strip():
             raise ValueError("Tool approval rule tool_name must be a non-empty string.")
-        self.tool_name = normalized_name
+        self.tool_name = tool_name
         self.arguments = dict(arguments) if arguments is not None else None
         self.server_label = server_label