Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion api/Assistant/assistant_repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import logging
from api.error_constant import ErrorConstants

def get_all_assistants(db: Session, skip: int, limit: int) -> Tuple[List[Assistant], int]:
def get_all_assistants(db: Session, skip: int, limit: int, user_email: str) -> Tuple[List[Assistant], int]:
db_query = db.query(Assistant).options(
load_only(
Assistant.id,
Expand All @@ -18,6 +18,8 @@ def get_all_assistants(db: Session, skip: int, limit: int) -> Tuple[List[Assista
Assistant.created_by,
Assistant.system_assistance
)
).filter(
(Assistant.created_by == user_email) | (Assistant.system_assistance == True)
)
total = db_query.count()
assistants = db_query.offset(skip).limit(limit).all()
Expand Down
5 changes: 3 additions & 2 deletions api/Assistant/assistant_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ def _build_assistant_info_response(assistant) -> AssistantInfoResponse:
)


def get_assistants(skip: 0, limit: 20) -> AssistantResponse:
def get_assistants(token: str, skip: int = 0, limit: int = 20) -> AssistantResponse:
current_user_email = validate_and_extract_user_email(token=token)
with SessionLocal() as db_session:
assistants, total = get_all_assistants(db=db_session, skip=skip, limit=limit)
assistants, total = get_all_assistants(db=db_session, skip=skip, limit=limit, user_email=current_user_email)
assistants_response = [
_build_assistant_list_item_response(assistant)
for assistant in assistants
Expand Down
5 changes: 3 additions & 2 deletions api/Assistant/assistant_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
)

@assistant_router.get("", status_code=status.HTTP_200_OK)
async def get_all_assistants(
async def get_all_assistants(
authentication_credential: Annotated[HTTPAuthorizationCredentials, Depends(oauth2_scheme)],
skip: int = Query(default=0),
limit: int = Query(default=10)) -> AssistantResponse:
return get_assistants(skip=skip, limit=limit)
return get_assistants(token=authentication_credential.credentials, skip=skip, limit=limit)

@assistant_router.post("", status_code=status.HTTP_201_CREATED)
async def create_assistant(
Expand Down
Loading