From 43e7d4846bece6b854bccd60019e2e10fdd3f4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6pf?= Date: Sun, 22 Jan 2023 18:43:38 +0100 Subject: [PATCH] lt->before, gt->after for cursor endpoints --- .../oasst_backend/api/v1/frontend_users.py | 8 +++---- backend/oasst_backend/api/v1/users.py | 24 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/backend/oasst_backend/api/v1/frontend_users.py b/backend/oasst_backend/api/v1/frontend_users.py index 51f8cd20..a01e009a 100644 --- a/backend/oasst_backend/api/v1/frontend_users.py +++ b/backend/oasst_backend/api/v1/frontend_users.py @@ -95,8 +95,8 @@ def query_frontend_user_messages( def query_frontend_user_messages_cursor( auth_method: str, username: str, - lt: Optional[str] = None, - gt: Optional[str] = None, + before: Optional[str] = None, + after: Optional[str] = None, only_roots: Optional[bool] = False, include_deleted: Optional[bool] = False, max_count: Optional[int] = Query(10, gt=0, le=1000), @@ -105,8 +105,8 @@ def query_frontend_user_messages_cursor( db: Session = Depends(deps.get_db), ): return get_messages_cursor( - before=lt, - after=gt, + before=before, + after=after, auth_method=auth_method, username=username, only_roots=only_roots, diff --git a/backend/oasst_backend/api/v1/users.py b/backend/oasst_backend/api/v1/users.py index 63bb79ea..e4683a76 100644 --- a/backend/oasst_backend/api/v1/users.py +++ b/backend/oasst_backend/api/v1/users.py @@ -78,8 +78,8 @@ def get_users_ordered_by_display_name( @router.get("/cursor", response_model=protocol.FrontEndUserPage) def get_users_cursor( - lt: Optional[str] = None, - gt: Optional[str] = None, + before: Optional[str] = None, + after: Optional[str] = None, sort_key: Optional[str] = Query("username", max_length=32), max_count: Optional[int] = Query(100, gt=0, le=10000), api_client_id: Optional[UUID] = None, @@ -99,8 +99,8 @@ def get_users_cursor( return x, None items: list[protocol.FrontEndUser] - qry_max_count = max_count + 1 if lt is None or gt is None else max_count - desc = lt is not None and not gt + qry_max_count = max_count + 1 if before is None or after is None else max_count + desc = before is not None and not after def get_next_prev(num_rows: int, lt: str | None, gt: str | None, key_fn: Callable[[protocol.FrontEndUser], str]): p, n = None, None @@ -127,8 +127,8 @@ def get_users_cursor( n, p = None, None if sort_key == "username": - lte_username, lt_id = split_cursor(lt) - gte_username, gt_id = split_cursor(gt) + lte_username, lt_id = split_cursor(before) + gte_username, gt_id = split_cursor(after) items = get_users_ordered_by_username( api_client_id=api_client_id, gte_username=gte_username, @@ -146,8 +146,8 @@ def get_users_cursor( p, n = get_next_prev(num_rows, lte_username, gte_username, lambda x: x.id) elif sort_key == "display_name": - lte_display_name, lt_id = split_cursor(lt) - gte_display_name, gt_id = split_cursor(gt) + lte_display_name, lt_id = split_cursor(before) + gte_display_name, gt_id = split_cursor(after) items = get_users_ordered_by_display_name( api_client_id=api_client_id, gte_display_name=gte_display_name, @@ -247,8 +247,8 @@ def query_user_messages( @router.get("/{user_id}/messages/cursor", response_model=protocol.MessagePage) def query_user_messages_cursor( user_id: Optional[UUID], - lt: Optional[str] = None, - gt: Optional[str] = None, + before: Optional[str] = None, + after: Optional[str] = None, only_roots: Optional[bool] = False, include_deleted: Optional[bool] = False, max_count: Optional[int] = Query(10, gt=0, le=1000), @@ -257,8 +257,8 @@ def query_user_messages_cursor( db: Session = Depends(deps.get_db), ): return get_messages_cursor( - before=lt, - after=gt, + before=before, + after=after, user_id=user_id, only_roots=only_roots, include_deleted=include_deleted,