adversarial-workflow 0.6.2__py3-none-any.whl → 0.6.3__py3-none-any.whl

adversarial_workflow/__main__.py

@@ -1,4 +1,5 @@
 """Allow execution via python -m adversarial_workflow."""
+
 from .cli import main
 
 if __name__ == "__main__":

adversarial_workflow/cli.py

@@ -322,16 +322,20 @@ def init_interactive(project_path: str = ".") -> int:
         f"{GREEN}✅ Setup Complete!{RESET}",
         [
             "Created:",
-            "  ✓ .env (with your API keys - added to .gitignore)"
-            if (anthropic_key or openai_key)
-            else "  ⚠️ .env (skipped - no API keys provided)",
+            (
+                "  ✓ .env (with your API keys - added to .gitignore)"
+                if (anthropic_key or openai_key)
+                else "  ⚠️ .env (skipped - no API keys provided)"
+            ),
             "  ✓ .adversarial/config.yml",
             "  ✓ .adversarial/scripts/ (3 workflow scripts)",
             "  ✓ .aider.conf.yml (aider configuration)",
             "",
-            "Your configuration:"
-            if (anthropic_key or openai_key)
-            else "Configuration (no API keys yet):",
+            (
+                "Your configuration:"
+                if (anthropic_key or openai_key)
+                else "Configuration (no API keys yet):"
+            ),
             f"  Author (implementation): {'Claude 3.5 Sonnet (Anthropic)' if anthropic_key else 'GPT-4o (OpenAI)' if openai_key else 'Not configured'}",
             f"  Evaluator: {'GPT-4o (OpenAI)' if openai_key else 'Claude 3.5 Sonnet (Anthropic)' if anthropic_key else 'Not configured'}",
             f"  Cost per workflow: {'~$0.02-0.10' if (anthropic_key and openai_key) else '~$0.05-0.15' if (anthropic_key or openai_key) else 'N/A'}",
@@ -2284,7 +2288,9 @@ def fetch_agent_template(url: str, template_type: str = "standard") -> Optional[
                 )
                 return None
         else:
-            print(f"{RED}❌ ERROR: {template_type} template not found in package{RESET}")
+            print(
+                f"{RED}❌ ERROR: {template_type} template not found in package{RESET}"
+            )
             return None
 
     elif template_type == "custom" and url:
@@ -3082,8 +3088,8 @@ For more information: https://github.com/movito/adversarial-workflow
             "--timeout",
             "-t",
             type=int,
-            default=180,
-            help="Timeout in seconds (default: 180)",
+            default=None,
+            help="Timeout in seconds (default: from evaluator config or 180, max: 600)",
         )
         # Store config for later execution
         eval_parser.set_defaults(evaluator_config=config)
@@ -3096,10 +3102,34 @@ For more information: https://github.com/movito/adversarial-workflow
 
     # Check for evaluator command first (has evaluator_config attribute)
     if hasattr(args, "evaluator_config"):
+        # Determine timeout: CLI flag > YAML config > default (180s)
+        if args.timeout is not None:
+            timeout = args.timeout
+            source = "CLI override"
+        elif args.evaluator_config.timeout != 180:
+            timeout = args.evaluator_config.timeout
+            source = "evaluator config"
+        else:
+            timeout = args.evaluator_config.timeout  # 180 (default)
+            source = "default"
+
+        # Validate CLI timeout (consistent with YAML validation)
+        if timeout <= 0:
+            print(f"{RED}Error: Timeout must be positive (> 0), got {timeout}{RESET}")
+            return 1
+        if timeout > 600:
+            print(
+                f"{YELLOW}Warning: Timeout {timeout}s exceeds maximum (600s), clamping to 600s{RESET}"
+            )
+            timeout = 600
+
+        # Log actual timeout and source
+        print(f"Using timeout: {timeout}s ({source})")
+
         return run_evaluator(
             args.evaluator_config,
             args.file,
-            timeout=args.timeout,
+            timeout=timeout,
         )
 
     # Execute static commands

adversarial_workflow/evaluators/config.py

@@ -26,6 +26,7 @@ class EvaluatorConfig:
         fallback_model: Fallback model if primary fails
         aliases: Alternative command names
         version: Evaluator version
