42api 0.1.2__tar.gz → 0.1.3__tar.gz

{42api-0.1.2 → 42api-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: 42api
-Version: 0.1.2
+Version: 0.1.3
 Summary: Object-oriented Python client for the 42 School API (api.intra.42.fr)
 Project-URL: Homepage, https://github.com/Shadowaker/42api
 Author-email: Dan <danyridolfo98@gmail.com>

{42api-0.1.2 → 42api-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "42api"
-version = "0.1.2"
+version = "0.1.3"
 description = "Object-oriented Python client for the 42 School API (api.intra.42.fr)"
 readme = "README.md"
 license = { text = "MIT" }

{42api-0.1.2 → 42api-0.1.3}/src/intra42/__init__.py

@@ -60,4 +60,4 @@ __all__ = [
     "NetworkError",
 ]
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"

{42api-0.1.2 → 42api-0.1.3}/src/intra42/_async/query.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 from collections.abc import AsyncIterator, Callable
 from typing import TYPE_CHECKING, Any, Generic, TypeVar
+from urllib.parse import parse_qsl, urlsplit
 
 from .._pagination import parse_link_header
 from .._query_params import build_query_params
@@ -78,8 +79,20 @@ class AsyncQuerySet(Generic[ModelT]):
         )
 
     async def __aiter__(self) -> AsyncIterator[ModelT]:
+        # `base_params` (filter/sort/page_size/range) is re-applied on every
+        # page, not just the first. Confirmed against the live API: the
+        # `next` link's own query string always uses a *bare* `page=N`
+        # cursor — a different, incompatible pagination scheme from the
+        # bracketed `page[size]`/`page[number]` this library sends, and the
+        # server returns 400 if both appear on the same request. So rather
+        # than forwarding the link's query string as-is (which either loses
+        # page_size or actively errors once you try to keep it), we extract
+        # just the page *number* from the link and reissue it as
+        # `page[number]`, combined with our own persisted page_size/filter/
+        # sort/range.
+        base_params = self._initial_params()
         url: str | None = self._path
-        params: dict[str, str] | None = self._initial_params()
+        params: dict[str, str] | None = base_params
         while url is not None:
             response = await self._client.request("GET", url, params=params)
             for item in response.json():
@@ -87,8 +100,18 @@ class AsyncQuerySet(Generic[ModelT]):
                 if self._bind is not None:
                     self._bind(instance)
                 yield instance
-            url = parse_link_header(response.headers.get("Link")).get("next")
-            params = None  # the next URL already carries its full query string
+
+            next_url = parse_link_header(response.headers.get("Link")).get("next")
+            if next_url is None:
+                break
+
+            split = urlsplit(next_url)
+            url = f"{split.scheme}://{split.netloc}{split.path}" if split.scheme else split.path
+            next_query = dict(parse_qsl(split.query))
+            page_number = next_query.pop("page[number]", None) or next_query.pop("page", None)
+            params = {**next_query, **base_params}
+            if page_number is not None:
+                params["page[number]"] = page_number
 
     async def all(self) -> list[ModelT]:
         return [item async for item in self]

{42api-0.1.2 → 42api-0.1.3}/src/intra42/_sync/query.py

@@ -13,6 +13,7 @@ from __future__ import annotations
 
 from collections.abc import Callable, Iterator
 from typing import TYPE_CHECKING, Any, Generic, TypeVar
+from urllib.parse import parse_qsl, urlsplit
 
 from .._pagination import parse_link_header
 from .._query_params import build_query_params
@@ -84,8 +85,20 @@ class QuerySet(Generic[ModelT]):
         )
 
     def __iter__(self) -> Iterator[ModelT]:
+        # `base_params` (filter/sort/page_size/range) is re-applied on every
+        # page, not just the first. Confirmed against the live API: the
+        # `next` link's own query string always uses a *bare* `page=N`
+        # cursor — a different, incompatible pagination scheme from the
+        # bracketed `page[size]`/`page[number]` this library sends, and the
+        # server returns 400 if both appear on the same request. So rather
+        # than forwarding the link's query string as-is (which either loses
+        # page_size or actively errors once you try to keep it), we extract
+        # just the page *number* from the link and reissue it as
+        # `page[number]`, combined with our own persisted page_size/filter/
+        # sort/range.
+        base_params = self._initial_params()
         url: str | None = self._path
-        params: dict[str, str] | None = self._initial_params()
+        params: dict[str, str] | None = base_params
         while url is not None:
             response = self._client.request("GET", url, params=params)
             for item in response.json():
@@ -93,8 +106,18 @@ class QuerySet(Generic[ModelT]):
                 if self._bind is not None:
                     self._bind(instance)
                 yield instance
