Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add lang filter option to message endpoints #902

Merged
merged 3 commits into from
Jan 23, 2023
Merged

add lang filter option to message endpoints #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f2cd47
add lang filter option to message endpoints
j0rd1smit Jan 23, 2023
2f61571
add lang filter option to frontend_users endpoints
j0rd1smit Jan 23, 2023
107fe6c
move lang param before api_client
andreaskoepf Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions backend/oasst_backend/api/v1/frontend_users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def query_frontend_user_messages(
only_roots: bool = False,
desc: bool = True,
include_deleted: bool = False,
lang: Optional[str] = None,
api_client: ApiClient = Depends(deps.get_api_client),
db: Session = Depends(deps.get_db),
):
Expand All @@ -87,6 +88,7 @@ def query_frontend_user_messages(
lte_created_date=end_date,
only_roots=only_roots,
deleted=None if include_deleted else False,
lang=lang,
)
return utils.prepare_message_list(messages)

Expand All @@ -101,6 +103,7 @@ def query_frontend_user_messages_cursor(
include_deleted: Optional[bool] = False,
max_count: Optional[int] = Query(10, gt=0, le=1000),
desc: Optional[bool] = False,
lang: Optional[str] = None,
api_client: ApiClient = Depends(deps.get_api_client),
db: Session = Depends(deps.get_db),
):
Expand All @@ -113,6 +116,7 @@ def query_frontend_user_messages_cursor(
include_deleted=include_deleted,
max_count=max_count,
desc=desc,
lang=lang,
api_client=api_client,
db=db,
)
Expand Down
4 changes: 4 additions & 0 deletions backend/oasst_backend/api/v1/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def query_messages(
only_roots: Optional[bool] = False,
desc: Optional[bool] = True,
allow_deleted: Optional[bool] = False,
lang: Optional[str] = None,
api_client: ApiClient = Depends(deps.get_api_client),
db: Session = Depends(deps.get_db),
):
Expand All @@ -43,6 +44,7 @@ def query_messages(
lte_created_date=end_date,
only_roots=only_roots,
deleted=None if allow_deleted else False,
lang=lang,
)

return utils.prepare_message_list(messages)
Expand All @@ -60,6 +62,7 @@ def get_messages_cursor(
include_deleted: Optional[bool] = False,
max_count: Optional[int] = Query(10, gt=0, le=1000),
desc: Optional[bool] = False,
lang: Optional[str] = None,
api_client: ApiClient = Depends(deps.get_api_client),
db: Session = Depends(deps.get_db),
):
Expand Down Expand Up @@ -103,6 +106,7 @@ def split_cursor(x: str | None) -> tuple[datetime, UUID]:
deleted=None if include_deleted else False,
desc=query_desc,
limit=qry_max_count,
lang=lang,
)

num_rows = len(items)
Expand Down
4 changes: 4 additions & 0 deletions backend/oasst_backend/api/v1/users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ def query_user_messages(
only_roots: bool = False,
desc: bool = True,
include_deleted: bool = False,
lang: Optional[str] = None,
api_client: ApiClient = Depends(deps.get_api_client),
db: Session = Depends(deps.get_db),
):
Expand All @@ -239,6 +240,7 @@ def query_user_messages(
lte_created_date=end_date,
only_roots=only_roots,
deleted=None if include_deleted else False,
lang=lang,
)

return utils.prepare_message_list(messages)
Expand All @@ -253,6 +255,7 @@ def query_user_messages_cursor(
include_deleted: Optional[bool] = False,
max_count: Optional[int] = Query(10, gt=0, le=1000),
desc: Optional[bool] = False,
lang: Optional[str] = None,
api_client: ApiClient = Depends(deps.get_api_client),
db: Session = Depends(deps.get_db),
):
Expand All @@ -264,6 +267,7 @@ def query_user_messages_cursor(
include_deleted=include_deleted,
max_count=max_count,
desc=desc,
lang=lang,
api_client=api_client,
db=db,
)
Expand Down
4 changes: 4 additions & 0 deletions backend/oasst_backend/prompt_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,7 @@ def query_messages_ordered_by_created_date(
deleted: Optional[bool] = None,
desc: bool = False,
limit: Optional[int] = 100,
lang: Optional[str] = None,
) -> list[Message]:
if not self.api_client.trusted:
if not api_client_id:
Expand Down Expand Up @@ -758,6 +759,9 @@ def query_messages_ordered_by_created_date(
if limit is not None:
qry = qry.limit(limit)

if lang is not None:
qry = qry.filter(Message.lang == lang)

return qry.all()

def update_children_counts(self, message_tree_id: UUID):
Expand Down