X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0c65289a80fb376b9d7e53653e16cef6a8fa781e..7284689b500e2af43692983cf07d4b3d2649e02b:/nominatim/server/starlette/server.py diff --git a/nominatim/server/starlette/server.py b/nominatim/server/starlette/server.py index 26494cdb..a2a70ebf 100644 --- a/nominatim/server/starlette/server.py +++ b/nominatim/server/starlette/server.py @@ -39,11 +39,12 @@ class ParamWrapper(api_impl.ASGIAdaptor): def error(self, msg: str, status: int = 400) -> HTTPException: - return HTTPException(status, detail=msg) + return HTTPException(status, detail=msg, + headers={'content-type': self.content_type}) - def create_response(self, status: int, output: str, content_type: str) -> Response: - return Response(output, status_code=status, media_type=content_type) + def create_response(self, status: int, output: str) -> Response: + return Response(output, status_code=status, media_type=self.content_type) def config(self) -> Configuration: @@ -59,7 +60,8 @@ def _wrap_endpoint(func: api_impl.EndpointFunc)\ def get_application(project_dir: Path, - environ: Optional[Mapping[str, str]] = None) -> Starlette: + environ: Optional[Mapping[str, str]] = None, + debug: bool = True) -> Starlette: """ Create a Nominatim falcon ASGI application. """ config = Configuration(project_dir, environ) @@ -76,8 +78,14 @@ def get_application(project_dir: Path, if config.get_bool('CORS_NOACCESSCONTROL'): middleware.append(Middleware(CORSMiddleware, allow_origins=['*'])) - app = Starlette(debug=True, routes=routes, middleware=middleware) + app = Starlette(debug=debug, routes=routes, middleware=middleware) app.state.API = NominatimAPIAsync(project_dir, environ) return app + + +def run_wsgi() -> Starlette: + """ Entry point for uvicorn. + """ + return get_application(Path('.'), debug=False)