adaptorch-cli 0.1.1__tar.gz → 0.1.3__tar.gz

{adaptorch_cli-0.1.1/src/adaptorch_cli.egg-info → adaptorch_cli-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: adaptorch-cli
-Version: 0.1.1
+Version: 0.1.3
 Summary: Command-line client for AdaptOrch
 Author: ClassicMate
 License-Expression: LicenseRef-Proprietary
@@ -11,11 +11,17 @@ Project-URL: Documentation, https://adaptorch.com/mcp-docs
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: adaptorch-client<0.2,>=0.1.2
+Requires-Dist: adaptorch-client<0.2,>=0.1.3
 Dynamic: license-file
 
 # adaptorch-cli
 
+Run/evidence JSON may include the SDK's safe, versioned `verification_diagnostics`.
+Project reports remain untrusted observations. Invalid optional metadata is
+omitted by the SDK, including in CLI JSON; it does not turn a valid run response
+into a CLI error. Existing failed/cancelled/inconclusive exits stay 8/9/10,
+and a stopped wait still exits 10. PDF tools are not global CLI prerequisites.
+
 Independent AdaptOrch SaaS CLI. Installs the `adaptorchctl` command and uses `adaptorch-client`; it does not invoke `adaptorch` or `adaptorch-mcp`.
 
 Log in once and every command picks the credential up:
@@ -41,6 +47,22 @@ A git push does not replace a previously published PyPI version.
 
 See [`../../docs/adaptorchctl-usage.ko.md`](../../docs/adaptorchctl-usage.ko.md) for usage.
 
+## Bounded wait exit codes
+
+`adaptorchctl run wait RUN_ID` emits the last observation as JSON. A terminal
+`SUCCEEDED` exits 0, `FAILED` exits 8, and `CANCELLED` exits 9. These codes describe
+run lifecycle, not result correctness or evidence verification.
+
+A `deadline`, `poll_limit`, `unsupported_status`, or unrecognized stop reason exits
+10, even if the last observation looks terminal. Missing or unsupported terminal
+observations also exit 10. This means the observation is inconclusive, not that
+the server-side run failed. Inspect `reason` and retain the JSON; continue with the
+same run ID when appropriate. Waiting never resubmits or cancels a run.
+
+Automation compatibility: `run wait` previously returned 0 for these observations.
+Scripts using `set -e` must now handle nonzero exits. `run get` keeps its existing
+exit-code behavior; submit and cancel still report command success separately.
+
 ## License
 
 Proprietary — Copyright ClassicMate. All rights reserved. See [LICENSE](https://github.com/dmae97/Adaptorch-MCP/blob/main/LICENSE).

{adaptorch_cli-0.1.1 → adaptorch_cli-0.1.3}/README.md

@@ -1,5 +1,11 @@
 # adaptorch-cli
 
+Run/evidence JSON may include the SDK's safe, versioned `verification_diagnostics`.
+Project reports remain untrusted observations. Invalid optional metadata is
+omitted by the SDK, including in CLI JSON; it does not turn a valid run response
+into a CLI error. Existing failed/cancelled/inconclusive exits stay 8/9/10,
+and a stopped wait still exits 10. PDF tools are not global CLI prerequisites.
+
 Independent AdaptOrch SaaS CLI. Installs the `adaptorchctl` command and uses `adaptorch-client`; it does not invoke `adaptorch` or `adaptorch-mcp`.
 
 Log in once and every command picks the credential up:
@@ -25,6 +31,22 @@ A git push does not replace a previously published PyPI version.
 
 See [`../../docs/adaptorchctl-usage.ko.md`](../../docs/adaptorchctl-usage.ko.md) for usage.
 
+## Bounded wait exit codes
+
+`adaptorchctl run wait RUN_ID` emits the last observation as JSON. A terminal
+`SUCCEEDED` exits 0, `FAILED` exits 8, and `CANCELLED` exits 9. These codes describe
+run lifecycle, not result correctness or evidence verification.
+
+A `deadline`, `poll_limit`, `unsupported_status`, or unrecognized stop reason exits
+10, even if the last observation looks terminal. Missing or unsupported terminal
+observations also exit 10. This means the observation is inconclusive, not that
+the server-side run failed. Inspect `reason` and retain the JSON; continue with the
+same run ID when appropriate. Waiting never resubmits or cancels a run.
+
+Automation compatibility: `run wait` previously returned 0 for these observations.
+Scripts using `set -e` must now handle nonzero exits. `run get` keeps its existing
+exit-code behavior; submit and cancel still report command success separately.
+
 ## License
 
 Proprietary — Copyright ClassicMate. All rights reserved. See [LICENSE](https://github.com/dmae97/Adaptorch-MCP/blob/main/LICENSE).

{adaptorch_cli-0.1.1 → adaptorch_cli-0.1.3}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "adaptorch-cli"
-version = "0.1.1"
+version = "0.1.3"
 description = "Command-line client for AdaptOrch"
 readme = "README.md"
 requires-python = ">=3.11"
 license = "LicenseRef-Proprietary"
 license-files = ["LICENSE"]
 authors = [{ name = "ClassicMate" }]
-dependencies = ["adaptorch-client>=0.1.2,<0.2"]
+dependencies = ["adaptorch-client>=0.1.3,<0.2"]
 
 [project.urls]
 Homepage = "https://adaptorch.com"

{adaptorch_cli-0.1.1 → adaptorch_cli-0.1.3}/src/adaptorch_cli/cli.py

@@ -347,6 +347,19 @@ def _run_status_exit(payload: JSONMapping) -> int:
     return 0
 
 
+def _wait_status_exit(payload: JSONMapping) -> int:
+    """Map a bounded observation without treating a stopped wait as success."""
+    if payload.get("reason") != "terminal":
+        return 10
+    run = payload.get("run")
+    if not isinstance(run, dict):
+        return 10
+    status = run.get("status")
+    if not isinstance(status, str):
+        return 10
+    return {"succeeded": 0, "failed": 8, "cancelled": 9}.get(status.lower(), 10)
+
+
 def main(argv: Sequence[str] | None = None) -> int:
     parser = build_parser()
     args = parse_args(argv)
@@ -362,6 +375,8 @@ def main(argv: Sequence[str] | None = None) -> int:
         except ValueError:
             print("response contained non-encodable JSON values", file=sys.stderr)
             return 7
+        if args.command == "run" and args.run_command == "wait":
+            return _wait_status_exit(payload)
         return _run_status_exit(payload) if check_run_status else 0
     # pi-lens-ignore: unreachable-except
     except KeyboardInterrupt:

{adaptorch_cli-0.1.1 → adaptorch_cli-0.1.3/src/adaptorch_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: adaptorch-cli
-Version: 0.1.1
+Version: 0.1.3
 Summary: Command-line client for AdaptOrch
 Author: ClassicMate
 License-Expression: LicenseRef-Proprietary
@@ -11,11 +11,17 @@ Project-URL: Documentation, https://adaptorch.com/mcp-docs
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: adaptorch-client<0.2,>=0.1.2
+Requires-Dist: adaptorch-client<0.2,>=0.1.3
 Dynamic: license-file
 
 # adaptorch-cli
 
+Run/evidence JSON may include the SDK's safe, versioned `verification_diagnostics`.
+Project reports remain untrusted observations. Invalid optional metadata is
+omitted by the SDK, including in CLI JSON; it does not turn a valid run response
+into a CLI error. Existing failed/cancelled/inconclusive exits stay 8/9/10,
+and a stopped wait still exits 10. PDF tools are not global CLI prerequisites.
+
 Independent AdaptOrch SaaS CLI. Installs the `adaptorchctl` command and uses `adaptorch-client`; it does not invoke `adaptorch` or `adaptorch-mcp`.
 
 Log in once and every command picks the credential up:
@@ -41,6 +47,22 @@ A git push does not replace a previously published PyPI version.
 
 See [`../../docs/adaptorchctl-usage.ko.md`](../../docs/adaptorchctl-usage.ko.md) for usage.
 
+## Bounded wait exit codes
+
+`adaptorchctl run wait RUN_ID` emits the last observation as JSON. A terminal
+`SUCCEEDED` exits 0, `FAILED` exits 8, and `CANCELLED` exits 9. These codes describe
+run lifecycle, not result correctness or evidence verification.
+
+A `deadline`, `poll_limit`, `unsupported_status`, or unrecognized stop reason exits
+10, even if the last observation looks terminal. Missing or unsupported terminal
+observations also exit 10. This means the observation is inconclusive, not that
+the server-side run failed. Inspect `reason` and retain the JSON; continue with the
+same run ID when appropriate. Waiting never resubmits or cancels a run.
+
+Automation compatibility: `run wait` previously returned 0 for these observations.
+Scripts using `set -e` must now handle nonzero exits. `run get` keeps its existing
+exit-code behavior; submit and cancel still report command success separately.
+
 ## License
 
 Proprietary — Copyright ClassicMate. All rights reserved. See [LICENSE](https://github.com/dmae97/Adaptorch-MCP/blob/main/LICENSE).

{adaptorch_cli-0.1.1 → adaptorch_cli-0.1.3}/src/adaptorch_cli.egg-info/SOURCES.txt

@@ -17,4 +17,5 @@ tests/test_cli_boundary.py
 tests/test_cli_commands.py
 tests/test_cli_integration.py
 tests/test_cli_login_config.py
-tests/test_cli_oauth.py
+tests/test_cli_oauth.py
+tests/test_cli_wait_exit_codes.py

adaptorch_cli-0.1.3/src/adaptorch_cli.egg-info/requires.txt

@@ -0,0 +1 @@
+adaptorch-client<0.2,>=0.1.3

adaptorch_cli-0.1.3/tests/test_cli_wait_exit_codes.py

@@ -0,0 +1,182 @@
+from __future__ import annotations
+
+import json
+from collections.abc import Callable
+from pathlib import Path
+
+import pytest
+from adaptorch_client import AdaptOrchClient, ClientConfig, PollPolicy, Run, RunPollResult, polling
+from adaptorch_client import client as client_module
+from adaptorch_client.transport import HTTPTransport, RequestSpec
+from cli_test_support import CliRunner
+
+from adaptorch_cli import cli
+
+
+@pytest.mark.parametrize(
+    ("reason", "status", "expected"),
+    [
+        ("terminal", "SUCCEEDED", 0),
+        ("terminal", "sUcCeEdEd", 0),
+        ("terminal", "FAILED", 8),
+        ("terminal", "failed", 8),
+        ("terminal", "CANCELLED", 9),
+        ("terminal", "cancelled", 9),
+        ("deadline", "RUNNING", 10),
+        ("deadline", "SUCCEEDED", 10),
+        ("deadline", "FAILED", 10),
+        ("poll_limit", "RUNNING", 10),
+        ("unsupported_status", "INCONCLUSIVE", 10),
+        ("unsupported_status", "FUTURE_STATUS", 10),
+        ("future_reason", "SUCCEEDED", 10),
+        ("terminal", "RUNNING", 10),
+        ("terminal", "FUTURE_STATUS", 10),
+    ],
+)
+def test_wait_exit_preserves_observation_and_never_resubmits(
+    run_cli: CliRunner,
+    monkeypatch: pytest.MonkeyPatch,
+    reason: str,
+    status: str,
+    expected: int,
+) -> None:
+    monkeypatch.setenv("FAKE_WAIT_REASON", reason)
+    monkeypatch.setenv("FAKE_RUN_STATUS", status)
+    result = run_cli(["run", "wait", "run-1"])
+
+    assert result.returncode == expected
+    assert json.loads(result.stdout) == {
+        "reason": reason,
+        "polls": 1,
+        "elapsed_seconds": 0.01,
+        "run": {"id": "run-1", "status": status},
+    }
+    assert result.stdout.count("\n") == 1
+    assert result.stderr == ""
+    methods = [json.loads(line)["method"] for line in result.client_log.splitlines()]
+    assert methods == ["init", "wait_for_run"]
+
+
+@pytest.mark.parametrize(
+    "payload",
+    [
+        {},
+        {"reason": None, "run": {"status": "SUCCEEDED"}},
+        {"reason": 1, "run": {"status": "SUCCEEDED"}},
+        {"reason": "future_reason", "run": {"status": "SUCCEEDED"}},
+        {"reason": "terminal"},
+        {"reason": "terminal", "run": None},
+        {"reason": "terminal", "run": []},
+        {"reason": "terminal", "run": {}},
+        {"reason": "terminal", "run": {"status": None}},
+        {"reason": "terminal", "run": {"status": 1}},
+        {"reason": "terminal", "run": {"status": ""}},
+        {"reason": "terminal", "run": {"data": {"status": "SUCCEEDED"}}},
+        {"reason": "deadline"},
+        {"reason": "poll_limit"},
+        {"reason": "unsupported_status"},
+    ],
+)
+def test_wait_unknown_or_missing_observation_is_inconclusive(
+    payload: cli.JSONMapping,
+) -> None:
+    assert cli._wait_status_exit(payload) == 10
+
+
+def test_wait_lifecycle_does_not_claim_result_correctness() -> None:
+    assert cli._wait_status_exit(
+        {"reason": "terminal", "run": {"status": "SUCCEEDED", "result_status": "FAILED"}}
+    ) == 0
+
+
+def test_wait_does_not_reinterpret_server_cancellation_encoding() -> None:
+    assert cli._wait_status_exit(
+        {"reason": "terminal", "run": {"status": "FAILED", "error_class": "CANCELLED"}}
+    ) == 8
+
+
+@pytest.mark.parametrize(
+    ("status", "reason", "expected", "timeout", "latency", "count"),
+    [
+        ("SUCCEEDED", "terminal", 0, "5", 0.0, 1),
+        ("FAILED", "terminal", 8, "5", 0.0, 1),
+        ("CANCELLED", "terminal", 9, "5", 0.0, 1),
+        ("RUNNING", "deadline", 10, "0.5", 0.0, 1),
+        ("RUNNING", "poll_limit", 10, "200", 0.0, 100),
+        ("NEW_STATUS", "unsupported_status", 10, "5", 0.0, 1),
+        ("INCONCLUSIVE", "unsupported_status", 10, "5", 0.0, 1),
+        ("SUCCEEDED", "deadline", 10, "0.5", 0.5, 1),
+    ],
+)
+def test_wait_uses_real_sdk_polling_without_writing_or_resubmitting(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path: Path,
+    capsys: pytest.CaptureFixture[str],
+    status: str,
+    reason: str,
+    expected: int,
+    timeout: str,
+    latency: float,
+    count: int,
+) -> None:
+    elapsed = 0.0
+    requests: list[RequestSpec] = []
+
+    def clock() -> float:
+        return elapsed
+
+    def sleep(duration: float) -> None:
+        nonlocal elapsed
+        elapsed += duration
+
+    def request(_transport: HTTPTransport, spec: RequestSpec) -> cli.JSONMapping:
+        nonlocal elapsed
+        requests.append(spec)
+        elapsed += latency
+        return {"run_id": "run-1", "status": status}
+
+    def poll(fetch: Callable[[float], Run], policy: PollPolicy) -> RunPollResult:
+        return polling.wait_for_run(fetch, policy, clock=clock, sleep=sleep)
+
+    client = AdaptOrchClient(ClientConfig("https://api.example.test", "ado_test"))
+    monkeypatch.setenv("ADAPTORCH_CONFIG_DIR", str(tmp_path / "isolated-config"))
+    monkeypatch.setattr(cli, "_require_client", lambda _api_url: client)
+    monkeypatch.setattr(HTTPTransport, "request", request)
+    monkeypatch.setattr(client_module, "poll_run", poll)
+
+    code = cli.main(["run", "wait", "run-1", "--timeout", timeout, "--interval", "1"])
+
+    captured = capsys.readouterr()
+    assert code == expected
+    assert json.loads(captured.out) == {
+        "reason": reason,
+        "polls": count,
+        "elapsed_seconds": elapsed,
+        "run": {"run_id": "run-1", "status": status},
+    }
+    assert captured.out.count("\n") == 1
+    assert captured.err == ""
+    assert len(requests) == count
+    assert all((spec.method, spec.path) == ("GET", "/v1/runs/run-1") for spec in requests)
+    assert all(spec.payload is None and spec.provider_credential is None for spec in requests)
+
+
+@pytest.mark.parametrize(
+    ("status", "expected"),
+    [("SUCCEEDED", 0), ("RUNNING", 0), ("NEW_STATUS", 0), ("FAILED", 8), ("CANCELLED", 9)],
+)
+def test_get_retains_its_mapping_with_additive_wait_like_fields(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path: Path,
+    capsys: pytest.CaptureFixture[str],
+    status: str,
+    expected: int,
+) -> None:
+    payload: cli.JSONMapping = {"run_id": "run-1", "status": status, "reason": "deadline"}
+    monkeypatch.setenv("ADAPTORCH_CONFIG_DIR", str(tmp_path / "isolated-config"))
+    monkeypatch.setattr(cli, "_execute", lambda *_args: (payload, True))
+
+    assert cli.main(["run", "get", "run-1"]) == expected
+    captured = capsys.readouterr()
+    assert json.loads(captured.out) == payload
+    assert captured.err == ""

adaptorch_cli-0.1.1/src/adaptorch_cli.egg-info/requires.txt

@@ -1 +0,0 @@
-adaptorch-client<0.2,>=0.1.2