diff --git a/src/finch/pagination.py b/src/finch/pagination.py index 20e2dabb..e1a57f18 100644 --- a/src/finch/pagination.py +++ b/src/finch/pagination.py @@ -4,6 +4,7 @@ from httpx import Response +from .types import Paging from ._types import ModelT from ._utils import is_mapping from ._models import BaseModel @@ -101,17 +102,13 @@ def next_page_info(self) -> None: return None -class IndividualsPagePaging(BaseModel): - count: Optional[int] = None - """The total number of elements for the entire query (not just the given page)""" - - offset: Optional[int] = None - """The current start index of the returned list of elements""" +IndividualsPagePaging = Paging +"""This is deprecated, Paging should be used instead""" class SyncIndividualsPage(BaseSyncPage[ModelT], BasePage[ModelT], Generic[ModelT]): - paging: IndividualsPagePaging individuals: List[ModelT] + paging: Paging def _get_page_items(self) -> List[ModelT]: return self.individuals @@ -135,8 +132,8 @@ def next_page_info(self) -> Optional[PageInfo]: class AsyncIndividualsPage(BaseAsyncPage[ModelT], BasePage[ModelT], Generic[ModelT]): - paging: IndividualsPagePaging individuals: List[ModelT] + paging: Paging def _get_page_items(self) -> List[ModelT]: return self.individuals @@ -159,17 +156,13 @@ def next_page_info(self) -> Optional[PageInfo]: return None -class CandidatesPagePaging(BaseModel): - count: Optional[int] = None - """The total number of elements for the entire query (not just the given page)""" - - offset: Optional[int] = None - """The current start index of the returned list of elements""" +CandidatesPagePaging = Paging +"""This is deprecated, Paging should be used instead""" class SyncCandidatesPage(BaseSyncPage[ModelT], BasePage[ModelT], Generic[ModelT]): - paging: CandidatesPagePaging candidates: List[ModelT] + paging: Paging def _get_page_items(self) -> List[ModelT]: return self.candidates @@ -193,8 +186,8 @@ def next_page_info(self) -> Optional[PageInfo]: class AsyncCandidatesPage(BaseAsyncPage[ModelT], BasePage[ModelT], Generic[ModelT]): - paging: CandidatesPagePaging candidates: List[ModelT] + paging: Paging def _get_page_items(self) -> List[ModelT]: return self.candidates @@ -217,17 +210,13 @@ def next_page_info(self) -> Optional[PageInfo]: return None -class ApplicationsPagePaging(BaseModel): - count: Optional[int] = None - """The total number of elements for the entire query (not just the given page)""" - - offset: Optional[int] = None - """The current start index of the returned list of elements""" +ApplicationsPagePaging = Paging +"""This is deprecated, Paging should be used instead""" class SyncApplicationsPage(BaseSyncPage[ModelT], BasePage[ModelT], Generic[ModelT]): - paging: ApplicationsPagePaging applications: List[ModelT] + paging: Paging def _get_page_items(self) -> List[ModelT]: return self.applications @@ -251,8 +240,8 @@ def next_page_info(self) -> Optional[PageInfo]: class AsyncApplicationsPage(BaseAsyncPage[ModelT], BasePage[ModelT], Generic[ModelT]): - paging: ApplicationsPagePaging applications: List[ModelT] + paging: Paging def _get_page_items(self) -> List[ModelT]: return self.applications @@ -275,17 +264,13 @@ def next_page_info(self) -> Optional[PageInfo]: return None -class JobsPagePaging(BaseModel): - count: Optional[int] = None - """The total number of elements for the entire query (not just the given page)""" - - offset: Optional[int] = None - """The current start index of the returned list of elements""" +JobsPagePaging = Paging +"""This is deprecated, Paging should be used instead""" class SyncJobsPage(BaseSyncPage[ModelT], BasePage[ModelT], Generic[ModelT]): - paging: JobsPagePaging jobs: List[ModelT] + paging: Paging def _get_page_items(self) -> List[ModelT]: return self.jobs @@ -309,8 +294,8 @@ def next_page_info(self) -> Optional[PageInfo]: class AsyncJobsPage(BaseAsyncPage[ModelT], BasePage[ModelT], Generic[ModelT]): - paging: JobsPagePaging jobs: List[ModelT] + paging: Paging def _get_page_items(self) -> List[ModelT]: return self.jobs @@ -333,17 +318,13 @@ def next_page_info(self) -> Optional[PageInfo]: return None -class OffersPagePaging(BaseModel): - count: Optional[int] = None - """The total number of elements for the entire query (not just the given page)""" - - offset: Optional[int] = None - """The current start index of the returned list of elements""" +OffersPagePaging = Paging +"""This is deprecated, Paging should be used instead""" class SyncOffersPage(BaseSyncPage[ModelT], BasePage[ModelT], Generic[ModelT]): - paging: OffersPagePaging offers: List[ModelT] + paging: Paging def _get_page_items(self) -> List[ModelT]: return self.offers @@ -367,8 +348,8 @@ def next_page_info(self) -> Optional[PageInfo]: class AsyncOffersPage(BaseAsyncPage[ModelT], BasePage[ModelT], Generic[ModelT]): - paging: OffersPagePaging offers: List[ModelT] + paging: Paging def _get_page_items(self) -> List[ModelT]: return self.offers