-            url = parse_link_header(response.headers.get("Link")).get("next")
-            params = None  # the next URL already carries its full query string
+
+            next_url = parse_link_header(response.headers.get("Link")).get("next")
+            if next_url is None:
+                break
+
+            split = urlsplit(next_url)
+            url = f"{split.scheme}://{split.netloc}{split.path}" if split.scheme else split.path
+            next_query = dict(parse_qsl(split.query))
+            page_number = next_query.pop("page[number]", None) or next_query.pop("page", None)
+            params = {**next_query, **base_params}
+            if page_number is not None:
+                params["page[number]"] = page_number
 
     def all(self) -> list[ModelT]:
         return [item for item in self]

42api-0.1.3/tests/integration/test_pagination_walk.py

@@ -0,0 +1,141 @@
+"""Integration tests for the auto-paginating query builder against respx."""
+
+import httpx
+
+from intra42._async.client import AsyncClient
+from intra42._sync.client import Client
+
+PAGE_1 = httpx.Response(
+    200,
+    json=[{"id": 1, "login": "a"}, {"id": 2, "login": "b"}],
+    headers={"Link": '<https://api.intra.42.fr/v2/users?page=2>; rel="next"'},
+)
+PAGE_2 = httpx.Response(200, json=[{"id": 3, "login": "c"}])
+
+
+async def test_all_walks_every_page_async(mock_token_route) -> None:
+    mock, _ = mock_token_route
+    route = mock.get("https://api.intra.42.fr/v2/users").mock(side_effect=[PAGE_1, PAGE_2])
+
+    client = AsyncClient("id", "secret")
+    try:
+        users = await client.users.all()
+    finally:
+        await client.aclose()
+
+    assert [u.id for u in users] == [1, 2, 3]
+    assert route.call_count == 2
+
+
+async def test_async_for_walks_every_page(mock_token_route) -> None:
+    mock, _ = mock_token_route
+    route = mock.get("https://api.intra.42.fr/v2/users").mock(side_effect=[PAGE_1, PAGE_2])
+
+    client = AsyncClient("id", "secret")
+    try:
+        seen = []
+        async for user in client.users:
+            seen.append(user.id)
+    finally:
+        await client.aclose()
+
+    assert seen == [1, 2, 3]
+    assert route.call_count == 2
+
+
+async def test_filter_and_sort_are_sent_as_query_params(mock_token_route) -> None:
+    mock, _ = mock_token_route
+    route = mock.get("https://api.intra.42.fr/v2/users").mock(
+        return_value=httpx.Response(200, json=[])
+    )
+
+    client = AsyncClient("id", "secret")
+    try:
+        await client.users.filter(primary_campus_id=1).sort("-pool_year").all()
+    finally:
+        await client.aclose()
+
+    request = route.calls.last.request
+    assert request.url.params["filter[primary_campus_id]"] == "1"
+    assert request.url.params["sort"] == "-pool_year"
+
+
+def test_all_walks_every_page_sync(mock_token_route) -> None:
+    mock, _ = mock_token_route
+    route = mock.get("https://api.intra.42.fr/v2/users").mock(side_effect=[PAGE_1, PAGE_2])
+
+    with Client("id", "secret") as client:
+        users = client.users.all()
+
+    assert [u.id for u in users] == [1, 2, 3]
+    assert route.call_count == 2
+
+
+def test_for_loop_walks_every_page_sync(mock_token_route) -> None:
+    mock, _ = mock_token_route
+    route = mock.get("https://api.intra.42.fr/v2/users").mock(side_effect=[PAGE_1, PAGE_2])
+
+    with Client("id", "secret") as client:
+        seen = [user.id for user in client.users]
+
+    assert seen == [1, 2, 3]
+    assert route.call_count == 2
+
+
+async def test_next_link_missing_page_size_is_restored(mock_token_route) -> None:
+    """Regression test, confirmed against the live API: 42's `next` link
+    uses a bare `page=N` cursor — a different, incompatible pagination
+    scheme from the bracketed `page[size]` this library sends, and the
+    server returns 400 if both appear on the same request. Forwarding the
+    link's query string as-is therefore either silently drops page_size
+    (producing duplicate/missing rows) or, if merged naively, breaks the
+    request outright. The fix extracts just the page number from the link
+    and reissues it as `page[number]`, never forwarding the bare `page`
+    key, alongside page_size/filter/sort/range re-applied on every page."""
+    mock, _ = mock_token_route
+    page_1 = httpx.Response(
+        200,
+        json=[{"id": 1}, {"id": 2}],
+        headers={"Link": '<https://api.intra.42.fr/v2/users?page=2>; rel="next"'},
+    )
+    page_2 = httpx.Response(200, json=[{"id": 3}])
+    route = mock.get("https://api.intra.42.fr/v2/users").mock(side_effect=[page_1, page_2])
+
+    client = AsyncClient("id", "secret")
+    try:
+        users = await client.users.filter(primary_campus_id=1).page_size(2).all()
+    finally:
+        await client.aclose()
+
+    assert [u.id for u in users] == [1, 2, 3]
+    assert route.call_count == 2
+
+    first_request, second_request = (call.request for call in route.calls)
+    assert first_request.url.params["page[size]"] == "2"
+    assert first_request.url.params["filter[primary_campus_id]"] == "1"
+    # The fix: these must survive onto the second page too, even though the
+    # `next` link's own query string didn't carry them.
+    assert second_request.url.params["page[size]"] == "2"
+    assert second_request.url.params["filter[primary_campus_id]"] == "1"
+    # The link's cursor (bare `page=2`) must come through as `page[number]`,
+    # not the bare key — mixing the two schemes is what causes the 400.
+    assert second_request.url.params["page[number]"] == "2"
+    assert "page" not in second_request.url.params
+
+
+def test_next_link_missing_page_size_is_restored_sync(mock_token_route) -> None:
+    mock, _ = mock_token_route
+    page_1 = httpx.Response(
+        200,
+        json=[{"id": 1}, {"id": 2}],
+        headers={"Link": '<https://api.intra.42.fr/v2/users?page=2>; rel="next"'},
+    )
+    page_2 = httpx.Response(200, json=[{"id": 3}])
+    route = mock.get("https://api.intra.42.fr/v2/users").mock(side_effect=[page_1, page_2])
+
+    with Client("id", "secret") as client:
+        users = client.users.page_size(2).all()
+
+    assert [u.id for u in users] == [1, 2, 3]
+    second_request = route.calls[1].request
+    assert second_request.url.params["page[size]"] == "2"

