dataspring-cli 0.4.0__tar.gz → 0.4.1__tar.gz

{dataspring_cli-0.4.0 → dataspring_cli-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: dataspring-cli
-Version: 0.4.0
+Version: 0.4.1
 Summary: DataSpring CLI - Query metrics and manage dashboards from the terminal
 Project-URL: Homepage, https://dataspring.app
 Project-URL: Documentation, https://dataspring.app/docs

{dataspring_cli-0.4.0 → dataspring_cli-0.4.1}/cli/auth.py

@@ -145,8 +145,11 @@ class CLIAuthManager:
         if r.status_code != 200:
             raise AuthenticationError(f"Could not start the sign-in (HTTP {r.status_code})")
         start = r.json()
+        # flush: an agent runs this with stdout redirected, where Python
+        # buffers it; unflushed, the code appeared only after the CLI exited,
+        # too late for anyone to approve it (tick 373).
         print(f"To sign in, open {start['verification_uri']} and enter the code {start['user_code']}")
-        print(f"  (or open {start['verification_uri_complete']})")
+        print(f"  (or open {start['verification_uri_complete']})", flush=True)
         if open_browser:
             try:
                 webbrowser.open(start["verification_uri_complete"])

{dataspring_cli-0.4.0 → dataspring_cli-0.4.1}/cli/bundled_manifest.py

@@ -6,7 +6,7 @@ the server's to say whether the server has operations this CLI does not
 know. tests/test_skills_surface.py asserts it is current.
 """
 
-MANIFEST_HASH = "386b42bdef87f3cc5aabaa69e1aec1b327b3a2f3f5dc5559eda1cf91a40ae48c"
+MANIFEST_HASH = "eacbe5d755f415a814b50b568eb105ff60693b92fe1ce44d30e39f71670d15d0"
 TOOL_KEYS = (
     "business_context_edit",
     "semantic_model_edit",

{dataspring_cli-0.4.0 → dataspring_cli-0.4.1}/cli/contract.py

@@ -656,7 +656,11 @@ class RunPipelineAction(DispatchParams):
     pipeline: str = Field(description="Pipeline name (a deployed pipelines/<name>.yaml)")
     window: RunWindowParams | None = Field(
         default=None,
-        description="A date window to load instead of the pipeline's own; wider than backfill_chunk becomes a chunked backfill",
+        description=(
+            "A date window to load instead of the pipeline's own; wider than backfill_chunk becomes a chunked backfill. "
+            "Both ends are inclusive days, and so is every chunk; a resource whose API reads its end bound as exclusive "
+            "declares `window.end: exclusive` in the pipeline and is sent the day after each chunk's last day"
+        ),
     )
     cursor: RunCursorParams | None = Field(default=None, description="{from: <value>}: a cursor to re-pull from")
     backfill_chunk: str | None = Field(
@@ -674,8 +678,18 @@ class ResetPipelineAction(DispatchParams):
     )
 
 
+class CancelRunAction(DispatchParams):
+    action: Literal["cancel"]
+    run_id: str = Field(
+        description=(
+            "The queued or running run to stop, or a backfill's parent run (its running child "
+            "is stopped and no further chunk starts); ids from dataspring://datacore/runs"
+        ),
+    )
+
+
 DatacoreRunAction = Annotated[
-    CheckDatacoreAction | DeployDatacoreAction | RunPipelineAction | ResetPipelineAction,
+    CheckDatacoreAction | DeployDatacoreAction | RunPipelineAction | ResetPipelineAction | CancelRunAction,
     Field(discriminator="action"),
 ]
 

{dataspring_cli-0.4.0 → dataspring_cli-0.4.1}/cli/generated.py

@@ -69,7 +69,7 @@ VERBS: dict[str, tuple[str, ...]] = {
     'warehouse_edit': ('activate', 'add_external', 'remove'),
     'secret_edit': ('set', 'reveal'),
     'datacore_edit': ('apply', 'patch', 'delete'),
-    'datacore_run': ('check', 'deploy', 'run', 'reset'),
+    'datacore_run': ('check', 'deploy', 'run', 'reset', 'cancel'),
     'tenant_edit': ('create', 'suspend', 'resume', 'offboard'),
     'board_edit': ('apply', 'patch', 'delete', 'convert_dashboard'),
     'watch_edit': ('apply', 'patch', 'delete', 'rotate_secret'),
@@ -885,7 +885,7 @@ def datacore_run__deploy(
 @datacore_run.command('run', short_help='`datacore_run` run.')
 def datacore_run__run(
     pipeline: Annotated[str, typer.Option('--pipeline', help='Pipeline name (a deployed pipelines/<name>.yaml)')],
-    window: Annotated[Optional[str], typer.Option('--window-json', help="A date window to load instead of the pipeline's own; wider than backfill_chunk becomes a chunked backfill (JSON object with keys: start, end, or @path to a .json/.yaml file)")] = None,
+    window: Annotated[Optional[str], typer.Option('--window-json', help="A date window to load instead of the pipeline's own; wider than backfill_chunk becomes a chunked backfill. Both ends are inclusive days, and so is every chunk; a resource whose API reads its end bound as exclusive declares `window.end: exclusive` in the pipeline and is sent the day after each chunk's last day (JSON object with keys: start, end, or @path to a .json/.yaml file)")] = None,
     cursor: Annotated[Optional[str], typer.Option('--cursor-json', help='{from: <value>}: a cursor to re-pull from (JSON object with keys: from, or @path to a .json/.yaml file)')] = None,
     backfill_chunk: Annotated[Optional[str], typer.Option('--backfill-chunk', help='Chunk size for a windowed run: 7d, 2w or 1M (calendar months, the default)')] = None,
     from_file: FromFile = None,
@@ -906,6 +906,16 @@ def datacore_run__reset(
     run_tool('datacore_run', contract.DatacoreRunParams, 'reset', {'pipeline': pipeline, 'approve': approve}, from_file=from_file, output=output)
 
 
+@datacore_run.command('cancel', short_help='`datacore_run` cancel.')
+def datacore_run__cancel(
+    run_id: Annotated[str, typer.Option('--run-id', help="The queued or running run to stop, or a backfill's parent run (its running child is stopped and no further chunk starts); ids from dataspring://datacore/runs")],
+    from_file: FromFile = None,
+    output: Output = None,
+) -> None:
+    """`datacore_run` cancel."""
+    run_tool('datacore_run', contract.DatacoreRunParams, 'cancel', {'run_id': run_id}, from_file=from_file, output=output)
+
+
 # ---------------------------------------------------------------------------
 # tenant_edit
 # ---------------------------------------------------------------------------

{dataspring_cli-0.4.0 → dataspring_cli-0.4.1}/cli/main.py

@@ -2552,11 +2552,15 @@ def _print_check_report(run: dict) -> None:
         mark = "ok " if entry.get("ok") else "ERR"
         typer.echo(f"  connection {mark} {entry['name']}" + ("" if entry.get("ok") else f": {entry.get('error')}"))
     dbt = report.get("dbt") or {}
-    if dbt:
+    if dbt.get("status") == "skipped" and dbt.get("reason"):
+        typer.echo(f"  dbt        skipped: {dbt['reason']}")
+    elif dbt:
         typer.echo(
             f"  dbt        {dbt.get('status')}: {dbt.get('models', 0)} models, {dbt.get('tests', 0)} tests, "
             f"{dbt.get('seeds', 0)} seeds" + (f" -> {dbt.get('target')}" if dbt.get("target") else "")
         )
+        if dbt.get("error"):
+            typer.echo(f"             {dbt['error']}")
         for failure in dbt.get("failures") or []:
             typer.echo(f"             FAIL {failure.get('node')}: {failure.get('message')}")
         for warning in dbt.get("warnings") or []:
@@ -2579,7 +2583,7 @@ def _poll_run(run_id: str, token: str, *, interval: float = 10.0, timeout: float
         if run.get("status") != last:
             last = run.get("status")
             print_info(f"run {run_id}: {last}")
-        if last in ("succeeded", "failed"):
+        if last in ("succeeded", "failed", "cancelled"):
             return run
         if time.monotonic() > deadline:
             print_error(f"run {run_id} still {last} after {int(timeout)}s")
@@ -2697,7 +2701,7 @@ def datacore_run_cmd(
         except Exception as e:
             fail(e, role_action="read the run")
         if run.get("status") != "succeeded":
-            print_error(f"run {run['id']} failed: {(run.get('error') or {}).get('message')}")
+            print_error(f"run {run['id']} {run.get('status')}: {(run.get('error') or {}).get('message')}")
             raise typer.Exit(1)
 
 
@@ -2723,6 +2727,30 @@ def datacore_reset_cmd(
     print_success(f"reset {pipeline}: dropped {', '.join(result.get('tables') or []) or 'no tables'}")
 
 
+@datacore_app.command("cancel")
+def datacore_cancel_cmd(
+    run_id: Annotated[str, typer.Argument(help="The run, or a backfill's parent run, to stop")],
+):
+    """Stop a queued or running run, or a backfill (admin).
+
+    A running run's Cloud Run execution is cancelled; a backfill's parent
+    and its current child are cancelled and no further chunk starts. The
+    pipeline's schedule fires again at its next slot.
+
+    Example:
+        dataspring datacore cancel r_01M4TV7V8K2MGX9VY9XV9S0HFR
+    """
+    require_auth()
+    token = auth.get_access_token()
+    try:
+        result = call_tool("datacore_run", "cancel", {"run_id": run_id}, token=token)
+    except Exception as e:
+        fail(e, role_action="cancel a run")
+    others = [r for r in result.get("cancelled") or [] if r != run_id]
+    also = f" (also {', '.join(others)})" if others else ""
+    print_success(f"cancelled {result.get('kind', 'run')} {run_id}{also}")
+
+
 @datacore_app.command("status")
 def datacore_status(
     format: Annotated[OutputFormat, typer.Option("--format", "-f", help="Output format")] = "table",

{dataspring_cli-0.4.0 → dataspring_cli-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dataspring-cli"
-version = "0.4.0"
+version = "0.4.1"
 description = "DataSpring CLI - Query metrics and manage dashboards from the terminal"
 readme = "README.md"
 requires-python = ">=3.12"

{dataspring_cli-0.4.0 → dataspring_cli-0.4.1}/skills/dataspring-author/SKILL.md

@@ -467,7 +467,7 @@ MCP tool `datacore_run`; `POST /api/dispatch/datacore_run`. The datacore's check
 | Parameter | Type | Required | Description |
 |---|---|---|---|
 | `pipeline` | string | yes | Pipeline name (a deployed pipelines/<name>.yaml) |
-| `window` | RunWindowParams | no | A date window to load instead of the pipeline's own; wider than backfill_chunk becomes a chunked backfill |
+| `window` | RunWindowParams | no | A date window to load instead of the pipeline's own; wider than backfill_chunk becomes a chunked backfill. Both ends are inclusive days, and so is every chunk; a resource whose API reads its end bound as exclusive declares `window.end: exclusive` in the pipeline and is sent the day after each chunk's last day |
 | `cursor` | RunCursorParams | no | {from: <value>}: a cursor to re-pull from |
 | `backfill_chunk` | string | no | Chunk size for a windowed run: 7d, 2w or 1M (calendar months, the default) |
 
@@ -477,4 +477,10 @@ MCP tool `datacore_run`; `POST /api/dispatch/datacore_run`. The datacore's check
 |---|---|---|---|
 | `pipeline` | string | yes | The pipeline whose dlt state and raw tables to remove |
 | `approve` | boolean | no, default `False` | Must be true: the reset is irreversible. Ask the user first |
+
+**`cancel`** — 
+
+| Parameter | Type | Required | Description |
+|---|---|---|---|
+| `run_id` | string | yes | The queued or running run to stop, or a backfill's parent run (its running child is stopped and no further chunk starts); ids from dataspring://datacore/runs |
 <!-- /dispatch-params -->