Showing
2 changed files
with
18 additions
and
21 deletions
| ... | @@ -28,16 +28,13 @@ def fetch_search( | ... | @@ -28,16 +28,13 @@ def fetch_search( |
| 28 | 'hits': [], | 28 | 'hits': [], |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | - return search.do_search( | 31 | + try: |
| 32 | - query.q, query.page, query.is_class, query.class_, query.order | 32 | + return search.do_search( |
| 33 | - ) | 33 | + query.q, query.page, query.is_class, query.class_, query.order |
| 34 | - # try: | 34 | + ) |
| 35 | - # return search.do_search( | 35 | + except search.SearchUnavailable as exc: |
| 36 | - # query.q, query.page, query.is_class, query.class_, query.order | 36 | + raise HTTPException( |
| 37 | - # ) | 37 | + status_code=503, |
| 38 | - # except search.SearchUnavailable as exc: | 38 | + detail='Search temporarily unavailable', |
| 39 | - # raise HTTPException( | 39 | + headers={'Retry-After': str(exc.retry_after)}, |
| 40 | - # status_code=503, | 40 | + ) from exc |
| 41 | - # detail='Search temporarily unavailable', | ||
| 42 | - # headers={'Retry-After': str(exc.retry_after)}, | ||
| 43 | - # ) from exc | ... | ... |
| ... | @@ -8,9 +8,9 @@ from typesense import exceptions as typesense_exceptions | ... | @@ -8,9 +8,9 @@ from typesense import exceptions as typesense_exceptions |
| 8 | TYPESENSE_API = open('./docs/typesense').read().strip() | 8 | TYPESENSE_API = open('./docs/typesense').read().strip() |
| 9 | TYPESENSE_API, TYPESENSE_HOST = TYPESENSE_API.split(':') | 9 | TYPESENSE_API, TYPESENSE_HOST = TYPESENSE_API.split(':') |
| 10 | client = typesense.Client({ | 10 | client = typesense.Client({ |
| 11 | - 'api_key': TYPESENSE_API, | 11 | + 'api_key': TYPESENSE_API.strip(), |
| 12 | 'nodes': [{ | 12 | 'nodes': [{ |
| 13 | - 'host': TYPESENSE_HOST, | 13 | + 'host': TYPESENSE_HOST.strip(), |
| 14 | 'port': '8108', | 14 | 'port': '8108', |
| 15 | 'protocol': 'http' | 15 | 'protocol': 'http' |
| 16 | }], | 16 | }], |
| ... | @@ -127,12 +127,12 @@ def do_search(query, page, is_class, class_=None, order=None): | ... | @@ -127,12 +127,12 @@ def do_search(query, page, is_class, class_=None, order=None): |
| 127 | if order == 'asc': | 127 | if order == 'asc': |
| 128 | search_parameters_['sort_by'] = 'devengado:asc' | 128 | search_parameters_['sort_by'] = 'devengado:asc' |
| 129 | 129 | ||
| 130 | - # try: | 130 | + try: |
| 131 | - response = client.collections[COLLECTION].documents.search( | 131 | + response = client.collections[COLLECTION].documents.search( |
| 132 | - search_parameters_ | 132 | + search_parameters_ |
| 133 | - ) | 133 | + ) |
| 134 | - # except BACKEND_ERRORS: | 134 | + except BACKEND_ERRORS: |
| 135 | - # raise SearchUnavailable(search_guard.record_failure()) | 135 | + raise SearchUnavailable(search_guard.record_failure()) |
| 136 | 136 | ||
| 137 | search_guard.record_success() | 137 | search_guard.record_success() |
| 138 | return response | 138 | return response | ... | ... |
-
Please register or login to post a comment