deepsieve-cli 0.1.1__tar.gz → 0.2.0__tar.gz

{deepsieve_cli-0.1.1 → deepsieve_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: deepsieve-cli
-Version: 0.1.1
+Version: 0.2.0
 Summary: DeepSieve CLI — run cited deep research from your terminal
 Requires-Python: >=3.11
 Requires-Dist: httpx>=0.27

{deepsieve_cli-0.1.1 → deepsieve_cli-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "deepsieve-cli"
-version = "0.1.1"
+version = "0.2.0"
 description = "DeepSieve CLI — run cited deep research from your terminal"
 requires-python = ">=3.11"
 readme = "README.md"

{deepsieve_cli-0.1.1 → deepsieve_cli-0.2.0}/src/deepsieve_cli/main.py

@@ -346,10 +346,49 @@ def cmd_members_list(args) -> int:
     return EXIT_OK
 
 
+def _blueprint_id(client, args) -> str | None:
+    """The Blueprint these commands address: ``--blueprint``, else the active one.
+
+    `/v1/data` was removed (pre-GA breaking change): every dataset read now names
+    its Blueprint in the path, because a read against the wrong one returns a
+    well-formed dataset about the wrong domain and nothing in the response says
+    so. The CLI keeps its zero-argument form by resolving the active Blueprint
+    here — one extra request, and only when no id was given.
+
+    Returns None after printing the reason, so callers exit non-zero rather than
+    falling back to some other Blueprint.
+    """
+    if getattr(args, "blueprint", None):
+        return args.blueprint
+    try:
+        body = client.request("GET", "/v1/blueprints")
+    except ApiError as exc:
+        err(str(exc))
+        return None
+    rows = body.get("data") or []
+    active = next((r for r in rows if r.get("is_active")), None)
+    if active is None:
+        # Say which of the two states this is. "No Blueprints at all" and "none
+        # of them is active" need different actions from the user, and an
+        # unqualified "not found" would send them looking for the wrong problem.
+        if not rows:
+            err("no Blueprints yet — design one in the app first.")
+        else:
+            err(
+                "no active Blueprint. Pass --blueprint <id>; "
+                "`deepsieve data catalog --blueprint <id>` lists ids via /v1/blueprints."
+            )
+        return None
+    return active.get("id")
+
+
 def cmd_data_catalog(args) -> int:
     client, _ = _require_auth(args)
+    bp_id = _blueprint_id(client, args)
+    if bp_id is None:
+        return EXIT_FAIL
     try:
-        body = client.request("GET", "/v1/data")
+        body = client.request("GET", f"/v1/blueprints/{bp_id}")
     except ApiError as exc:
         err(str(exc))
         return EXIT_FAIL
@@ -364,13 +403,18 @@ def cmd_data_catalog(args) -> int:
 
 def cmd_data_get(args) -> int:
     client, _ = _require_auth(args)
+    bp_id = _blueprint_id(client, args)
+    if bp_id is None:
+        return EXIT_FAIL
     params: dict[str, Any] = {"limit": args.limit, "receipts": args.receipts}
     if args.cursor:
         params["cursor"] = args.cursor
     if args.updated_since:
         params["updated_since"] = args.updated_since
     try:
-        body = client.request("GET", f"/v1/data/{args.entity}", params=params)
+        body = client.request(
+            "GET", f"/v1/blueprints/{bp_id}/entities/{args.entity}", params=params
+        )
     except ApiError as exc:
         err(str(exc))
         return EXIT_FAIL
@@ -515,6 +559,7 @@ def build_parser() -> argparse.ArgumentParser:
     data = sub.add_parser("data", help="your cited dataset", parents=[common]).add_subparsers(dest="sub", required=True)
 
     dc = data.add_parser("catalog", help="entities and columns (never guess these)", parents=[common])
+    dc.add_argument("--blueprint", help="Blueprint id (default: the active one)")
     dc.set_defaults(func=cmd_data_catalog)
 
     dg = data.add_parser("get", help="rows for one entity", parents=[common])
@@ -523,6 +568,7 @@ def build_parser() -> argparse.ArgumentParser:
     dg.add_argument("--cursor")
     dg.add_argument("--updated-since")
     dg.add_argument("--receipts", action="store_true", help="include per-cell citations")
+    dg.add_argument("--blueprint", help="Blueprint id (default: the active one)")
     dg.set_defaults(func=cmd_data_get)
 
     setup = sub.add_parser("setup", help="connect other tools", parents=[common]).add_subparsers(

{deepsieve_cli-0.1.1 → deepsieve_cli-0.2.0}/tests/test_cli.py

@@ -230,10 +230,18 @@ def test_run_create_with_neither_sends_an_empty_broad_sweep(monkeypatch):
     assert seen["body"]["dry_run"] is True
 
 
+# A workspace with one Blueprint, active. `data` commands resolve through this
+# listing since #1282 removed the ambient /v1/data — so a handler that does not
+# serve it is a handler the data commands cannot get past.
+_ONE_ACTIVE_BP = {"data": [{"id": "bp_1", "name": "Finance", "is_active": True}]}
+
+
 def test_truncated_dataset_is_called_out(monkeypatch, capsys):
     cfg.save_profile(cfg.Profile(name="default", origin="https://x.test", api_key="k"))
 
-    def handler(_r):
+    def handler(r):
+        if r.url.path == "/v1/blueprints":
+            return httpx.Response(200, json=_ONE_ACTIVE_BP)
         return httpx.Response(200, json={"data": [], "truncated": True, "preview_row_cap": 10})
 
     monkeypatch.setattr(httpx, "Client", _mock(handler))
@@ -241,6 +249,59 @@ def test_truncated_dataset_is_called_out(monkeypatch, capsys):
     assert "PREVIEW" in capsys.readouterr().err
 
 
+def test_data_get_addresses_the_active_blueprint_by_id(monkeypatch):
+    """The path must NAME a Blueprint. #1282 removed the ambient `/v1/data/{key}`,
+    so a CLI still calling it would 404 against any current deployment."""
+    cfg.save_profile(cfg.Profile(name="default", origin="https://x.test", api_key="k"))
+    seen = {}
+
+    def handler(r):
+        if r.url.path == "/v1/blueprints":
+            return httpx.Response(200, json=_ONE_ACTIVE_BP)
+        seen["path"] = r.url.path
+        return httpx.Response(200, json={"data": []})
+
+    monkeypatch.setattr(httpx, "Client", _mock(handler))
+    assert main(["data", "get", "companies"]) == 0
+    assert seen["path"] == "/v1/blueprints/bp_1/entities/companies"
+
+
+def test_blueprint_flag_names_one_without_consulting_the_listing(monkeypatch):
+    """`--blueprint` is the whole point of the flag: it must not be second-guessed
+    against the active one, and it must not cost a listing call."""
+    cfg.save_profile(cfg.Profile(name="default", origin="https://x.test", api_key="k"))
+    paths = []
+
+    def handler(r):
+        paths.append(r.url.path)
+        return httpx.Response(200, json={"data": []})
+
+    monkeypatch.setattr(httpx, "Client", _mock(handler))
+    assert main(["data", "get", "companies", "--blueprint", "bp_other"]) == 0
+    assert paths == ["/v1/blueprints/bp_other/entities/companies"]
+
+
+def test_no_active_blueprint_fails_rather_than_picking_one(monkeypatch, capsys):
+    """⚠️ The failure mode this helper exists to prevent.
+
+    With several Blueprints and none active, reading "whichever" returns a
+    well-formed dataset about the wrong domain — indistinguishable from the
+    right answer. So it exits NON-ZERO and names the flag, rather than falling
+    back to the first row.
+    """
+    cfg.save_profile(cfg.Profile(name="default", origin="https://x.test", api_key="k"))
+    listed = {"data": [{"id": "a", "is_active": False}, {"id": "b", "is_active": False}]}
+
+    def handler(r):
+        if r.url.path == "/v1/blueprints":
+            return httpx.Response(200, json=listed)
+        raise AssertionError(f"must not read data without a Blueprint: {r.url.path}")
+
+    monkeypatch.setattr(httpx, "Client", _mock(handler))
+    assert main(["data", "get", "companies"]) != 0
+    assert "--blueprint" in capsys.readouterr().err
+
+
 def test_setup_mcp_names_this_profiles_origin(monkeypatch, capsys):
     cfg.save_profile(cfg.Profile(name="staging", origin="https://staging.test", api_key="k"))
     assert main(["--profile", "staging", "setup", "mcp"]) == 0