From 78472e82535da109f63e1b5c5ce8465016c2f8cc Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Fri, 15 Jan 2021 01:17:32 -0800 Subject: api: fix /search test, and mypy error on implementation --- fatcat_scholar/web.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'fatcat_scholar') diff --git a/fatcat_scholar/web.py b/fatcat_scholar/web.py index 0b82df9..fe2ad90 100644 --- a/fatcat_scholar/web.py +++ b/fatcat_scholar/web.py @@ -9,7 +9,7 @@ from typing import Optional, Any, List from pydantic import BaseModel import babel.support -from fastapi import FastAPI, APIRouter, Request, Depends, Response +from fastapi import FastAPI, APIRouter, Request, Depends, Response, HTTPException from fastapi.staticfiles import StaticFiles from fastapi.responses import PlainTextResponse, JSONResponse, FileResponse import sentry_sdk @@ -93,16 +93,16 @@ class HitsModel(BaseModel): @api.get("/search", operation_id="get_search", response_model=HitsModel) async def search(query: FulltextQuery = Depends(FulltextQuery)) -> FulltextHits: - if query.q is not None: - try: - hits: FulltextHits = do_fulltext_search(query) - except ValueError as e: - sentry_sdk.set_level("warning") - sentry_sdk.capture_exception(e) - raise HTTPException(status_code=400, detail=f"Query Error: {e}") - except IOError as e: - sentry_sdk.capture_exception(e) - raise HTTPException(status_code=500, detail=f"Backend Error: {e}") + hits: Optional[FulltextHits] = None + try: + hits = do_fulltext_search(query) + except ValueError as e: + sentry_sdk.set_level("warning") + sentry_sdk.capture_exception(e) + raise HTTPException(status_code=400, detail=f"Query Error: {e}") + except IOError as e: + sentry_sdk.capture_exception(e) + raise HTTPException(status_code=500, detail=f"Backend Error: {e}") # remove internal context from hit objects for doc in hits.results: -- cgit v1.2.3