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

agentpool_config/toolsets.py

@@ -33,12 +33,6 @@ if TYPE_CHECKING:
 
 MarkupType = Literal["yaml", "json", "toml"]
 # Tool name literals for statically-defined toolsets
-AgentManagementToolName = Literal[
-    "create_worker_agent",
-    "add_agent",
-    "add_team",
-    "connect_nodes",
-]
 SubagentToolName = Literal[
     "list_available_nodes",
     "delegate_to",
@@ -46,7 +40,7 @@ SubagentToolName = Literal[
 ]
 ExecutionEnvironmentToolName = Literal[
     "execute_code",
-    "execute_command",
+    "bash",
     "start_process",
     "get_process_output",
     "wait_for_process",
@@ -55,13 +49,11 @@ ExecutionEnvironmentToolName = Literal[
     "list_processes",
 ]
 
-ToolManagementToolName = Literal["register_tool", "register_code_tool"]
 UserInteractionToolName = Literal["ask_user",]
-HistoryToolName = Literal["search_history", "show_statistics"]
 SkillsToolName = Literal["load_skill", "list_skills"]
-IntegrationToolName = Literal["add_local_mcp_server", "add_remote_mcp_server"]
 CodeToolName = Literal["format_code", "ast_grep"]
 PlanToolName = Literal["get_plan", "add_plan_entry", "update_plan_entry", "remove_plan_entry"]
+PlanToolMode = Literal["granular", "declarative", "hybrid"]
 
 
 class BaseToolsetConfig(Schema):
@@ -176,37 +168,6 @@ class ComposioToolSetConfig(BaseToolsetConfig):
         return ComposioTools(user_id=self.user_id, toolsets=self.toolsets, api_key=key)
 
 
-class AgentManagementToolsetConfig(BaseToolsetConfig):
-    """Configuration for agent pool building tools."""
-
-    model_config = ConfigDict(
-        json_schema_extra={
-            "x-icon": "octicon:people-16",
-            "x-doc-title": "Agent Management Toolset",
-        }
-    )
-
-    type: Literal["agent_management"] = Field("agent_management", init=False)
-    """Agent pool building toolset (create_worker_agent, add_agent, add_team, connect_nodes)."""
-
-    tools: dict[AgentManagementToolName, bool] | None = Field(
-        default=None,
-        title="Tool filter",
-    )
-    """Optional tool filter to enable/disable specific tools."""
-
-    def get_provider(self) -> ResourceProvider:
-        """Create agent management tools provider."""
-        from agentpool_toolsets.builtin import AgentManagementTools
-
-        provider = AgentManagementTools(name="agent_management")
-        if self.tools is not None:
-            from agentpool.resource_providers import FilteringResourceProvider
-
-            return FilteringResourceProvider(provider, cast(dict[str, bool], self.tools))
-        return provider
-
-
 class SubagentToolsetConfig(BaseToolsetConfig):
     """Configuration for subagent interaction tools."""
 
@@ -312,37 +273,6 @@ class ExecutionEnvironmentToolsetConfig(BaseToolsetConfig):
         return provider
 
 
-class ToolManagementToolsetConfig(BaseToolsetConfig):
-    """Configuration for tool management toolset."""
-
-    model_config = ConfigDict(
-        json_schema_extra={
-            "x-icon": "octicon:tools-16",
-            "x-doc-title": "Tool Management Toolset",
-        }
-    )
-
-    type: Literal["tool_management"] = Field("tool_management", init=False)
-    """Tool management toolset."""
-
-    tools: dict[ToolManagementToolName, bool] | None = Field(
-        default=None,
-        title="Tool filter",
-    )
-    """Optional tool filter to enable/disable specific tools."""
-
-    def get_provider(self) -> ResourceProvider:
-        """Create tool management tools provider."""
-        from agentpool_toolsets.builtin import ToolManagementTools
-
-        provider = ToolManagementTools(name="tool_management")
-        if self.tools is not None:
-            from agentpool.resource_providers import FilteringResourceProvider
-
-            return FilteringResourceProvider(provider, cast(dict[str, bool], self.tools))
-        return provider
-
-
 class UserInteractionToolsetConfig(BaseToolsetConfig):
     """Configuration for user interaction toolset."""
 
@@ -374,37 +304,6 @@ class UserInteractionToolsetConfig(BaseToolsetConfig):
         return provider
 
 
-class HistoryToolsetConfig(BaseToolsetConfig):
-    """Configuration for history toolset."""
-
-    model_config = ConfigDict(
-        json_schema_extra={
-            "x-icon": "octicon:history-16",
-            "x-doc-title": "History Toolset",
-        }
-    )
-
-    type: Literal["history"] = Field("history", init=False)
-    """History toolset."""
-
-    tools: dict[HistoryToolName, bool] | None = Field(
-        default=None,
-        title="Tool filter",
-    )
-    """Optional tool filter to enable/disable specific tools."""
-
-    def get_provider(self) -> ResourceProvider:
-        """Create history tools provider."""
-        from agentpool_toolsets.builtin import HistoryTools
-
-        provider = HistoryTools(name="history")
-        if self.tools is not None:
-            from agentpool.resource_providers import FilteringResourceProvider
-
-            return FilteringResourceProvider(provider, cast(dict[str, bool], self.tools))
-        return provider
-
-
 class SkillsToolsetConfig(BaseToolsetConfig):
     """Configuration for skills toolset.
 
@@ -441,37 +340,6 @@ class SkillsToolsetConfig(BaseToolsetConfig):
         return provider
 
 
-class IntegrationToolsetConfig(BaseToolsetConfig):
-    """Configuration for integration toolset."""
-
-    model_config = ConfigDict(
-        json_schema_extra={
-            "x-icon": "octicon:link-16",
-            "x-doc-title": "Integration Toolset",
-        }
-    )
-
-    type: Literal["integrations"] = Field("integrations", init=False)
-    """Integration toolset."""
-
-    tools: dict[IntegrationToolName, bool] | None = Field(
-        default=None,
-        title="Tool filter",
-    )
-    """Optional tool filter to enable/disable specific tools."""
-
-    def get_provider(self) -> ResourceProvider:
-        """Create integration tools provider."""
-        from agentpool_toolsets.builtin import IntegrationTools
-
-        provider = IntegrationTools(name="integrations")
-        if self.tools is not None:
-            from agentpool.resource_providers import FilteringResourceProvider
-
-            return FilteringResourceProvider(provider, cast(dict[str, bool], self.tools))
-        return provider
-
-
 class CodeToolsetConfig(BaseToolsetConfig):
     """Configuration for code toolset."""
 
@@ -607,6 +475,32 @@ class FSSpecToolsetConfig(BaseToolsetConfig):
     )
     """Maximum tokens for structure map output when reading large files."""
 
+    edit_tool: Literal["simple", "batch", "agentic"] = Field(
+        default="simple",
+        title="Edit tool variant",
+    )
+    """Which edit tool to expose: "simple" (single replacement),
+    "batch" (multiple replacements), or "agentic" (LLM-driven editing)."""
+
+    max_image_size: int | None = Field(
+        default=2000,
+        ge=100,
+        le=8192,
+        title="Maximum image dimension",
+    )
+    """Max width/height for images in pixels. Larger images are auto-resized
+    for better model compatibility. Set to None to disable resizing."""
+
+    max_image_bytes: int | None = Field(
+        default=None,
+        ge=102400,
+        le=20971520,
+        title="Maximum image file size",
+    )
+    """Max file size for images in bytes. Images exceeding this are compressed
+    using progressive quality/dimension reduction. Default: 4.5MB (Anthropic limit).
+    Set to None to use the default 4.5MB limit."""
+
     def get_provider(self) -> ResourceProvider:
         """Create FSSpec filesystem tools provider."""
         import fsspec
@@ -641,6 +535,9 @@ class FSSpecToolsetConfig(BaseToolsetConfig):
             enable_diagnostics=self.enable_diagnostics,
             large_file_tokens=self.large_file_tokens,
             map_max_tokens=self.map_max_tokens,
+            edit_tool=self.edit_tool,
+            max_image_size=self.max_image_size,
+            max_image_bytes=self.max_image_bytes,
         )
 
 
@@ -949,6 +846,16 @@ class PlanToolsetConfig(BaseToolsetConfig):
     type: Literal["plan"] = Field("plan", init=False)
     """Plan toolset."""
 
+    mode: PlanToolMode = Field(
+        default="granular",
+        title="Plan tool mode",
+    )
+    """Tool mode:
+    - 'granular': Separate tools (get/add/update/remove) - better for simpler models
+    - 'declarative': Single set_plan tool with full list - fewer calls, suits capable models
+    - 'hybrid': Both approaches available - model chooses most efficient per situation
+    """
+
     tools: dict[PlanToolName, bool] | None = Field(
         default=None,
         title="Tool filter",
@@ -959,7 +866,7 @@ class PlanToolsetConfig(BaseToolsetConfig):
         """Create plan tools provider."""
         from agentpool.resource_providers import PlanProvider
 
-        provider = PlanProvider()
+        provider = PlanProvider(mode=self.mode)
         if self.tools is not None:
             from agentpool.resource_providers import FilteringResourceProvider
 
@@ -987,19 +894,59 @@ class DebugToolsetConfig(BaseToolsetConfig):
     type: Literal["debug"] = Field("debug", init=False)
     """Debug toolset."""
 
-    install_log_handler: bool = Field(
-        default=True,
-        title="Install log handler",
-    )
-    """Whether to install the memory log handler for log inspection."""
-
     def get_provider(self) -> ResourceProvider:
         """Create debug tools provider."""
         from agentpool_toolsets.builtin.debug import DebugTools
 
-        return DebugTools(
-            name=self.namespace or "debug",
-            install_log_handler=self.install_log_handler,
+        return DebugTools(name=self.namespace or "debug")
+
+
+class MCPDiscoveryToolsetConfig(BaseToolsetConfig):
+    """Configuration for MCP discovery toolset.
+
+    Enables dynamic discovery and use of MCP servers without preloading tools.
+    Uses semantic search over 1000+ indexed servers for intelligent matching.
+
+    Requires the `mcp-discovery` extra: `pip install agentpool[mcp-discovery]`
+    """
+
+    model_config = ConfigDict(
+        json_schema_extra={
+            "x-icon": "octicon:search-16",
+            "x-doc-title": "MCP Discovery Toolset",
+        }
+    )
+
+    type: Literal["mcp_discovery"] = Field("mcp_discovery", init=False)
+    """MCP discovery toolset."""
+
+    registry_url: str = Field(
+        default="https://registry.modelcontextprotocol.io",
+        title="Registry URL",
+    )
+    """Base URL for the MCP registry API."""
+
+    allowed_servers: list[str] | None = Field(
+        default=None,
+        title="Allowed servers",
+    )
+    """If set, only these server names can be used."""
+
+    blocked_servers: list[str] | None = Field(
+        default=None,
+        title="Blocked servers",
+    )
+    """Server names that cannot be used."""
+
+    def get_provider(self) -> ResourceProvider:
+        """Create MCP discovery tools provider."""
+        from agentpool_toolsets.mcp_discovery.toolset import MCPDiscoveryToolset
+
+        return MCPDiscoveryToolset(
+            name=self.namespace or "mcp_discovery",
+            registry_url=self.registry_url,
+            allowed_servers=self.allowed_servers,
+            blocked_servers=self.blocked_servers,
         )
 
 
@@ -1007,13 +954,9 @@ ToolsetConfig = Annotated[
     OpenAPIToolsetConfig
     | EntryPointToolsetConfig
     | ComposioToolSetConfig
-    | AgentManagementToolsetConfig
     | ExecutionEnvironmentToolsetConfig
-    | ToolManagementToolsetConfig
     | UserInteractionToolsetConfig
-    | HistoryToolsetConfig
     | SkillsToolsetConfig
-    | IntegrationToolsetConfig
     | CodeToolsetConfig
     | FSSpecToolsetConfig
     | VFSToolsetConfig
@@ -1028,6 +971,7 @@ ToolsetConfig = Annotated[
     | ImportToolsToolsetConfig
     | PlanToolsetConfig
     | DebugToolsetConfig
+    | MCPDiscoveryToolsetConfig
     | CustomToolsetConfig,
     Field(discriminator="type"),
 ]