coderfastapi 5.2.1__tar.gz → 5.3.0__tar.gz

{coderfastapi-5.2.1 → coderfastapi-5.3.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: coderfastapi
-Version: 5.2.1
+Version: 5.3.0
 Summary: coderfastapi
 Author-email: Code R <hello@coderstudio.dev>
 Description-Content-Type: text/markdown
-Requires-Dist: codercore~=6.3
+Requires-Dist: codercore~=6.5
 Requires-Dist: fastapi[all]~=0.89
 Requires-Dist: google-cloud-logging~=3.7
 Requires-Dist: orjson~=3.8

{coderfastapi-5.2.1 → coderfastapi-5.3.0}/coderfastapi/lib/decorators/pagination.py

@@ -1,17 +1,15 @@
 from inspect import Parameter, Signature, isclass, signature
-from typing import Awaitable, Callable, Iterable, TypeVar
+from typing import Any, Awaitable, Callable, Iterable, TypeVar
 from urllib.parse import parse_qs, urlencode, urlsplit, urlunsplit
 
 from codercore.lib.collection import Direction
+from codercore.types import SequentialCollection
 from fastapi import Request, Response
 from fastapi.params import Depends
 
 from coderfastapi.lib.signature import copy_parameters
 from coderfastapi.lib.validation.schemas.pagination import DeserializableCursor
-from coderfastapi.lib.validation.schemas.query import (
-    OrderableQueryParameters,
-    QueryParameters,
-)
+from coderfastapi.lib.validation.schemas.query import QueryParameters
 
 T = TypeVar("T")
 S = TypeVar("S", bound=QueryParameters)
@@ -19,7 +17,7 @@ Entities = Iterable[T]
 
 
 def paginate(
-    id_attr: str,
+    *id_attr: str,
 ) -> Callable[
     [Callable[..., Awaitable[Entities]]],
     Callable[[Request, Response, ...], Awaitable[Entities]],
@@ -82,16 +80,14 @@ def _is_injectable(parameter) -> bool:
 
 
 def _build_links(
-    id_attr: str,
+    id_attr: SequentialCollection[str],
     query_schema: S,
     request: Request,
     result: Entities,
 ) -> list[str]:
     result_length = len(result)
     links = []
-    value_attr = id_attr
-    if isinstance(query_schema, OrderableQueryParameters):
-        value_attr = query_schema.order_by
+    value_attr = getattr(query_schema, "order_by", id_attr)
 
     if previous_cursor := query_schema.cursor:
         previous_direction = previous_cursor.direction
@@ -111,17 +107,34 @@ def _build_links(
 
 def _create_cursor(
     direction: Direction,
-    id_attr: str,
-    value_attr: str,
+    id_attr: SequentialCollection[str],
+    value_attr: str | SequentialCollection[str],
     item: T,
 ) -> DeserializableCursor:
     return DeserializableCursor(
-        last_id=getattr(item, id_attr),
-        last_value=getattr(item, value_attr),
+        last_id=_get_last_id(item, id_attr),
+        last_value=_get_last_value(item, value_attr),
         direction=direction,
     )
 
 
+def _get_last_id(item: T, id_attr: SequentialCollection[str]) -> Any:
+    if len(id_attr) > 1:
+        return [getattr(item, attr) for attr in id_attr]
+    else:
+        return getattr(item, id_attr[0])
+
+
+def _get_last_value(item: T, value_attr: str | SequentialCollection[str]) -> Any:
+    if isinstance(value_attr, (list, tuple)):
+        if len(value_attr) > 1:
+            return [getattr(item, attr) for attr in value_attr]
+        else:
+            return getattr(item, value_attr[0])
+    else:
+        return getattr(item, value_attr)
+
+
 def _construct_link(cursor: DeserializableCursor, rel: str, request: Request) -> str:
     url = _construct_url_with_cursor(cursor, request)
     return f'<{url}>; rel="{rel}"'

{coderfastapi-5.2.1 → coderfastapi-5.3.0}/coderfastapi.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: coderfastapi
-Version: 5.2.1
+Version: 5.3.0
 Summary: coderfastapi
 Author-email: Code R <hello@coderstudio.dev>
 Description-Content-Type: text/markdown
-Requires-Dist: codercore~=6.3
+Requires-Dist: codercore~=6.5
 Requires-Dist: fastapi[all]~=0.89
 Requires-Dist: google-cloud-logging~=3.7
 Requires-Dist: orjson~=3.8

{coderfastapi-5.2.1 → coderfastapi-5.3.0}/coderfastapi.egg-info/requires.txt

@@ -1,4 +1,4 @@
-codercore~=6.3
+codercore~=6.5
 fastapi[all]~=0.89
 google-cloud-logging~=3.7
 orjson~=3.8

{coderfastapi-5.2.1 → coderfastapi-5.3.0}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "coderfastapi"
-version = "5.2.1"
+version = "5.3.0"
 description = "coderfastapi"
 readme = "README.md"
 authors = [{ name = "Code R", email = "hello@coderstudio.dev" }]
 dependencies = [
-    'codercore ~= 6.3',
+    'codercore ~= 6.5',
     'fastapi[all] ~= 0.89',
     'google-cloud-logging ~= 3.7',
     'orjson ~= 3.8',
@@ -33,7 +33,7 @@ dev = [
 ]
 
 [tool.bumpver]
-current_version = "5.2.1"
+current_version = "5.3.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true