fix handling of unused extra tags

[nominatim.git] / nominatim / server / falcon / server.py

diff --git a/nominatim/server/falcon/server.py b/nominatim/server/falcon/server.py
index ccb0164ce668175f4e60c7ad11eb81cac8054b96..a536318aaf6ed3cf269733046442dd783335af6f 100644 (file)
--- a/nominatim/server/falcon/server.py
+++ b/nominatim/server/falcon/server.py
@@ -2,78 +2,88 @@
 #
 # This file is part of Nominatim. (https://nominatim.org)
 #
 #
 # 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.
 """
 # For a full list of authors see the git log.
 """
 Server implementation using the falcon webserver framework.
 """

-from typing import Type, Any
+from typing import Optional, Mapping, cast

 from pathlib import Path
 
 import falcon
 from pathlib import Path
 
 import falcon

-import falcon.asgi
+from falcon.asgi import App, Request, Response

 
 from nominatim.api import NominatimAPIAsync
 
 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

 
 

-CONTENT_TYPE = {
-  'text': falcon.MEDIA_TEXT,
-  'xml': falcon.MEDIA_XML
-}

 
 

-class NominatimV1:
-    """ Implementation of V1 version of the Nominatim API.
+class ParamWrapper(api_impl.ASGIAdaptor):
+    """ Adaptor class for server glue to Falcon framework.

     """
 
     """
 

-    def __init__(self, project_dir: Path) -> None:
-        self.api = NominatimAPIAsync(project_dir)
-        self.formatters = {}
+    def __init__(self, req: Request, resp: Response,
+                 config: Configuration) -> None:
+        self.request = req
+        self.response = resp
+        self._config = config

 
 

-        for rtype in (StatusResult, ):
-            self.formatters[rtype] = formatting.create(rtype)

 
 

+    def get(self, name: str, default: Optional[str] = None) -> Optional[str]:
+        return cast(Optional[str], self.request.get_param(name, default=default))

 
 

-    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_header(self, name: str, default: Optional[str] = None) -> Optional[str]:
+        return cast(Optional[str], self.request.get_header(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 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)

 
 

-    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')

 
 

-        result = await self.api.status()
+    def create_response(self, status: int, output: str, content_type: str) -> None:
+        self.response.status = status
+        self.response.text = output
+        self.response.content_type = content_type
+
+
+    def config(self) -> Configuration:
+        return self._config
+

 
 

-        self.format_response(req, resp, result)
+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) -> falcon.asgi.App:
-    """ Create a Nominatim falcon ASGI application.
+def get_application(project_dir: Path,
+                    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)
+    app = App(cors_enable=api.config.get_bool('CORS_NOACCESSCONTROL'))

 
 

-    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
 
     return app