From 7273bd21842ac7a3bd846311fa6353cb366300be Mon Sep 17 00:00:00 2001 From: willmakenoise <4471935+willmakenoise@users.noreply.github.com> Date: Mon, 28 Sep 2026 17:24:46 +0200 Subject: [PATCH 1/2] Fix create_request crash when nothing is left to request --- pyproject.toml | 3 +++ src/python_overseerr/exceptions.py | 10 +++++++++ src/python_overseerr/overseerr.py | 15 ++++++++++++- .../overseerr/no_seasons_available.json | 4 ++++ .../fixtures/seerr/no_seasons_available.json | 4 ++++ tests/test_overseerr.py | 21 +++++++++++++++++++ 6 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 tests/fixtures/overseerr/no_seasons_available.json create mode 100644 tests/fixtures/seerr/no_seasons_available.json diff --git a/pyproject.toml b/pyproject.toml index de356d6..a01d7a6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -92,6 +92,9 @@ warn_unused_configs = true warn_unused_ignores = true [tool.pylint.MASTER] +extension-pkg-allow-list = [ + "orjson", +] ignore = [ "tests", ] diff --git a/src/python_overseerr/exceptions.py b/src/python_overseerr/exceptions.py index 169961c..44cc8fa 100644 --- a/src/python_overseerr/exceptions.py +++ b/src/python_overseerr/exceptions.py @@ -11,3 +11,13 @@ class OverseerrConnectionError(OverseerrError): class OverseerrAuthenticationError(OverseerrError): """Overseerr authentication exception.""" + + +class OverseerrMediaAlreadyAvailableError(OverseerrError): + """Raised when there is nothing left to request. + + Overseerr responds with a 2xx status and a ``{"status", "message"}`` body + instead of a created request when every requested season is already + available (e.g. ``NoSeasonsAvailableError`` server-side), so this can't + be detected from the HTTP status code alone. + """ diff --git a/src/python_overseerr/overseerr.py b/src/python_overseerr/overseerr.py index 25e0da6..0e6d946 100644 --- a/src/python_overseerr/overseerr.py +++ b/src/python_overseerr/overseerr.py @@ -11,9 +11,14 @@ from aiohttp import ClientError, ClientResponseError, ClientSession from aiohttp.hdrs import METH_DELETE, METH_GET, METH_POST, METH_PUT +import orjson from yarl import URL -from .exceptions import OverseerrAuthenticationError, OverseerrConnectionError +from .exceptions import ( + OverseerrAuthenticationError, + OverseerrConnectionError, + OverseerrMediaAlreadyAvailableError, +) from .models import ( Issue, IssueCount, @@ -171,6 +176,14 @@ async def create_request( if seasons: data["seasons"] = seasons response = await self._request(METH_POST, "request", data=data) + parsed: dict[str, Any] = orjson.loads(response) + if "id" not in parsed: + # A 2xx response without a created request means there was + # nothing left to request, e.g. every season is already + # available. The body is {"status": ..., "message": ...} + # rather than a MediaRequest in that case. + msg = parsed.get("message", "No request was created") + raise OverseerrMediaAlreadyAvailableError(msg) return RequestWithMedia.from_json(response) async def get_issues( diff --git a/tests/fixtures/overseerr/no_seasons_available.json b/tests/fixtures/overseerr/no_seasons_available.json new file mode 100644 index 0000000..cb5dfca --- /dev/null +++ b/tests/fixtures/overseerr/no_seasons_available.json @@ -0,0 +1,4 @@ +{ + "status": 202, + "message": "No seasons available to request" +} diff --git a/tests/fixtures/seerr/no_seasons_available.json b/tests/fixtures/seerr/no_seasons_available.json new file mode 100644 index 0000000..cb5dfca --- /dev/null +++ b/tests/fixtures/seerr/no_seasons_available.json @@ -0,0 +1,4 @@ +{ + "status": 202, + "message": "No seasons available to request" +} diff --git a/tests/test_overseerr.py b/tests/test_overseerr.py index 5e0ce25..76fea8d 100644 --- a/tests/test_overseerr.py +++ b/tests/test_overseerr.py @@ -16,6 +16,7 @@ OverseerrAuthenticationError, OverseerrConnectionError, OverseerrError, + OverseerrMediaAlreadyAvailableError, ) from python_overseerr.models import ( IssueStatus, @@ -514,6 +515,26 @@ async def test_creating_request( ) +@pytest.mark.parametrize("service", SERVICES) +async def test_creating_request_nothing_to_request( + responses: aiointercept, + client: OverseerrClient, + service: str, +) -> None: + """Test creating a request when every season is already available. + + Overseerr responds with a 2xx status and a {"status", "message"} body + instead of a created request in this case, rather than an HTTP error. + """ + responses.post( + f"{MOCK_URL}/request", + status=202, + body=load_fixture(f"{service}/no_seasons_available.json"), + ) + with pytest.raises(OverseerrMediaAlreadyAvailableError): + await client.create_request(MediaType.TV, 249522, "all") + + @pytest.mark.parametrize("service", SERVICES) async def test_fetching_single_issue( responses: aiointercept, From 2336b3238a35f93cc3df5256d07548b90cf59e62 Mon Sep 17 00:00:00 2001 From: willmakenoise <4471935+willmakenoise@users.noreply.github.com> Date: Mon, 9 Nov 2026 15:43:06 +0100 Subject: [PATCH 2/2] Address review feedback --- src/python_overseerr/exceptions.py | 7 +++---- src/python_overseerr/overseerr.py | 12 ++++-------- tests/test_overseerr.py | 8 ++++---- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/python_overseerr/exceptions.py b/src/python_overseerr/exceptions.py index 44cc8fa..52233bf 100644 --- a/src/python_overseerr/exceptions.py +++ b/src/python_overseerr/exceptions.py @@ -13,11 +13,10 @@ class OverseerrAuthenticationError(OverseerrError): """Overseerr authentication exception.""" -class OverseerrMediaAlreadyAvailableError(OverseerrError): +class OverseerrNothingToRequestError(OverseerrError): """Raised when there is nothing left to request. - Overseerr responds with a 2xx status and a ``{"status", "message"}`` body + Overseerr responds with HTTP 202 and a ``{"status", "message"}`` body instead of a created request when every requested season is already - available (e.g. ``NoSeasonsAvailableError`` server-side), so this can't - be detected from the HTTP status code alone. + requested or available (``NoSeasonsAvailableError`` server-side). """ diff --git a/src/python_overseerr/overseerr.py b/src/python_overseerr/overseerr.py index 0e6d946..17f585f 100644 --- a/src/python_overseerr/overseerr.py +++ b/src/python_overseerr/overseerr.py @@ -17,7 +17,7 @@ from .exceptions import ( OverseerrAuthenticationError, OverseerrConnectionError, - OverseerrMediaAlreadyAvailableError, + OverseerrNothingToRequestError, ) from .models import ( Issue, @@ -177,14 +177,10 @@ async def create_request( data["seasons"] = seasons response = await self._request(METH_POST, "request", data=data) parsed: dict[str, Any] = orjson.loads(response) - if "id" not in parsed: - # A 2xx response without a created request means there was - # nothing left to request, e.g. every season is already - # available. The body is {"status": ..., "message": ...} - # rather than a MediaRequest in that case. + if parsed.get("status") == 202: msg = parsed.get("message", "No request was created") - raise OverseerrMediaAlreadyAvailableError(msg) - return RequestWithMedia.from_json(response) + raise OverseerrNothingToRequestError(msg) + return RequestWithMedia.from_dict(parsed) async def get_issues( self, diff --git a/tests/test_overseerr.py b/tests/test_overseerr.py index 76fea8d..6e05290 100644 --- a/tests/test_overseerr.py +++ b/tests/test_overseerr.py @@ -16,7 +16,7 @@ OverseerrAuthenticationError, OverseerrConnectionError, OverseerrError, - OverseerrMediaAlreadyAvailableError, + OverseerrNothingToRequestError, ) from python_overseerr.models import ( IssueStatus, @@ -521,9 +521,9 @@ async def test_creating_request_nothing_to_request( client: OverseerrClient, service: str, ) -> None: - """Test creating a request when every season is already available. + """Test creating a request when every season is already requested or available. - Overseerr responds with a 2xx status and a {"status", "message"} body + Overseerr responds with HTTP 202 and a {"status", "message"} body instead of a created request in this case, rather than an HTTP error. """ responses.post( @@ -531,7 +531,7 @@ async def test_creating_request_nothing_to_request( status=202, body=load_fixture(f"{service}/no_seasons_available.json"), ) - with pytest.raises(OverseerrMediaAlreadyAvailableError): + with pytest.raises(OverseerrNothingToRequestError): await client.create_request(MediaType.TV, 249522, "all")