docassert 0.14.0__tar.gz → 0.14.1__tar.gz

{docassert-0.14.0/docassert.egg-info → docassert-0.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docassert
-Version: 0.14.0
+Version: 0.14.1
 Summary: Unit testing for business documents — validate structured Markdown docs against a configurable audit standard.
 Author: C4G Enterprises Inc.
 License: Apache-2.0

{docassert-0.14.0 → docassert-0.14.1}/docassert/__init__.py

@@ -5,4 +5,4 @@ standard: deterministic structural checks that gate a merge, plus optional
 AI-graded semantic checks that advise.
 """
 
-__version__ = "0.14.0"
+__version__ = "0.14.1"

{docassert-0.14.0 → docassert-0.14.1}/docassert/bridge/board.py

@@ -7,7 +7,7 @@ writes converge on the same values.
 """
 from __future__ import annotations
 
-from .gh import GhRunner
+from .gh import GhError, GhRunner
 
 FIELD_SPECS: dict[str, dict] = {
     "Type": {"dataType": "SINGLE_SELECT", "options": ["Feature", "Story"]},
@@ -67,22 +67,28 @@ def ensure_fields(gh: GhRunner, owner: str, number: int) -> dict:
     for name, spec in FIELD_SPECS.items():
         if name in project["fields"]:
             continue
-        if spec["dataType"] == "SINGLE_SELECT":
-            opts = ", ".join(
-                f'{{name: "{o}", color: GRAY, description: ""}}'
-                for o in spec["options"])
-            gh.graphql(
-                "mutation($p: ID!, $n: String!) { createProjectV2Field(input: {"
-                "projectId: $p, dataType: SINGLE_SELECT, name: $n, "
-                f"singleSelectOptions: [{opts}]"
-                "}) { projectV2Field { ... on ProjectV2FieldCommon { id } } } }",
-                p=project["id"], n=name)
-        else:
-            gh.graphql(
-                "mutation($p: ID!, $n: String!) { createProjectV2Field(input: {"
-                "projectId: $p, dataType: TEXT, name: $n"
-                "}) { projectV2Field { ... on ProjectV2FieldCommon { id } } } }",
-                p=project["id"], n=name)
+        try:
+            if spec["dataType"] == "SINGLE_SELECT":
+                opts = ", ".join(
+                    f'{{name: "{o}", color: GRAY, description: ""}}'
+                    for o in spec["options"])
+                gh.graphql(
+                    "mutation($p: ID!, $n: String!) { createProjectV2Field(input: {"
+                    "projectId: $p, dataType: SINGLE_SELECT, name: $n, "
+                    f"singleSelectOptions: [{opts}]"
+                    "}) { projectV2Field { ... on ProjectV2FieldCommon { id } } } }",
+                    p=project["id"], n=name)
+            else:
+                gh.graphql(
+                    "mutation($p: ID!, $n: String!) { createProjectV2Field(input: {"
+                    "projectId: $p, dataType: TEXT, name: $n"
+                    "}) { projectV2Field { ... on ProjectV2FieldCommon { id } } } }",
+                    p=project["id"], n=name)
+        except GhError as exc:
+            # A concurrent sync created it between our read and our write;
+            # an existing field is the outcome we wanted.
+            if "already been taken" not in str(exc).lower():
+                raise
     return get_project(gh, owner, number)
 
 

{docassert-0.14.0 → docassert-0.14.1}/docassert/bridge/ops.py

@@ -45,6 +45,33 @@ def _index(issues: list[dict]) -> dict[str, dict]:
     return out
 
 
+def _converge_duplicates(gh, repo: str, issues: list[dict]) -> tuple[list[dict], list[str]]:
+    """One open issue per bridge marker: racing scaffolds may have created
+    duplicates, so close every open duplicate except the lowest-numbered one
+    and drop the closed ones from the working set. First writer wins."""
+    from collections import defaultdict
+    by_marker: dict[str, list[dict]] = defaultdict(list)
+    for issue in issues:
+        m = MARKER_RE.search(issue.get("body") or "")
+        if m and issue.get("state") == "open":
+            by_marker[m.group(1)].append(issue)
+    actions: list[str] = []
+    losers: set[int] = set()
+    for marker, dupes in by_marker.items():
+        if len(dupes) < 2:
+            continue
+        dupes.sort(key=lambda i: i["number"])
+        for extra in dupes[1:]:
+            G.update_issue(gh, repo, extra["number"], state="closed")
+            G.comment(gh, repo, extra["number"],
+                      f"Duplicate of #{dupes[0]['number']} (bridge marker "
+                      f"{marker}); racing scaffold runs converge on the "
+                      "lowest-numbered issue.")
+            losers.add(extra["number"])
+            actions.append(f"converged duplicate #{extra['number']} -> #{dupes[0]['number']}")
+    return [i for i in issues if i["number"] not in losers], actions
+
+
 def scaffold(plan: BridgePlan, gh: G.GhRunner, repo: str,
              docs_url: str | None = None,
              board_cfg: dict | None = None) -> list[str]:
@@ -59,6 +86,8 @@ def scaffold(plan: BridgePlan, gh: G.GhRunner, repo: str,
         G.ensure_label(gh, repo, name, color, desc)
 
     issues = G.list_issues(gh, repo)
+    issues, converge_actions = _converge_duplicates(gh, repo, issues)
+    actions.extend(converge_actions)
     by_key = _index(issues)
 
     def ensure(key: str, title: str, body: str, label: str) -> dict:

{docassert-0.14.0 → docassert-0.14.1/docassert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docassert
-Version: 0.14.0
+Version: 0.14.1
 Summary: Unit testing for business documents — validate structured Markdown docs against a configurable audit standard.
 Author: C4G Enterprises Inc.
 License: Apache-2.0

{docassert-0.14.0 → docassert-0.14.1}/tests/test_bridge.py

@@ -441,3 +441,32 @@ def test_anchor_without_repo_keeps_single_repo_mode_working(tmp_path):
     gh = FakeGh()
     ops.scaffold(plan, gh, "o/r", docs_url=None)
     assert any("issues" in " ".join(c) for c in gh.calls)
+
+
+# ── concurrency safety (ENG-PR-006) ──────────────────────────────────────────
+def test_scaffold_converges_racing_duplicates(tmp_path):
+    plan = build_bridge_plan(_tree(tmp_path))
+    fid = plan.features[0].id
+    dupes = [_mk_issue(5, fid), _mk_issue(9, fid)]
+    gh = FakeGh(issues=dupes)
+    actions = ops.scaffold(plan, gh, "o/r", docs_url=None)
+    assert any("converged duplicate #9" in a for a in actions)
+    patches = [c for c in gh.calls if "repos/o/r/issues/9" in " ".join(c)
+               and "state=closed" in " ".join(c)]
+    assert patches, "the higher-numbered duplicate is closed"
+
+
+def test_ensure_fields_tolerates_existing_field():
+    gh = BoardGh()
+    original = gh.graphql
+
+    def racing(query, **kw):
+        if "createProjectV2Field" in query:
+            from docassert.bridge.gh import GhError
+            raise GhError('[{"message": "Name has already been taken"}]')
+        return original(query, **kw)
+
+    gh.graphql = racing
+    from docassert.bridge import board
+    project = board.ensure_fields(gh, "o", 1)   # must not raise
+    assert project["id"]