feat: adopt contree-client~=0.4.0

contree_cli/cli/auth.py

@@ -31,7 +31,7 @@
 from dataclasses import dataclass
 from multiprocessing.pool import ThreadPool
 
-from contree_client.exceptions import ContreeAPIError
+from contree_client.exceptions import APIStatusError
 from contree_client.models import WhoAmIResponse
 
 from contree_cli import FORMATTER, ArgumentsProtocol, SetupResult
@@ -263,12 +263,13 @@ def cmd_auth(args: AuthArgs) -> int | None:
     try:
         with client:
             whoami = client.whoami()
-    except ContreeAPIError as exc:
+    except (APIStatusError, ValueError) as exc:
+        # ValueError covers parse_whoami's own non-2xx status check.
         # Logs the API error message, not the token itself.
         # nosemgrep: python-logger-credential-disclosure
         logger.error("Token verification failed: %s. Profile not changed.", exc)
         return 1
-    except (KeyError, TypeError, ValueError) as exc:
+    except (KeyError, TypeError) as exc:
         # Strict contree-client models raise TypeError (missing required
         # field) or KeyError (parse_fields lookup) on incomplete payloads.
         logger.error("Could not parse /v1/whoami response: %s", exc)

contree_cli/cli/cd.py

@@ -14,7 +14,7 @@
 import posixpath
 from dataclasses import dataclass
 
-from contree_client.exceptions import ContreeAPIError
+from contree_client.exceptions import APIStatusError
 
 from contree_cli import CLIENT, SESSION_STORE, ArgumentsProtocol, SetupResult
 
@@ -64,7 +64,7 @@ def cmd_cd(args: CdArgs) -> int | None:
             client = CLIENT.get()
             uuid = client.resolve_image(session.current_image)
             client.inspect_image_list(uuid, new_cwd)
-        except ContreeAPIError as exc:
+        except APIStatusError as exc:
             if exc.status == 404:
                 logger.error("cd: %s: no such directory", new_cwd)
                 return 1

contree_cli/cli/images.py

@@ -16,7 +16,7 @@
 from dataclasses import dataclass, field
 from datetime import datetime
 
-from contree_client.exceptions import ContreeAPIError
+from contree_client.exceptions import APIStatusError
 from contree_client.models import (
     TERMINAL_STATUSES,
     ImageImportRegistry,
@@ -393,7 +393,7 @@ def cmd_import(args: ImportArgs) -> int | None:
             try:
                 client.cancel_operation(op_uuid)
                 logger.info("Cancelled operation %s", op_uuid)
-            except (ContreeAPIError, KeyboardInterrupt, OSError):
+            except (APIStatusError, KeyboardInterrupt, OSError):
                 pass
         raise
 

contree_cli/cli/ls.py

@@ -71,7 +71,7 @@ def cmd_ls(args: LsArgs) -> None:
             )
         )
         if response.status != 200:
-            raise error_for_response(response)
+            raise error_for_response(response.status, response.headers, response.body)
         sys.stdout.write(response.body.decode())
         return
 

contree_cli/cli/operation.py

@@ -21,7 +21,7 @@
 from datetime import datetime
 from typing import Any
 
-from contree_client.exceptions import ContreeAPIError
+from contree_client.exceptions import APIStatusError
 from contree_client.models import ACTIVE_STATUSES, TERMINAL_STATUSES
 
 from contree_cli import CLIENT, FORMATTER, SESSION_STORE, ArgumentsProtocol, SetupResult
@@ -460,7 +460,7 @@ def cmd_show_multi(args: ShowMultiArgs) -> int | None:
     for uuid in args.uuids:
         try:
             result = cmd_show(ShowArgs(uuid=uuid, raw=args.raw))
-        except ContreeAPIError as exc:
+        except APIStatusError as exc:
             logger.error("Failed to fetch %s: %s", uuid, exc)
             exit_code = max(exit_code, 1)
             continue
@@ -490,7 +490,7 @@ def cmd_cancel(args: CancelArgs) -> int | None:
         try:
             client.cancel_operation(uuid)
             logger.info("Cancelled operation %s", uuid)
-        except ContreeAPIError as exc:
+        except APIStatusError as exc:
             logger.error("Failed to cancel %s: %s", uuid, exc)
             failed += 1
     return 1 if failed else None
@@ -506,7 +506,7 @@ def cmd_events(args: EventsArgs) -> int | None:
         try:
             for ev in client.iter_operation_events(uuid, follow=False):
                 formatter(uuid=uuid, **ev.to_dict())
-        except ContreeAPIError as exc:
+        except APIStatusError as exc:
             logger.error("Failed to fetch events for %s: %s", uuid, exc)
             exit_code = 1
     formatter.flush()
@@ -592,7 +592,7 @@ def cmd_wait(args: WaitArgs) -> int | None:
     for uuid in sorted(pending):
         try:
             op = client.get_operation_status(uuid).to_dict()
-        except ContreeAPIError as exc:
+        except APIStatusError as exc:
             logger.error("Failed to fetch %s: %s", uuid, exc)
             continue
         formatter(**{**op, "timed_out": True})

contree_cli/cli/run.py

@@ -65,7 +65,7 @@
 from multiprocessing.pool import ThreadPool
 from typing import Any
 
-from contree_client.exceptions import ContreeAPIError
+from contree_client.exceptions import APIStatusError, ContreeError
 from contree_client.models import (
     TERMINAL_STATUSES,
     ClosableStreamRepr,
@@ -94,14 +94,8 @@
 
 logger = logging.getLogger(__name__)
 
-# Backend transport exceptions (httpx/urllib3/aiohttp/...) don't inherit
-# from OSError, so ContreeAPIError/OSError alone miss a lost connection.
-SIGNAL_ERRORS: tuple[type[BaseException], ...] = (
-    ContreeAPIError,
-    OSError,
-    *CliClient.retryable_errors,
-    *CliClient.nonretryable_errors,
-)
+# ContreeError covers APIConnectionError from any transport backend.
+SIGNAL_ERRORS: tuple[type[BaseException], ...] = (ContreeError, OSError)
 
 EPILOG = """\
 examples:
@@ -688,7 +682,7 @@ def stream_events_until_close(
         # payload the caller would otherwise build from `completion`.
         try:
             op = client.get_operation_status(op_uuid).to_dict()
-        except ContreeAPIError as exc:
+        except APIStatusError as exc:
             logger.debug("terminal op fetch failed: %s", exc)
             return summary
         if op.get("status") in TERMINAL_STATUSES:
@@ -1027,7 +1021,7 @@ def norm(item: object) -> dict[str, object]:
             # so callers see the SIGPIPE convention (128 + 13).
             if forwarder is not None:
                 forwarder.abandon()
-            with contextlib.suppress(ContreeAPIError, OSError):
+            with contextlib.suppress(APIStatusError, OSError):
                 client.cancel_operation(op_uuid)
             with contextlib.suppress(OSError):
                 devnull = os.open(os.devnull, os.O_WRONLY)

contree_cli/cli/session.py

@@ -664,7 +664,9 @@ def cmd_wait(args: WaitArgs) -> int | None:
                 RequestSpec(method="GET", path="/operations", idempotent=True)
             )
             if response.status != 200:
-                raise error_for_response(response)
+                raise error_for_response(
+                    response.status, response.headers, response.body
+                )
             operations = json.loads(response.body)
             api_op_ids: list[str] = []
             for op in operations:

contree_cli/docker/kw_from.py

@@ -8,7 +8,7 @@
 from dataclasses import dataclass
 from typing import ClassVar
 
-from contree_client.exceptions import ContreeAPIError
+from contree_client.exceptions import APIStatusError
 from contree_client.models import ImageImportRegistry
 
 from contree_cli.cli.images import normalize_registry_url
@@ -110,7 +110,7 @@ def resolve_or_import(ctx: BuildContext, ref: str) -> str:
     """Resolve ``ref`` to a UUID, importing from a registry on miss."""
     try:
         return ctx.client.resolve_image(ref)
-    except ContreeAPIError as exc:
+    except APIStatusError as exc:
         if exc.status != 404:
             raise
 
@@ -127,7 +127,7 @@ def resolve_or_import(ctx: BuildContext, ref: str) -> str:
     try:
         return wait_import(ctx, op_uuid, tag)
     except KeyboardInterrupt:
-        with contextlib.suppress(ContreeAPIError, OSError):
+        with contextlib.suppress(APIStatusError, OSError):
             ctx.client.cancel_operation(op_uuid)
         raise
 

contree_cli/shell/repl.py

@@ -11,7 +11,7 @@
 from dataclasses import dataclass
 from functools import cached_property
 
-from contree_client.exceptions import ContreeAPIError
+from contree_client.exceptions import APIStatusError
 
 from contree_cli import FORMATTER, IN_SHELL, PROFILE, SESSION_STORE, ArgumentsProtocol
 from contree_cli.output import FORMATTERS, OutputFormatter
@@ -519,7 +519,7 @@ def dispatch_contree(self, tokens: list[str]) -> None:
         before = self.session_snapshot()
         try:
             handler(loader.from_args(ns))
-        except ContreeAPIError as exc:
+        except APIStatusError as exc:
             print(f"API error: {exc}", file=sys.stderr)
         except KeyboardInterrupt:
             print()
@@ -558,7 +558,7 @@ def dispatch_run(self, line: str, *, timeout: int | None = None) -> None:
         before = self.session_snapshot()
         try:
             cmd_run(args)
-        except ContreeAPIError as exc:
+        except APIStatusError as exc:
             print(f"API error: {exc}", file=sys.stderr)
         except KeyboardInterrupt:
             print()

pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "contree-client>=0.2.1",
+    "contree-client~=0.4.0",
 ]
 
 [project.urls]

tests/conftest.py

@@ -87,7 +87,7 @@ def request(self, spec: RequestSpec) -> ResponseData:
         self.raw_requests.append(spec)
         if self.raw_responses:
             return self.raw_responses.popleft()
-        raise testing.unmocked(spec)
+        return self.mocked_response(spec)
 
 
 class ContreeTestIAMClient(ContreeTestClient):

tests/test_auth.py

@@ -74,7 +74,7 @@ def mock_whoami_response(tc: ContreeTestClient, status: int, body: bytes) -> Non
 
     Runs ``operations.parse_whoami`` over a synthetic response so the
     tests keep exercising the client's own status/JSON/model error
-    behavior (401 -> UnauthorizedError, non-dict -> ContreeAPIError,
+    behavior (401 -> AuthenticationError, non-dict -> APIStatusError,
     missing model field -> TypeError, invalid JSON -> ValueError).
     """
     response = ResponseData(status=status, headers={}, body=body)
@@ -277,7 +277,7 @@ def test_non_dict_whoami_payload_rejected(self, config_dir, caplog):
         with caplog.at_level("ERROR"), mock_whoami(body=b"[]"):
             rc = cmd_auth(args)
         assert rc == 1
-        assert "Token verification failed" in caplog.text
+        assert "Could not parse /v1/whoami response" in caplog.text
         assert Config().resolve().token is None
 
     def test_success_logs_saved(self, config_dir, caplog):

tests/test_file_cmd.py

@@ -8,7 +8,7 @@
 
 import pytest
 from conftest import ContreeTestClient
-from contree_client.exceptions import ContreeAPIError, NotFoundError
+from contree_client.exceptions import APIStatusError, NotFoundError
 from contree_client.models import File, FileResponse, FilesListResponse
 
 from contree_cli import CLIENT, FORMATTER, SESSION_STORE
@@ -227,9 +227,9 @@ def test_non_404_error_propagates(
         args = FileEditArgs(path="/etc/config.ini")
         contree_client.mock(
             "inspect_image_download_stream",
-            error=ContreeAPIError(403, "forbidden"),
+            error=APIStatusError(403, "forbidden"),
         )
-        with pytest.raises(ContreeAPIError) as exc_info:
+        with pytest.raises(APIStatusError) as exc_info:
             _run_file_edit(contree_client, args, store=session_store)
         assert exc_info.value.status == 403
 

tests/test_kill.py

@@ -3,7 +3,7 @@
 from contextvars import copy_context
 
 from conftest import ContreeTestClient
-from contree_client.exceptions import ContreeAPIError
+from contree_client.exceptions import APIStatusError
 from contree_client.models import OperationSummary
 
 from contree_cli import CLIENT
@@ -31,7 +31,7 @@ def test_logs_cancellation(self, contree_client, caplog):
         assert "Cancelled operation op-456" in caplog.text
 
     def test_not_found_logs_and_sets_exit(self, contree_client, caplog):
-        contree_client.mock("cancel_operation", error=ContreeAPIError(404, "nope"))
+        contree_client.mock("cancel_operation", error=APIStatusError(404, "nope"))
         CLIENT.set(contree_client)
         ctx = copy_context()
         with caplog.at_level("ERROR"):
@@ -41,7 +41,7 @@ def test_not_found_logs_and_sets_exit(self, contree_client, caplog):
 
     def test_conflict_logs_and_sets_exit(self, contree_client, caplog):
         contree_client.mock(
-            "cancel_operation", error=ContreeAPIError(409, "already done")
+            "cancel_operation", error=APIStatusError(409, "already done")
         )
         CLIENT.set(contree_client)
         ctx = copy_context()
@@ -86,7 +86,7 @@ def _run_kill_all(pages, *, cancel_failures=None):
             if op["uuid"] in cancel_failures:
                 tc.mock(
                     "cancel_operation",
-                    error=ContreeAPIError(409, "conflict"),
+                    error=APIStatusError(409, "conflict"),
                 )
             else:
                 tc.mock("cancel_operation", None)

tests/test_operation.py

@@ -5,7 +5,7 @@
 
 import pytest
 from conftest import ContreeTestClient
-from contree_client.exceptions import ContreeAPIError
+from contree_client.exceptions import APIStatusError
 from contree_client.models import OperationEvent, OperationResponse, OperationSummary
 
 from contree_cli import CLIENT, FORMATTER, SESSION_STORE
@@ -222,7 +222,7 @@ def test_show_continues_on_api_error(
     ):
         # First UUID -> 404, then a successful one
         contree_client.mock(
-            "get_operation_status", error=ContreeAPIError(404, "not found")
+            "get_operation_status", error=APIStatusError(404, "not found")
         )
         mock_op(contree_client, make_op("op-b"))
 
@@ -378,7 +378,7 @@ def test_cancel_continues_on_error(self, contree_client, caplog):
             rc = run_cancel(
                 contree_client,
                 uuids=["op-a", "op-b"],
-                cancel_outcomes=[ContreeAPIError(409, "conflict"), None],
+                cancel_outcomes=[APIStatusError(409, "conflict"), None],
             )
         assert rc == 1
         assert "Failed to cancel op-a" in caplog.text