fix: Resolve backwards compatibility of search
This commit is contained in:
parent
3cf1722527
commit
89207780e9
1 changed files with 25 additions and 8 deletions
|
|
@ -132,14 +132,31 @@ async def search(
|
|||
],
|
||||
)
|
||||
else:
|
||||
return [
|
||||
SearchResult(
|
||||
search_result=result,
|
||||
dataset_id=datasets[min(index, len(datasets) - 1)].id if datasets else None,
|
||||
dataset_name=datasets[min(index, len(datasets) - 1)].name if datasets else None,
|
||||
)
|
||||
for index, (result, _, datasets) in enumerate(search_results)
|
||||
]
|
||||
# This is for maintaining backwards compatibility
|
||||
if os.getenv("ENABLE_BACKEND_ACCESS_CONTROL", "false").lower() == "true":
|
||||
return_value = {}
|
||||
for search_result in search_results:
|
||||
result, context, datasets = search_result
|
||||
return_value[str(datasets[0].id)] = {
|
||||
"search_result": result,
|
||||
"dataset_id": str(datasets[0].id),
|
||||
}
|
||||
return return_value
|
||||
else:
|
||||
return_value = []
|
||||
for search_result in search_results:
|
||||
result, context, datasets = search_result
|
||||
return_value.append(result)
|
||||
|
||||
return return_value
|
||||
# return [
|
||||
# SearchResult(
|
||||
# search_result=result,
|
||||
# dataset_id=datasets[min(index, len(datasets) - 1)].id if datasets else None,
|
||||
# dataset_name=datasets[min(index, len(datasets) - 1)].name if datasets else None,
|
||||
# )
|
||||
# for index, (result, _, datasets) in enumerate(search_results)
|
||||
# ]
|
||||
|
||||
|
||||
async def authorized_search(
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue