faceit 0.2.2__tar.gz → 0.2.3__tar.gz

faceit-0.2.2/.github/workflows/ci.yml → faceit-0.2.3/.github/workflows/ci.yaml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.12", "3.14"]
+        python-version: ["3.8", "3.10", "3.12", "3.14"]
 
     steps:
       - uses: actions/checkout@v4

{faceit-0.2.2 → faceit-0.2.3}/.mypy.ini

@@ -2,11 +2,13 @@
 exclude = (?x)(
     ^assets/
     | ^docs/
+    | ^examples/
+    | ^tests/
     )
 local_partial_types = True
-; We target Python 3.9+ for type checking because modern mypy releases
+; We target Python 3.10+ for type checking because modern mypy releases
 ; have dropped support for Python 3.8, even though our library supports 3.8
-python_version = 3.9
+python_version = 3.10
 strict = True
 warn_unreachable = True
 

{faceit-0.2.2 → faceit-0.2.3}/.ruff.toml

@@ -12,7 +12,6 @@ ignore = [
     "D",       # pydocstyle docstring violations
     "DOC",     # pydoclint docstring validation violations
     "E501",    # Line too long
-    "EM102",   # f-string used directly in exception
     "FIX002",  # TODO comment detected
     "PLR0904", # Too many public methods
     "PLR0913", # Too many function arguments
@@ -20,7 +19,6 @@ ignore = [
     "SLF001",  # Private member accessed outside class
     "S101",    # Use of assert detected
     "TD",      # flake8-todos violations
-    "TRY003",  # Long exception message defined outside exception class
 ]
 
 [lint.flake8-bugbear]
@@ -85,5 +83,10 @@ ignore-names = ["env", "pages"]
     "PYI018",  # Unused private `TypeVar`, `ParamSpec`, or `TypeVarTuple` declaration
 ]
 
+[lint.pylint]
+allow-dunder-method-names = [
+    "__get_pydantic_core_schema__",
+]
+
 [lint.pyupgrade]
 keep-runtime-typing = true

