X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/dfcb24061eb6d3d415cd86d2f4edd95c4debaf36..5184a8aff9686c4035e236be65c3615fe97859a0:/nominatim/server/falcon/server.py?ds=sidebyside diff --git a/nominatim/server/falcon/server.py b/nominatim/server/falcon/server.py index 080650e7..a536318a 100644 --- a/nominatim/server/falcon/server.py +++ b/nominatim/server/falcon/server.py @@ -15,15 +15,18 @@ from falcon.asgi import App, Request, Response from nominatim.api import NominatimAPIAsync import nominatim.api.v1 as api_impl +from nominatim.config import Configuration class ParamWrapper(api_impl.ASGIAdaptor): """ Adaptor class for server glue to Falcon framework. """ - def __init__(self, req: Request, resp: Response) -> None: + def __init__(self, req: Request, resp: Response, + config: Configuration) -> None: self.request = req self.response = resp + self._config = config def get(self, name: str, default: Optional[str] = None) -> Optional[str]: @@ -34,8 +37,13 @@ class ParamWrapper(api_impl.ASGIAdaptor): return cast(Optional[str], self.request.get_header(name, default=default)) - def error(self, msg: str) -> falcon.HTTPBadRequest: - return falcon.HTTPBadRequest(description=msg) + def error(self, msg: str, status: int = 400) -> falcon.HTTPError: + if status == 400: + return falcon.HTTPBadRequest(description=msg) + if status == 404: + return falcon.HTTPNotFound(description=msg) + + return falcon.HTTPError(status, description=msg) def create_response(self, status: int, output: str, content_type: str) -> None: @@ -44,6 +52,10 @@ class ParamWrapper(api_impl.ASGIAdaptor): self.response.content_type = content_type + def config(self) -> Configuration: + return self._config + + class EndpointWrapper: """ Converter for server glue endpoint functions to Falcon request handlers. """ @@ -56,7 +68,7 @@ class EndpointWrapper: async def on_get(self, req: Request, resp: Response) -> None: """ Implementation of the endpoint. """ - await self.func(self.api, ParamWrapper(req, resp)) + await self.func(self.api, ParamWrapper(req, resp, self.api.config)) def get_application(project_dir: Path,