drydock-cli 3.0.134__tar.gz → 3.0.135__tar.gz

{drydock_cli-3.0.134/drydock_cli.egg-info → drydock_cli-3.0.135}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.134
+Version: 3.0.135
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -253,7 +253,7 @@ drydock
 ```
 
 Requires Python 3.11+. From source instead:
-`git clone https://github.com/fbobe321/drydock-v3.git && cd drydock-v3 && pip install -e .`
+`git clone https://github.com/fbobe321/drydock.git && cd drydock && pip install -e .`
 
 On first launch with no config, Drydock probes localhost for a running local
 LLM (llama.cpp/vLLM `:8000`, Ollama `:11434`, LM Studio `:1234`) and wires up

{drydock_cli-3.0.134 → drydock_cli-3.0.135}/README.md

@@ -229,7 +229,7 @@ drydock
 ```
 
 Requires Python 3.11+. From source instead:
-`git clone https://github.com/fbobe321/drydock-v3.git && cd drydock-v3 && pip install -e .`
+`git clone https://github.com/fbobe321/drydock.git && cd drydock && pip install -e .`
 
 On first launch with no config, Drydock probes localhost for a running local
 LLM (llama.cpp/vLLM `:8000`, Ollama `:11434`, LM Studio `:1234`) and wires up

{drydock_cli-3.0.134 → drydock_cli-3.0.135}/drydock/cli.py

@@ -248,6 +248,27 @@ def _summarize(inputs: dict) -> str:
 
 # ── Entry point ───────────────────────────────────────────────────────────
 
