EvoScientist 0.0.1.dev2__tar.gz → 0.0.1.dev4__tar.gz

{evoscientist-0.0.1.dev2 → evoscientist-0.0.1.dev4}/EvoScientist/EvoScientist.py

@@ -13,34 +13,47 @@ Usage:
         ...
 """
 
-import os
 from datetime import datetime
 from pathlib import Path
 
 from deepagents import create_deep_agent
 from deepagents.backends import FilesystemBackend, CompositeBackend
-from langchain.chat_models import init_chat_model
 
 from .backends import CustomSandboxBackend, MergedReadOnlyBackend
-from .middleware import create_skills_middleware
+from .config import get_effective_config, apply_config_to_env
+from .llm import get_chat_model
+from .middleware import create_skills_middleware, create_memory_middleware
 from .prompts import RESEARCHER_INSTRUCTIONS, get_system_prompt
 from .utils import load_subagents
-from .tools import tavily_search, think_tool
+from .tools import tavily_search, think_tool, skill_manager
+from .paths import (
+    ensure_dirs,
+    default_workspace_dir,
+    MEMORY_DIR as _MEMORY_DIR_PATH,
+    USER_SKILLS_DIR as _USER_SKILLS_DIR_PATH,
+)
 
 # =============================================================================
 # Configuration
 # =============================================================================
 
+# Load configuration from file/env/defaults
+_config = get_effective_config()
+apply_config_to_env(_config)
+
 # Backend mode: "sandbox" (with execute) or "filesystem" (read/write only)
 BACKEND_MODE = "sandbox"
 
-# Research limits
-MAX_CONCURRENT = 3  # Max parallel sub-agents
-MAX_ITERATIONS = 3  # Max delegation rounds
+# Research limits (from config)
+MAX_CONCURRENT = _config.max_concurrent
+MAX_ITERATIONS = _config.max_iterations
 
 # Workspace settings
-WORKSPACE_DIR = "./workspace/"
+ensure_dirs()
+WORKSPACE_DIR = str(default_workspace_dir())
+MEMORY_DIR = str(_MEMORY_DIR_PATH)  # Shared across sessions (not per-session)
 SKILLS_DIR = str(Path(__file__).parent / "skills")
+USER_SKILLS_DIR = str(_USER_SKILLS_DIR_PATH)
 SUBAGENTS_CONFIG = Path(__file__).parent / "subagent.yaml"
 
 # =============================================================================
@@ -56,10 +69,10 @@ SYSTEM_PROMPT = get_system_prompt(
     max_iterations=MAX_ITERATIONS,
 )
 
-# Initialize chat model
-chat_model = init_chat_model(
-    model="claude-sonnet-4-5-20250929",
-    model_provider="anthropic",
+# Initialize chat model using the LLM module (respects config settings)
+chat_model = get_chat_model(
+    model=_config.model,
+    provider=_config.provider,
     # thinking={"type": "enabled", "budget_tokens": 2000},
 )
 
@@ -76,16 +89,25 @@ else:
         virtual_mode=True,
     )
 
-# Skills backend: merge user-installed (workspace) and system (package) skills
+# Skills backend: merge user-installed (./skills/) and system (package) skills
 _skills_backend = MergedReadOnlyBackend(
-    primary_dir=str(Path(WORKSPACE_DIR) / "skills"),   # user-installed, takes priority
+    primary_dir=USER_SKILLS_DIR,                        # user-installed, takes priority
     secondary_dir=SKILLS_DIR,                           # package built-in, fallback
 )
 
-# Composite backend: workspace as default, skills mounted at /skills/
+# Memory backend: persistent filesystem for long-term memory (shared across sessions)
+_memory_backend = FilesystemBackend(
+    root_dir=MEMORY_DIR,
+    virtual_mode=True,
+)
+
+# Composite backend: workspace as default, skills and memory mounted
 backend = CompositeBackend(
     default=_workspace_backend,
-    routes={"/skills/": _skills_backend},
+    routes={
+        "/skills/": _skills_backend,
+        "/memory/": _memory_backend,
+    },
 )
 
 tool_registry = {
@@ -107,10 +129,13 @@ subagents = load_subagents(
 _AGENT_KWARGS = dict(
     name="EvoScientist",
     model=chat_model,
-    tools=[think_tool],
+    tools=[think_tool, skill_manager],
     backend=backend,
     subagents=subagents,
-    middleware=[create_skills_middleware(SKILLS_DIR, WORKSPACE_DIR)],
+    middleware=[
+        create_memory_middleware(MEMORY_DIR, extraction_model=chat_model),
+        create_skills_middleware(SKILLS_DIR, user_skills_dir=USER_SKILLS_DIR),
+    ],
     system_prompt=SYSTEM_PROMPT,
 )
 
@@ -124,7 +149,7 @@ def create_cli_agent(workspace_dir: str | None = None):
     Args:
         workspace_dir: Optional per-session workspace directory. If provided,
             creates a fresh backend rooted at this path. If None, uses the
-            module-level default backend (./workspace/).
+            module-level default backend (./workspace).
     """
     from langgraph.checkpoint.memory import InMemorySaver  # type: ignore[import-untyped]
 
@@ -135,14 +160,25 @@ def create_cli_agent(workspace_dir: str | None = None):
             timeout=300,
         )
         sk_backend = MergedReadOnlyBackend(
-            primary_dir=str(Path(workspace_dir) / "skills"),
+            primary_dir=USER_SKILLS_DIR,
             secondary_dir=SKILLS_DIR,
         )
+        # Memory always uses SHARED directory (not per-session) for cross-session persistence
+        mem_backend = FilesystemBackend(
+            root_dir=MEMORY_DIR,
+            virtual_mode=True,
+        )
         be = CompositeBackend(
             default=ws_backend,
-            routes={"/skills/": sk_backend},
+            routes={
+                "/skills/": sk_backend,
+                "/memory/": mem_backend,
+            },
         )
-        mw = [create_skills_middleware(SKILLS_DIR, workspace_dir)]
+        mw = [
+            create_memory_middleware(MEMORY_DIR, extraction_model=chat_model),
+            create_skills_middleware(SKILLS_DIR, user_skills_dir=USER_SKILLS_DIR),
+        ]
         kwargs = dict(
             _AGENT_KWARGS,
             backend=be,

{evoscientist-0.0.1.dev2 → evoscientist-0.0.1.dev4}/EvoScientist/__init__.py

@@ -1,6 +1,14 @@
 """EvoScientist Agent — AI-powered research & code execution."""
 
 from .backends import CustomSandboxBackend, ReadOnlyFilesystemBackend
+from .config import (
+    EvoScientistConfig,
+    load_config,
+    save_config,
+    get_effective_config,
+    get_config_path,
+)
+from .llm import get_chat_model, MODELS, list_models, DEFAULT_MODEL
 from .middleware import create_skills_middleware
 from .prompts import get_system_prompt, RESEARCHER_INSTRUCTIONS
 from .tools import tavily_search, think_tool
@@ -13,6 +21,17 @@ __all__ = [
     # Backends
     "CustomSandboxBackend",
     "ReadOnlyFilesystemBackend",
+    # Configuration
+    "EvoScientistConfig",
+    "load_config",
+    "save_config",
+    "get_effective_config",
+    "get_config_path",
+    # LLM
+    "get_chat_model",
+    "MODELS",
+    "list_models",
+    "DEFAULT_MODEL",
     # Middleware
     "create_skills_middleware",
     # Prompts