drydock-cli 3.0.25__tar.gz → 3.0.26__tar.gz

{drydock_cli-3.0.25/drydock_cli.egg-info → drydock_cli-3.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.25
+Version: 3.0.26
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0

{drydock_cli-3.0.25 → drydock_cli-3.0.26}/drydock/__init__.py

@@ -7,4 +7,4 @@ try:
     __version__ = _version("drydock-cli")
 except PackageNotFoundError:
     # Running from source before install (e.g. PYTHONPATH dev runs).
-    __version__ = "3.0.25"
+    __version__ = "3.0.26"

{drydock_cli-3.0.25 → drydock_cli-3.0.26}/drydock/providers.py

@@ -253,7 +253,12 @@ def stream(
         if delta.content:
             # Strip any leaked thinking-token markers (best-effort per chunk).
             chunk_text = strip_thinking_tokens(delta.content)
-            if chunk_text.strip():
+            # Keep ANY non-empty chunk — including whitespace-only ones. A
+            # `.strip()` guard here used to DROP newline-only chunks (the blank
+            # line a model streams between markdown blocks arrives as its own
+            # chunk), mashing "para### Header" together. `if chunk_text:` still
+            # skips chunks that stripping emptied (e.g. a lone thinking marker).
+            if chunk_text:
                 text += chunk_text
                 yield TextChunk(chunk_text)
 

{drydock_cli-3.0.25 → drydock_cli-3.0.26/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.25
+Version: 3.0.26
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0

{drydock_cli-3.0.25 → drydock_cli-3.0.26}/drydock_cli.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ tests/test_loop_detect.py
 tests/test_plan_autocontinue.py
 tests/test_providers_unreachable.py
 tests/test_stop.py
+tests/test_streaming_newlines.py
 tests/test_subagent.py
 tests/test_todo.py
 tests/test_tool_arg_parsing.py

{drydock_cli-3.0.25 → drydock_cli-3.0.26}/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.25"
+version = "3.0.26"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.12"

drydock_cli-3.0.26/tests/test_streaming_newlines.py

@@ -0,0 +1,70 @@
+"""Streaming must preserve whitespace-only (newline) chunks.
+
+A `.strip()` guard in the streaming loop used to DROP a chunk that was only
+"\n\n" — the blank line a model streams between markdown blocks — so a long
+response rendered as "paragraph### Header" mashed together (operator-reported).
+"""
+from __future__ import annotations
+
+import drydock.providers as P
+from drydock.providers import AssistantTurn, TextChunk, stream
+
+
+class _Delta:
+    def __init__(self, c):
+        self.content = c
+        self.tool_calls = None
+
+
+class _Choice:
+    def __init__(self, c):
+        self.delta = _Delta(c)
+        self.finish_reason = None
+
+
+class _Chunk:
+    def __init__(self, c):
+        self.choices = [_Choice(c)]
+        self.usage = None
+
+
+def test_streaming_preserves_newline_only_chunks(monkeypatch):
+    chunks = [
+        _Chunk("Intro paragraph."),
+        _Chunk("\n\n"),          # ← blank line between blocks (was dropped)
+        _Chunk("### Header"),
+        _Chunk("\n\n"),
+        _Chunk("body text"),
+    ]
+    monkeypatch.setattr(P, "_safe_create", lambda *a, **k: iter(chunks))
+
+    full = ""
+    streamed = []
+    for ev in stream(
+        model="gemma4", system="s",
+        messages=[{"role": "user", "content": "review"}],
+        tool_schemas=[],  # no tools → text-only → streaming path even for gemma
+        config={"model": "gemma4", "provider": "vllm"},
+    ):
+        if isinstance(ev, TextChunk):
+            streamed.append(ev.text)
+        elif isinstance(ev, AssistantTurn):
+            full = ev.text
+
+    assert "\n\n" in "".join(streamed)            # newline chunks survived streaming
+    assert "Intro paragraph.\n\n### Header" in full  # blocks not mashed
+    assert "### Header\n\nbody text" in full
+
+
+def test_streaming_still_drops_chunk_emptied_by_stripping(monkeypatch):
+    # A chunk that is ONLY a thinking marker strips to "" and is skipped (so we
+    # don't emit empty text), but real whitespace is kept.
+    chunks = [_Chunk("hello"), _Chunk("<|channel>x<channel|>"), _Chunk("\n"), _Chunk("world")]
+    monkeypatch.setattr(P, "_safe_create", lambda *a, **k: iter(chunks))
+    full = ""
+    for ev in stream(model="gemma4", system="s",
+                     messages=[{"role": "user", "content": "hi"}],
+                     tool_schemas=[], config={"model": "gemma4", "provider": "vllm"}):
+        if isinstance(ev, AssistantTurn):
+            full = ev.text
+    assert full == "hello\nworld"  # marker-only chunk gone, newline kept