replace Weaver's custom credential management with a lightweight abstraction layer that leverages litellm's native credential resolution

Author: adv-11

weaver.toml

@@ -0,0 +1,31 @@
+# Example weaver.toml configuration file
+# Place this in your project root or home directory
+
+# litellm-specific configuration
+[litellm]
+# Enable verbose logging for debugging
+set_verbose = true
+
+# Drop parameters that aren't supported by certain providers
+drop_params = true
+
+# Custom API bases for different providers (optional)
+[api_bases]
+# Use a custom OpenAI-compatible endpoint
+# openai = "https://api.custom-openai.com/v1"
+
+# Use Azure OpenAI
+# azure = "https://your-resource.openai.azure.com"
+
+# Example credentials (these would typically be set as environment variables instead)
+# [credentials]
+# openai_api_key = "sk-..."
+# anthropic_api_key = "sk-ant-..."
+# google_api_key = "AI..."
+
+# Note: It's recommended to use environment variables for credentials:
+# export OPENAI_API_KEY="sk-..."
+# export ANTHROPIC_API_KEY="sk-ant-..."
+# export GOOGLE_API_KEY="AI..."
+# export AZURE_API_KEY="..."
+# export COHERE_API_KEY="..."

weaver/agent.py

@@ -1,8 +1,6 @@
 """
 Agent: Executes individual tasks via an LLM, handling retries and updating the Blueprint.
 """
-# weaver/agent.py
-
 import time
 from datetime import datetime
 import litellm
@@ -62,17 +60,23 @@ def execute_task(self, task_id: int):
 
         # 2) Attempt LLM call with retries
         last_error = None
+        response = None
+        
         for attempt in range(1, 4):
             try:
+                # Use litellm.completion with the model name directly
+                # litellm handles provider routing and authentication
                 response = litellm.completion(
                     model=model_cfg["model"],
-                    prompt=prompt,
+                    messages=[{"role": "user", "content": prompt}],
                     max_tokens=model_cfg.get("max_tokens")
                 )
                 break
             except Exception as e:
                 last_error = e
-                time.sleep(2 ** attempt)  # exponential backoff
+                print(f"[weaver] Task {task_id} attempt {attempt} failed: {e}")
+                if attempt < 3:
+                    time.sleep(2 ** attempt)  # exponential backoff
         else:
             # 3a) All retries failed: record failure
             err_msg = str(last_error)
@@ -93,6 +97,8 @@ def execute_task(self, task_id: int):
         usage = response.get("usage", {})
         prompt_tokens = usage.get("prompt_tokens", 0)
         completion_tokens = usage.get("completion_tokens", 0)
+        
+        # Calculate costs using the model's rate information
         rates = model_cfg.get("cost_per_1k_tokens", {})
         cost = (
             prompt_tokens / 1_000 * rates.get("prompt", 0) +
@@ -114,4 +120,4 @@ def execute_task(self, task_id: int):
             cost=cost,
             execution_end_timestamp=end_ts
         )
-        self.blueprint.update_task_status(task_id, "awaiting_human_approval")
+        self.blueprint.update_task_status(task_id, "awaiting_human_approval")

weaver/blueprint.py

@@ -44,6 +44,8 @@ def __init__(self, db_path: str):
         except Exception as e:
             raise DatabaseError(f"Failed to connect to SQLite DB at '{db_path}': {e}")
 
+
+    
     def _initialize_table(self) -> None:
         """
         Create tasks table if not exists, according to the defined schema.
@@ -105,8 +107,6 @@ def get_task(self, task_id: int) -> dict:
         row = self._execute_query(sql, (task_id,), fetch='one')
         if not row:
             return None
-        cols = [col[0] for col in self.conn.cursor().description] if False else []
-        # Actually get column names via PRAGMA
         cols = [info[1] for info in self._execute_query("PRAGMA table_info(tasks)", fetch='all')]
         return dict(zip(cols, row))
 

weaver/cli.py

@@ -1,35 +1,23 @@
-# weaver/cli.py
-
 import sys
 import click
 from weaver.project import Project
 from weaver.exceptions import WeaverError
-from weaver.config import get_openai_api_key
+from weaver.config import check_environment, get_missing_credentials
 
 @click.group()
-@click.option(
-    "--api-key", "-k",
-    help="Your OpenAI API key (overrides env or config file).",
-)
 @click.pass_context
-def cli(ctx, api_key):
+def cli(ctx):
     """
-    python-weaver CLI.
+    python-weaver CLI: orchestrate long-duration LLM workflows.
     """
-    # Resolve and stash the key in context
     ctx.ensure_object(dict)
-    ctx.obj["OPENAI_API_KEY"] = get_openai_api_key(api_key)
-
-# Then in commands where you call litellm or any SDK, inject ctx.obj["OPENAI_API_KEY"]
-# For example:
-@cli.command()
-@click.argument("project_name")
-@click.argument("project_goal")
-@click.pass_context
-
-def cli():
-    """python-weaver CLI: orchestrate long-duration LLM workflows."""
-    pass
+    
+    # Check environment on startup
+    env_error = check_environment()
+    if env_error:
+        click.echo(f"[weaver][error] {env_error}", err=True)
+        click.echo("\nFor setup instructions, see: https://docs.litellm.ai/docs/providers", err=True)
+        sys.exit(1)
 
 @cli.command()
 @click.argument("project_name")
@@ -111,8 +99,36 @@ def run(project_name: str, no_human_feedback: bool, steps: int):
         click.echo(f"[weaver][error] {e}", err=True)
         sys.exit(1)
 
+@cli.command()
+def check():
+    """
+    Check credential configuration for all providers.
+    """
+    missing = get_missing_credentials()
+    
+    if not missing:
+        click.echo("[weaver] ✓ All configured models have valid credentials.")
+        return
+    
+    click.echo("[weaver] Credential status:")
+    
+    # Show missing credentials
+    for provider, creds in missing.items():
+        cred_list = " or ".join(creds)
+        click.echo(f"  ❌ {provider}: Missing {cred_list}")
+    
+    # Show available models
+    from weaver.config import LLM_CONFIG, validate_model_credentials
+    click.echo("\n[weaver] Model availability:")
+    
+    for model_key in LLM_CONFIG["available_llms"]:
+        status = "✓" if validate_model_credentials(model_key) else "❌"
+        click.echo(f"  {status} {model_key}")
+    
+    click.echo("\nFor setup instructions, see: https://docs.litellm.ai/docs/providers")
+
 def main():
     cli()
 
 if __name__ == "__main__":
-    main()
+    main()