+def _resolve_first_run(cfg: dict, args, cfg_path, cfgmod, interactive: bool) -> tuple[dict, str]:
+    """First-launch model-server resolution. AUTODETECT a live local server and
+    wire it up with ZERO prompts (the frictionless path). Only when nothing is
+    detected AND we're interactive do we ask the user to enter their own URL — so
+    the easy install (server already running) needs no input, while a custom
+    endpoint is still one prompt (or `--base-url`, or `/model url` later)."""
+    from drydock import detect
+
+    found = detect.detect_local_llms()
+    if found:
+        cfg["provider"] = found[0]["provider"]
+        cfg["base_url"] = found[0]["base_url"]
+        if found[0].get("models") and not getattr(args, "model", None):
+            cfg["model"] = found[0]["models"][0]
+        cfgmod.save_file(cfg, cfg_path)
+        return cfg, detect.onboarding_message(found)
+    if interactive:
+        return _first_run_setup(cfg, cfg_path, cfgmod)
+    return cfg, detect.onboarding_message(found)
+
+
 def _first_run_setup(cfg: dict, cfg_path, cfgmod) -> tuple[dict, str]:
     """Interactive first-launch: ask for the model server URL + model name and
     persist them to config.toml. Autodetect (if anything is listening) supplies
@@ -346,22 +367,11 @@ def main():
         "context_limit": args.context_limit,
     }, cfg_path)
 
-    # First launch: ask the user for their model server URL + model name and
-    # persist them to config.toml. Interactive only — when stdin isn't a TTY
-    # (piped / -p / cron) we fall back to silent autodetect so nothing blocks.
+    # First launch: autodetect a local server and wire it up (see _resolve_first_run).
     onboarding = ""
     if first_run and not args.provider and not args.base_url:
-        if sys.stdin.isatty() and not args.prompt:
-            cfg, onboarding = _first_run_setup(cfg, cfg_path, cfgmod)
-        else:
-            from drydock import detect
-
-            found = detect.detect_local_llms()
-            onboarding = detect.onboarding_message(found)
-            if found:
-                cfg["provider"] = found[0]["provider"]
-                cfg["base_url"] = found[0]["base_url"]
-                cfgmod.save_file(cfg, cfg_path)
+        interactive = sys.stdin.isatty() and not args.prompt
+        cfg, onboarding = _resolve_first_run(cfg, args, cfg_path, cfgmod, interactive)
 
     config = {
         # context_limit now comes from cfg (DEFAULTS < config.toml < --context-limit)

{drydock_cli-3.0.134 → drydock_cli-3.0.135/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.134
+Version: 3.0.135
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0
@@ -253,7 +253,7 @@ drydock
 ```
 
 Requires Python 3.11+. From source instead:
-`git clone https://github.com/fbobe321/drydock-v3.git && cd drydock-v3 && pip install -e .`
+`git clone https://github.com/fbobe321/drydock.git && cd drydock && pip install -e .`
 
 On first launch with no config, Drydock probes localhost for a running local
 LLM (llama.cpp/vLLM `:8000`, Ollama `:11434`, LM Studio `:1234`) and wires up

{drydock_cli-3.0.134 → drydock_cli-3.0.135}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 # PyPI distribution name is drydock-cli (the established install name, continued
 # from the retired v2 fork); the import package + CLI command stay `drydock`.
 name = "drydock-cli"
-version = "3.0.134"
+version = "3.0.135"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

{drydock_cli-3.0.134 → drydock_cli-3.0.135}/tests/test_config_migration.py

@@ -77,8 +77,8 @@ def test_partial_config_backfills_missing_keys(tmp_path):
 
 
 def test_explicit_user_values_are_respected(tmp_path):
-    m = _load(tmp_path, 'base_url = "http://192.168.50.129:8000/v1"\nmodel = "gemma4"\n')
-    assert m["base_url"] == "http://192.168.50.129:8000/v1"
+    m = _load(tmp_path, 'base_url = "http://192.0.2.10:8000/v1"\nmodel = "gemma4"\n')
+    assert m["base_url"] == "http://192.0.2.10:8000/v1"
 
 
 def test_default_base_url_is_concrete_not_empty():
@@ -108,7 +108,7 @@ def test_v2_file_is_migrated_and_backed_up(tmp_path):
 def test_real_v3_file_is_left_untouched(tmp_path):
     """A genuine v3 file (has a known key) must NOT be migrated/rewritten."""
     p = tmp_path / "config.toml"
-    p.write_text('base_url = "http://192.168.50.21:8000/v1"\n# my hand edit\n')
+    p.write_text('base_url = "http://192.0.2.20:8000/v1"\n# my hand edit\n')
     cfg.resolve({}, path=p)
     assert not p.with_name("config.toml.bak").exists()
     assert "# my hand edit" in p.read_text()  # untouched

drydock_cli-3.0.135/tests/test_first_run_setup.py

@@ -0,0 +1,81 @@
+"""First-launch setup: prompt for model server URL + name, persist to config."""
+from __future__ import annotations
+
+from drydock import cli
+from drydock import config as cfgmod
+
+
+def test_first_run_setup_persists_url_and_model(tmp_path, monkeypatch):
+    # No server running → defaults; user types a custom URL + model.
+    monkeypatch.setattr(cli, "_first_run_setup", cli._first_run_setup)  # ensure present
+    import drydock.detect as detect
+    monkeypatch.setattr(detect, "detect_local_llms", lambda: [])
+    answers = iter(["http://127.0.0.1:8000/v1", "gemma4"])
+    monkeypatch.setattr("builtins.input", lambda *_: next(answers))
+
+    cfg_path = tmp_path / "config.toml"
+    cfg, onboarding = cli._first_run_setup(dict(cfgmod.DEFAULTS), cfg_path, cfgmod)
+
+    assert cfg["base_url"] == "http://127.0.0.1:8000/v1"
+    assert cfg["model"] == "gemma4"
+    # Persisted to disk.
+    on_disk = cfgmod.load_file(cfg_path)
+    assert on_disk["base_url"] == "http://127.0.0.1:8000/v1"
+    assert on_disk["model"] == "gemma4"
+    assert "gemma4" in onboarding and "127.0.0.1:8000" in onboarding
+
+
+def test_first_run_setup_uses_defaults_on_empty_input(tmp_path, monkeypatch):
+    import drydock.detect as detect
+    monkeypatch.setattr(detect, "detect_local_llms", lambda: [])
+    monkeypatch.setattr("builtins.input", lambda *_: "")  # user just hits Enter
+    cfg, _ = cli._first_run_setup(dict(cfgmod.DEFAULTS), tmp_path / "c.toml", cfgmod)
+    assert cfg["base_url"] == "http://127.0.0.1:8000/v1"  # the documented default
+    assert cfg["model"] == "gemma4"
+
+
+class _Args:
+    def __init__(self, model=None): self.model = model
+
+
+def test_autowire_uses_detected_server_no_prompt(tmp_path, monkeypatch):
+    """First launch with a live server: wire it up automatically, NO input()."""
+    from drydock import cli, config as cfgmod, detect
+    monkeypatch.setattr(detect, "detect_local_llms",
+                        lambda: [{"provider": "ollama", "base_url": "http://localhost:11434/v1",
+                                  "models": ["llama3"]}])
+    # input() must NOT be called on the auto-wire path
+    monkeypatch.setattr("builtins.input", lambda *a: (_ for _ in ()).throw(AssertionError("prompted!")))
+    cfg_path = tmp_path / "c.toml"
+    cfg, onboarding = cli._resolve_first_run(dict(cfgmod.DEFAULTS), _Args(), cfg_path, cfgmod, interactive=True)
+    assert cfg["base_url"] == "http://localhost:11434/v1"
+    assert cfg["provider"] == "ollama" and cfg["model"] == "llama3"
+    assert "Detected" in onboarding and cfg_path.exists()   # persisted
+
+
+def test_autowire_respects_explicit_model(tmp_path, monkeypatch):
+    from drydock import cli, config as cfgmod, detect
+    monkeypatch.setattr(detect, "detect_local_llms",
+                        lambda: [{"provider": "vllm", "base_url": "http://localhost:8000/v1",
+                                  "models": ["served-model"]}])
+    cfg, _ = cli._resolve_first_run(dict(cfgmod.DEFAULTS), _Args(model="gemma4"),
+                                    tmp_path / "c.toml", cfgmod, interactive=True)
+    assert cfg["model"] == "gemma4"   # --model wins over the detected id
+
+
+def test_nothing_detected_noninteractive_shows_help(tmp_path, monkeypatch):
+    from drydock import cli, config as cfgmod, detect
+    monkeypatch.setattr(detect, "detect_local_llms", lambda: [])
+    monkeypatch.setattr("builtins.input", lambda *a: (_ for _ in ()).throw(AssertionError("prompted!")))
+    cfg, onboarding = cli._resolve_first_run(dict(cfgmod.DEFAULTS), _Args(), tmp_path / "c.toml",
+                                             cfgmod, interactive=False)
+    assert "No local LLM detected" in onboarding   # tells the user how to set a URL
+
+
+def test_nothing_detected_interactive_prompts(tmp_path, monkeypatch):
+    from drydock import cli, config as cfgmod, detect
+    monkeypatch.setattr(detect, "detect_local_llms", lambda: [])
+    monkeypatch.setattr("builtins.input", lambda *a: "http://myhost:9000/v1")
+    cfg, _ = cli._resolve_first_run(dict(cfgmod.DEFAULTS), _Args(), tmp_path / "c.toml",
+                                    cfgmod, interactive=True)
+    assert cfg["base_url"] == "http://myhost:9000/v1"   # user's URL honored

drydock_cli-3.0.134/tests/test_first_run_setup.py

@@ -1,34 +0,0 @@
-"""First-launch setup: prompt for model server URL + name, persist to config."""
-from __future__ import annotations
-
-from drydock import cli
-from drydock import config as cfgmod
-
-
-def test_first_run_setup_persists_url_and_model(tmp_path, monkeypatch):
-    # No server running → defaults; user types a custom URL + model.
-    monkeypatch.setattr(cli, "_first_run_setup", cli._first_run_setup)  # ensure present
-    import drydock.detect as detect
-    monkeypatch.setattr(detect, "detect_local_llms", lambda: [])
-    answers = iter(["http://127.0.0.1:8000/v1", "gemma4"])
-    monkeypatch.setattr("builtins.input", lambda *_: next(answers))
-
-    cfg_path = tmp_path / "config.toml"
-    cfg, onboarding = cli._first_run_setup(dict(cfgmod.DEFAULTS), cfg_path, cfgmod)
-
-    assert cfg["base_url"] == "http://127.0.0.1:8000/v1"
-    assert cfg["model"] == "gemma4"
-    # Persisted to disk.
-    on_disk = cfgmod.load_file(cfg_path)
-    assert on_disk["base_url"] == "http://127.0.0.1:8000/v1"
-    assert on_disk["model"] == "gemma4"
-    assert "gemma4" in onboarding and "127.0.0.1:8000" in onboarding
-
-
-def test_first_run_setup_uses_defaults_on_empty_input(tmp_path, monkeypatch):
-    import drydock.detect as detect
-    monkeypatch.setattr(detect, "detect_local_llms", lambda: [])
-    monkeypatch.setattr("builtins.input", lambda *_: "")  # user just hits Enter
-    cfg, _ = cli._first_run_setup(dict(cfgmod.DEFAULTS), tmp_path / "c.toml", cfgmod)
-    assert cfg["base_url"] == "http://127.0.0.1:8000/v1"  # the documented default
-    assert cfg["model"] == "gemma4"