Merge branch 'master' into asyncio

Author: greenape

autoflow/Pipfile.lock

@@ -1,38 +1,36 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from quart.exceptions import HTTPException
+from werkzeug.exceptions import BadRequest
 import rapidjson as json
 
 
-class JSONHTTPException(HTTPException):
-    def get_body(self) -> str:
+class JSONHTTPException(BadRequest):
+    def get_body(self, environ, scope) -> str:
         return json.dumps({"msg": self.description})
 
-    def get_headers(self) -> dict:
-        return {"Content-Type": "application/json"}
+    def get_headers(self, environ, scope) -> dict:
+        return [("Content-Type", "application/json")]
 
 
 class BadQueryError(JSONHTTPException):
+    name = "Bad query"
+
     def __init__(self):
         super().__init__(
-            status_code=400, description="Could not parse query spec.", name="Bad query"
+            description="Could not parse query spec.",
         )
 
 
 class MissingQueryKindError(JSONHTTPException):
     def __init__(self):
         super().__init__(
-            status_code=400,
             description="Query kind must be specified when running a query.",
-            name="Bad query",
         )
 
 
 class MissingAggregationUnitError(JSONHTTPException):
     def __init__(self):
         super().__init__(
-            status_code=400,
             description="Aggregation unit must be specified when running a query.",
-            name="Bad query",
         )

deployment/Pipfile.lock

@@ -4,7 +4,7 @@
 
 
 from quart import request
-from quart.exceptions import HTTPException
+from werkzeug.exceptions import NotFound
 
 
 async def get_query_parameters_from_flowmachine(*, query_id) -> dict:
@@ -36,9 +36,7 @@ async def get_query_parameters_from_flowmachine(*, query_id) -> dict:
     )
     reply = await request.socket.recv_json()
     if reply["status"] == "error":
-        raise HTTPException(
+        raise NotFound(
             description=f"Unknown query ID '{query_id}'",
-            name="Query ID not found",
-            status_code=404,
         )
     return reply["payload"]["query_params"]

docs/Pipfile.lock

@@ -9,7 +9,7 @@
 
 from .models import *
 
-blueprint = Blueprint(__name__, __name__)
+blueprint = Blueprint(__name__.split(".").pop(), __name__)
 admin_permission = Permission(RoleNeed("admin"))
 
 

flowapi/Pipfile.lock

@@ -9,7 +9,7 @@
 from .invalid_usage import InvalidUsage
 from .models import *
 
-blueprint = Blueprint(__name__, __name__)
+blueprint = Blueprint(__name__.split(".").pop(), __name__)
 admin_permission = Permission(RoleNeed("admin"))
 
 

flowapi/flowapi/flowapi_errors.py

@@ -12,7 +12,7 @@
 from .invalid_usage import InvalidUsage, Unauthorized
 from .models import *
 
-blueprint = Blueprint(__name__, __name__)
+blueprint = Blueprint(__name__.split(".").pop(), __name__)
 
 
 @blueprint.route("/signin", methods=["POST"])