X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7219ee653276359d4485ff8b89e1841e42af71c5..2af20f8df88461f2593c7fa0851e3841f20d66c3:/nominatim/server/falcon/server.py diff --git a/nominatim/server/falcon/server.py b/nominatim/server/falcon/server.py index b7b1aaa5..c11cf4a8 100644 --- a/nominatim/server/falcon/server.py +++ b/nominatim/server/falcon/server.py @@ -2,79 +2,110 @@ # # This file is part of Nominatim. (https://nominatim.org) # -# Copyright (C) 2022 by the Nominatim developer community. +# Copyright (C) 2023 by the Nominatim developer community. # For a full list of authors see the git log. """ Server implementation using the falcon webserver framework. """ -from typing import Type, Any, Optional, Mapping +from typing import Optional, Mapping, cast, Any from pathlib import Path -import falcon -import falcon.asgi +from falcon.asgi import App, Request, Response from nominatim.api import NominatimAPIAsync -from nominatim.apicmd.status import StatusResult -import nominatim.result_formatter.v1 as formatting +import nominatim.api.v1 as api_impl +from nominatim.config import Configuration + +class HTTPNominatimError(Exception): + """ A special exception class for errors raised during processing. + """ + def __init__(self, msg: str, status: int, content_type: str) -> None: + self.msg = msg + self.status = status + self.content_type = content_type -CONTENT_TYPE = { - 'text': falcon.MEDIA_TEXT, - 'xml': falcon.MEDIA_XML -} -class NominatimV1: - """ Implementation of V1 version of the Nominatim API. +async def nominatim_error_handler(req: Request, resp: Response, #pylint: disable=unused-argument + exception: HTTPNominatimError, + _: Any) -> None: + """ Special error handler that passes message and content type as + per exception info. """ + resp.status = exception.status + resp.text = exception.msg + resp.content_type = exception.content_type - def __init__(self, project_dir: Path, environ: Optional[Mapping[str, str]]) -> None: - self.api = NominatimAPIAsync(project_dir, environ) - self.formatters = {} - for rtype in (StatusResult, ): - self.formatters[rtype] = formatting.create(rtype) +class ParamWrapper(api_impl.ASGIAdaptor): + """ Adaptor class for server glue to Falcon framework. + """ + def __init__(self, req: Request, resp: Response, + config: Configuration) -> None: + self.request = req + self.response = resp + self._config = config - def parse_format(self, req: falcon.asgi.Request, rtype: Type[Any], default: str) -> None: - """ Get and check the 'format' parameter and prepare the formatter. - `rtype` describes the expected return type and `default` the - format value to assume when no parameter is present. - """ - req.context.format = req.get_param('format', default=default) - req.context.formatter = self.formatters[rtype] - if not req.context.formatter.supports_format(req.context.format): - raise falcon.HTTPBadRequest( - description="Parameter 'format' must be one of: " + - ', '.join(req.context.formatter.list_formats())) + def get(self, name: str, default: Optional[str] = None) -> Optional[str]: + return cast(Optional[str], self.request.get_param(name, default=default)) - def format_response(self, req: falcon.asgi.Request, resp: falcon.asgi.Response, - result: Any) -> None: - """ Render response into a string according to the formatter - set in `parse_format()`. - """ - resp.text = req.context.formatter.format(result, req.context.format) - resp.content_type = CONTENT_TYPE.get(req.context.format, falcon.MEDIA_JSON) + def get_header(self, name: str, default: Optional[str] = None) -> Optional[str]: + return cast(Optional[str], self.request.get_header(name, default=default)) - async def on_get_status(self, req: falcon.asgi.Request, resp: falcon.asgi.Response) -> None: - """ Implementation of status endpoint. - """ - self.parse_format(req, StatusResult, 'text') + def error(self, msg: str, status: int = 400) -> HTTPNominatimError: + return HTTPNominatimError(msg, status, self.content_type) + + + def create_response(self, status: int, output: str) -> None: + self.response.status = status + self.response.text = output + self.response.content_type = self.content_type - result = await self.api.status() - self.format_response(req, resp, result) + def config(self) -> Configuration: + return self._config + + +class EndpointWrapper: + """ Converter for server glue endpoint functions to Falcon request handlers. + """ + + def __init__(self, func: api_impl.EndpointFunc, api: NominatimAPIAsync) -> None: + self.func = func + self.api = api + + + async def on_get(self, req: Request, resp: Response) -> None: + """ Implementation of the endpoint. + """ + await self.func(self.api, ParamWrapper(req, resp, self.api.config)) def get_application(project_dir: Path, - environ: Optional[Mapping[str, str]] = None) -> falcon.asgi.App: - """ Create a Nominatim falcon ASGI application. + environ: Optional[Mapping[str, str]] = None) -> App: + """ Create a Nominatim Falcon ASGI application. """ - app = falcon.asgi.App() + api = NominatimAPIAsync(project_dir, environ) - api = NominatimV1(project_dir, environ) + app = App(cors_enable=api.config.get_bool('CORS_NOACCESSCONTROL')) + app.add_error_handler(HTTPNominatimError, nominatim_error_handler) - app.add_route('/status', api, suffix='status') + legacy_urls = api.config.get_bool('SERVE_LEGACY_URLS') + for name, func in api_impl.ROUTES: + endpoint = EndpointWrapper(func, api) + app.add_route(f"/{name}", endpoint) + if legacy_urls: + app.add_route(f"/{name}.php", endpoint) return app + + +def run_wsgi() -> App: + """ Entry point for uvicorn. + + Make sure uvicorn is run from the project directory. + """ + return get_application(Path('.'))