update Makefile in test directory

[nominatim.git] / nominatim / cli.py

diff --git a/nominatim/cli.py b/nominatim/cli.py
index 34abb617efe3346aa156b3055ab36da045b7b594..cedbdb4a5f984b0dc9b2bd5e60e450fad2adebd0 100644 (file)
--- a/nominatim/cli.py
+++ b/nominatim/cli.py
@@ -9,6 +9,7 @@ Command-line interface to the Nominatim functions for import, update,
 database administration and querying.
 """
 from typing import Optional, Any, List, Union
 database administration and querying.
 """
 from typing import Optional, Any, List, Union

+import importlib

 import logging
 import os
 import sys
 import logging
 import os
 import sys


@@ -60,7 +61,7 @@ class CommandlineParser:
     def nominatim_version_text(self) -> str:
         """ Program name and version number as string
         """
     def nominatim_version_text(self) -> str:
         """ Program name and version number as string
         """

-        text = f'Nominatim version {version.version_str()}'
+        text = f'Nominatim version {version.NOMINATIM_VERSION!s}'

         if version.GIT_COMMIT_HASH is not None:
             text += f' ({version.GIT_COMMIT_HASH})'
         return text
         if version.GIT_COMMIT_HASH is not None:
             text += f' ({version.GIT_COMMIT_HASH})'
         return text


@@ -202,7 +203,7 @@ class AdminServe:
     for testing and development. Do not use it in production setups!
 
     There are different webservers available. The default 'php' engine
     for testing and development. Do not use it in production setups!
 
     There are different webservers available. The default 'php' engine

-    runs the classic PHP frontend. 'sanic' and 'falcon' are Python servers
+    runs the classic PHP frontend. The other engines are Python servers

     which run the new Python frontend code. This is highly experimental
     at the moment and may not include the full API.
 
     which run the new Python frontend code. This is highly experimental
     at the moment and may not include the full API.
 


@@ -214,7 +215,7 @@ class AdminServe:
         group.add_argument('--server', default='127.0.0.1:8088',
                            help='The address the server will listen to.')
         group.add_argument('--engine', default='php',
         group.add_argument('--server', default='127.0.0.1:8088',
                            help='The address the server will listen to.')
         group.add_argument('--engine', default='php',

-                           choices=('php', 'sanic', 'falcon'),
+                           choices=('php', 'sanic', 'falcon', 'starlette'),

                            help='Webserver framework to run. (default: php)')
 
 
                            help='Webserver framework to run. (default: php)')
 
 


@@ -232,15 +233,19 @@ class AdminServe:
                 port = 8088
 
             if args.engine == 'sanic':
                 port = 8088
 
             if args.engine == 'sanic':

-                import nominatim.server.sanic.server
+                server_module = importlib.import_module('nominatim.server.sanic.server')

 
 

-                app = nominatim.server.sanic.server.get_application(args.project_dir)
+                app = server_module.get_application(args.project_dir)

                 app.run(host=host, port=port, debug=True)
                 app.run(host=host, port=port, debug=True)

-            elif args.engine == 'falcon':
-                import uvicorn
-                import nominatim.server.falcon.server
+            else:
+                import uvicorn # pylint: disable=import-outside-toplevel
+
+                if args.engine == 'falcon':
+                    server_module = importlib.import_module('nominatim.server.falcon.server')
+                elif args.engine == 'starlette':
+                    server_module = importlib.import_module('nominatim.server.starlette.server')

 
 

-                app = nominatim.server.falcon.server.get_application(args.project_dir)
+                app = server_module.get_application(args.project_dir)

                 uvicorn.run(app, host=host, port=port)
 
         return 0
                 uvicorn.run(app, host=host, port=port)
 
         return 0