flibusta-apps/book_library_server
1
0
Fork 0
mirror of https://github.com/flibusta-apps/book_library_server.git synced 2025-12-06 15:15:36 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update search

Browse Source
This commit is contained in:
Bulat Kurbanov
2022-08-09 19:17:08 +03:00
parent 34095d268d
commit cae4096816
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fastapi_book_server/app/services/common.py
View File

@@ -225,8 +225,8 @@ class MeiliSearchService(Generic[MODEL], BaseSearchService[MODEL, SearchQuery]):
@classmethod @classmethod
def make_request( def make_request(
cls, query: str, allowed_langs_filter: list[list[str]], offset: int cls, query: str, allowed_langs_filter: list[list[str]], offset: int, limit: int
): ) -> tuple[int, list[int]]:
client = meilisearch.Client(env_config.MEILI_HOST, env_config.MEILI_MASTER_KEY) client = meilisearch.Client(env_config.MEILI_HOST, env_config.MEILI_MASTER_KEY)
index = client.index(cls.index_name) index = client.index(cls.index_name)
@@ -235,7 +235,7 @@ class MeiliSearchService(Generic[MODEL], BaseSearchService[MODEL, SearchQuery]):
{ {
"filter": allowed_langs_filter, "filter": allowed_langs_filter,
"offset": offset, "offset": offset,
"limit": 630, "limit": limit,
"attributesToRetrieve": ["id"], "attributesToRetrieve": ["id"],
}, },
) )
@@ -243,12 +243,11 @@ class MeiliSearchService(Generic[MODEL], BaseSearchService[MODEL, SearchQuery]):
total: int = result["estimatedTotalHits"] total: int = result["estimatedTotalHits"]
ids: list[int] = [r["id"] for r in result["hits"][:total]] ids: list[int] = [r["id"] for r in result["hits"][:total]]
return ids return total, ids
@classmethod @classmethod
async def _get_object_ids(cls, query: SearchQuery) -> list[int]: async def _get_object_ids(cls, query: SearchQuery) -> tuple[int, list[int]]:
params = cls.get_raw_params() params = cls.get_raw_params()
allowed_langs_filter = cls.get_allowed_langs_filter(query["allowed_langs"]) allowed_langs_filter = cls.get_allowed_langs_filter(query["allowed_langs"])
return await asyncio.get_event_loop().run_in_executor( return await asyncio.get_event_loop().run_in_executor(
@@ -257,8 +256,15 @@ class MeiliSearchService(Generic[MODEL], BaseSearchService[MODEL, SearchQuery]):
query["query"], query["query"],
allowed_langs_filter, allowed_langs_filter,
params.offset, params.offset,
params.limit,
) )
@classmethod
async def get_object_ids(
cls, query: SearchQuery, redis: aioredis.Redis
) -> tuple[int, list[int]]:
return await cls._get_object_ids(query)
class GetRandomService(Generic[MODEL, QUERY], BaseService[MODEL, QUERY]): class GetRandomService(Generic[MODEL, QUERY], BaseService[MODEL, QUERY]):
GET_OBJECTS_ID_QUERY: Optional[str] = None GET_OBJECTS_ID_QUERY: Optional[str] = None