Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / clicmd / admin.py

diff --git a/nominatim/clicmd/admin.py b/nominatim/clicmd/admin.py
index ad900579946c6a1d08e2d65b081e4ac05118648c..5f1f4a807a2e8211944c1a019f8297efb064fe7e 100644 (file)
--- a/nominatim/clicmd/admin.py
+++ b/nominatim/clicmd/admin.py
@@ -9,9 +9,11 @@ Implementation of the 'admin' subcommand.
 """
 import logging
 import argparse
 """
 import logging
 import argparse

+import random

 
 

-from nominatim.tools.exec_utils import run_legacy_script
+from nominatim.db.connection import connect

 from nominatim.clicmd.args import NominatimArgs
 from nominatim.clicmd.args import NominatimArgs

+import nominatim.api as napi

 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111
 
 # Do not repeat documentation of subcommand classes.
 # pylint: disable=C0111


@@ -20,6 +22,7 @@ from nominatim.clicmd.args import NominatimArgs
 
 LOG = logging.getLogger()
 
 
 LOG = logging.getLogger()
 

+

 class AdminFuncs:
     """\
     Analyse and maintain the database.
 class AdminFuncs:
     """\
     Analyse and maintain the database.


@@ -36,6 +39,8 @@ class AdminFuncs:
                           help='Migrate the database to a new software version')
         objs.add_argument('--analyse-indexing', action='store_true',
                           help='Print performance analysis of the indexing process')
                           help='Migrate the database to a new software version')
         objs.add_argument('--analyse-indexing', action='store_true',
                           help='Print performance analysis of the indexing process')

+        objs.add_argument('--collect-os-info', action="store_true",
+                          help="Generate a report about the host system information")

         group = parser.add_argument_group('Arguments for cache warming')
         group.add_argument('--search-only', action='store_const', dest='target',
                            const='search',
         group = parser.add_argument_group('Arguments for cache warming')
         group.add_argument('--search-only', action='store_const', dest='target',
                            const='search',


@@ -70,14 +75,36 @@ class AdminFuncs:
             from ..tools import migration
             return migration.migrate(args.config, args)
 
             from ..tools import migration
             return migration.migrate(args.config, args)
 

+        if args.collect_os_info:
+            LOG.warning("Reporting System Information")
+            from ..tools import collect_os_info
+            collect_os_info.report_system_information(args.config)
+            return 0
+

         return 1
 
 
     def _warm(self, args: NominatimArgs) -> int:
         LOG.warning('Warming database caches')
         return 1
 
 
     def _warm(self, args: NominatimArgs) -> int:
         LOG.warning('Warming database caches')

-        params = ['warm.php']
-        if args.target == 'reverse':
-            params.append('--reverse-only')
-        if args.target == 'search':
-            params.append('--search-only')
-        return run_legacy_script(*params, nominatim_env=args)
+
+        api = napi.NominatimAPI(args.project_dir)
+
+        try:
+            if args.target != 'reverse':
+                for _ in range(1000):
+                    api.reverse((random.uniform(-90, 90), random.uniform(-180, 180)),
+                                address_details=True)
+
+            if args.target != 'search':
+                from ..tokenizer import factory as tokenizer_factory
+
+                tokenizer = tokenizer_factory.get_tokenizer_for_db(args.config)
+                with connect(args.config.get_libpq_dsn()) as conn:
+                    words = tokenizer.most_frequent_words(conn, 1000)
+
+                for word in words:
+                    api.search(word)
+        finally:
+            api.close()
+
+        return 0