bmsdna-devtools 0.23.0__tar.gz → 0.24.0__tar.gz

{bmsdna_devtools-0.23.0 → bmsdna_devtools-0.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: bmsdna-devtools
-Version: 0.23.0
+Version: 0.24.0
 Summary: Shared Azure DevOps / GitHub / git / Azure Monitor developer tooling for BMS projects
 Requires-Python: >=3.14
 Requires-Dist: pgdevkit[db]>=0.7.1

{bmsdna_devtools-0.23.0 → bmsdna_devtools-0.24.0}/bmsdna/devtools/ado_issue.py

@@ -60,8 +60,12 @@ def resolve_board(board: str | None, start: Path | None = None) -> str | None:
     return board or load_bdt_table("ado", start).get("board")
 
 
+def _org_url(remote: AdoRemote) -> str:
+    return f"https://dev.azure.com/{quote(remote.org, safe='')}"
+
+
 def _base_url(remote: AdoRemote) -> str:
-    return f"https://dev.azure.com/{quote(remote.org, safe='')}/{quote(remote.project, safe='')}"
+    return f"{_org_url(remote)}/{quote(remote.project, safe='')}"
 
 
 def get_team_area_path(session: requests.Session, remote: AdoRemote, team: str) -> str:
@@ -395,8 +399,11 @@ def html_url(work_item: dict) -> str | None:
     return work_item.get("_links", {}).get("html", {}).get("href")
 
 
-def edit_url(remote: AdoRemote, work_item_id: int) -> str:
-    return f"{_base_url(remote)}/_workitems/edit/{work_item_id}"
+def edit_url(remote: AdoRemote, work_item_id: int, project: str | None = None) -> str:
+    """`project` overrides `remote.project` -- needed by an org-wide `search()`, whose results
+    can belong to a different project than the one the command was run in.
+    """
+    return f"{_org_url(remote)}/{quote(project or remote.project, safe='')}/_workitems/edit/{work_item_id}"
 
 
 def _escape_wiql_string(value: str) -> str:
@@ -415,11 +422,13 @@ def build_search_wiql(
     since: str | None = None,
     area_path: str | None = None,
     state: str = "open",
+    org_wide: bool = False,
+    tags: list[str] | None = None,
 ) -> str:
     """WIQL for work items whose Title or Description contains every given keyword (ANDed),
-    optionally restricted to items changed on/after `since` (an ISO 'YYYY-MM-DD' date) and/or
-    scoped to a board's Area Path subtree, most recently changed first. `keywords` may be empty,
-    to list work items without a text filter.
+    optionally restricted to items changed on/after `since` (an ISO 'YYYY-MM-DD' date), carrying
+    every given tag (ANDed), and/or scoped to a board's Area Path subtree, most recently changed
+    first. `keywords` may be empty, to list work items without a text filter.
 
     `since` is rendered as a UTC ISO 8601 literal (`'YYYY-MM-DDT00:00:00Z'`) — the one
     DateTime format WIQL accepts regardless of the querying account's locale/date-pattern
@@ -430,11 +439,21 @@ def build_search_wiql(
     CMMI use 'Closed' for their Completed-category state, Scrum and Basic use 'Done' — so
     `_TERMINAL_STATES` is the union across the built-in templates, not a per-project source of
     truth (a custom process with its own state names won't be filtered correctly).
+
+    `org_wide` drops the `[System.TeamProject] = @project` clause -- `@project` is only valid
+    when the query runs against a project-scoped WIQL endpoint (see `run_wiql`'s `org_wide`),
+    and dropping it is what actually lets the query match work items outside the current project.
+
+    `tags` is a separate filter from `keywords` -- `Contains Words` against Title/Description
+    doesn't match `System.Tags` at all, so a tag search (e.g. every work item tagged
+    'ready4implementation' across the whole org) needs its own `[System.Tags] Contains` clause.
     """
     clauses = [
         f"([System.Title] Contains Words '{_escape_wiql_string(k)}' OR [System.Description] Contains Words '{_escape_wiql_string(k)}')"
         for k in keywords
     ]
+    for tag in tags or []:
+        clauses.append(f"[System.Tags] Contains '{_escape_wiql_string(tag)}'")
     if since:
         clauses.append(f"[System.ChangedDate] >= '{since}T00:00:00Z'")
     if area_path:
@@ -443,13 +462,21 @@ def build_search_wiql(
         clauses.append(" AND ".join(f"[System.State] <> '{s}'" for s in _TERMINAL_STATES))
     elif state == "closed":
         clauses.append("(" + " OR ".join(f"[System.State] = '{s}'" for s in _TERMINAL_STATES) + ")")
-    where = " AND ".join(["[System.TeamProject] = @project", *clauses])
-    return f"SELECT [System.Id] FROM WorkItems WHERE {where} ORDER BY [System.ChangedDate] DESC"
+    if not org_wide:
+        clauses.insert(0, "[System.TeamProject] = @project")
+    query = "SELECT [System.Id] FROM WorkItems"
+    if clauses:
+        query += " WHERE " + " AND ".join(clauses)
+    return f"{query} ORDER BY [System.ChangedDate] DESC"
 
 
-def run_wiql(session: requests.Session, remote: AdoRemote, wiql: str, top: int) -> list[int]:
+def run_wiql(session: requests.Session, remote: AdoRemote, wiql: str, top: int, org_wide: bool = False) -> list[int]:
+    """`org_wide` runs the query against the org-level WIQL endpoint (no `/{project}` segment),
+    which Azure DevOps resolves across every project in the org instead of just `remote.project`.
+    """
+    base = _org_url(remote) if org_wide else _base_url(remote)
     r = session.post(
-        f"{_base_url(remote)}/_apis/wit/wiql",
+        f"{base}/_apis/wit/wiql",
         params={"api-version": "7.1", "$top": top},
         json={"query": wiql},
     )
@@ -457,16 +484,23 @@ def run_wiql(session: requests.Session, remote: AdoRemote, wiql: str, top: int)
     return [wi["id"] for wi in r.json()["workItems"]]
 
 
-def get_work_items(session: requests.Session, remote: AdoRemote, ids: list[int]) -> list[dict]:
-    """Batch-fetch Title/State for a set of work item ids, in the given `ids` order — WIQL only
-    returns ids (not field values), and this batch endpoint doesn't guarantee it echoes them back
-    in the order they were requested, so the caller's WIQL `ORDER BY` isn't preserved otherwise.
+def get_work_items(session: requests.Session, remote: AdoRemote, ids: list[int], org_wide: bool = False) -> list[dict]:
+    """Batch-fetch Title/State (plus TeamProject when `org_wide`) for a set of work item ids, in
+    the given `ids` order — WIQL only returns ids (not field values), and this batch endpoint
+    doesn't guarantee it echoes them back in the order they were requested, so the caller's WIQL
+    `ORDER BY` isn't preserved otherwise.
+
+    `org_wide` fetches via the org-level endpoint (ids from an org-wide `run_wiql` may belong to
+    a project other than `remote.project`) and also asks for `System.TeamProject`, so `search()`
+    can show which project each result came from.
     """
     if not ids:
         return []
+    base = _org_url(remote) if org_wide else _base_url(remote)
+    fields = "System.Title,System.State,System.TeamProject" if org_wide else "System.Title,System.State"
     r = session.get(
-        f"{_base_url(remote)}/_apis/wit/workitems",
-        params={"ids": ",".join(map(str, ids)), "fields": "System.Title,System.State", "api-version": "7.1"},
+        f"{base}/_apis/wit/workitems",
+        params={"ids": ",".join(map(str, ids)), "fields": fields, "api-version": "7.1"},
     )
     r.raise_for_status()
     by_id = {item["id"]: item for item in r.json()["value"]}
@@ -481,19 +515,31 @@ def search(
     board: str | None = None,
     top: int = 10,
     state: str = "open",
+    org_wide: bool = False,
+    tags: list[str] | None = None,
 ) -> list[dict]:
     """Search (or, with no keywords, just list) work items by keywords (ANDed, matched against
     Title or Description) and state, most recently changed first. `board` is an Azure Boards team
     name (like `create`'s `--board`) — resolved to its Area Path so results are scoped to that
-    team's subtree instead of the whole project.
+    team's subtree instead of the whole project. `tags` is a separate ANDed filter against
+    `System.Tags` (see `build_search_wiql`) -- a plain keyword doesn't match tags.
+
+    `org_wide` searches every project in `remote.org` instead of just `remote.project` --
+    mutually exclusive with `board`, since a team's Area Path only means something within a
+    single project.
     """
+    if org_wide and board:
+        sys.exit("--board can't be combined with --org-wide (a board's Area Path is scoped to a single project).")
     area_path = get_team_area_path(session, remote, board) if board else None
-    ids = run_wiql(session, remote, build_search_wiql(keywords, since, area_path, state), top)
-    items = get_work_items(session, remote, ids)
+    wiql = build_search_wiql(keywords, since, area_path, state, org_wide=org_wide, tags=tags)
+    ids = run_wiql(session, remote, wiql, top, org_wide=org_wide)
+    items = get_work_items(session, remote, ids, org_wide=org_wide)
     for item in items:
         fields = item["fields"]
-        print(f"#{item['id']} [{fields['System.State']}] {fields['System.Title']}")
-        print(edit_url(remote, item["id"]))
+        project = fields.get("System.TeamProject")
+        prefix = f"[{project}] " if org_wide else ""
+        print(f"{prefix}#{item['id']} [{fields['System.State']}] {fields['System.Title']}")
+        print(edit_url(remote, item["id"], project if org_wide else None))
     if not items:
         print("No matching work items found.")
     return items

{bmsdna_devtools-0.23.0 → bmsdna_devtools-0.24.0}/bmsdna/devtools/cli.py

@@ -537,6 +537,14 @@ def issue_search(
         r"(falls back to \[tool.bdt.github].board), same as `issue create`",
     ),
     limit: int = typer.Option(10, "--limit", help="Max results to return"),
+    org_wide: bool = typer.Option(
+        False,
+        "--org-wide",
+        help="Search every project in the Azure DevOps org, or every repo owned by the GitHub owner, "
+        "instead of just the current one. Can't be combined with --board.",
+    ),
+    label: list[str] = typer.Option([], "--label", help="Only issues carrying this label, ANDed (GitHub only, repeatable)"),
+    tag: list[str] = typer.Option([], "--tag", help="Only work items carrying this tag, ANDed (Azure DevOps only, repeatable)"),
     pat: str | None = typer.Option(
         None,
         "--pat",
@@ -554,12 +562,14 @@ def issue_search(
     remote = current_remote()
     if isinstance(remote, GitHubRemote):
         resolved_board = gh_issue.resolve_board(board)
-        gh_issue.search(require_gh(), remote.owner, remote.repo, keywords or [], since, limit, state, board=resolved_board)
+        gh_issue.search(
+            require_gh(), remote.owner, remote.repo, keywords or [], since, limit, state, board=resolved_board, org_wide=org_wide, labels=label
+        )
     else:
         session = requests.Session()
         session.headers.update(auth_header(pat))
         resolved_board = ado_issue.resolve_board(board)
-        ado_issue.search(session, remote, keywords or [], since=since, board=resolved_board, top=limit, state=state)
+        ado_issue.search(session, remote, keywords or [], since=since, board=resolved_board, top=limit, state=state, org_wide=org_wide, tags=tag)
 
 
 @issue_app.command("update")

{bmsdna_devtools-0.23.0 → bmsdna_devtools-0.24.0}/bmsdna/devtools/gh_issue.py

@@ -215,18 +215,66 @@ def build_search_query(keywords: list[str], since: str | None) -> str:
 
 
 def search(
-    gh: str, owner: str, repo: str, keywords: list[str], since: str | None, limit: int, state: str = "open", board: str | None = None
+    gh: str,
+    owner: str,
+    repo: str,
+    keywords: list[str],
+    since: str | None,
+    limit: int,
+    state: str = "open",
+    board: str | None = None,
+    org_wide: bool = False,
+    labels: list[str] | None = None,
 ) -> list[dict]:
     """Search (or, with no keywords, just list) issues by state, most recently updated first.
 
     `state` is `gh issue list`'s own `open|closed|all` flag, not a search qualifier. `board`
     scopes results to a GitHub Projects (v2) board (by title or number) -- `gh issue list` has no
     board filter of its own, so this over-fetches a wider raw pool first and filters down to
-    `limit` afterward, client-side.
+    `limit` afterward, client-side. `labels` is ANDed (an issue must carry every given label) --
+    both `gh issue list` and `gh search issues` support a native, repeatable `--label` flag, so
+    it doesn't need folding into `query` as a `label:` qualifier.
+
+    `org_wide` searches every repo `owner` has, via `gh search issues --owner` (GitHub's
+    cross-repo search endpoint) instead of `gh issue list` (always single-repo, scoped by cwd's
+    git remote) -- mutually exclusive with `board`, whose membership is only resolved against
+    `repo`, not every repo under `owner`.
     """
+    if org_wide and board:
+        sys.exit("--board can't be combined with --org-wide (board membership is only resolved for the current repo).")
+
     query = build_search_query(keywords, since)
+    label_args = [arg for label in labels or [] for arg in ("--label", label)]
+
+    if org_wide:
+        # `gh search issues --state` only accepts open/closed (unlike `gh issue list --state`
+        # below, which also takes 'all') -- so 'all' is passed by omitting --state entirely
+        # (`gh search issues`'s own default), rather than forwarding a value it would reject.
+        #
+        # `gh search issues`' `--json state` also returns lowercase 'open'/'closed' (the GitHub
+        # search API's own casing), unlike `gh issue list`'s 'OPEN'/'CLOSED' below (GraphQL enum
+        # casing) -- both are printed as-is, so the two search modes' output differs in casing.
+        state_args = [] if state == "all" else ["--state", state]
+        out = _run_gh(
+            gh,
+            [
+                "search", "issues", query, "--owner", owner, *state_args, *label_args,
+                "--limit", str(limit), "--json", "number,title,url,state,repository",
+            ],
+        )
+        items = json.loads(out) if out else []
+        for item in items:
+            print(f"{item['repository']['nameWithOwner']}#{item['number']} [{item['state']}] {item['title']}")
+            print(item["url"])
+        if not items:
+            print("No matching issues found.")
+        return items
+
     fetch_limit = limit * _BOARD_SEARCH_OVERFETCH if board else limit
-    out = _run_gh(gh, ["issue", "list", "--search", query, "--state", state, "--limit", str(fetch_limit), "--json", "number,title,url,state"])
+    out = _run_gh(
+        gh,
+        ["issue", "list", "--search", query, "--state", state, *label_args, "--limit", str(fetch_limit), "--json", "number,title,url,state"],
+    )
     items = json.loads(out) if out else []
 
     if board:

{bmsdna_devtools-0.23.0 → bmsdna_devtools-0.24.0}/pyproject.toml

@@ -10,7 +10,7 @@ packages = ["bmsdna"]
 
 [project]
 name = "bmsdna-devtools"
-version = "0.23.0"
+version = "0.24.0"
 description = "Shared Azure DevOps / GitHub / git / Azure Monitor developer tooling for BMS projects"
 readme = "README.md"
 requires-python = ">=3.14"  # pgdevkit>=0.7.1 requires 3.14; was >=3.11 before adding it as a dependency

{bmsdna_devtools-0.23.0 → bmsdna_devtools-0.24.0}/tests/test_ado_issue.py

@@ -1,5 +1,7 @@
 from unittest.mock import MagicMock
 
+import pytest
+
 from bmsdna.devtools.ado_issue import (
     add_pr_available_tag,
     add_tag,
@@ -9,8 +11,11 @@ from bmsdna.devtools.ado_issue import (
     build_update_ops,
     edit_url,
     get_work_item_tags,
+    get_work_items,
     html_url,
     resolve_board,
+    run_wiql,
+    search,
     upload_attachment,
 )
 from bmsdna.devtools.gitrepo import AdoRemote
@@ -248,6 +253,79 @@ def test_build_search_wiql_no_area_path_by_default() -> None:
     assert "AreaPath" not in build_search_wiql(["auth"])
 
 
+def test_build_search_wiql_org_wide_drops_team_project_clause() -> None:
+    wiql = build_search_wiql(["auth"], org_wide=True)
+    assert "TeamProject" not in wiql
+
+
+def test_build_search_wiql_org_wide_with_no_other_clauses_has_no_where() -> None:
+    assert build_search_wiql([], state="all", org_wide=True) == "SELECT [System.Id] FROM WorkItems ORDER BY [System.ChangedDate] DESC"
+
+
+def test_build_search_wiql_not_org_wide_still_scopes_to_project() -> None:
+    assert "[System.TeamProject] = @project" in build_search_wiql(["auth"], org_wide=False)
+
+
+def test_edit_url_org_wide_uses_given_project_not_remote_project() -> None:
+    assert (
+        edit_url(REMOTE, 42, project="OtherProj")
+        == "https://dev.azure.com/myorg/OtherProj/_workitems/edit/42"
+    )
+
+
+def test_run_wiql_org_wide_hits_org_level_endpoint_without_project() -> None:
+    session = MagicMock()
+    session.post.return_value.json.return_value = {"workItems": [{"id": 1}]}
+
+    run_wiql(session, REMOTE, "SELECT ...", 10, org_wide=True)
+
+    url = session.post.call_args.args[0]
+    assert url == "https://dev.azure.com/myorg/_apis/wit/wiql"
+
+
+def test_run_wiql_project_scoped_by_default() -> None:
+    session = MagicMock()
+    session.post.return_value.json.return_value = {"workItems": []}
+
+    run_wiql(session, REMOTE, "SELECT ...", 10)
+
+    url = session.post.call_args.args[0]
+    assert url == "https://dev.azure.com/myorg/MyProj/_apis/wit/wiql"
+
+
+def test_get_work_items_org_wide_requests_team_project_field() -> None:
+    session = MagicMock()
+    session.get.return_value.json.return_value = {"value": [{"id": 1, "fields": {"System.TeamProject": "OtherProj"}}]}
+
+    get_work_items(session, REMOTE, [1], org_wide=True)
+
+    fields_param = session.get.call_args.kwargs["params"]["fields"]
+    assert "System.TeamProject" in fields_param
+    url = session.get.call_args.args[0]
+    assert url == "https://dev.azure.com/myorg/_apis/wit/workitems"
+
+
+def test_search_org_wide_and_board_together_exits() -> None:
+    session = MagicMock()
+    with pytest.raises(SystemExit):
+        search(session, REMOTE, [], board="SomeTeam", org_wide=True)
+
+
+def test_search_org_wide_prints_project_prefix(capsys) -> None:
+    session = MagicMock()
+    session.post.return_value.json.return_value = {"workItems": [{"id": 1}]}
+    session.get.return_value.json.return_value = {
+        "value": [{"id": 1, "fields": {"System.Title": "Some bug", "System.State": "Active", "System.TeamProject": "OtherProj"}}]
+    }
+
+    items = search(session, REMOTE, [], org_wide=True)
+
+    assert len(items) == 1
+    out = capsys.readouterr().out
+    assert "[OtherProj] #1 [Active] Some bug" in out
+    assert "https://dev.azure.com/myorg/OtherProj/_workitems/edit/1" in out
+
+
 # -- get_work_item_tags / add_tag / add_pr_available_tag --------------------
 
 

{bmsdna_devtools-0.23.0 → bmsdna_devtools-0.24.0}/tests/test_gh_issue.py

@@ -114,6 +114,84 @@ def test_search_board_overfetches_then_filters_to_limit(monkeypatch) -> None:
     assert all(item["number"] % 2 == 0 for item in results)
 
 
+def test_search_org_wide_uses_gh_search_issues_with_owner(monkeypatch) -> None:
+    import json
+
+    captured_cmd: list[str] = []
+    items = [
+        {"number": 5, "title": "org-wide bug", "url": "https://github.com/owner/other-repo/issues/5", "state": "open", "repository": {"nameWithOwner": "owner/other-repo"}}
+    ]
+
+    def fake_run(cmd, **kwargs):
+        captured_cmd[:] = cmd
+        return MagicMock(returncode=0, stdout=json.dumps(items), stderr="")
+
+    monkeypatch.setattr("bmsdna.devtools.gh_issue.subprocess.run", fake_run)
+
+    results = search("gh", "owner", "repo", ["auth"], None, 10, org_wide=True)
+
+    assert captured_cmd[1:3] == ["search", "issues"]
+    assert captured_cmd[captured_cmd.index("--owner") + 1] == "owner"
+    assert "--repo" not in captured_cmd
+    assert results == items
+
+
+def test_search_org_wide_all_state_omits_state_flag(monkeypatch) -> None:
+    import json
+
+    captured_cmd: list[str] = []
+
+    def fake_run(cmd, **kwargs):
+        captured_cmd[:] = cmd
+        return MagicMock(returncode=0, stdout=json.dumps([]), stderr="")
+
+    monkeypatch.setattr("bmsdna.devtools.gh_issue.subprocess.run", fake_run)
+
+    search("gh", "owner", "repo", [], None, 10, state="all", org_wide=True)
+
+    # `gh search issues --state` (unlike `gh issue list --state`) has no 'all' value -- it must
+    # be omitted, not forwarded, or `gh` rejects it outright.
+    assert "--state" not in captured_cmd
+
+
+def test_search_org_wide_passes_labels_as_repeatable_flag(monkeypatch) -> None:
+    import json
+
+    captured_cmd: list[str] = []
+
+    def fake_run(cmd, **kwargs):
+        captured_cmd[:] = cmd
+        return MagicMock(returncode=0, stdout=json.dumps([]), stderr="")
+
+    monkeypatch.setattr("bmsdna.devtools.gh_issue.subprocess.run", fake_run)
+
+    search("gh", "owner", "repo", [], None, 10, org_wide=True, labels=["bug", "urgent"])
+
+    label_indices = [i for i, arg in enumerate(captured_cmd) if arg == "--label"]
+    assert [captured_cmd[i + 1] for i in label_indices] == ["bug", "urgent"]
+
+
+def test_search_non_org_wide_passes_labels_as_repeatable_flag(monkeypatch) -> None:
+    import json
+
+    captured_cmd: list[str] = []
+
+    def fake_run(cmd, **kwargs):
+        captured_cmd[:] = cmd
+        return MagicMock(returncode=0, stdout=json.dumps([]), stderr="")
+
+    monkeypatch.setattr("bmsdna.devtools.gh_issue.subprocess.run", fake_run)
+
+    search("gh", "owner", "repo", [], None, 10, labels=["bug"])
+
+    assert captured_cmd[captured_cmd.index("--label") + 1] == "bug"
+
+
+def test_search_org_wide_and_board_together_exits(monkeypatch) -> None:
+    with pytest.raises(SystemExit):
+        search("gh", "owner", "repo", [], None, 10, board="Roadmap", org_wide=True)
+
+
 def test_search_board_ignores_same_number_issue_from_a_different_repo(monkeypatch) -> None:
     import json
 

{bmsdna_devtools-0.23.0 → bmsdna_devtools-0.24.0}/uv.lock

@@ -22,7 +22,7 @@ wheels = [
 
 [[package]]
 name = "bmsdna-devtools"
-version = "0.23.0"
+version = "0.24.0"
 source = { editable = "." }
 dependencies = [
     { name = "pgdevkit", extra = ["db"] },