agentpool 2.2.3__py3-none-any.whl → 2.5.0__py3-none-any.whl

agentpool/ui/stdlib_provider.py

@@ -17,7 +17,7 @@ from agentpool.ui.base import InputProvider
 if TYPE_CHECKING:
     from pydantic import BaseModel
 
-    from agentpool.agents.context import ConfirmationResult
+    from agentpool.agents.context import AgentContext, ConfirmationResult
     from agentpool.messaging import ChatMessage
     from agentpool.messaging.context import NodeContext
     from agentpool.tools.base import Tool
@@ -60,7 +60,7 @@ class StdlibInputProvider(InputProvider):
 
     async def get_tool_confirmation(
         self,
-        context: NodeContext,
+        context: AgentContext[Any],
         tool: Tool,
         args: dict[str, Any],
         message_history: list[ChatMessage[Any]] | None = None,

agentpool/utils/streams.py

@@ -8,11 +8,30 @@ from contextlib import asynccontextmanager
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any, Literal
 
+# Re-export FileTracker from new location for backwards compatibility
+from agentpool.agents.events.processors import (
+    FileTracker,
+    FileTrackingProcessor,
+    extract_file_path_from_tool_call,
+)
+
 
 if TYPE_CHECKING:
     from collections.abc import AsyncIterator
 
-    from agentpool.common_types import SimpleJsonType
+
+__all__ = [
+    "FileChange",
+    "FileOpsTracker",
+    "FileTracker",
+    "FileTrackingProcessor",
+    "TodoEntry",
+    "TodoPriority",
+    "TodoStatus",
+    "TodoTracker",
+    "extract_file_path_from_tool_call",
+    "merge_queue_into_iterator",
+]
 
 
 @asynccontextmanager
@@ -70,7 +89,7 @@ async def merge_queue_into_iterator[T, V](  # noqa: PLR0915
         try:
             while not primary_done.is_set():
                 try:
-                    secondary_event = await asyncio.wait_for(secondary_queue.get(), timeout=0.1)
+                    secondary_event = await asyncio.wait_for(secondary_queue.get(), timeout=0.01)
                     await event_queue.put(secondary_event)
                 except TimeoutError:
                     continue
@@ -116,100 +135,6 @@ async def merge_queue_into_iterator[T, V](  # noqa: PLR0915
         await asyncio.gather(primary_task_obj, secondary_task_obj, return_exceptions=True)
 
 
-def extract_file_path_from_tool_call(tool_name: str, raw_input: dict[str, Any]) -> str | None:
-    """Extract file path from a tool call if it's a file-writing tool.
-
-    Uses simple heuristics:
-    - Tool name contains 'write' or 'edit' (case-insensitive)
-    - Input contains 'path' or 'file_path' key
-
-    Args:
-        tool_name: Name of the tool being called
-        raw_input: Tool call arguments
-
-    Returns:
-        File path if this is a file-writing tool, None otherwise
-    """
-    name_lower = tool_name.lower()
-    if "write" not in name_lower and "edit" not in name_lower:
-        return None
-
-    # Try common path argument names
-    for key in ("file_path", "path", "filepath", "filename", "file"):
-        if key in raw_input and isinstance(val := raw_input[key], str):
-            return val
-
-    return None
-
-
-@dataclass
-class FileTracker:
-    """Tracks files modified during a stream of events.
-
-    Example:
-        ```python
-        file_tracker = FileTracker()
-        async for event in file_tracker.track(events):
-            yield event
-
-        print(f"Modified files: {file_tracker.touched_files}")
-        ```
-    """
-
-    touched_files: set[str] = field(default_factory=set)
-    """Set of file paths that were modified by tool calls."""
-
-    extractor: Callable[[str, dict[str, Any]], str | None] = extract_file_path_from_tool_call
-    """Function to extract file path from tool call. Can be customized."""
-
-    def process_event(self, event: Any) -> None:
-        """Process an event and track any file modifications.
-
-        Args:
-            event: The event to process (checks for ToolCallStartEvent)
-        """
-        # Import here to avoid circular imports
-        from agentpool.agents.events import ToolCallStartEvent
-
-        if isinstance(event, ToolCallStartEvent) and (
-            file_path := self.extractor(event.tool_name or "", event.raw_input or {})
-        ):
-            self.touched_files.add(file_path)
-
-    def track[T](self, stream: AsyncIterator[T]) -> AsyncIterator[T]:
-        """Wrap an async iterator to automatically track file modifications.
-
-        Args:
-            stream: The event stream to wrap
-
-        Returns:
-            Wrapped async iterator that tracks file modifications
-
-        Example:
-            ```python
-            async for event in file_tracker.track(events):
-                yield event
-            ```
-        """
-
-        async def wrapped() -> AsyncIterator[T]:
-            async for event in stream:
-                self.process_event(event)
-                yield event
-
-        return wrapped()
-
-    def get_metadata(self) -> SimpleJsonType:
-        """Get metadata dict with touched files (if any).
-
-        Returns:
-            Dict with 'touched_files' key if files were modified, else empty dict
-        """
-        if self.touched_files:
-            return {"touched_files": sorted(self.touched_files)}
-        return {}
-
-
 @dataclass
 class FileChange:
     """Represents a single file change operation."""

agentpool/vfs_registry.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Literal, assert_never, overload
 
-from upathtools import AsyncUPath, UnionFileSystem, list_files, read_folder, read_path
+from upathtools import AsyncUPath, list_files, read_folder, read_path
 
 from agentpool.log import get_logger
 from agentpool.utils.baseregistry import AgentPoolError
@@ -13,6 +13,7 @@ if TYPE_CHECKING:
 
     from fsspec import AbstractFileSystem
     from upathtools import AsyncUPath, UPath
+    from upathtools.filesystems import UnionFileSystem
 
     from agentpool.models.manifest import ResourceConfig
 
@@ -25,6 +26,8 @@ class VFSRegistry:
 
     def __init__(self) -> None:
         """Initialize empty VFS registry."""
+        from upathtools.filesystems import UnionFileSystem
+
         self._union_fs = UnionFileSystem({})
         logger.debug("Initialized VFS registry")
 
@@ -87,7 +90,7 @@ class VFSRegistry:
         Returns:
             The registered filesystem instance
         """
-        from upathtools.configs.base import FileSystemConfig, URIFileSystemConfig
+        from upathtools_config.base import FileSystemConfig, URIFileSystemConfig
 
         match config:
             case str() as uri:
@@ -236,6 +239,8 @@ class VFSRegistry:
 
     def reset(self) -> None:
         """Reset registry to empty state."""
+        from upathtools.filesystems import UnionFileSystem
+
         logger.debug("Resetting VFS registry")
         self._union_fs = UnionFileSystem({})
 

{agentpool-2.2.3.dist-info → agentpool-2.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentpool
-Version: 2.2.3
+Version: 2.5.0
 Summary: Pydantic-AI based Multi-Agent Framework with YAML-based Agents, Teams, Workflows & Extended ACP / AGUI integration
 Keywords: 
 Author: Philipp Temminghoff
@@ -24,26 +24,29 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Dist: anyenv[httpx]>=0.3.0
+Requires-Dist: claude-agent-sdk>=0.1.18
 Requires-Dist: docler>=1.0.3
 Requires-Dist: docstring-parser>=0.17.0
 Requires-Dist: epregistry
 Requires-Dist: evented>=1.0.5
 Requires-Dist: exxec>=0.1.0
+Requires-Dist: fastapi
 Requires-Dist: fastmcp>=2.12.4
 Requires-Dist: fsspec
 Requires-Dist: httpx
 Requires-Dist: jinja2
 Requires-Dist: jinjarope
+Requires-Dist: keyring>=25.6.0
 Requires-Dist: llmling-models>=1.4.1
-Requires-Dist: logfire
+Requires-Dist: logfire[fastapi]
 Requires-Dist: mcp>=1.2.0
 Requires-Dist: pillow>=11.3.0
 Requires-Dist: platformdirs
 Requires-Dist: promptantic>=0.4.5
 Requires-Dist: psygnal>=0.11.1
 Requires-Dist: pydantic>=2.10.0
-Requires-Dist: pydantic-ai-slim>=1.0.0
-Requires-Dist: pydocket==0.16.1
+Requires-Dist: pydantic-ai-slim[openai,google,anthropic,mistral,retries]>=1.0.0
+Requires-Dist: pydocket>=0.16.1
 Requires-Dist: python-dotenv>=1.0.1
 Requires-Dist: rich
 Requires-Dist: schemez[codegen]
@@ -55,7 +58,8 @@ Requires-Dist: structlog>=25.5.0
 Requires-Dist: tokonomics>=0.1.2
 Requires-Dist: toprompt>=0.0.1
 Requires-Dist: typer
-Requires-Dist: upathtools>=0.1.0
+Requires-Dist: upathtools[httpx]>=0.1.0
+Requires-Dist: uvicorn[standard]
 Requires-Dist: watchfiles>=1.1.1
 Requires-Dist: websockets>=15.0
 Requires-Dist: yamling>=2.0.2
@@ -64,8 +68,7 @@ Requires-Dist: starlette ; extra == 'a2a'
 Requires-Dist: ag-ui-protocol>=0.1.10 ; extra == 'ag-ui'
 Requires-Dist: braintrust ; extra == 'braintrust'
 Requires-Dist: autoevals ; extra == 'braintrust'
-Requires-Dist: claude-agent-sdk>=0.1.18 ; extra == 'claude'
-Requires-Dist: clipman ; extra == 'clipboard'
+Requires-Dist: copykitten ; extra == 'clipboard'
 Requires-Dist: rustworkx>=0.17.1 ; extra == 'coding'
 Requires-Dist: grep-ast ; extra == 'coding'
 Requires-Dist: ast-grep-py>=0.40.0 ; extra == 'coding'
@@ -81,8 +84,6 @@ Requires-Dist: tree-sitter-go>=0.23.0 ; extra == 'coding'
 Requires-Dist: tree-sitter-json>=0.24.0 ; extra == 'coding'
 Requires-Dist: tree-sitter-yaml>=0.6.0 ; extra == 'coding'
 Requires-Dist: composio ; extra == 'composio'
-Requires-Dist: pydantic-ai-slim[openai,google,anthropic,mistral,retries]>=1.0.0 ; extra == 'default'
-Requires-Dist: claude-agent-sdk ; extra == 'default'
 Requires-Dist: evented[all] ; extra == 'events'
 Requires-Dist: fsspec[git] ; extra == 'git'
 Requires-Dist: langfuse ; extra == 'langfuse'
@@ -91,16 +92,12 @@ Requires-Dist: fastembed>=0.7.4 ; python_full_version < '3.14' and extra == 'mcp
 Requires-Dist: lancedb>=0.26.0 ; python_full_version < '3.14' and extra == 'mcp-discovery'
 Requires-Dist: pyarrow>=19.0.0 ; python_full_version < '3.14' and extra == 'mcp-discovery'
 Requires-Dist: mcpx-py>=0.7.0 ; extra == 'mcp-run'
-Requires-Dist: typeagent>=0.3.3 ; extra == 'memory'
 Requires-Dist: apprise>=1.9.5 ; extra == 'notifications'
-Requires-Dist: keyring>=25.6.0 ; extra == 'oauth'
 Requires-Dist: promptlayer ; extra == 'promptlayer'
-Requires-Dist: logfire[fastapi] ; extra == 'server'
-Requires-Dist: fastapi ; extra == 'server'
-Requires-Dist: uvicorn[standard] ; extra == 'server'
 Requires-Dist: textual>=1.0.0 ; extra == 'textual'
 Requires-Dist: tiktoken ; extra == 'tiktoken'
 Requires-Dist: anyvoice[tts-edge,openai]>=0.0.2 ; extra == 'tts'
+Requires-Dist: zstandard>=0.23.0 ; extra == 'zed'
 Requires-Python: >=3.13
 Project-URL: Code coverage, https://app.codecov.io/gh/phil65/agentpool
 Project-URL: Discussions, https://github.com/phil65/agentpool/discussions
@@ -110,25 +107,21 @@ Project-URL: Source, https://github.com/phil65/agentpool
 Provides-Extra: a2a
 Provides-Extra: ag-ui
 Provides-Extra: braintrust
-Provides-Extra: claude
 Provides-Extra: clipboard
 Provides-Extra: coding
 Provides-Extra: composio
-Provides-Extra: default
 Provides-Extra: events
 Provides-Extra: git
 Provides-Extra: langfuse
 Provides-Extra: markitdown
 Provides-Extra: mcp-discovery
 Provides-Extra: mcp-run
-Provides-Extra: memory
 Provides-Extra: notifications
-Provides-Extra: oauth
 Provides-Extra: promptlayer
-Provides-Extra: server
 Provides-Extra: textual
 Provides-Extra: tiktoken
 Provides-Extra: tts
+Provides-Extra: zed
 Description-Content-Type: text/markdown
 
 # AgentPool
@@ -182,7 +175,8 @@ flowchart TB
 ## Quick Start
 
 ```bash
-uv tool install agentpool[default]
+uv tool install agentpool
+
 ```
 
 ### Minimal Configuration
@@ -214,7 +208,7 @@ agents:
   coordinator:
     type: native
     model: openai:gpt-4o
-    toolsets:
+    tools:
       - type: subagent  # Can delegate to all other agents
     system_prompt: "Coordinate tasks between available agents."
 
@@ -282,7 +276,7 @@ agents:
     model:
       type: fallback
       models: [openai:gpt-4o, anthropic:claude-sonnet-4-0]
-    toolsets:
+    tools:
       - type: subagent
       - type: resource_access
     mcp_servers: