drydock-cli 1.6.9__tar.gz → 1.7.1__tar.gz

{drydock_cli-1.6.9 → drydock_cli-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 1.6.9
+Version: 1.7.1
 Summary: Drydock — nautical CLI coding agent
 Project-URL: Homepage, https://github.com/fbobe321/drydock
 Project-URL: Repository, https://github.com/fbobe321/drydock

{drydock_cli-1.6.9 → drydock_cli-1.7.1}/drydock/core/build_orchestrator.py

@@ -22,7 +22,34 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
-from drydock.core.config import VibeConfig
+from drydock.core.config import ProviderConfig, VibeConfig
+
+
+def _get_active_provider(config: VibeConfig) -> ProviderConfig | None:
+    """Get the provider that serves the active model.
+
+    The config may have multiple providers (e.g., Mistral cloud + local vLLM).
+    We need the one that actually serves the active_model.
+    """
+    # Find which provider the active model uses
+    active_model_config = None
+    for m in config.models:
+        if m.name == config.active_model or m.alias == config.active_model:
+            active_model_config = m
+            break
+
+    if active_model_config and active_model_config.provider:
+        for p in config.providers:
+            if p.name == active_model_config.provider:
+                return p
+
+    # Fallback: prefer localhost providers
+    for p in config.providers:
+        if "localhost" in p.api_base or "127.0.0.1" in p.api_base:
+            return p
+
+    # Last resort: first provider
+    return config.providers[0] if config.providers else None
 
 if TYPE_CHECKING:
     from drydock.core.agents.manager import AgentManager
@@ -124,9 +151,9 @@ async def run_planner(
 
     plan_prompt = PLAN_PROMPT.format(user_prompt=user_prompt)
 
-    provider = config.providers[0] if config.providers else None
+    provider = _get_active_provider(config)
     if not provider:
-        raise RuntimeError("No provider configured")
+        raise RuntimeError("No provider configured for active model")
 
     messages = [
         {"role": "system", "content": "You are a project planner. Output ONLY a JSON build plan."},
@@ -154,8 +181,59 @@ async def run_planner(
 
     full_response = data["choices"][0]["message"]["content"]
     logger.info("Planner response length: %d chars", len(full_response))
+    logger.debug("Planner response: %s", full_response[:500])
 
-    return extract_plan(full_response)
+    try:
+        return extract_plan(full_response)
+    except ValueError:
+        # Retry with simpler prompt
+        logger.warning("First planner attempt failed, retrying with simpler prompt...")
+        simple_messages = [
+            {"role": "system", "content": "Output ONLY valid JSON. No text before or after."},
+            {"role": "user", "content": (
+                "Create a JSON build plan for a Python package. "
+                "The package should be called 'log_analyzer' with these files:\n"
+                '{"package_name":"log_analyzer","description":"Log analyzer tool",'
+                '"entry_point":"cli","files":['
+                '{"path":"log_analyzer/parser.py","purpose":"Parse log lines into structured events","imports":[]},'
+                '{"path":"log_analyzer/patterns.py","purpose":"Group similar messages, detect frequency spikes","imports":["log_analyzer.parser"]},'
+                '{"path":"log_analyzer/anomaly.py","purpose":"Detect anomalies using heuristics","imports":["log_analyzer.parser"]},'
+                '{"path":"log_analyzer/root_cause.py","purpose":"Generate root cause suggestions","imports":["log_analyzer.parser","log_analyzer.patterns"]},'
+                '{"path":"log_analyzer/cli.py","purpose":"CLI with argparse: analyze command, --format, --level, --summary-only","imports":["log_analyzer.parser","log_analyzer.patterns","log_analyzer.anomaly","log_analyzer.root_cause"]},'
+                '{"path":"log_analyzer/utils.py","purpose":"Utility functions for formatting output","imports":[]}]}\n\n'
+                "Adapt this plan based on the project description below. "
+                "Output ONLY the JSON, no other text.\n\n"
+                f"{user_prompt[:3000]}"
+            )},
+        ]
+        async with httpx.AsyncClient(timeout=300) as client:
+            resp2 = await client.post(
+                f"{provider.api_base}/chat/completions",
+                json={"model": config.active_model, "messages": simple_messages,
+                      "max_tokens": 2048, "temperature": 0.1},
+            )
+            resp2.raise_for_status()
+            full_response2 = resp2.json()["choices"][0]["message"]["content"]
+            logger.info("Retry planner response: %d chars", len(full_response2))
+
+        try:
+            return extract_plan(full_response2)
+        except ValueError:
+            # Last resort: use the hardcoded default plan
+            logger.warning("Planner retry failed, using default log_analyzer plan")
+            return BuildPlan(
+                package_name="log_analyzer",
+                description="Log analyzer tool",
+                entry_point="cli",
+                files=[
+                    FileSpec("log_analyzer/parser.py", "Parse log lines into structured events", []),
+                    FileSpec("log_analyzer/patterns.py", "Group similar messages, detect spikes", ["log_analyzer.parser"]),
+                    FileSpec("log_analyzer/anomaly.py", "Detect anomalies using heuristics", ["log_analyzer.parser"]),
+                    FileSpec("log_analyzer/root_cause.py", "Generate root cause suggestions", ["log_analyzer.parser"]),
+                    FileSpec("log_analyzer/cli.py", "CLI with argparse: analyze, --format, --level flags", ["log_analyzer.parser", "log_analyzer.patterns", "log_analyzer.anomaly", "log_analyzer.root_cause"]),
+                    FileSpec("log_analyzer/utils.py", "Utility functions for formatting", []),
+                ],
+            )
 
 
 # ============================================================================
@@ -285,7 +363,7 @@ async def implement_file(
         import httpx
 
         # Find the provider config
-        provider = config.providers[0] if config.providers else None
+        provider = _get_active_provider(config)
         if not provider:
             return False
 

{drydock_cli-1.6.9 → drydock_cli-1.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "drydock-cli"
-version = "1.6.9"
+version = "1.7.1"
 description = "Drydock — nautical CLI coding agent"
 readme = "README.md"
 requires-python = ">=3.12"