Add mypy fixes.

pull/550/head
Andrey Dolgolev 2022-02-18 19:58:16 +02:00
rodzic a1595e3e26
commit ef04be14f5
1 zmienionych plików z 14 dodań i 9 usunięć

Wyświetl plik

@ -10,7 +10,7 @@ from bugout.data import BugoutResources, BugoutJournalEntryContent, BugoutJourna
from bugout.exceptions import BugoutResponseException from bugout.exceptions import BugoutResponseException
from fastapi import APIRouter, Body, Request from fastapi import APIRouter, Body, Request
import requests import requests
from slugify import slugify from slugify import slugify # type: ignore
from .. import data from .. import data
@ -30,14 +30,16 @@ from ..settings import bugout_client as bc
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
router = APIRouter(prefix="/queries",) router = APIRouter(
prefix="/queries",
)
BUGOUT_RESOURCE_QUERY_RESOLVER = "query_name_resolver" BUGOUT_RESOURCE_QUERY_RESOLVER = "query_name_resolver"
@router.get("/list", tags=["queries"]) @router.get("/list", tags=["queries"])
async def get_list_of_queries_handler(request: Request) -> Dict[str, Any]: async def get_list_of_queries_handler(request: Request) -> List[Dict[str, Any]]:
token = request.state.token token = request.state.token
@ -233,7 +235,7 @@ async def update_query_data_handler(
entries = bc.search( entries = bc.search(
token=MOONSTREAM_ADMIN_ACCESS_TOKEN, token=MOONSTREAM_ADMIN_ACCESS_TOKEN,
journal_id=MOONSTREAM_QUERIES_JOURNAL_ID, journal_id=MOONSTREAM_QUERIES_JOURNAL_ID,
query=f"#approved ! #query_id:{query_id}", query=f"#approved #query_id:{query_id} !#preapprove",
limit=1, limit=1,
timeout=5, timeout=5,
) )
@ -272,7 +274,10 @@ async def update_query_data_handler(
@router.get("/{query_name}", tags=["queries"]) @router.get("/{query_name}", tags=["queries"])
async def get_access_link_handler(request: Request, query_name: str,) -> str: async def get_access_link_handler(
request: Request,
query_name: str,
) -> str:
""" """
Request update data on S3 bucket Request update data on S3 bucket
""" """
@ -289,7 +294,7 @@ async def get_access_link_handler(request: Request, query_name: str,) -> str:
entries = bc.search( entries = bc.search(
token=MOONSTREAM_ADMIN_ACCESS_TOKEN, token=MOONSTREAM_ADMIN_ACCESS_TOKEN,
journal_id=MOONSTREAM_QUERIES_JOURNAL_ID, journal_id=MOONSTREAM_QUERIES_JOURNAL_ID,
query=f"#approved #query_id:{query_id}", query=f"#approved #query_id:{query_id} !#preapprove",
limit=1, limit=1,
timeout=5, timeout=5,
) )
@ -321,7 +326,8 @@ async def get_access_link_handler(request: Request, query_name: str,) -> str:
@router.delete("/{query_name}", tags=["queries"]) @router.delete("/{query_name}", tags=["queries"])
async def remove_query_handler( async def remove_query_handler(
request: Request, query_name: str, request: Request,
query_name: str,
) -> BugoutJournalEntry: ) -> BugoutJournalEntry:
""" """
Request update data on S3 bucket Request update data on S3 bucket
@ -356,7 +362,7 @@ async def remove_query_handler(
raise MoonstreamHTTPException(status_code=404, detail="Query does not existю") raise MoonstreamHTTPException(status_code=404, detail="Query does not existю")
try: try:
bc.remove_resources(token=token, resource_id=query_ids[query_name][0]) bc.delete_resource(token=token, resource_id=query_ids[query_name][0])
except BugoutResponseException as e: except BugoutResponseException as e:
raise MoonstreamHTTPException(status_code=e.status_code, detail=e.detail) raise MoonstreamHTTPException(status_code=e.status_code, detail=e.detail)
except Exception as e: except Exception as e:
@ -376,4 +382,3 @@ async def remove_query_handler(
raise MoonstreamHTTPException(status_code=500, internal_error=e) raise MoonstreamHTTPException(status_code=500, internal_error=e)
return entry return entry