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

agentpool_config/storage.py

@@ -19,7 +19,6 @@ if TYPE_CHECKING:
     from agentpool.sessions.store import SessionStore
 
 
-LogFormat = Literal["chronological", "conversations"]
 FilterMode = Literal["and", "override"]
 
 APP_NAME: Final = "agentpool"
@@ -27,8 +26,10 @@ APP_AUTHOR: Final = "agentpool"
 DATA_DIR: Final = Path(user_data_dir(APP_NAME, APP_AUTHOR))
 DEFAULT_DB_NAME: Final = "history.db"
 DEFAULT_TITLE_PROMPT: Final = """\
-Generate a short, descriptive title (3-7 words) for this request. \
-Only respond with the title, nothing else."""
+Generate metadata for this conversation request. Provide:
+- A short, descriptive title (3-7 words)
+- A single emoji that represents the topic
+- An iconify icon name (e.g., 'mdi:code-braces', 'mdi:database', 'mdi:bug')"""
 
 
 def get_database_path() -> str:
@@ -104,38 +105,6 @@ class SQLStorageConfig(BaseStorageProviderConfig):
         return create_async_engine(url_str, pool_size=self.pool_size)
 
 
-class TextLogConfig(BaseStorageProviderConfig):
-    """Text log configuration."""
-
-    model_config = ConfigDict(json_schema_extra={"x-doc-title": "Text Log"})
-
-    type: Literal["text_file"] = Field("text_file", init=False)
-    """Text log storage configuration."""
-
-    path: str = Field(
-        examples=["/var/log/agent.log", "~/logs/conversations.txt"],
-        title="Log file path",
-    )
-    """Path to log file"""
-
-    format: LogFormat = Field(
-        default="chronological",
-        examples=["chronological", "conversations"],
-        title="Log format",
-    )
-    """Log format template to use"""
-
-    template: Literal["chronological", "conversations"] | str | None = Field(  # noqa: PYI051
-        default="chronological",
-        examples=["chronological", "conversations", "/path/to/template.j2"],
-        title="Template",
-    )
-    """Template to use: either predefined name or path to custom template"""
-
-    encoding: str = Field(default="utf-8", examples=["utf-8", "ascii"], title="File encoding")
-    """File encoding"""
-
-
 class FileStorageConfig(BaseStorageProviderConfig):
     """File storage configuration."""
 
@@ -170,8 +139,75 @@ class MemoryStorageConfig(BaseStorageProviderConfig):
     """In-memory storage configuration for testing."""
 
 
+class ClaudeStorageConfig(BaseStorageProviderConfig):
+    """Claude Code native storage format configuration.
+
+    Reads/writes to Claude Code's native JSONL format in ~/.claude/projects/.
+    Useful for sharing conversation history between agentpool and Claude Code CLI.
+    """
+
+    model_config = ConfigDict(json_schema_extra={"x-doc-title": "Claude Storage"})
+
+    type: Literal["claude"] = Field("claude", init=False)
+    """Claude Code native storage configuration."""
+
+    path: str = Field(
+        default="~/.claude",
+        examples=["~/.claude", "/home/user/.claude"],
+        title="Claude data directory",
+    )
+    """Path to Claude data directory (default: ~/.claude)"""
+
+
+class OpenCodeStorageConfig(BaseStorageProviderConfig):
+    """OpenCode native storage format configuration.
+
+    Reads from OpenCode's native JSON format in ~/.local/share/opencode/storage/.
+    Useful for importing conversation history from OpenCode.
+    """
+
+    model_config = ConfigDict(json_schema_extra={"x-doc-title": "OpenCode Storage"})
+
+    type: Literal["opencode"] = Field("opencode", init=False)
+    """OpenCode native storage configuration."""
+
+    path: str = Field(
+        default="~/.local/share/opencode/storage",
+        examples=["~/.local/share/opencode/storage"],
+        title="OpenCode storage directory",
+    )
+    """Path to OpenCode storage directory."""
+
+
+class ZedStorageConfig(BaseStorageProviderConfig):
+    """Zed IDE native storage format configuration.
+
+    Reads from Zed's native SQLite + zstd-compressed JSON format.
+    Useful for importing conversation history from Zed's AI assistant.
+
+    This is a READ-ONLY provider - it cannot write back to Zed's format.
+    """
+
+    model_config = ConfigDict(json_schema_extra={"x-doc-title": "Zed Storage"})
+
+    type: Literal["zed"] = Field("zed", init=False)
+    """Zed IDE native storage configuration."""
+
+    path: str = Field(
+        default="~/.local/share/zed/threads/threads.db",
+        examples=["~/.local/share/zed/threads/threads.db", "~/.local/share/zed"],
+        title="Zed threads database path",
+    )
+    """Path to Zed threads database (or parent directory)."""
+
+
 StorageProviderConfig = Annotated[
-    SQLStorageConfig | FileStorageConfig | TextLogConfig | MemoryStorageConfig,
+    SQLStorageConfig
+    | FileStorageConfig
+    | MemoryStorageConfig
+    | ClaudeStorageConfig
+    | OpenCodeStorageConfig
+    | ZedStorageConfig,
     Field(discriminator="type"),
 ]
 
@@ -237,8 +273,12 @@ class StorageConfig(Schema):
     """Whether to log additions to the context."""
 
     title_generation_model: ModelId | str | None = Field(
-        default="google-gla:gemini-2.5-flash-lite",
-        examples=["google-gla:gemini-2.5-flash-lite", None],
+        default="google-gla:gemini-2.5-flash-lite,openrouter:deepseek/deepseek-r1-0528:free",
+        examples=[
+            "google-gla:gemini-2.5-flash-lite",
+            "google-gla:gemini-2.5-flash-lite,openrouter:deepseek/deepseek-r1-0528:free",
+            None,
+        ],
         title="Title generation model",
     )
     """Model to use for generating conversation titles.
