when a country is in the results, restrict further searches to places

[nominatim.git] / nominatim / tokenizer / factory.py

diff --git a/nominatim/tokenizer/factory.py b/nominatim/tokenizer/factory.py
index e0c06293ff56e22b9d90938bb5af923b0e279bdb..d6bc51638019cd31281260a68402348f03954a13 100644 (file)
--- a/nominatim/tokenizer/factory.py
+++ b/nominatim/tokenizer/factory.py
@@ -1,39 +1,51 @@
+# 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.

 """
 Functions for creating a tokenizer or initialising the right one for an
 existing database.
 
 A tokenizer is something that is bound to the lifetime of a database. It
 """
 Functions for creating a tokenizer or initialising the right one for an
 existing database.
 
 A tokenizer is something that is bound to the lifetime of a database. It

-can be choosen and configured before the intial import but then needs to
+can be chosen and configured before the initial import but then needs to

 be used consistently when querying and updating the database.
 
 This module provides the functions to create and configure a new tokenizer
 be used consistently when querying and updating the database.
 
 This module provides the functions to create and configure a new tokenizer

-as well as instanciating the appropriate tokenizer for updating an existing
+as well as instantiating the appropriate tokenizer for updating an existing

 database.
 
 A tokenizer usually also includes PHP code for querying. The appropriate PHP
 normalizer module is installed, when the tokenizer is created.
 """
 database.
 
 A tokenizer usually also includes PHP code for querying. The appropriate PHP
 normalizer module is installed, when the tokenizer is created.
 """

+from typing import Optional

 import logging
 import importlib
 import logging
 import importlib

+from pathlib import Path

 
 

-from ..errors import UsageError
-from ..db import properties
-from ..db.connection import connect
+from nominatim.errors import UsageError
+from nominatim.db import properties
+from nominatim.db.connection import connect
+from nominatim.config import Configuration
+from nominatim.tokenizer.base import AbstractTokenizer, TokenizerModule

 
 LOG = logging.getLogger()
 
 
 LOG = logging.getLogger()
 

-def _import_tokenizer(name):
+def _import_tokenizer(name: str) -> TokenizerModule:

     """ Load the tokenizer.py module from project directory.
     """
     """ Load the tokenizer.py module from project directory.
     """

-    try:
-        return importlib.import_module('nominatim.tokenizer.' + name + '_tokenizer')
-    except ModuleNotFoundError as exp:
+    src_file = Path(__file__).parent / (name + '_tokenizer.py')
+    if not src_file.is_file():

         LOG.fatal("No tokenizer named '%s' available. "
                   "Check the setting of NOMINATIM_TOKENIZER.", name)
         LOG.fatal("No tokenizer named '%s' available. "
                   "Check the setting of NOMINATIM_TOKENIZER.", name)

-        raise UsageError('Tokenizer not found') from exp
+        raise UsageError('Tokenizer not found')

 
 

+    return importlib.import_module('nominatim.tokenizer.' + name + '_tokenizer')

 
 

-def create_tokenizer(config, init_db=True, module_name=None):
+
+def create_tokenizer(config: Configuration, init_db: bool = True,
+                     module_name: Optional[str] = None) -> AbstractTokenizer:

     """ Create a new tokenizer as defined by the given configuration.
 
         The tokenizer data and code is copied into the 'tokenizer' directory
     """ Create a new tokenizer as defined by the given configuration.
 
         The tokenizer data and code is copied into the 'tokenizer' directory


@@ -43,6 +55,7 @@ def create_tokenizer(config, init_db=True, module_name=None):
         module_name = config.TOKENIZER
 
     # Create the directory for the tokenizer data
         module_name = config.TOKENIZER
 
     # Create the directory for the tokenizer data

+    assert config.project_dir is not None

     basedir = config.project_dir / 'tokenizer'
     if not basedir.exists():
         basedir.mkdir()
     basedir = config.project_dir / 'tokenizer'
     if not basedir.exists():
         basedir.mkdir()


@@ -62,16 +75,17 @@ def create_tokenizer(config, init_db=True, module_name=None):
     return tokenizer
 
 
     return tokenizer
 
 

-def get_tokenizer_for_db(config):
+def get_tokenizer_for_db(config: Configuration) -> AbstractTokenizer:

     """ Instantiate a tokenizer for an existing database.
 
         The function looks up the appropriate tokenizer in the database
         and initialises it.
     """
     """ Instantiate a tokenizer for an existing database.
 
         The function looks up the appropriate tokenizer in the database
         and initialises it.
     """

+    assert config.project_dir is not None

     basedir = config.project_dir / 'tokenizer'
     if not basedir.is_dir():
     basedir = config.project_dir / 'tokenizer'
     if not basedir.is_dir():

-        LOG.fatal("Cannot find tokenizer data in '%s'.", basedir)
-        raise UsageError('Cannot initialize tokenizer.')
+        # Directory will be repopulated by tokenizer below.
+        basedir.mkdir()

 
     with connect(config.get_libpq_dsn()) as conn:
         name = properties.get_property(conn, 'tokenizer')
 
     with connect(config.get_libpq_dsn()) as conn:
         name = properties.get_property(conn, 'tokenizer')


@@ -83,6 +97,6 @@ def get_tokenizer_for_db(config):
     tokenizer_module = _import_tokenizer(name)
 
     tokenizer = tokenizer_module.create(config.get_libpq_dsn(), basedir)
     tokenizer_module = _import_tokenizer(name)
 
     tokenizer = tokenizer_module.create(config.get_libpq_dsn(), basedir)

-    tokenizer.init_from_project()
+    tokenizer.init_from_project(config)

 
     return tokenizer
 
     return tokenizer