Merge branch 'dev' into remove-default-user-search

This commit is contained in:
Boris 2025-09-25 21:02:00 +02:00 committed by GitHub
commit 013baa3bfc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 12 deletions

View file

@ -35,7 +35,7 @@ async def no_access_control_search(
[get_completion, get_context] = search_tools [get_completion, get_context] = search_tools
if only_context: if only_context:
return await get_context(query_text) return None, await get_context(query_text), []
context = await get_context(query_text) context = await get_context(query_text)
result = await get_completion(query_text, context) result = await get_completion(query_text, context)

View file

@ -143,20 +143,35 @@ async def search(
context = prepared_search_results["context"] context = prepared_search_results["context"]
datasets = prepared_search_results["datasets"] datasets = prepared_search_results["datasets"]
return_value.append( if only_context:
{ return_value.append(
"search_result": [result] if result else None, {
"dataset_id": datasets[0].id, "search_result": [context] if context else None,
"dataset_name": datasets[0].name, "dataset_id": datasets[0].id,
"graphs": graphs, "dataset_name": datasets[0].name,
} "graphs": graphs,
) }
)
else:
return_value.append(
{
"search_result": [result] if result else None,
"dataset_id": datasets[0].id,
"dataset_name": datasets[0].name,
"graphs": graphs,
}
)
return return_value return return_value
else: else:
return_value = [] return_value = []
for search_result in search_results: if only_context:
result, context, datasets = search_result for search_result in search_results:
return_value.append(result) prepared_search_results = await prepare_search_result(search_result)
return_value.append(prepared_search_results["context"])
else:
for search_result in search_results:
result, context, datasets = search_result
return_value.append(result)
# For maintaining backwards compatibility # For maintaining backwards compatibility
if len(return_value) == 1 and isinstance(return_value[0], list): if len(return_value) == 1 and isinstance(return_value[0], list):
return return_value[0] return return_value[0]