@@ -273,6 +313,10 @@ class StorageConfig(Schema):
         from agentpool.sessions.store import MemorySessionStore
         from agentpool_storage.session_store import SQLSessionStore
 
+        # Use memory store during tests
+        if os.getenv("PYTEST_CURRENT_TEST"):
+            return MemorySessionStore()
+
         match self.session_store:
             case "memory":
                 return MemorySessionStore()

agentpool_config/task.py

@@ -23,7 +23,7 @@ class Job[TDeps, TResult = str](Schema):
 
     Requirements:
     - The agent must have compatible dependencies (required_dependency)
-    - The agent must produce the specified result type (required_return_type)
+    - The agent must produce the specified result type (required_output_type)
 
     Equipment:
     - The task provides necessary tools for execution (tools)
@@ -54,7 +54,7 @@ class Job[TDeps, TResult = str](Schema):
     )
     """The task instruction/prompt."""
 
-    required_return_type: ImportString[type[TResult]] = Field(
+    required_output_type: ImportString[type[TResult]] = Field(
         default="str",
         validate_default=True,
         examples=["str", "dict", "builtins:str"],
@@ -120,7 +120,7 @@ class Job[TDeps, TResult = str](Schema):
         ):
             return False
 
-        if agent._output_type != self.required_return_type:
+        if agent._output_type != self.required_output_type:
             return False
 
         # Check vision capabilities

agentpool_config/tools.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Callable
-from typing import TYPE_CHECKING, Annotated, Any, Literal
+from typing import TYPE_CHECKING, Any, Literal
 
 from pydantic import ConfigDict, Field, ImportString
 from schemez import Schema
@@ -56,26 +56,9 @@ class BaseToolConfig(Schema):
     requires_confirmation: bool = Field(default=False, title="Requires confirmation")
     """Whether tool execution needs confirmation."""
 
-    metadata: dict[str, str] = Field(
-        default_factory=dict,
-        examples=[
-            {"category": "web", "version": "1.0"},
-            {"author": "system", "tags": "search,utility"},
-            {"priority": "high", "environment": "production"},
-        ],
-        title="Tool metadata",
-    )
+    metadata: dict[str, str] = Field(default_factory=dict, title="Tool metadata")
     """Additional tool metadata."""
 
-    hints: ToolHints | None = Field(
-        default=None,
-        title="Execution hints",
-        examples=[
-            {"read_only": True, "destructive": False, "open_world": True, "idempotent": False},
-        ],
-    )
-    """Hints for tool execution."""
-
     model_config = ConfigDict(frozen=True)
 
     def get_tool(self) -> Tool:
@@ -95,6 +78,15 @@ class ImportToolConfig(BaseToolConfig):
     )
     """Import path to the tool function."""
 
+    hints: ToolHints | None = Field(
+        default=None,
+        title="Execution hints",
+        examples=[
+            {"read_only": True, "destructive": False, "open_world": True, "idempotent": False},
+        ],
+    )
+    """Hints for tool execution."""
+
     def get_tool(self) -> Tool:
         """Import and create tool from configuration."""
         from agentpool.tools.base import Tool
@@ -107,6 +99,3 @@ class ImportToolConfig(BaseToolConfig):
             requires_confirmation=self.requires_confirmation,
             metadata=self.metadata,
         )
-
-
-ToolConfig = Annotated[ImportToolConfig, Field(discriminator="type")]