mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-26 11:31:08 +00:00
Code Issues Projects Releases Wiki Activity

Verify url before async search

Browse source 
The database lookup doesn't work during the asyn process, so this change
loops through the connectors and grabs the formatted urls before sending
it to the async handler.
This commit is contained in:
Mouse Reeve 2022-05-30 11:16:05 -07:00
parent 0adda36da7
commit 9a9cef7766
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bookwyrm/connectors/connector_manager.py
View file

@ -22,13 +22,13 @@ class ConnectorException(HTTPError):
"""when the connector can't do what was asked"""
async def async_connector_search(query, connectors, params):
async def async_connector_search(query, items, params):
"""Try a number of requests simultaneously"""
timeout = aiohttp.ClientTimeout(total=SEARCH_TIMEOUT)
async with aiohttp.ClientSession(timeout=timeout) as session:
for connector in connectors:
for url, connector in items:
url = connector.get_search_url(query)
raise_not_valid_url(url)
# raise_not_valid_url(url)
async with session.get(url, params=params) as response:
print("Status:", response.status)
@ -36,7 +36,7 @@ async def async_connector_search(query, connectors, params):
print("Content-type:", response.headers["content-type"])
raw_response = await response.json()
yield {
return {
"connector": connector,
"results": connector.process_search_response(query, raw_response),
}
@ -48,11 +48,18 @@ def search(query, min_confidence=0.1, return_first=False):
return []
results = []
connectors = list(get_connectors())
items = []
for connector in get_connectors():
# get the search url from the connector before sending
url = connector.get_search_url(query)
# check the URL is valid
raise_not_valid_url(url)
items.append((url, connector))
# load as many results as we can
params = {"min_confidence": min_confidence}
results = asyncio.run(async_connector_search(query, connectors, params))
results = asyncio.run(async_connector_search(query, items, params))
raise Exception("Hi")
if return_first:
# find the best result from all the responses and return that