Files
Alberto Schiabel b2f5098b28 fix(py): make HTTP status errors catchable as ComposioError on client 2.0 (#4556)
This PR:

- relates to #4537 and ports
https://github.com/ComposioHQ/composio/pull/4543 (which targets `next`
on `composio-client==1.43.0`) to `main`, which pins
`composio-client==2.0.0rc7`
- the 2.0 client has no `_make_status_error` hook; it raises the
module-level `status_error()` from `_decode()` and
`_process_response()`, so `HttpClient` overrides those two instead
- raised errors subclass both the generated class and
`composio.exceptions.ComposioError` (one cached class per generated
class), so `except ComposioError` and `except
composio_client.AuthenticationError` both keep working, with
`status_code`, `response` and `body` unchanged
- the classes support `pickle`/`deepcopy` via `__reduce__`
- adds `python/tests/test_client_errors.py` (from #4543, minus the
`ToolNotFoundError` case, which only exists on `next`): 17 tests, 15 of
which fail without the override
- out of scope: `APIConnectionError`/`APITimeoutError` are still not
`ComposioError`
- when `next` and `main` reconcile, keep this version and drop the
`_make_status_error` override from #4543

Verified locally: full Python suite 1939 passed / 51 skipped (baseline
1922 / 51, no new failures); ruff clean; mypy shows only the 4 errors
already on `main` (`schema_converter.py`, `url_safety.py`).
2026-09-21 17:57:52 +04:00

171 lines
5.7 KiB
Python

"""HTTP status errors from the generated client must be ``ComposioError``s.
The generated client (``composio_client``) has its own exception root, so an
invalid API key or any other 4xx/5xx response used to escape
``except ComposioError`` (issue #4537). ``HttpClient`` now builds those errors
as subclasses of both the generated class and ``ComposioError``, so SDK callers
can catch one root while existing ``except APIStatusError`` handlers, including
the SDK's own, keep working.
"""
import copy
import pickle
import typing as t
from unittest.mock import Mock
import composio_client
import httpx
import pytest
from composio import exceptions
from composio.client import HttpClient
from composio.core.models.base import allow_tracking
from composio.core.models.tools import Tools
from composio.core.models.triggers import Triggers
@pytest.fixture(autouse=True)
def disable_telemetry():
"""Disable telemetry for all tests to prevent thread issues."""
token = allow_tracking.set(False)
yield
allow_tracking.reset(token)
def _client_returning(
status: int,
*,
max_retries: int = 0,
calls: t.Optional[t.List[httpx.Request]] = None,
) -> HttpClient:
def handler(request: httpx.Request) -> httpx.Response:
if calls is not None:
calls.append(request)
return httpx.Response(
status,
json={"error": {"message": "nope"}},
# Keep retry backoff short in tests.
headers={"retry-after-ms": "1"},
)
return HttpClient(
provider="test",
api_key="sk-test",
base_url="https://backend.invalid",
max_retries=max_retries,
http_client=httpx.Client(transport=httpx.MockTransport(handler)),
)
@pytest.mark.parametrize(
("status", "client_error"),
[
(400, composio_client.BadRequestError),
(401, composio_client.AuthenticationError),
(403, composio_client.PermissionDeniedError),
(404, composio_client.NotFoundError),
(409, composio_client.ConflictError),
(422, composio_client.UnprocessableEntityError),
(429, composio_client.RateLimitError),
(500, composio_client.InternalServerError),
(418, composio_client.APIStatusError),
],
)
def test_status_errors_are_composio_errors(
status: int, client_error: t.Type[composio_client.APIStatusError]
) -> None:
client = _client_returning(status)
with pytest.raises(exceptions.ComposioError) as exc_info:
client.tools.retrieve(tool_slug="GITHUB_CREATE_AN_ISSUE")
error = exc_info.value
assert isinstance(error, client_error)
assert isinstance(error, composio_client.APIStatusError)
assert error.status_code == status
assert error.message
def test_invalid_api_key_is_catchable_as_composio_error() -> None:
client = _client_returning(401)
try:
client.tools.retrieve(tool_slug="GITHUB_CREATE_AN_ISSUE")
except exceptions.ComposioError as error:
assert isinstance(error, composio_client.AuthenticationError)
else:
pytest.fail("expected the 401 to raise")
def test_error_classes_are_reused_across_requests() -> None:
client = _client_returning(401)
raised = []
for _ in range(2):
with pytest.raises(composio_client.AuthenticationError) as exc_info:
client.tools.retrieve(tool_slug="GITHUB_CREATE_AN_ISSUE")
raised.append(type(exc_info.value))
assert raised[0] is raised[1]
assert raised[0].__name__ == "AuthenticationError"
def test_schema_fetch_auth_error_is_a_composio_error() -> None:
tools = Tools(client=_client_returning(401), provider=Mock())
with pytest.raises(composio_client.AuthenticationError) as exc_info:
tools.get_raw_composio_tool_by_slug("SLACK_FETCH_CONVERSATION_HISTORY")
assert isinstance(exc_info.value, exceptions.ComposioError)
assert not isinstance(exc_info.value, exceptions.ToolNotFoundError)
def test_trigger_type_not_found_mapping_still_applies() -> None:
triggers = Triggers(client=_client_returning(404))
with pytest.raises(exceptions.TriggerTypeNotFound) as exc_info:
triggers.create(slug="NONEXISTENT_TRIGGER", user_id="user")
assert isinstance(exc_info.value.__cause__, composio_client.NotFoundError)
def test_without_retries_client_raises_composio_error() -> None:
client = _client_returning(401)
with pytest.raises(exceptions.ComposioError) as exc_info:
client.without_retries.tools.retrieve(tool_slug="GITHUB_CREATE_AN_ISSUE")
assert isinstance(exc_info.value, composio_client.AuthenticationError)
def test_error_after_exhausted_retries_is_composio_error() -> None:
calls: t.List[httpx.Request] = []
client = _client_returning(503, max_retries=2, calls=calls)
with pytest.raises(exceptions.ComposioError) as exc_info:
client.tools.retrieve(tool_slug="GITHUB_CREATE_AN_ISSUE")
assert isinstance(exc_info.value, composio_client.InternalServerError)
assert len(calls) == 3
@pytest.mark.parametrize(
"clone",
[lambda error: pickle.loads(pickle.dumps(error)), copy.deepcopy],
ids=["pickle", "deepcopy"],
)
def test_status_errors_survive_serialization(
clone: t.Callable[[BaseException], BaseException],
) -> None:
client = _client_returning(401)
with pytest.raises(exceptions.ComposioError) as exc_info:
client.tools.retrieve(tool_slug="GITHUB_CREATE_AN_ISSUE")
error = exc_info.value
restored = clone(error)
assert type(restored) is type(error)
assert isinstance(restored, composio_client.AuthenticationError)
assert isinstance(restored, exceptions.ComposioError)
assert t.cast(composio_client.APIStatusError, restored).status_code == 401
assert str(restored) == str(error)