sij/khoj
1
0
Fork 0
mirror of https://github.com/khoj-ai/khoj.git synced 2024-11-27 17:35:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only return requested result count even if search in multiple content types

Browse source 
- Set results_count to default value at start so it is an int, never None
This commit is contained in:
Debanjum Singh Solanky 2023-06-29 14:49:05 -07:00
parent f272d4503e
commit da2de21339
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/khoj/routers/api.py
View file

@ -155,7 +155,7 @@ async def search(
# initialize variables
user_query = q.strip()
results_count = n
results_count = n or 5
score_threshold = score_threshold if score_threshold is not None else -math.inf
search_futures: List[concurrent.futures.Future] = []
@ -296,15 +296,15 @@ async def search(
image_names=state.model.image_search.image_names,
output_directory=output_directory,
image_files_url="/static/images",
count=results_count or 5,
count=results_count,
)
else:
hits, entries = await search_future.result()
# Collate results
results += text_search.collate_results(hits, entries, results_count or 5)
results += text_search.collate_results(hits, entries, results_count)
# Sort results across all content types
results.sort(key=lambda x: float(x.score), reverse=True)
# Sort results across all content types and take top results
results = sorted(results, key=lambda x: float(x.score), reverse=True)[:results_count]
# Cache results
state.query_cache[query_cache_key] = results