Fixed setting tokenizer property

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

diff --git a/nominatim/clicmd/admin.py b/nominatim/clicmd/admin.py
index e99807727095257a6ad2d538e0b7d087659d11b9..9557dc988c94712f446f8c21c8f167d69639747f 100644 (file)
--- a/nominatim/clicmd/admin.py
+++ b/nominatim/clicmd/admin.py
@@ -1,10 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# This file is part of Nominatim. (https://nominatim.org)
+#
+# Copyright (C) 2022 by the Nominatim developer community.
+# For a full list of authors see the git log.

 """
 Implementation of the 'admin' subcommand.
 """
 import logging
 """
 Implementation of the 'admin' subcommand.
 """
 import logging

+import argparse
+import random

 
 

-from nominatim.tools.exec_utils import run_legacy_script

 from nominatim.db.connection import connect
 from nominatim.db.connection import connect

+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


@@ -13,23 +22,27 @@ from nominatim.db.connection import connect
 
 LOG = logging.getLogger()
 
 
 LOG = logging.getLogger()
 

+

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

-    @staticmethod
-    def add_args(parser):
+    def add_args(self, parser: argparse.ArgumentParser) -> None:

         group = parser.add_argument_group('Admin tasks')
         objs = group.add_mutually_exclusive_group(required=True)
         objs.add_argument('--warm', action='store_true',
         group = parser.add_argument_group('Admin tasks')
         objs = group.add_mutually_exclusive_group(required=True)
         objs.add_argument('--warm', action='store_true',

-                          help='Warm database caches for search and reverse queries.')
+                          help='Warm database caches for search and reverse queries')

         objs.add_argument('--check-database', action='store_true',
         objs.add_argument('--check-database', action='store_true',

-                          help='Check that the database is complete and operational.')
+                          help='Check that the database is complete and operational')

         objs.add_argument('--migrate', action='store_true',
         objs.add_argument('--migrate', action='store_true',

-                          help='Migrate the database to a new software version.')
+                          help='Migrate the database to a new software version')

         objs.add_argument('--analyse-indexing', action='store_true',
         objs.add_argument('--analyse-indexing', action='store_true',

-                          help='Print performance analysis of the indexing process.')
+                          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")
+        objs.add_argument('--clean-deleted', action='store', metavar='AGE',
+                          help='Clean up deleted relations')

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


@@ -44,10 +57,11 @@ class AdminFuncs:
         mgroup.add_argument('--place-id', type=int,
                             help='Analyse indexing of the given Nominatim object')
 
         mgroup.add_argument('--place-id', type=int,
                             help='Analyse indexing of the given Nominatim object')
 

-    @staticmethod
-    def run(args):
+
+    def run(self, args: NominatimArgs) -> int:
+        # pylint: disable=too-many-return-statements

         if args.warm:
         if args.warm:

-            return AdminFuncs._warm(args)
+            return self._warm(args)

 
         if args.check_database:
             LOG.warning('Checking database')
 
         if args.check_database:
             LOG.warning('Checking database')


@@ -57,8 +71,7 @@ class AdminFuncs:
         if args.analyse_indexing:
             LOG.warning('Analysing performance of indexing function')
             from ..tools import admin
         if args.analyse_indexing:
             LOG.warning('Analysing performance of indexing function')
             from ..tools import admin

-            with connect(args.config.get_libpq_dsn()) as conn:
-                admin.analyse_indexing(conn, osm_id=args.osm_id, place_id=args.place_id)
+            admin.analyse_indexing(args.config, osm_id=args.osm_id, place_id=args.place_id)

             return 0
 
         if args.migrate:
             return 0
 
         if args.migrate:


@@ -66,15 +79,45 @@ 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
+
+        if args.clean_deleted:
+            LOG.warning('Cleaning up deleted relations')
+            from ..tools import admin
+            admin.clean_deleted_relations(args.config, age=args.clean_deleted)
+            return 0
+

         return 1
 
 
         return 1
 
 

-    @staticmethod
-    def _warm(args):
+    def _warm(self, args: NominatimArgs) -> int:

         LOG.warning('Warming database caches')
         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 != 'search':
+                for _ in range(1000):
+                    api.reverse((random.uniform(-90, 90), random.uniform(-180, 180)),
+                                address_details=True)
+
+            if args.target != 'reverse':
+                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:
+                    if conn.table_exists('search_name'):
+                        words = tokenizer.most_frequent_words(conn, 1000)
+                    else:
+                        words = []
+
+                for word in words:
+                    api.search(word)
+        finally:
+            api.close()
+
+        return 0