+        timeout: Timeout in seconds (default: 180, max: 600)
         source: "builtin" or "local" (set internally)
         config_file: Path to YAML file if local (set internally)
     """
@@ -43,6 +44,7 @@ class EvaluatorConfig:
     fallback_model: str | None = None
     aliases: list[str] = field(default_factory=list)
     version: str = "1.0.0"
+    timeout: int = 180  # Timeout in seconds (default: 180, max: 600)
 
     # Metadata (set internally during discovery, not from YAML)
     source: str = "builtin"

adversarial_workflow/evaluators/discovery.py

@@ -122,6 +122,35 @@ def parse_evaluator_yaml(yml_file: Path) -> EvaluatorConfig:
                     f"Field '{field}' must be a string, got {type(value).__name__}: {value!r}"
                 )
 
+    # Validate timeout if present
+    if "timeout" in data:
+        timeout = data["timeout"]
+        # Handle null/empty values
+        if timeout is None or timeout == "":
+            raise EvaluatorParseError("Field 'timeout' cannot be null or empty")
+        # Check for bool before int (bool is subclass of int in Python)
+        # YAML parses 'yes'/'true' as True, 'no'/'false' as False
+        if isinstance(timeout, bool):
+            raise EvaluatorParseError(
+                f"Field 'timeout' must be an integer, got bool: {timeout!r}"
+            )
+        if not isinstance(timeout, int):
+            raise EvaluatorParseError(
+                f"Field 'timeout' must be an integer, got {type(timeout).__name__}: {timeout!r}"
+            )
+        # timeout=0 is invalid (does not disable timeout - use a large value instead)
+        if timeout <= 0:
+            raise EvaluatorParseError(
+                f"Field 'timeout' must be positive (> 0), got {timeout}"
+            )
+        if timeout > 600:
+            logger.warning(
+                "Timeout %ds exceeds maximum (600s), clamping to 600s in %s",
+                timeout,
+                yml_file.name,
+            )
+            data["timeout"] = 600
+
     # Filter to known fields only (log unknown fields)
     known_fields = {
         "name",
@@ -134,6 +163,7 @@ def parse_evaluator_yaml(yml_file: Path) -> EvaluatorConfig:
         "fallback_model",
         "aliases",
         "version",
+        "timeout",
     }
     unknown = set(data.keys()) - known_fields
     if unknown:

{adversarial_workflow-0.6.2.dist-info → adversarial_workflow-0.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: adversarial-workflow
-Version: 0.6.2
+Version: 0.6.3
 Summary: Multi-stage AI code review system preventing phantom work - Author/Evaluator pattern
 Author: Fredrik Matheson
 License: MIT
@@ -55,9 +55,30 @@ Evaluate proposals, sort out ideas, and prevent "phantom work" (AI claiming to i
 - 🎯 **Tool-agnostic**: Use with Claude Code, Cursor, Aider, manual coding, or any workflow
 - ✨ **Interactive onboarding**: Guided setup wizard gets you started in <5 minutes
 
-## What's New in v0.6.0
+## What's New in v0.6.3
 
-🔌 **Plugin Architecture** - Define custom evaluators without modifying the package:
+### Upgrade
+
+```bash
+pip install --upgrade adversarial-workflow
+```
+
+### v0.6.3 - Configurable Timeouts
+
+- **Per-evaluator timeout**: Add `timeout: 300` to evaluator YAML for slow models like Mistral Large
+- **CLI override**: Use `--timeout 400` to override YAML config on-the-fly
+- **Timeout logging**: See which timeout source is used (CLI/YAML/default)
+- **Safety limits**: Maximum 600 seconds to prevent runaway processes
+
+### v0.6.2 - .env Loading & Stability
+
+- **Automatic .env loading**: API keys in `.env` files are now loaded at CLI startup
+- **Custom evaluator support**: Evaluators using `api_key_env: GEMINI_API_KEY` (or other keys) now work with `.env` files
+- **Better diagnostics**: `adversarial check` correctly reports the number of variables loaded from `.env`
+
+### v0.6.0 - Plugin Architecture
+
+🔌 **Custom Evaluators** - Define your own evaluators without modifying the package:
 
 ```bash
 # Create a custom evaluator
@@ -459,6 +480,7 @@ Starting with v0.6.0, you can define project-specific evaluators without modifyi
 | `aliases` | No | Alternative command names |
 | `log_prefix` | No | CLI output prefix |
 | `fallback_model` | No | Fallback model if primary fails |
+| `timeout` | No | Timeout in seconds (default: 180, max: 600) |
 | `version` | No | Evaluator version (default: 1.0.0) |
 
 ### Listing Available Evaluators

{adversarial_workflow-0.6.2.dist-info → adversarial_workflow-0.6.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
 adversarial_workflow/__init__.py,sha256=moTEp6nKU5F4B1YnJaSBmwhptkDP0ST5n--2hak9PRc,596
-adversarial_workflow/__main__.py,sha256=Ibb0CngDCh4mpCe8Zxnf3kyKnMddBxQy2JAk_kfTUMQ,119
-adversarial_workflow/cli.py,sha256=I9LM6MnfW-m1kXbF202l50-SeidLCyyF0Sk0sR-UFqk,110743
+adversarial_workflow/__main__.py,sha256=iM2jmO5YCFpGxfWiEhIYi_SsxVa0hRIE-MB7J0EcN7Y,120
+adversarial_workflow/cli.py,sha256=FxjoC3KVUiwbOF7mWNPe6Zrk82fQcqyE8SPi5bo3ntI,111802
 adversarial_workflow/evaluators/__init__.py,sha256=A9ZKUmjSMfyvEu6jDzYAFLxfkt_OQ4RGA10Bv_eO2i4,1267
 adversarial_workflow/evaluators/builtins.py,sha256=u5LokYLe8ruEW2tunhOQaNSkpcZ9Ee2IeTkaC0dZDSY,1102
-adversarial_workflow/evaluators/config.py,sha256=05qYPIiIpCxXBVJzs70WQQLxi8I7MedfhE_oydXEcq0,1520
-adversarial_workflow/evaluators/discovery.py,sha256=a8qTUsuJRdPUcVbt1zzEgLixmvJbHA7WfnYSNm8V5OY,6834
+adversarial_workflow/evaluators/config.py,sha256=H_4vkto07rAqnz0qEYdzN_DH6WbvRPMIEdkEOFE58UI,1651
+adversarial_workflow/evaluators/discovery.py,sha256=dPQ0dDy9anYjzLnG-V9gVrLkCVAVZ2tEE9dyFWqSvJc,8079
 adversarial_workflow/evaluators/runner.py,sha256=JPVeigjGF2fRDVJLcGyDEuy9pCIp-LjmVAZyucMbdCU,9310
 adversarial_workflow/templates/.aider.conf.yml.template,sha256=jT2jWIgsnmS3HLhoQWMTO3GV07bUcsT2keYw60jqiDw,183
 adversarial_workflow/templates/.env.example.template,sha256=TmTlcgz44uZqIbqgXqdfHMl-0vVn96F_EGNohClFkb8,1821
@@ -25,9 +25,9 @@ adversarial_workflow/utils/colors.py,sha256=uRrG6KfIDBLo0F5_vPwms9NCm9-x8YXBiyZ4
 adversarial_workflow/utils/config.py,sha256=NBoC_-YYukEVo6BgpX2cDyeqV-3tnn_sHNU9L1AuSLQ,1341
 adversarial_workflow/utils/file_splitter.py,sha256=-zSWgAZ71DfX6dBu15Y4M84NBbJzq-0ENktbBEp9zvQ,12409
 adversarial_workflow/utils/validation.py,sha256=ZiJxtm03kJXicfFTt0QZwpc9V_D8PkDOVYrJEDsafQI,2202
-adversarial_workflow-0.6.2.dist-info/licenses/LICENSE,sha256=M-dOQlre-NmicyPa55hYOJUW8roGpCKEgtq-z0z1KCA,1073
-adversarial_workflow-0.6.2.dist-info/METADATA,sha256=zdFc4h-9XPcgg6mn0SCnJNg3VFhYl7XyxI0egYhU2fY,29955
-adversarial_workflow-0.6.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-adversarial_workflow-0.6.2.dist-info/entry_points.txt,sha256=9H-iZ-yF1uKZ8P0G1suc6kWR0NvK7uPZJbhN7nvt1sE,62
-adversarial_workflow-0.6.2.dist-info/top_level.txt,sha256=8irutNxLRjUbTlzfAibIpz7_ovkkF2h8ES69NQpv24c,21
-adversarial_workflow-0.6.2.dist-info/RECORD,,
+adversarial_workflow-0.6.3.dist-info/licenses/LICENSE,sha256=M-dOQlre-NmicyPa55hYOJUW8roGpCKEgtq-z0z1KCA,1073
+adversarial_workflow-0.6.3.dist-info/METADATA,sha256=4dfW8_CURJEoooPFtdqtYu-R-BVj-SCC-AXg_teHklg,30835
+adversarial_workflow-0.6.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+adversarial_workflow-0.6.3.dist-info/entry_points.txt,sha256=9H-iZ-yF1uKZ8P0G1suc6kWR0NvK7uPZJbhN7nvt1sE,62
+adversarial_workflow-0.6.3.dist-info/top_level.txt,sha256=8irutNxLRjUbTlzfAibIpz7_ovkkF2h8ES69NQpv24c,21
+adversarial_workflow-0.6.3.dist-info/RECORD,,