{42api-0.1.2 → 42api-0.1.3}/uv.lock

@@ -8,7 +8,7 @@ resolution-markers = [
 
 [[package]]
 name = "42api"
-version = "0.1.2"
+version = "0.1.3"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },
@@ -180,7 +180,7 @@ name = "exceptiongroup"
 version = "1.3.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "typing-extensions" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/50/79/66800aadf48771f6b62f7eb014e352e5d06856655206165d775e675a02c9/exceptiongroup-1.3.1.tar.gz", hash = "sha256:8b412432c6055b0b7d14c310000ae93352ed6754f70fa8f7c34141f91c4e3219", size = 30371, upload-time = "2025-11-21T23:01:54.787Z" }
 wheels = [

42api-0.1.2/tests/integration/test_pagination_walk.py

@@ -1,82 +0,0 @@
-"""Integration tests for the auto-paginating query builder against respx."""
-
-import httpx
-
-from intra42._async.client import AsyncClient
-from intra42._sync.client import Client
-
-PAGE_1 = httpx.Response(
-    200,
-    json=[{"id": 1, "login": "a"}, {"id": 2, "login": "b"}],
-    headers={"Link": '<https://api.intra.42.fr/v2/users?page=2>; rel="next"'},
-)
-PAGE_2 = httpx.Response(200, json=[{"id": 3, "login": "c"}])
-
-
-async def test_all_walks_every_page_async(mock_token_route) -> None:
-    mock, _ = mock_token_route
-    route = mock.get("https://api.intra.42.fr/v2/users").mock(side_effect=[PAGE_1, PAGE_2])
-
-    client = AsyncClient("id", "secret")
-    try:
-        users = await client.users.all()
-    finally:
-        await client.aclose()
-
-    assert [u.id for u in users] == [1, 2, 3]
-    assert route.call_count == 2
-
-
-async def test_async_for_walks_every_page(mock_token_route) -> None:
-    mock, _ = mock_token_route
-    route = mock.get("https://api.intra.42.fr/v2/users").mock(side_effect=[PAGE_1, PAGE_2])
-
-    client = AsyncClient("id", "secret")
-    try:
-        seen = []
-        async for user in client.users:
-            seen.append(user.id)
-    finally:
-        await client.aclose()
-
-    assert seen == [1, 2, 3]
-    assert route.call_count == 2
-
-
-async def test_filter_and_sort_are_sent_as_query_params(mock_token_route) -> None:
-    mock, _ = mock_token_route
-    route = mock.get("https://api.intra.42.fr/v2/users").mock(
-        return_value=httpx.Response(200, json=[])
-    )
-
-    client = AsyncClient("id", "secret")
-    try:
-        await client.users.filter(primary_campus_id=1).sort("-pool_year").all()
-    finally:
-        await client.aclose()
-
-    request = route.calls.last.request
-    assert request.url.params["filter[primary_campus_id]"] == "1"
-    assert request.url.params["sort"] == "-pool_year"
-
-
-def test_all_walks_every_page_sync(mock_token_route) -> None:
-    mock, _ = mock_token_route
-    route = mock.get("https://api.intra.42.fr/v2/users").mock(side_effect=[PAGE_1, PAGE_2])
-
-    with Client("id", "secret") as client:
-        users = client.users.all()
-
-    assert [u.id for u in users] == [1, 2, 3]
-    assert route.call_count == 2
-
-
-def test_for_loop_walks_every_page_sync(mock_token_route) -> None:
-    mock, _ = mock_token_route
-    route = mock.get("https://api.intra.42.fr/v2/users").mock(side_effect=[PAGE_1, PAGE_2])
-
-    with Client("id", "secret") as client:
-        seen = [user.id for user in client.users]
-
-    assert seen == [1, 2, 3]
-    assert route.call_count == 2