Skip to content
Open
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
22 changes: 16 additions & 6 deletions web_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,8 @@ def suggestions_by_category(name: GroupedLabelRequest):
response['all_tokenizations'] = all_tokenizations

logger.info(json.dumps(
log_entry.create_grouped_log_entry(name.model_dump(), {**related_suggestions, **grouped_suggestions})))
log_entry.create_grouped_log_entry(name.model_dump(), {**related_suggestions, **grouped_suggestions})
))

return response

Expand Down Expand Up @@ -497,6 +498,8 @@ async def find_collections_by_string(query: CollectionSearchByString):
'other_collections': other_collections,
'metadata': metadata
}

logger.info(json.dumps({'endpoint': 'find_collections_by_string', 'request': query.model_dump()}))

return response

Expand All @@ -523,6 +526,8 @@ async def get_collections_count_by_string(query: CollectionCountByStringRequest)
'elasticsearch_communication_time_ms': es_response_metadata.get('elasticsearch_communication_time', None),
}

logger.info(json.dumps({'endpoint': 'count_collections_by_string', 'request': query.model_dump()}))

return {'count': count, 'metadata': metadata}


Expand Down Expand Up @@ -570,6 +575,8 @@ async def find_collections_by_collection(query: CollectionSearchByCollection):
'metadata': metadata
}

logger.info(json.dumps({'endpoint': 'find_collections_by_collection', 'request': query.model_dump()}))

return response


Expand All @@ -594,6 +601,8 @@ async def get_collections_membership_count(request: CollectionsContainingLabelCo
'elasticsearch_processing_time_ms': es_response_metadata.get('took', None),
'elasticsearch_communication_time_ms': es_response_metadata.get('elasticsearch_communication_time', None),
}

logger.info(json.dumps({'endpoint': 'count_collections_by_member', 'request': request.model_dump()}))

return {'count': count, 'metadata': metadata}

Expand Down Expand Up @@ -628,6 +637,8 @@ async def find_collections_membership_list(request: CollectionsContainingLabelRe
'elasticsearch_communication_time_ms': es_search_metadata.get('elasticsearch_communication_time', None),
}

logger.info(json.dumps({'endpoint': 'find_collections_by_member', 'request': request.model_dump()}))

return {'collections': collections, 'metadata': metadata}


Expand Down Expand Up @@ -660,10 +671,7 @@ async def fetch_collection_members(fetch_command: FetchCollectionMembersRequest)

response = convert_related_to_suggestions_from_collection_format(rs, include_metadata=fetch_command.metadata)

logger.info(json.dumps({
'endpoint': 'fetch_collection_members',
'request': fetch_command.model_dump()
}))
logger.info(json.dumps({'endpoint': 'fetch_collection_members', 'request': fetch_command.model_dump()}))

return response

Expand All @@ -685,7 +693,9 @@ async def get_collection_by_id(request: GetCollectionByIdRequest):
return Response(status_code=404, content=f'Collection with id={request.collection_id} not found')

collection = convert_to_collection_format(collections)[0]


logger.info(json.dumps({'endpoint': 'get_collection_by_id', 'request': request.model_dump()}))

return collection


Expand Down