EvoScientist 0.0.1.dev6__tar.gz → 0.0.1.dev7__tar.gz

{evoscientist-0.0.1.dev6 → evoscientist-0.0.1.dev7}/EvoScientist/cli/_app.py

@@ -14,7 +14,7 @@ app.add_typer(config_app, name="config")
 
 # MCP subcommand group
 _MCP_HELP = """\
-Configure and manage MCP servers.
+Configure and manage MCP servers
 
 Examples:
   # Add a local MCP server (stdio auto-detected):

{evoscientist-0.0.1.dev6 → evoscientist-0.0.1.dev7}/EvoScientist/cli/commands.py

@@ -36,7 +36,7 @@ def onboard(
         help="Skip API key validation during setup"
     ),
 ):
-    """Interactive setup wizard for EvoScientist.
+    """Interactive setup wizard for EvoScientist
 
     Guides you through configuring API keys, model selection,
     workspace settings, and agent parameters.
@@ -51,14 +51,14 @@ def onboard(
 
 @config_app.callback(invoke_without_command=True)
 def config_callback(ctx: typer.Context):
-    """Configuration management commands."""
+    """Configuration management commands"""
     if ctx.invoked_subcommand is None:
         config_list()
 
 
 @config_app.command("list")
 def config_list():
-    """List all configuration values."""
+    """List all configuration values"""
     from ..config import list_config, get_config_path
 
     config_data = list_config()
@@ -84,7 +84,7 @@ def config_list():
 
 @config_app.command("get")
 def config_get(key: str = typer.Argument(..., help="Configuration key to get")):
-    """Get a single configuration value."""
+    """Get a single configuration value"""
     from ..config import get_config_value
 
     value = get_config_value(key)
@@ -108,7 +108,7 @@ def config_set(
     key: str = typer.Argument(..., help="Configuration key to set"),
     value: str = typer.Argument(..., help="New value"),
 ):
-    """Set a single configuration value."""
+    """Set a single configuration value"""
     from ..config import set_config_value
 
     if set_config_value(key, value):
@@ -122,7 +122,7 @@ def config_set(
 def config_reset(
     yes: bool = typer.Option(False, "--yes", "-y", help="Skip confirmation prompt"),
 ):
-    """Reset configuration to defaults."""
+    """Reset configuration to defaults"""
     from ..config import reset_config, get_config_path
 
     config_path = get_config_path()
@@ -143,7 +143,7 @@ def config_reset(
 
 @config_app.command("path")
 def config_path():
-    """Show the configuration file path."""
+    """Show the configuration file path"""
     from ..config import get_config_path
 
     path = get_config_path()
@@ -158,14 +158,14 @@ def config_path():
 
 @mcp_app.callback(invoke_without_command=True)
 def mcp_callback(ctx: typer.Context):
-    """MCP server management commands."""
+    """MCP server management commands"""
     if ctx.invoked_subcommand is None:
         mcp_list()
 
 
 @mcp_app.command("list")
 def mcp_list():
-    """List configured MCP servers."""
+    """List configured MCP servers"""
     _mcp_list_servers()
 
 
@@ -173,7 +173,7 @@ def mcp_list():
 def mcp_config(
     name: Optional[str] = typer.Argument(None, help="Server name (omit to show all)"),
 ):
-    """Show detailed configuration for MCP servers.
+    """Show detailed configuration for MCP servers
 
     \b
     Examples:
@@ -200,7 +200,7 @@ def mcp_add(
     env: Optional[list[str]] = typer.Option(None, "--env", help="Env var as KEY=VALUE for stdio (repeatable)"),
     env_ref: Optional[list[str]] = typer.Option(None, "--env-ref", help="Env var name as ${NAME} runtime ref (repeatable)"),
 ):
-    """Add an MCP server to user config.
+    """Add an MCP server to user config
 
     \b
     Transport is auto-detected: URLs default to http, commands default to stdio.
@@ -249,7 +249,7 @@ def mcp_edit(
     header: Optional[list[str]] = typer.Option(None, "--header", "-H", help="HTTP header as Key:Value (repeatable)"),
     env: Optional[list[str]] = typer.Option(None, "--env", help="Env var as KEY=VALUE for stdio (repeatable)"),
 ):
-    """Edit an existing MCP server in user config.
+    """Edit an existing MCP server in user config
 
     \b
     Examples:
@@ -278,7 +278,7 @@ def mcp_edit(
 def mcp_remove(
     name: str = typer.Argument(..., help="Server name to remove"),
 ):
-    """Remove an MCP server from user config."""
+    """Remove an MCP server from user config"""
     if not _mcp_remove_server(name, show_reload_hint=False):
         raise typer.Exit(1)
 
@@ -308,7 +308,7 @@ def _main_callback(
     use_cwd: bool = typer.Option(False, "--use-cwd", help="Use current working directory as workspace"),
     no_thinking: bool = typer.Option(False, "--no-thinking", help="Disable thinking display"),
 ):
-    """EvoScientist Agent - AI-powered research & code execution CLI."""
+    """EvoScientist Agent - AI-powered research & code execution CLI"""
     # If a subcommand was invoked, don't run the default behavior
     if ctx.invoked_subcommand is not None:
         return

{evoscientist-0.0.1.dev6 → evoscientist-0.0.1.dev7}/EvoScientist/cli/interactive.py

@@ -349,7 +349,7 @@ def cmd_interactive(
     async def _cmd_threads():
         """Handle /threads command — show recent sessions."""
         threads = await list_threads(
-            limit=20, include_message_count=True, include_preview=True,
+            limit=0, include_message_count=True, include_preview=True,
         )
         if not threads:
             console.print("[yellow]No saved sessions.[/yellow]")
@@ -423,7 +423,7 @@ def cmd_interactive(
         if not arg:
             # Show interactive session picker with conversation previews
             threads = await list_threads(
-                limit=10, include_message_count=True, include_preview=True,
+                limit=0, include_message_count=True, include_preview=True,
             )
             if not threads:
                 console.print("[yellow]No sessions to resume.[/yellow]")
@@ -453,11 +453,20 @@ def cmd_interactive(
                 label = f"{_pad_to_width(left_text, col_width)}({tid} {when})"
                 choices.append(questionary.Choice(title=label, value=tid))
 
-            selected = questionary.select(
+            from prompt_toolkit.layout.dimension import Dimension
+            from questionary.prompts.common import InquirerControl
+
+            prompt = questionary.select(
                 "Select session to resume:",
                 choices=choices,
                 style=_PICKER_STYLE,
-            ).ask()
+            )
+            # Limit visible list to 10 rows with scrolling
+            for window in prompt.application.layout.find_all_windows():
+                if isinstance(window.content, InquirerControl):
+                    window.height = Dimension(max=10)
+                    break
+            selected = prompt.ask()
 
             if selected is None:
                 return

{evoscientist-0.0.1.dev6 → evoscientist-0.0.1.dev7}/EvoScientist/config.py

@@ -63,6 +63,10 @@ class EvoScientistConfig:
     openai_api_key: str = ""
     nvidia_api_key: str = ""
     google_api_key: str = ""
+    siliconflow_api_key: str = ""
+    openrouter_api_key: str = ""
+    custom_api_key: str = ""
+    custom_base_url: str = ""
     tavily_api_key: str = ""
 
     # LLM Settings
@@ -213,6 +217,10 @@ _ENV_MAPPINGS = {
     "openai_api_key": "OPENAI_API_KEY",
     "nvidia_api_key": "NVIDIA_API_KEY",
     "google_api_key": "GOOGLE_API_KEY",
+    "siliconflow_api_key": "SILICONFLOW_API_KEY",
+    "openrouter_api_key": "OPENROUTER_API_KEY",
+    "custom_api_key": "CUSTOM_API_KEY",
+    "custom_base_url": "CUSTOM_BASE_URL",
     "tavily_api_key": "TAVILY_API_KEY",
     "default_mode": "EVOSCIENTIST_DEFAULT_MODE",
     "default_workdir": "EVOSCIENTIST_WORKSPACE_DIR",
@@ -281,5 +289,13 @@ def apply_config_to_env(config: EvoScientistConfig) -> None:
         os.environ["NVIDIA_API_KEY"] = config.nvidia_api_key
     if config.google_api_key and not os.environ.get("GOOGLE_API_KEY"):
         os.environ["GOOGLE_API_KEY"] = config.google_api_key
+    if config.siliconflow_api_key and not os.environ.get("SILICONFLOW_API_KEY"):
+        os.environ["SILICONFLOW_API_KEY"] = config.siliconflow_api_key
+    if config.openrouter_api_key and not os.environ.get("OPENROUTER_API_KEY"):
+        os.environ["OPENROUTER_API_KEY"] = config.openrouter_api_key
+    if config.custom_api_key and not os.environ.get("CUSTOM_API_KEY"):
+        os.environ["CUSTOM_API_KEY"] = config.custom_api_key
+    if config.custom_base_url and not os.environ.get("CUSTOM_BASE_URL"):
+        os.environ["CUSTOM_BASE_URL"] = config.custom_base_url
     if config.tavily_api_key and not os.environ.get("TAVILY_API_KEY"):
         os.environ["TAVILY_API_KEY"] = config.tavily_api_key

{evoscientist-0.0.1.dev6 → evoscientist-0.0.1.dev7}/EvoScientist/llm/__init__.py

@@ -8,6 +8,7 @@ from .models import (
     MODELS,
     DEFAULT_MODEL,
     get_chat_model,
+    get_models_for_provider,
     list_models,
     get_model_info,
 )
@@ -16,6 +17,7 @@ __all__ = [
     "MODELS",
     "DEFAULT_MODEL",
     "get_chat_model",
+    "get_models_for_provider",
     "list_models",
     "get_model_info",
 ]

evoscientist-0.0.1.dev7/EvoScientist/llm/models.py

@@ -0,0 +1,193 @@
+"""LLM model configuration based on LangChain init_chat_model.
+
+This module provides a unified interface for creating chat model instances
+with support for multiple providers (Anthropic, OpenAI) and convenient
+short names for common models.
+"""
+
+from __future__ import annotations
+
+import os
+from typing import Any
+
+from langchain.chat_models import init_chat_model
+
+_SILICONFLOW_BASE_URL = "https://api.siliconflow.cn/v1"
+_OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1"
+
+# Model registry: list of (short_name, model_id, provider)
+# Allows same short_name across different providers.
+_MODEL_ENTRIES: list[tuple[str, str, str]] = [
+    # Anthropic (ordered by capability)
+    ("claude-opus-4-6", "claude-opus-4-6", "anthropic"),
+    ("claude-opus-4-5", "claude-opus-4-5-20251101", "anthropic"),
+    ("claude-sonnet-4-5", "claude-sonnet-4-5-20250929", "anthropic"),
+    ("claude-haiku-4-5", "claude-haiku-4-5-20251001", "anthropic"),
+    # OpenAI
+    ("gpt-5.2-codex", "gpt-5.2-codex", "openai"),
+    ("gpt-5.2", "gpt-5.2-2025-12-11", "openai"),
+    ("gpt-5.1", "gpt-5.1-2025-11-13", "openai"),
+    ("gpt-5", "gpt-5-2025-08-07", "openai"),
+    ("gpt-5-mini", "gpt-5-mini-2025-08-07", "openai"),
+    ("gpt-5-nano", "gpt-5-nano-2025-08-07", "openai"),
+    # Google GenAI
+    ("gemini-3-pro", "gemini-3-pro-preview", "google-genai"),
+    ("gemini-3-flash", "gemini-3-flash-preview", "google-genai"),
+    ("gemini-2.5-flash", "gemini-2.5-flash", "google-genai"),
+    ("gemini-2.5-flash-lite", "gemini-2.5-flash-lite", "google-genai"),
+    ("gemini-2.5-pro", "gemini-2.5-pro", "google-genai"),
+    # NVIDIA
+    ("glm4.7", "z-ai/glm4.7", "nvidia"),
+    ("deepseek-v3.2", "deepseek-ai/deepseek-v3.2", "nvidia"),
+    ("deepseek-v3.1", "deepseek-ai/deepseek-v3.1-terminus", "nvidia"),
+    ("kimi-k2.5", "moonshotai/kimi-k2.5", "nvidia"),
+    ("kimi-k2-thinking", "moonshotai/kimi-k2-thinking", "nvidia"),
+    ("minimax-m2.1", "minimaxai/minimax-m2.1", "nvidia"),
+    ("step-3.5-flash", "stepfun-ai/step-3.5-flash", "nvidia"),
+    ("nemotron-nano", "nvidia/nemotron-3-nano-30b-a3b", "nvidia"),
+]
+
+# Public dict for simple lookups (last entry wins for duplicate names).
+# Use get_models_for_provider() for provider-aware lookups.
+MODELS: dict[str, tuple[str, str]] = {
+    name: (model_id, provider) for name, model_id, provider in _MODEL_ENTRIES
+}
+
+DEFAULT_MODEL = "claude-sonnet-4-5"
+
+
+def get_models_for_provider(provider: str) -> list[tuple[str, str]]:
+    """Get all models for a specific provider.
+
+    Args:
+        provider: Provider name (e.g., 'anthropic', 'openrouter').
+
+    Returns:
+        List of (short_name, model_id) tuples for the provider.
+    """
+    return [
+        (name, model_id)
+        for name, model_id, p in _MODEL_ENTRIES
+        if p == provider
+    ]
+
+
+def get_chat_model(
+    model: str | None = None,
+    provider: str | None = None,
+    **kwargs: Any,
+) -> Any:
+    """Get a chat model instance.
+
+    Args:
+        model: Model name (short name like 'claude-sonnet-4-5' or full ID
+               like 'claude-sonnet-4-5-20250929'). Defaults to DEFAULT_MODEL.
+        provider: Override the provider (e.g., 'anthropic', 'openai').
+                  If not specified, inferred from model name or defaults to 'anthropic'.
+        **kwargs: Additional arguments passed to init_chat_model (e.g., temperature).
+
+    Returns:
+        A LangChain chat model instance.
+
+    Examples:
+        >>> model = get_chat_model()  # Uses default (claude-sonnet-4-5)
+        >>> model = get_chat_model("claude-opus-4-5")  # Use short name
+        >>> model = get_chat_model("gpt-4o")  # OpenAI model
+        >>> model = get_chat_model("claude-3-opus-20240229", provider="anthropic")  # Full ID
+    """
+    model = model or DEFAULT_MODEL
+
+    # Look up short name in registry (provider-aware)
+    model_id = None
+    if provider:
+        # Try exact match with provider first
+        for name, mid, p in _MODEL_ENTRIES:
+            if name == model and p == provider:
+                model_id = mid
+                break
+    if model_id is None and model in MODELS:
+        model_id, default_provider = MODELS[model]
+        provider = provider or default_provider
+
+    if model_id is None:
+        # Assume it's a full model ID
+        model_id = model
+        # Try to infer provider from model ID prefix
+        if provider is None:
+            if model_id.startswith(("claude-", "anthropic")):
+                provider = "anthropic"
+            elif model_id.startswith(("gpt-", "o1", "davinci", "text-")):
+                provider = "openai"
+            elif model_id.startswith("gemini"):
+                provider = "google-genai"
+            elif "/" in model_id:
+                provider = "nvidia"
+            else:
+                provider = "anthropic"  # Default fallback
+
+    # SiliconFlow / OpenRouter / Custom → route through OpenAI provider with base_url
+    _is_third_party = provider in ("siliconflow", "openrouter", "custom")
+    if provider == "custom":
+        base_url = os.environ.get("CUSTOM_BASE_URL", "")
+        if base_url:
+            kwargs["base_url"] = base_url
+        api_key = os.environ.get("CUSTOM_API_KEY", "")
+        if api_key:
+            kwargs["api_key"] = api_key
+        provider = "openai"
+    elif provider == "siliconflow":
+        kwargs["base_url"] = _SILICONFLOW_BASE_URL
+        api_key = os.environ.get("SILICONFLOW_API_KEY", "")
+        if api_key:
+            kwargs["api_key"] = api_key
+        provider = "openai"
+    elif provider == "openrouter":
+        kwargs["base_url"] = _OPENROUTER_BASE_URL
+        api_key = os.environ.get("OPENROUTER_API_KEY", "")
+        if api_key:
+            kwargs["api_key"] = api_key
+        provider = "openai"
+
+    # Auto-enable thinking for Anthropic models
+    if provider == "anthropic" and "thinking" not in kwargs:
+        if model_id.startswith("claude-opus-4-6"):
+            kwargs["thinking"] = {"type": "adaptive"}
+        else:
+            kwargs["thinking"] = {"type": "enabled", "budget_tokens": 2000}
+
+    # Auto-enable reasoning for OpenAI models (not for third-party routed)
+    if provider == "openai" and not _is_third_party and "reasoning" not in kwargs:
+        kwargs["reasoning"] = {"effort": "medium", "summary": "auto"}
+
+    # Auto-enable thinking visibility for Google GenAI models
+    if provider == "google-genai":
+        kwargs.setdefault("include_thoughts", True)
+
+    return init_chat_model(model=model_id, model_provider=provider, **kwargs)
+
+
+def list_models() -> list[str]:
+    """List all available model short names.
+
+    Returns:
+        List of unique model short names that can be passed to get_chat_model().
+    """
+    seen = set()
+    result = []
+    for name, _, _ in _MODEL_ENTRIES:
+        if name not in seen:
+            seen.add(name)
+            result.append(name)
+    return result
+
+
+def get_model_info(model: str) -> tuple[str, str] | None:
+    """Get the (model_id, provider) tuple for a short name.
+
+    Args:
+        model: Short model name.
+
+    Returns:
+        Tuple of (model_id, provider) or None if not found.
+    """
+    return MODELS.get(model)

{evoscientist-0.0.1.dev6 → evoscientist-0.0.1.dev7}/EvoScientist/memory.py

@@ -302,8 +302,7 @@ def _merge_memory(existing_md: str, extracted: dict[str, Any]) -> str:
             if value and value != "null":
                 # Replace the line  "- **Label**: ..." with new value
                 pattern = rf"(- \*\*{label}\*\*: ).*"
-                replacement = rf"\g<1>{value}"
-                result = re.sub(pattern, replacement, result)
+                result = re.sub(pattern, lambda m: m.group(1) + value, result)
 
     # --- Research Preferences ---
     prefs = extracted.get("research_preferences")
@@ -320,8 +319,7 @@ def _merge_memory(existing_md: str, extracted: dict[str, Any]) -> str:
             value = prefs.get(key)
             if value and value != "null":
                 pattern = rf"(- \*\*{label}\*\*: ).*"
-                replacement = rf"\g<1>{value}"
-                result = re.sub(pattern, replacement, result)
+                result = re.sub(pattern, lambda m: m.group(1) + value, result)
 
     # --- Experiment History (append) ---
     exp = extracted.get("experiment_conclusion")