{faceit-0.2.2 → faceit-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: faceit
-Version: 0.2.2
+Version: 0.2.3
 Summary: The Python wrapper for the FACEIT API
 Project-URL: Documentation, https://docs.faceit.com/docs
 Author-email: zombyacoff <zombyacoff@gmail.com>
@@ -58,7 +58,7 @@ Description-Content-Type: text/markdown
 
 ## Installation
 
-> Requires Python 3.8+
+> Requires **Python 3.8+**.
 
 ```bash
 pip install faceit
@@ -138,9 +138,9 @@ The goal is to provide a solution approaching enterprise-level quality, while re
 
 ### Planned Improvements
 
-- Support for more endpoints and models
-- Webhooks and chat API integration
-- Full documentation and usage guides
+- Support for more endpoints and models.
+- Webhooks and chat API integration.
+- Full documentation and usage guides.
 
 ---
 

{faceit-0.2.2 → faceit-0.2.3}/README.md

@@ -29,7 +29,7 @@
 
 ## Installation
 
-> Requires Python 3.8+
+> Requires **Python 3.8+**.
 
 ```bash
 pip install faceit
@@ -109,9 +109,9 @@ The goal is to provide a solution approaching enterprise-level quality, while re
 
 ### Planned Improvements
 
-- Support for more endpoints and models
-- Webhooks and chat API integration
-- Full documentation and usage guides
+- Support for more endpoints and models.
+- Webhooks and chat API integration.
+- Full documentation and usage guides.
 
 ---
 

{faceit-0.2.2 → faceit-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "faceit"
-version = "0.2.2"
+version = "0.2.3"
 description = "The Python wrapper for the FACEIT API"
 readme = "README.md"
 requires-python = ">=3.8"

{faceit-0.2.2 → faceit-0.2.3}/src/faceit/__init__.py

@@ -18,21 +18,17 @@ from .api import (
     pages,
 )
 from .constants import EventCategory, ExpandedField, GameID, Region, SkillLevel
-from .exceptions import APIError, FaceitError  # deprecated import
 from .faceit import AsyncFaceit, Faceit
-from .http import EnvKey, FromEnv, MaxConcurrentRequests
+from .http import FromEnv, MaxConcurrentRequests
 
 __all__ = [
-    "APIError",
     "AsyncDataResource",
     "AsyncFaceit",  # deprecated (remove in v0.3.0 ?)
     "AsyncPageIterator",
     "CollectReturnFormat",
-    "EnvKey",  # deprecated (remove in v0.2.2 ?)
     "EventCategory",
     "ExpandedField",
     "Faceit",  # deprecated (remove in v0.3.0 ?)
-    "FaceitError",
     "FromEnv",
     "GameID",
     "MaxConcurrentRequests",

{faceit-0.2.2 → faceit-0.2.3}/src/faceit/api/base.py

@@ -21,8 +21,6 @@ from faceit.types import (
 )
 from faceit.utils import warn_stacklevel
 
-from .pagination import AsyncPageIterator, SyncPageIterator
-
 if typing.TYPE_CHECKING:
     _ResponseT = typing.TypeVar("_ResponseT", bound=RawAPIResponse)
 
@@ -66,9 +64,6 @@ class BaseResource(ABC, typing.Generic[ClientT]):
         "category": "type",
     })
 
-    _sync_page_iterator: typing.ClassVar = SyncPageIterator
-    _async_page_iterator: typing.ClassVar = AsyncPageIterator
-
     def __init__(
         self,
         client: ClientT,

{faceit-0.2.2 → faceit-0.2.3}/src/faceit/api/data/championships.py

@@ -1,4 +1,3 @@
-# mypy: disable-error-code="no-any-return"
 from __future__ import annotations
 
 import typing
@@ -8,7 +7,12 @@ from pydantic import AfterValidator, Field, validate_call
 from typing_extensions import Annotated, TypeAlias
 
 from faceit.api.base import BaseResource, ModelPlaceholder
-from faceit.api.pagination import MaxItemsType, pages
+from faceit.api.pagination import (
+    AsyncPageIterator,
+    MaxItemsType,
+    SyncPageIterator,
+    pages,
+)
 from faceit.constants import EventCategory, ExpandedField, GameID
 from faceit.http import AsyncClient, SyncClient
 from faceit.models import Championship, ItemPage
@@ -107,9 +111,8 @@ class SyncChampionships(
         category: EventCategory = EventCategory.ALL,
         max_items: MaxItemsType = pages(30),
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Championship]]:
-        return self.__class__._sync_page_iterator.gather_pages(
-            self.items, game, category, max_items=max_items
-        )
+        iterator = SyncPageIterator(self.items, game, category, max_items=max_items)
+        return iterator.collect()
 
     @typing.overload
     def get(
@@ -327,9 +330,8 @@ class AsyncChampionships(
         category: EventCategory = EventCategory.ALL,
         max_items: MaxItemsType = pages(30),
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Championship]]:
-        return await self.__class__._async_page_iterator.gather_pages(
-            self.items, game, category, max_items=max_items
-        )
+        iterator = AsyncPageIterator(self.items, game, category, max_items=max_items)
+        return await iterator.collect()
 
     @typing.overload
     async def get(

{faceit-0.2.2 → faceit-0.2.3}/src/faceit/api/data/games.py

@@ -1,4 +1,3 @@
-# mypy: disable-error-code="no-any-return"
 from __future__ import annotations
 
 import typing
@@ -7,7 +6,12 @@ from abc import ABC
 from pydantic import Field, validate_call
 
 from faceit.api.base import BaseResource, ModelPlaceholder
-from faceit.api.pagination import MaxItems, MaxItemsType
+from faceit.api.pagination import (
+    AsyncPageIterator,
+    MaxItems,
+    MaxItemsType,
+    SyncPageIterator,
+)
 from faceit.http import AsyncClient, SyncClient
 from faceit.models import ItemPage  # noqa: TC001
 from faceit.types import (
@@ -78,9 +82,8 @@ class SyncGames(BaseGames[SyncClient], typing.Generic[APIResponseFormatT]):
     def all_items(
         self, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[ModelNotImplemented]]:
-        return self.__class__._sync_page_iterator.gather_pages(
-            self.items, max_items=max_items
-        )
+        iterator = SyncPageIterator(self.items, max_items=max_items)
+        return iterator.collect()
 
 
 @typing.final
@@ -132,6 +135,5 @@ class AsyncGames(BaseGames[AsyncClient], typing.Generic[APIResponseFormatT]):
     async def all_items(
         self, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[ModelNotImplemented]]:
-        return await self.__class__._async_page_iterator.gather_pages(
-            self.items, max_items=max_items
-        )
+        iterator = AsyncPageIterator(self.items, max_items=max_items)
+        return await iterator.collect()

{faceit-0.2.2 → faceit-0.2.3}/src/faceit/api/data/players.py

@@ -1,4 +1,3 @@
-# mypy: disable-error-code="no-any-return"
 from __future__ import annotations
 
 import logging
@@ -15,8 +14,10 @@ from faceit.api.base import (
     RequestPayload,
 )
 from faceit.api.pagination import (
+    AsyncPageIterator,
     MaxItems,
     MaxItemsType,
+    SyncPageIterator,
     TimestampPaginationConfig,
     pages,
 )
@@ -34,6 +35,7 @@ from faceit.models import (
     Player,
     Tournament,
 )
+from faceit.models.custom_types import NotStrictTimestampMs  # noqa: TC001
 from faceit.models.players.general import AnyPlayerStats
 from faceit.models.players.match import AbstractMatchPlayerStats
 from faceit.types import (
@@ -44,7 +46,6 @@ from faceit.types import (
     Raw,
     RawAPIItem,
     RawAPIPageResponse,
-    TimestampMillis,
     ValidUUID,
 )
 from faceit.utils import is_valid_uuid
@@ -237,9 +238,8 @@ class SyncPlayers(BasePlayers[SyncClient], typing.Generic[APIResponseFormatT]):
     def all_bans(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[BanEntry]]:
-        return self.__class__._sync_page_iterator.gather_pages(
-            self.bans, player_id, max_items=max_items
-        )
+        iterator = SyncPageIterator(self.bans, player_id, max_items=max_items)
+        return iterator.collect()
 
     @typing.overload
     def matches_stats(
@@ -249,8 +249,8 @@ class SyncPlayers(BasePlayers[SyncClient], typing.Generic[APIResponseFormatT]):
         *,
         offset: int = Field(0, ge=0, le=200),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> RawAPIPageResponse: ...
 
     # TODO: This overload-based approach for specific games feels clunky and doesn't scale well.
@@ -264,20 +264,20 @@ class SyncPlayers(BasePlayers[SyncClient], typing.Generic[APIResponseFormatT]):
         *,
         offset: int = Field(0, ge=0, le=200),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> ItemPage[CS2MatchPlayerStats]: ...
 
     @typing.overload
-    def matches_stats(
+    def matches_stats(  # Fallback
         self: SyncPlayers[Model],
         player_id: PlayerID,
         game: GameID,
         *,
         offset: int = Field(0, ge=0, le=200),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> ItemPage[AbstractMatchPlayerStats]: ...
 
     @validate_call
@@ -288,8 +288,8 @@ class SyncPlayers(BasePlayers[SyncClient], typing.Generic[APIResponseFormatT]):
         *,
         offset: int = Field(0, ge=0, le=200),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> typing.Union[
         RawAPIPageResponse,
         ItemPage[AbstractMatchPlayerStats],
@@ -341,12 +341,14 @@ class SyncPlayers(BasePlayers[SyncClient], typing.Generic[APIResponseFormatT]):
         ItemPage[CS2MatchPlayerStats],
         ItemPage[AbstractMatchPlayerStats],
     ]:
-        return self.__class__._sync_page_iterator.gather_pages(
-            self.matches_stats,
-            player_id,
-            game,
-            max_items=max_items,
-            unix=self.__class__._matches_stats_timestamp_cfg,
+        return SyncPageIterator.gather_from_iterator(
+            SyncPageIterator.unix(
+                self.matches_stats,
+                player_id,
+                game,
+                cfg=self.__class__._matches_stats_timestamp_cfg,
+                max_items=max_items,
+            )
         )
 
     @typing.overload
@@ -357,8 +359,8 @@ class SyncPlayers(BasePlayers[SyncClient], typing.Generic[APIResponseFormatT]):
         *,
         offset: int = Field(0, ge=0, le=1000),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> RawAPIPageResponse: ...
 
     @typing.overload
@@ -369,8 +371,8 @@ class SyncPlayers(BasePlayers[SyncClient], typing.Generic[APIResponseFormatT]):
         *,
         offset: int = Field(0, ge=0, le=1000),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> ItemPage[Match]: ...
 
     @validate_call
@@ -381,8 +383,8 @@ class SyncPlayers(BasePlayers[SyncClient], typing.Generic[APIResponseFormatT]):
         *,
         offset: int = Field(0, ge=0, le=1000),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> typing.Union[RawAPIPageResponse, ItemPage[Match]]:
         return self._validate_response(
             self._client.get(
@@ -417,12 +419,14 @@ class SyncPlayers(BasePlayers[SyncClient], typing.Generic[APIResponseFormatT]):
         game: GameID,
         max_items: MaxItemsType = pages(50),
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Match]]:
-        return self.__class__._sync_page_iterator.gather_pages(
-            self.history,
-            player_id,
-            game,
-            max_items=max_items,
-            unix=self.__class__._history_timestamp_cfg,
+        return SyncPageIterator.gather_from_iterator(
+            SyncPageIterator.unix(
+                self.history,
+                player_id,
+                game,
+                cfg=self.__class__._history_timestamp_cfg,
+                max_items=max_items,
+            )
         )
 
     @typing.overload
@@ -477,9 +481,8 @@ class SyncPlayers(BasePlayers[SyncClient], typing.Generic[APIResponseFormatT]):
     def all_hubs(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Hub]]:
-        return self.__class__._sync_page_iterator.gather_pages(
-            self.hubs, player_id, max_items=max_items
-        )
+        iterator = SyncPageIterator(self.hubs, player_id, max_items=max_items)
+        return iterator.collect()
 
     @typing.overload
     def stats(
@@ -561,9 +564,8 @@ class SyncPlayers(BasePlayers[SyncClient], typing.Generic[APIResponseFormatT]):
     def all_teams(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[GeneralTeam]]:
-        return self.__class__._sync_page_iterator.gather_pages(
-            self.teams, player_id, max_items=max_items
-        )
+        iterator = SyncPageIterator(self.teams, player_id, max_items=max_items)
+        return iterator.collect()
 
     @typing.overload
     def tournaments(
@@ -617,9 +619,8 @@ class SyncPlayers(BasePlayers[SyncClient], typing.Generic[APIResponseFormatT]):
     def all_tournaments(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Tournament]]:
-        return self.__class__._sync_page_iterator.gather_pages(
-            self.tournaments, player_id, max_items=max_items
-        )
+        iterator = SyncPageIterator(self.tournaments, player_id, max_items=max_items)
+        return iterator.collect()
 
 
 @typing.final
@@ -716,9 +717,8 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
     async def all_bans(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[BanEntry]]:
-        return await self.__class__._async_page_iterator.gather_pages(
-            self.bans, player_id, max_items=max_items
-        )
+        iterator = AsyncPageIterator(self.bans, player_id, max_items=max_items)
+        return await iterator.collect()
 
     @typing.overload
     async def matches_stats(
@@ -728,8 +728,8 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
         *,
         offset: int = Field(0, ge=0, le=200),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> RawAPIPageResponse: ...
 
     @typing.overload
@@ -740,8 +740,8 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
         *,
         offset: int = Field(0, ge=0, le=200),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> ItemPage[CS2MatchPlayerStats]: ...
 
     @typing.overload
@@ -752,8 +752,8 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
         *,
         offset: int = Field(0, ge=0, le=200),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> ItemPage[AbstractMatchPlayerStats]: ...
 
     @validate_call
@@ -764,8 +764,8 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
         *,
         offset: int = Field(0, ge=0, le=200),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> typing.Union[
         RawAPIPageResponse,
         ItemPage[AbstractMatchPlayerStats],
@@ -817,12 +817,14 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
         ItemPage[AbstractMatchPlayerStats],
         ItemPage[CS2MatchPlayerStats],
     ]:
-        return await self.__class__._async_page_iterator.gather_pages(
-            self.matches_stats,
-            player_id,
-            game,
-            max_items=max_items,
-            unix=self.__class__._matches_stats_timestamp_cfg,
+        return await AsyncPageIterator.gather_from_iterator(
+            AsyncPageIterator.unix(
+                self.matches_stats,
+                player_id,
+                game,
+                cfg=self.__class__._matches_stats_timestamp_cfg,
+                max_items=max_items,
+            )
         )
 
     @typing.overload
@@ -833,8 +835,8 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
         *,
         offset: int = Field(0, ge=0, le=1000),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> RawAPIPageResponse: ...
 
     @typing.overload
@@ -845,8 +847,8 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
         *,
         offset: int = Field(0, ge=0, le=1000),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> ItemPage[Match]: ...
 
     @validate_call
@@ -857,8 +859,8 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
         *,
         offset: int = Field(0, ge=0, le=1000),
         limit: int = Field(20, ge=1, le=100),
-        start: typing.Optional[TimestampMillis] = None,
-        to: typing.Optional[TimestampMillis] = None,
+        start: typing.Optional[NotStrictTimestampMs] = None,
+        to: typing.Optional[NotStrictTimestampMs] = None,
     ) -> typing.Union[RawAPIPageResponse, ItemPage[Match]]:
         return self._validate_response(
             await self._client.get(
@@ -893,12 +895,14 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
         game: GameID,
         max_items: MaxItemsType = pages(50),
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Match]]:
-        return await self.__class__._async_page_iterator.gather_pages(
-            self.history,
-            player_id,
-            game,
-            max_items=max_items,
-            unix=self.__class__._history_timestamp_cfg,
+        return await AsyncPageIterator.gather_from_iterator(
+            AsyncPageIterator.unix(
+                self.history,
+                player_id,
+                game,
+                cfg=self.__class__._history_timestamp_cfg,
+                max_items=max_items,
+            )
         )
 
     @typing.overload
@@ -953,9 +957,8 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
     async def all_hubs(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Hub]]:
-        return await self.__class__._async_page_iterator.gather_pages(
-            self.hubs, player_id, max_items=max_items
-        )
+        iterator = AsyncPageIterator(self.hubs, player_id, max_items=max_items)
+        return await iterator.collect()
 
     @typing.overload
     async def stats(
@@ -1037,9 +1040,8 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
     async def all_teams(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[GeneralTeam]]:
-        return await self.__class__._async_page_iterator.gather_pages(
-            self.teams, player_id, max_items=max_items
-        )
+        iterator = AsyncPageIterator(self.teams, player_id, max_items=max_items)
+        return await iterator.collect()
 
     @typing.overload
     async def tournaments(
@@ -1093,6 +1095,5 @@ class AsyncPlayers(BasePlayers[AsyncClient], typing.Generic[APIResponseFormatT])
     async def all_tournaments(
         self, player_id: PlayerID, max_items: MaxItemsType = MaxItems.SAFE
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[Tournament]]:
-        return await self.__class__._async_page_iterator.gather_pages(
-            self.tournaments, player_id, max_items=max_items
-        )
+        iterator = AsyncPageIterator(self.tournaments, player_id, max_items=max_items)
+        return await iterator.collect()

{faceit-0.2.2 → faceit-0.2.3}/src/faceit/api/data/rankings.py

@@ -1,4 +1,3 @@
-# mypy: disable-error-code="no-any-return"
 from __future__ import annotations
 
 import typing
@@ -7,7 +6,12 @@ from abc import ABC
 from pydantic import Field, validate_call
 
 from faceit.api.base import BaseResource, ModelPlaceholder
-from faceit.api.pagination import MaxItemsType, pages
+from faceit.api.pagination import (
+    AsyncPageIterator,
+    MaxItemsType,
+    SyncPageIterator,
+    pages,
+)
 from faceit.constants import GameID  # noqa: TC001
 from faceit.http import AsyncClient, SyncClient
 from faceit.models import ItemPage  # noqa: TC001
@@ -107,9 +111,10 @@ class SyncRankings(BaseRankings[SyncClient], typing.Generic[APIResponseFormatT])
         country: typing.Optional[CountryCode] = None,
         max_items: MaxItemsType = pages(10),
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[ModelNotImplemented]]:
-        return self.__class__._sync_page_iterator.gather_pages(
+        iterator = SyncPageIterator(
             self.unbounded, game, region, country, max_items=max_items
         )
+        return iterator.collect()
 
     @typing.overload
     def player(
@@ -230,9 +235,10 @@ class AsyncRankings(BaseRankings[AsyncClient], typing.Generic[APIResponseFormatT
         country: typing.Optional[CountryCode] = None,
         max_items: MaxItemsType = pages(10),
     ) -> typing.Union[typing.List[RawAPIItem], ItemPage[ModelNotImplemented]]:
-        return await self.__class__._async_page_iterator.gather_pages(
+        iterator = AsyncPageIterator(
             self.unbounded, game, region, country, max_items=max_items
         )
+        return await iterator.collect()
 
     @typing.overload
     async def player(