vbagent 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

vbagent/agents/base.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Optional
 if TYPE_CHECKING:
     from agents import Agent, ModelSettings
 
-from vbagent.config import get_model, get_model_settings
+from vbagent.config import get_model, get_model_settings, apply_provider_config
 
 
 def _get_agent_class():
@@ -115,6 +115,9 @@ def create_agent(
     """
     Agent = _get_agent_class()
     
+    # Apply provider config (base_url, api_key) before creating agent
+    apply_provider_config()
+    
     # Get model and settings from config if not explicitly provided
     if model is None:
         model = get_model(agent_type or "default")

vbagent/agents/classifier.py

@@ -1,32 +1,56 @@
-"""Classifier agent for physics question image classification.
+"""Classifier agent for question image classification.
 
-Uses openai-agents SDK to analyze physics question images and extract
+Uses openai-agents SDK to analyze question images and extract
 structured metadata including question type, difficulty, topic, etc.
 """
 
+from typing import TYPE_CHECKING, Optional
+
+if TYPE_CHECKING:
+    from agents import Agent
+
 from vbagent.agents.base import (
     create_agent,
     create_image_message,
     run_agent_sync,
 )
+from vbagent.config import get_config
 from vbagent.models.classification import ClassificationResult
-from vbagent.prompts.classifier import SYSTEM_PROMPT, USER_TEMPLATE
+from vbagent.prompts.classifier import get_classifier_prompt, get_user_template
 
 
-# Create the classifier agent with structured output
-classifier_agent = create_agent(
-    name="Classifier",
-    instructions=SYSTEM_PROMPT,
-    output_type=ClassificationResult,
-    agent_type="classifier",
-)
+def create_classifier_agent(subject: Optional[str] = None) -> "Agent":
+    """Create a classifier agent for a subject.
+    
+    Args:
+        subject: Subject override (uses config if not provided)
+        
+    Returns:
+        Configured Agent instance for classification
+    """
+    if subject is None:
+        subject = get_config().subject
+    
+    prompt = get_classifier_prompt(subject)
+    
+    return create_agent(
+        name=f"Classifier-{subject}",
+        instructions=prompt,
+        output_type=ClassificationResult,
+        agent_type="classifier",
+    )
 
 
-def classify(image_path: str) -> ClassificationResult:
-    """Analyze a physics question image and return structured metadata.
+# Legacy: Create default classifier agent for backward compatibility
+classifier_agent = create_classifier_agent("physics")
+
+
+def classify(image_path: str, subject: Optional[str] = None) -> ClassificationResult:
+    """Analyze a question image and return structured metadata.
     
     Args:
         image_path: Path to the image file to classify
+        subject: Subject override (uses config if not provided)
         
     Returns:
         ClassificationResult with extracted metadata
@@ -34,6 +58,11 @@ def classify(image_path: str) -> ClassificationResult:
     Raises:
         FileNotFoundError: If the image file doesn't exist
     """
-    message = create_image_message(image_path, USER_TEMPLATE)
-    result = run_agent_sync(classifier_agent, message)
+    if subject is None:
+        subject = get_config().subject
+    
+    agent = create_classifier_agent(subject)
+    user_template = get_user_template(subject)
+    message = create_image_message(image_path, user_template)
+    result = run_agent_sync(agent, message)
     return result

vbagent/agents/compile_fixer.py

@@ -0,0 +1,57 @@
+"""Agent for fixing LaTeX compilation errors.
+
+Takes a LaTeX snippet and pdflatex error output, returns corrected LaTeX.
+"""
+
+from vbagent.agents.base import create_agent, run_agent_sync
+
+
+SYSTEM_PROMPT = r"""You are a LaTeX error fixer. You receive LaTeX code that failed to compile and the pdflatex error output.
+
+Your job:
+1. Read the error messages carefully
+2. Fix ONLY the errors — do not change the content or structure
+3. Common fixes: missing braces, undefined commands, wrong environment names, missing $ delimiters
+4. Output ONLY the corrected LaTeX code — no explanations, no markdown, no code blocks
+
+CRITICAL: Output the EXACT same content with ONLY the compilation errors fixed. Do not add \documentclass, preamble, or any wrapping."""
+
+USER_TEMPLATE = """Fix the compilation errors in this LaTeX code.
+
+**Errors from pdflatex:**
+```
+{errors}
+```
+
+**LaTeX code to fix:**
+```latex
+{latex}
+```
+
+Output ONLY the corrected LaTeX code:"""
+
+
+def fix_latex(error_summary: str, latex: str) -> str:
+    """Send LaTeX + errors to agent and get fixed version.
+
+    Args:
+        error_summary: Parsed pdflatex error output
+        latex: The LaTeX code that failed to compile
+
+    Returns:
+        Corrected LaTeX code
+    """
+    agent = create_agent(
+        name="LaTeX-Fixer",
+        instructions=SYSTEM_PROMPT,
+        agent_type="converter",  # Use converter model (lighter/cheaper)
+    )
+
+    prompt = USER_TEMPLATE.format(errors=error_summary, latex=latex)
+    result = run_agent_sync(agent, prompt)
+
+    # Clean markdown artifacts
+    import re
+    result = re.sub(r'^```(?:latex|tex)?\s*\n?', '', result, flags=re.IGNORECASE)
+    result = re.sub(r'\n?```\s*$', '', result)
+    return result.strip()

vbagent/agents/scanner.py

@@ -1,11 +1,11 @@
-"""Scanner agent for extracting LaTeX from physics question images.
+"""Scanner agent for extracting LaTeX from question images.
 
-Uses openai-agents SDK to analyze physics question images and extract
-LaTeX code using type-specific prompts.
+Uses openai-agents SDK to analyze question images and extract
+LaTeX code using type-specific and subject-specific prompts.
 """
 
 import re
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 if TYPE_CHECKING:
     from agents import Agent
@@ -15,9 +15,10 @@ from vbagent.agents.base import (
     create_image_message,
     run_agent_sync,
 )
+from vbagent.config import get_config
 from vbagent.models.classification import ClassificationResult
 from vbagent.models.scan import ScanResult
-from vbagent.prompts.scanner import get_scanner_prompt, USER_TEMPLATE
+from vbagent.prompts.scanner import get_scanner_prompt, get_user_template
 from vbagent.references.context import get_context_prompt_section
 
 
@@ -51,17 +52,26 @@ def clean_latex_output(latex: str) -> str:
     return latex.strip()
 
 
-def create_scanner_agent(question_type: str, use_context: bool = True) -> "Agent":
+def create_scanner_agent(
+    question_type: str,
+    use_context: bool = True,
+    subject: Optional[str] = None,
+) -> "Agent":
     """Create a scanner agent with type-specific prompt.
     
     Args:
         question_type: The type of question (mcq_sc, mcq_mc, etc.)
         use_context: Whether to include reference context in prompt
+        subject: Subject override (uses config if not provided)
         
     Returns:
         Configured Agent instance for scanning that question type
     """
-    prompt = get_scanner_prompt(question_type)
+    # Get subject from config if not provided
+    if subject is None:
+        subject = get_config().subject
+    
+    prompt = get_scanner_prompt(question_type, subject)
     
     # Add reference context if enabled
     context = get_context_prompt_section("latex", use_context)
@@ -69,7 +79,7 @@ def create_scanner_agent(question_type: str, use_context: bool = True) -> "Agent
         prompt = prompt + "\n" + context
     
     return create_agent(
-        name=f"Scanner-{question_type}",
+        name=f"Scanner-{question_type}-{subject}",
         instructions=prompt,
         agent_type="scanner",
     )
@@ -79,8 +89,9 @@ def scan(
     image_path: str,
     classification: ClassificationResult,
     use_context: bool = True,
+    subject: Optional[str] = None,
 ) -> ScanResult:
-    """Extract LaTeX from a physics question image.
+    """Extract LaTeX from a question image.
     
     Uses the classification result to select the appropriate prompt
     for the question type.
@@ -89,6 +100,7 @@ def scan(
         image_path: Path to the image file to scan
         classification: Classification result with question type info
         use_context: Whether to include reference context in prompt
+        subject: Subject override (uses config if not provided)
         
     Returns:
         ScanResult with extracted LaTeX and diagram info
@@ -96,8 +108,13 @@ def scan(
     Raises:
         FileNotFoundError: If the image file doesn't exist
     """
-    agent = create_scanner_agent(classification.question_type, use_context)
-    message = create_image_message(image_path, USER_TEMPLATE)
+    # Get subject from config if not provided
+    if subject is None:
+        subject = get_config().subject
+    
+    agent = create_scanner_agent(classification.question_type, use_context, subject)
+    user_template = get_user_template(subject)
+    message = create_image_message(image_path, user_template)
     raw_latex = run_agent_sync(agent, message)
     
     # Clean up markdown artifacts from LLM output
@@ -114,8 +131,9 @@ def scan_with_type(
     image_path: str,
     question_type: str,
     use_context: bool = True,
+    subject: Optional[str] = None,
 ) -> ScanResult:
-    """Extract LaTeX from a physics question image with explicit type.
+    """Extract LaTeX from a question image with explicit type.
     
     Bypasses classification and uses the provided question type directly.
     
@@ -123,6 +141,7 @@ def scan_with_type(
         image_path: Path to the image file to scan
         question_type: The type of question (mcq_sc, mcq_mc, etc.)
         use_context: Whether to include reference context in prompt
+        subject: Subject override (uses config if not provided)
         
     Returns:
         ScanResult with extracted LaTeX
@@ -130,8 +149,13 @@ def scan_with_type(
     Raises:
         FileNotFoundError: If the image file doesn't exist
     """
-    agent = create_scanner_agent(question_type, use_context)
-    message = create_image_message(image_path, USER_TEMPLATE)
+    # Get subject from config if not provided
+    if subject is None:
+        subject = get_config().subject
+    
+    agent = create_scanner_agent(question_type, use_context, subject)
+    user_template = get_user_template(subject)
+    message = create_image_message(image_path, user_template)
     raw_latex = run_agent_sync(agent, message)
     
     # Clean up markdown artifacts from LLM output

vbagent/cli/config.py

@@ -9,9 +9,18 @@ from vbagent.config import (
     get_config,
     save_config,
     reset_config,
+    init_workspace,
+    has_workspace_config,
+    get_workspace_config_path,
+    get_provider_name,
+    apply_model_group,
     AGENT_TYPES,
     MODELS,
+    MODEL_GROUPS,
+    SUBJECTS,
+    PROVIDERS,
     CONFIG_FILE,
+    WORKSPACE_CONFIG_FILE,
 )
 
 
@@ -64,6 +73,13 @@ def show():
     console = _get_console()
     cfg = get_config()
     
+    # Show config source
+    workspace_path = get_workspace_config_path()
+    if workspace_path:
+        console.print(f"[dim]Using workspace config: {workspace_path}[/dim]\n")
+    else:
+        console.print(f"[dim]Using global config: {CONFIG_FILE}[/dim]\n")
+    
     # Create table
     table = _get_table(title="Agent Model Configuration")
     table.add_column("Agent", style="cyan")
@@ -95,10 +111,21 @@ def show():
     
     console.print(table)
     
-    # Show available models and config location
-    console.print("\n[dim]Available models:[/dim]")
-    console.print(f"[dim]{', '.join(MODELS.keys())}[/dim]")
-    console.print(f"\n[dim]Config file: {CONFIG_FILE}[/dim]")
+    # Show subject and provider
+    console.print(f"\n[bold]Subject:[/bold] {cfg.subject}")
+    console.print(f"[bold]Provider:[/bold] {get_provider_name()}")
+    if cfg.base_url:
+        console.print(f"[bold]Base URL:[/bold] {cfg.base_url}")
+    if cfg.api_key:
+        # Mask the API key
+        masked = cfg.api_key[:8] + "..." + cfg.api_key[-4:] if len(cfg.api_key) > 12 else "***"
+        console.print(f"[bold]API Key:[/bold] {masked}")
+    
+    # Show available models
+    console.print(f"\n[dim]Available models: {', '.join(MODELS.keys())}[/dim]")
+    console.print(f"[dim]Available subjects: {', '.join(SUBJECTS)}[/dim]")
+    console.print(f"[dim]Known providers: {', '.join(PROVIDERS.keys())}[/dim]")
+    console.print(f"[dim]Model groups: {', '.join(MODEL_GROUPS.keys())}[/dim]")
 
 
 @config.command()
@@ -111,7 +138,8 @@ def show():
 )
 @click.option("--temperature", "-t", type=float, help="Temperature (0.0-2.0)")
 @click.option("--max-tokens", type=int, help="Maximum tokens")
-def set(agent_type: str, model: str, reasoning: str, temperature: float, max_tokens: int):
+@click.option("--workspace", "-w", is_flag=True, help="Save to workspace config instead of global")
+def set(agent_type: str, model: str, reasoning: str, temperature: float, max_tokens: int, workspace: bool):
     """Set model configuration for an agent type.
     
     \b
@@ -123,6 +151,7 @@ def set(agent_type: str, model: str, reasoning: str, temperature: float, max_tok
         vbagent config set scanner --model gpt-4o
         vbagent config set variant --model o1-mini --reasoning medium
         vbagent config set default --model gpt-4.1
+        vbagent config set scanner -m gpt-4o --workspace  # Save to .vbagent.json
     """
     console = _get_console()
     cfg = get_config()
@@ -146,7 +175,7 @@ def set(agent_type: str, model: str, reasoning: str, temperature: float, max_tok
         console.print(f"[green]✓[/green] Updated {agent_type} configuration")
     
     # Save to file
-    save_config()
+    config_path = save_config(workspace=workspace)
     
     # Show updated config
     if agent_type == "default":
@@ -161,15 +190,19 @@ def set(agent_type: str, model: str, reasoning: str, temperature: float, max_tok
         if agent_cfg.max_tokens:
             console.print(f"  Max Tokens: {agent_cfg.max_tokens}")
     
-    console.print(f"\n[dim]Saved to: {CONFIG_FILE}[/dim]")
+    console.print(f"\n[dim]Saved to: {config_path}[/dim]")
 
 
 @config.command()
-def reset():
-    """Reset all configurations to defaults."""
+@click.option("--workspace", "-w", is_flag=True, help="Reset workspace config instead of global")
+def reset(workspace: bool):
+    """Reset configuration to defaults."""
     console = _get_console()
-    reset_config()
-    console.print("[green]✓[/green] Configuration reset to defaults")
+    reset_config(workspace=workspace)
+    if workspace:
+        console.print("[green]✓[/green] Workspace configuration removed")
+    else:
+        console.print("[green]✓[/green] Global configuration reset to defaults")
 
 
 @config.command()
@@ -178,14 +211,215 @@ def models():
     console = _get_console()
     console.print("[bold]Available Models:[/bold]\n")
     
-    # Group models
+    # Group models by provider
     gpt_models = [m for m in MODELS.keys() if m.startswith("gpt")]
-    o_models = [m for m in MODELS.keys() if m.startswith("o")]
+    grok_models = [m for m in MODELS.keys() if m.startswith("grok")]
+    gemini_models = [m for m in MODELS.keys() if m.startswith("gemini")]
+    
+    if gpt_models:
+        console.print("[cyan]OpenAI:[/cyan]")
+        for m in gpt_models:
+            console.print(f"  • {m}")
+    
+    if grok_models:
+        console.print("\n[cyan]xAI Grok:[/cyan]")
+        for m in grok_models:
+            console.print(f"  • {m}")
+    
+    if gemini_models:
+        console.print("\n[cyan]Google Gemini:[/cyan]")
+        for m in gemini_models:
+            console.print(f"  • {m}")
+    
+    console.print(f"\n[dim]Model groups available: {', '.join(MODEL_GROUPS.keys())}[/dim]")
+    console.print("[dim]Use 'vbagent config model-group' to view/apply groups[/dim]")
+
+
+
+@config.command()
+@click.option("--force", "-f", is_flag=True, help="Overwrite existing workspace config")
+@click.option("--quick", "-q", is_flag=True, help="Quick mode - only ask for subject")
+@click.option("--yes", "-y", is_flag=True, help="Non-interactive mode with defaults")
+@click.pass_context
+def init(ctx, force: bool, quick: bool, yes: bool):
+    """Initialize workspace config interactively.
+    
+    Creates .vbagent.json in current directory with customized settings.
+    This is an alias for `vbagent init`.
+    
+    \b
+    Examples:
+        vbagent config init              # Interactive setup
+        vbagent config init --quick      # Only ask for subject
+        vbagent config init --yes        # Use all defaults
+        vbagent config init --force      # Overwrite existing
+    """
+    # Import and invoke the main init command
+    from vbagent.cli.init import init as main_init
+    ctx.invoke(main_init, force=force, quick=quick, yes=yes)
+
+
+@config.command()
+@click.argument("subject", type=click.Choice(SUBJECTS))
+@click.option("--workspace", "-w", is_flag=True, help="Set in workspace config")
+def subject(subject: str, workspace: bool):
+    """Set the subject for prompts.
+    
+    \b
+    Subjects:
+        physics      - Physics problems (default)
+        chemistry    - Chemistry problems
+        mathematics  - Mathematics problems
+        biology      - Biology problems
+    
+    \b
+    Examples:
+        vbagent config subject chemistry
+        vbagent config subject physics --workspace
+    """
+    console = _get_console()
+    cfg = get_config()
+    cfg.subject = subject
+    config_path = save_config(workspace=workspace)
+    console.print(f"[green]✓[/green] Subject set to: {subject}")
+    console.print(f"[dim]Saved to: {config_path}[/dim]")
+
+
+
+@config.command()
+@click.argument("provider", required=False)
+@click.option("--base-url", "-b", help="Custom base URL")
+@click.option("--api-key", "-k", help="API key for the provider")
+@click.option("--no-models", is_flag=True, help="Don't auto-switch agent models")
+@click.option("--workspace", "-w", is_flag=True, help="Save to workspace config")
+def provider(provider: str, base_url: str, api_key: str, no_models: bool, workspace: bool):
+    """Set the API provider (openai, xai, google, or custom URL).
+    
+    Switching providers auto-applies the matching model group so every
+    agent gets the right model. Use --no-models to skip this.
+    
+    \b
+    Known Providers:
+        openai  - OpenAI (default, no base_url needed)
+        xai     - xAI Grok (https://api.x.ai/v1)
+        google  - Google Gemini (OpenAI-compatible endpoint)
+    
+    \b
+    Examples:
+        vbagent config provider openai
+        vbagent config provider xai --api-key xai-xxx
+        vbagent config provider xai --workspace
+        vbagent config provider xai --no-models   # keep current models
+        vbagent config provider --base-url https://custom.api/v1
+    """
+    console = _get_console()
+    cfg = get_config()
+    
+    resolved_provider = None
+    
+    if provider and provider in PROVIDERS:
+        cfg.base_url = PROVIDERS[provider]["base_url"]
+        resolved_provider = provider
+        console.print(f"[green]✓[/green] Provider: {provider}")
+        if PROVIDERS[provider]["base_url"]:
+            console.print(f"  Base URL: {PROVIDERS[provider]['base_url']}")
+            env_key = PROVIDERS[provider]["env_key"]
+            console.print(f"  API key env var: {env_key}")
+        else:
+            console.print("  Base URL: [dim]default (OpenAI)[/dim]")
+    elif base_url:
+        cfg.base_url = base_url
+        # Try to detect provider from custom URL
+        from vbagent.config import _provider_from_base_url
+        resolved_provider = _provider_from_base_url(base_url)
+        console.print(f"[green]✓[/green] Base URL: {base_url}")
+    elif provider:
+        console.print(f"[yellow]Unknown provider '{provider}'[/yellow]")
+        console.print(f"[dim]Known: {', '.join(PROVIDERS.keys())}[/dim]")
+        console.print("[dim]Or use --base-url for custom endpoints[/dim]")
+        return
     
-    console.print("[cyan]GPT Models:[/cyan]")
-    for m in gpt_models:
-        console.print(f"  • {m}")
+    if api_key:
+        cfg.api_key = api_key
+        masked = api_key[:8] + "..." + api_key[-4:] if len(api_key) > 12 else "***"
+        console.print(f"[green]✓[/green] API Key: {masked}")
     
-    console.print("\n[cyan]Reasoning Models (o-series):[/cyan]")
-    for m in o_models:
-        console.print(f"  • {m}")
+    # Auto-apply model group when switching providers
+    if resolved_provider and not no_models and resolved_provider in MODEL_GROUPS:
+        apply_model_group(cfg, resolved_provider)
+        console.print(f"[green]✓[/green] Applied [bold]{resolved_provider}[/bold] model group")
+        # Show the models that were set
+        table = _get_table(title=f"Model Group: {resolved_provider}")
+        table.add_column("Agent", style="cyan")
+        table.add_column("Model", style="green")
+        table.add_row("[bold]default[/bold]", cfg.default_model, style="dim")
+        for agent_type in AGENT_TYPES:
+            table.add_row(agent_type, getattr(cfg, agent_type).model)
+        console.print(table)
+    
+    if not provider and not base_url and not api_key:
+        # Show current provider info
+        console.print(f"[bold]Current provider:[/bold] {get_provider_name()}")
+        if cfg.base_url:
+            console.print(f"  Base URL: {cfg.base_url}")
+        if cfg.api_key:
+            masked = cfg.api_key[:8] + "..." + cfg.api_key[-4:] if len(cfg.api_key) > 12 else "***"
+            console.print(f"  API Key: {masked}")
+        console.print(f"\n[dim]Known providers: {', '.join(PROVIDERS.keys())}[/dim]")
+        console.print(f"[dim]Model groups: {', '.join(MODEL_GROUPS.keys())}[/dim]")
+        return
+    
+    config_path = save_config(workspace=workspace)
+    console.print(f"[dim]Saved to: {config_path}[/dim]")
+
+
+@config.command("model-group")
+@click.argument("group_name", required=False, type=click.Choice(list(MODEL_GROUPS.keys())))
+@click.option("--workspace", "-w", is_flag=True, help="Save to workspace config")
+def model_group(group_name: str, workspace: bool):
+    """View or apply a model group.
+    
+    Model groups are pre-configured sets of models for each agent,
+    optimized per provider. Switching providers auto-applies the
+    matching group, but you can also apply one manually.
+    
+    \b
+    Examples:
+        vbagent config model-group              # List all groups
+        vbagent config model-group openai       # Apply OpenAI group
+        vbagent config model-group xai          # Apply xAI group
+        vbagent config model-group google -w    # Apply Google group to workspace
+    """
+    console = _get_console()
+    
+    if not group_name:
+        # Show all model groups
+        for name, group in MODEL_GROUPS.items():
+            table = _get_table(title=f"Model Group: {name}")
+            table.add_column("Agent", style="cyan")
+            table.add_column("Model", style="green")
+            table.add_row("[bold]default[/bold]", group["default_model"], style="dim")
+            for agent_type in AGENT_TYPES:
+                if agent_type in group:
+                    table.add_row(agent_type, group[agent_type])
+            console.print(table)
+            console.print()
+        return
+    
+    cfg = get_config()
+    apply_model_group(cfg, group_name)
+    config_path = save_config(workspace=workspace)
+    
+    console.print(f"[green]✓[/green] Applied [bold]{group_name}[/bold] model group")
+    if cfg.base_url:
+        console.print(f"  Base URL: {cfg.base_url}")
+    else:
+        console.print("  Base URL: [dim]default (OpenAI)[/dim]")
+    table = _get_table(title=f"Model Group: {group_name}")
+    table.add_column("Agent", style="cyan")
+    table.add_column("Model", style="green")
+    table.add_row("[bold]default[/bold]", cfg.default_model, style="dim")
+    for agent_type in AGENT_TYPES:
+        table.add_row(agent_type, getattr(cfg, agent_type).model)
+    console.print(table)
+    console.print(f"[dim]Saved to: {config_path}[/dim]")