drydock-cli 3.0.80__tar.gz → 3.0.81__tar.gz

{drydock_cli-3.0.80/drydock_cli.egg-info → drydock_cli-3.0.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.80
+Version: 3.0.81
 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.80 → drydock_cli-3.0.81}/drydock/agent.py

@@ -29,7 +29,9 @@ from drydock.tools import register_all
 # emits tool calls as TEXT — which is exactly how the empty-registry regression
 # manifested. register_all() is idempotent.
 register_all()
-from drydock.compaction import maybe_compact, emergency_compact, is_context_length_error
+from drydock.compaction import (
+    maybe_compact, emergency_compact, is_context_length_error, is_image_load_error,
+)
 from drydock.loop_detect import LoopTracker
 from drydock.tuning import (
     filter_tool_schemas,
@@ -184,6 +186,15 @@ def run(
                     if retries >= 2:
                         raise
                     yield TextChunk("\n[context limit hit — compacting and retrying...]\n")
+                elif is_image_load_error(err):
+                    # Corrupt/truncated/unsupported image the server couldn't decode —
+                    # end the turn cleanly rather than dumping the raw 400.
+                    yield TextChunk(
+                        "\n[The model server couldn't load an attached image — it may be "
+                        "corrupt, truncated, or an unsupported format. Try a different image.]\n"
+                    )
+                    assistant_turn = None
+                    break
                 else:
                     raise
 

{drydock_cli-3.0.80 → drydock_cli-3.0.81}/drydock/compaction.py

@@ -34,6 +34,16 @@ def is_context_length_error(err: str) -> bool:
     return "context" in e and ("exceed" in e or "too long" in e or "too large" in e)
 
 
+def is_image_load_error(err: str) -> bool:
+    """Whether a provider 400 is the server failing to decode an attached image
+    (corrupt / truncated / unsupported), so the agent ends the turn with a clean
+    message instead of dumping the raw API error."""
+    e = (err or "").lower()
+    return "failed to load image" in e or (
+        "image" in e and ("invalid_request" in e or "could not" in e or "decode" in e)
+    )
+
+
 def estimate_tokens(messages: list) -> int:
     """Rough token estimate: chars / 3.5.
 

{drydock_cli-3.0.80 → drydock_cli-3.0.81/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.0.80
+Version: 3.0.81
 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.80 → drydock_cli-3.0.81}/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.80"
+version = "3.0.81"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

{drydock_cli-3.0.80 → drydock_cli-3.0.81}/tests/test_cci.py

@@ -80,3 +80,19 @@ def test_load_map_creates_dir_and_caches(tmp_path, monkeypatch):
     m = cci.load_map(str(tmp_path))
     assert m["CCI-000366"] == "cm-6"                 # parsed from the "fetched" list
     assert cci.cache_path(str(tmp_path)).exists()    # cached as json
+
+
+def test_parse_cci_tolerates_malformed_items(tmp_path):
+    # items with no references, empty references, and non-NIST refs are skipped,
+    # not crashed on
+    xml = ('<?xml version="1.0"?><cci_list><cci_items>'
+           '<cci_item id="CCI-A"></cci_item>'                       # no references
+           '<cci_item id="CCI-B"><references></references></cci_item>'
+           '<cci_item id="CCI-C"><references>'
+           '<reference title="Some Other Doc" version="1" index="X-9"/></references></cci_item>'
+           '<cci_item id="CCI-D"><references>'
+           '<reference title="NIST SP 800-53 Revision 5" version="5" index="SI-4"/></references></cci_item>'
+           '</cci_items></cci_list>')
+    p = tmp_path / "c.xml"; p.write_text(xml)
+    m = cci.parse_cci_list(p)
+    assert m == {"CCI-D": "si-4"}                            # only the valid mapping

{drydock_cli-3.0.80 → drydock_cli-3.0.81}/tests/test_poam.py

@@ -48,3 +48,33 @@ def test_write_csv_has_emass_headers(tmp_path):
         assert reader.fieldnames == poam.EMASS_HEADERS
         row = next(reader)
         assert row["Control"] == "CM-6" and row["Severity"] == "High"
+
+
+def test_poam_cklb_mixed_severities(tmp_path):
+    import json
+    data = {"stigs": [{"stig_name": "S", "version": "1", "rules": [
+        {"group_id": "V-10", "rule_id": "SV-10", "rule_title": "low one", "severity": "low",
+         "status": "open", "fix_text": "fix low", "ccis": ["CCI-1"]},
+        {"group_id": "V-11", "rule_id": "SV-11", "rule_title": "med one", "severity": "medium",
+         "status": "open", "fix_text": "fix med"},
+        {"group_id": "V-12", "rule_id": "SV-12", "rule_title": "clean", "severity": "high",
+         "status": "not_a_finding"},
+    ]}]}
+    p = tmp_path / "m.cklb"; p.write_text(json.dumps(data))
+    cl = stig.load(p)
+    rows = poam.poam_rows(cl, {"CCI-1": "ac-2"})
+    assert len(rows) == 2                                  # 2 open, the NAF excluded
+    by_sev = {r["Source Identifying Vulnerability"]: r["Severity"] for r in rows}
+    assert by_sev["SV-10"] == "Low" and by_sev["SV-11"] == "Moderate"
+    assert rows[0]["Control"] == "AC-2"                    # CCI-1 mapped
+    assert rows[1]["Control"] == "(no CCI)"                # no cci on V-11
+
+
+def test_poam_empty_checklist_writes_header_only(tmp_path):
+    import json
+    p = tmp_path / "e.cklb"; p.write_text(json.dumps({"stigs": [{"rules": []}]}))
+    cl = stig.load(p)
+    out = tmp_path / "e.csv"
+    assert poam.export(cl, {}, out)["rows"] == 0
+    lines = out.read_text().strip().splitlines()
+    assert len(lines) == 1 and lines[0].startswith("Control,")   # header only, valid CSV

{drydock_cli-3.0.80 → drydock_cli-3.0.81}/tests/test_server_probe.py

@@ -37,3 +37,21 @@ def test_probe_unreachable_is_none(monkeypatch):
     def boom(url, timeout=0): raise OSError("offline")
     monkeypatch.setattr(urllib.request, "urlopen", boom)
     assert providers.probe_server_context("http://localhost:9999/v1") is None
+
+
+def test_probe_garbage_and_missing_fields(monkeypatch):
+    import urllib.request
+    def fake(url, timeout=0):
+        return _Resp({"unexpected": "shape"})              # no n_ctx / max_model_len
+    monkeypatch.setattr(urllib.request, "urlopen", fake)
+    assert providers.probe_server_context("http://localhost:8000/v1") is None
+
+
+def test_probe_zero_or_negative_ignored(monkeypatch):
+    import urllib.request
+    def fake(url, timeout=0):
+        if url.endswith("/props"):
+            return _Resp({"default_generation_settings": {"n_ctx": 0}})
+        return _Resp({"data": [{"max_model_len": -1}]})
+    monkeypatch.setattr(urllib.request, "urlopen", fake)
+    assert providers.probe_server_context("http://localhost:8000/v1") is None

{drydock_cli-3.0.80 → drydock_cli-3.0.81}/tests/test_viewimage.py

@@ -66,3 +66,11 @@ def test_read_on_image_points_to_viewimage(tmp_path):
     (tmp_path / "f.txt").write_text("hello\nworld\n")
     txt = reg.execute("Read", {"file_path": str(tmp_path / "f.txt")}, {"cwd": str(tmp_path)})
     assert "hello" in txt and "ViewImage" not in txt
+
+
+def test_image_load_error_classifier():
+    from drydock.compaction import is_image_load_error
+    assert is_image_load_error("Error code: 400 - {'error': {'message': 'Failed to load image or audio file'}}")
+    assert is_image_load_error("invalid_request_error: could not decode image")
+    assert not is_image_load_error("rate limit exceeded")
+    assert not is_image_load_error("context_length_exceeded")