2021-04-21 10:57:17 +03:00
|
|
|
"""
|
|
|
|
Tokenizer implementing normalisation as used before Nominatim 4.
|
|
|
|
"""
|
2021-04-25 19:26:36 +03:00
|
|
|
from collections import OrderedDict
|
2021-04-21 16:00:37 +03:00
|
|
|
import logging
|
2021-04-25 11:38:29 +03:00
|
|
|
import re
|
2021-04-21 16:00:37 +03:00
|
|
|
import shutil
|
2021-04-28 11:59:07 +03:00
|
|
|
from textwrap import dedent
|
2021-04-21 16:00:37 +03:00
|
|
|
|
2021-04-27 22:50:35 +03:00
|
|
|
from icu import Transliterator
|
2021-04-21 16:00:37 +03:00
|
|
|
import psycopg2
|
2021-04-24 23:35:46 +03:00
|
|
|
import psycopg2.extras
|
2021-04-21 16:00:37 +03:00
|
|
|
|
2021-04-21 10:57:17 +03:00
|
|
|
from nominatim.db.connection import connect
|
|
|
|
from nominatim.db import properties
|
2021-04-22 23:47:34 +03:00
|
|
|
from nominatim.db import utils as db_utils
|
|
|
|
from nominatim.db.sql_preprocessor import SQLPreprocessor
|
2021-04-21 16:00:37 +03:00
|
|
|
from nominatim.errors import UsageError
|
2021-04-21 10:57:17 +03:00
|
|
|
|
|
|
|
DBCFG_NORMALIZATION = "tokenizer_normalization"
|
2021-04-22 23:47:34 +03:00
|
|
|
DBCFG_MAXWORDFREQ = "tokenizer_maxwordfreq"
|
2021-04-21 10:57:17 +03:00
|
|
|
|
2021-04-21 16:00:37 +03:00
|
|
|
LOG = logging.getLogger()
|
|
|
|
|
2021-04-21 10:57:17 +03:00
|
|
|
def create(dsn, data_dir):
|
|
|
|
""" Create a new instance of the tokenizer provided by this module.
|
|
|
|
"""
|
|
|
|
return LegacyTokenizer(dsn, data_dir)
|
|
|
|
|
2021-04-21 16:00:37 +03:00
|
|
|
|
2021-04-21 16:38:52 +03:00
|
|
|
def _install_module(config_module_path, src_dir, module_dir):
|
2021-04-21 16:00:37 +03:00
|
|
|
""" Copies the PostgreSQL normalisation module into the project
|
|
|
|
directory if necessary. For historical reasons the module is
|
|
|
|
saved in the '/module' subdirectory and not with the other tokenizer
|
|
|
|
data.
|
|
|
|
|
|
|
|
The function detects when the installation is run from the
|
|
|
|
build directory. It doesn't touch the module in that case.
|
|
|
|
"""
|
2021-04-21 16:38:52 +03:00
|
|
|
# Custom module locations are simply used as is.
|
|
|
|
if config_module_path:
|
|
|
|
LOG.info("Using custom path for database module at '%s'", config_module_path)
|
|
|
|
return config_module_path
|
|
|
|
|
|
|
|
# Compatibility mode for builddir installations.
|
2021-04-21 16:00:37 +03:00
|
|
|
if module_dir.exists() and src_dir.samefile(module_dir):
|
|
|
|
LOG.info('Running from build directory. Leaving database module as is.')
|
2021-04-21 16:38:52 +03:00
|
|
|
return module_dir
|
2021-04-21 16:00:37 +03:00
|
|
|
|
2021-04-21 16:38:52 +03:00
|
|
|
# In any other case install the module in the project directory.
|
2021-04-21 16:00:37 +03:00
|
|
|
if not module_dir.exists():
|
|
|
|
module_dir.mkdir()
|
|
|
|
|
|
|
|
destfile = module_dir / 'nominatim.so'
|
|
|
|
shutil.copy(str(src_dir / 'nominatim.so'), str(destfile))
|
|
|
|
destfile.chmod(0o755)
|
|
|
|
|
|
|
|
LOG.info('Database module installed at %s', str(destfile))
|
|
|
|
|
2021-04-21 16:38:52 +03:00
|
|
|
return module_dir
|
|
|
|
|
2021-04-21 16:00:37 +03:00
|
|
|
|
|
|
|
def _check_module(module_dir, conn):
|
2021-04-22 23:47:34 +03:00
|
|
|
""" Try to use the PostgreSQL module to confirm that it is correctly
|
|
|
|
installed and accessible from PostgreSQL.
|
|
|
|
"""
|
2021-04-21 16:00:37 +03:00
|
|
|
with conn.cursor() as cur:
|
|
|
|
try:
|
|
|
|
cur.execute("""CREATE FUNCTION nominatim_test_import_func(text)
|
|
|
|
RETURNS text AS '{}/nominatim.so', 'transliteration'
|
|
|
|
LANGUAGE c IMMUTABLE STRICT;
|
|
|
|
DROP FUNCTION nominatim_test_import_func(text)
|
|
|
|
""".format(module_dir))
|
|
|
|
except psycopg2.DatabaseError as err:
|
|
|
|
LOG.fatal("Error accessing database module: %s", err)
|
|
|
|
raise UsageError("Database module cannot be accessed.") from err
|
|
|
|
|
|
|
|
|
2021-04-21 10:57:17 +03:00
|
|
|
class LegacyTokenizer:
|
|
|
|
""" The legacy tokenizer uses a special PostgreSQL module to normalize
|
|
|
|
names and queries. The tokenizer thus implements normalization through
|
|
|
|
calls to the database.
|
|
|
|
"""
|
|
|
|
|
|
|
|
def __init__(self, dsn, data_dir):
|
|
|
|
self.dsn = dsn
|
|
|
|
self.data_dir = data_dir
|
|
|
|
self.normalization = None
|
|
|
|
|
|
|
|
|
2021-04-28 11:59:07 +03:00
|
|
|
def init_new_db(self, config, init_db=True):
|
2021-04-21 10:57:17 +03:00
|
|
|
""" Set up a new tokenizer for the database.
|
|
|
|
|
|
|
|
This copies all necessary data in the project directory to make
|
|
|
|
sure the tokenizer remains stable even over updates.
|
|
|
|
"""
|
2021-04-21 16:38:52 +03:00
|
|
|
module_dir = _install_module(config.DATABASE_MODULE_PATH,
|
|
|
|
config.lib_dir.module,
|
|
|
|
config.project_dir / 'module')
|
2021-04-21 16:00:37 +03:00
|
|
|
|
2021-04-21 10:57:17 +03:00
|
|
|
self.normalization = config.TERM_NORMALIZATION
|
|
|
|
|
2021-04-28 11:59:07 +03:00
|
|
|
self._install_php(config)
|
|
|
|
|
2021-04-21 10:57:17 +03:00
|
|
|
with connect(self.dsn) as conn:
|
2021-04-21 16:00:37 +03:00
|
|
|
_check_module(module_dir, conn)
|
2021-04-22 23:47:34 +03:00
|
|
|
self._save_config(conn, config)
|
|
|
|
conn.commit()
|
|
|
|
|
2021-04-28 11:59:07 +03:00
|
|
|
if init_db:
|
|
|
|
self.update_sql_functions(config)
|
|
|
|
self._init_db_tables(config)
|
2021-04-21 10:57:17 +03:00
|
|
|
|
|
|
|
|
|
|
|
def init_from_project(self):
|
|
|
|
""" Initialise the tokenizer from the project directory.
|
|
|
|
"""
|
|
|
|
with connect(self.dsn) as conn:
|
|
|
|
self.normalization = properties.get_property(conn, DBCFG_NORMALIZATION)
|
2021-04-21 16:38:52 +03:00
|
|
|
|
|
|
|
|
2021-04-30 18:28:34 +03:00
|
|
|
def finalize_import(self, config):
|
|
|
|
""" Do any required postprocessing to make the tokenizer data ready
|
|
|
|
for use.
|
|
|
|
"""
|
|
|
|
with connect(self.dsn) as conn:
|
|
|
|
sqlp = SQLPreprocessor(conn, config)
|
|
|
|
sqlp.run_sql_file(conn, 'tokenizer/legacy_tokenizer_indices.sql')
|
|
|
|
|
|
|
|
|
2021-04-22 23:47:34 +03:00
|
|
|
def update_sql_functions(self, config):
|
|
|
|
""" Reimport the SQL functions for this tokenizer.
|
|
|
|
"""
|
|
|
|
with connect(self.dsn) as conn:
|
|
|
|
max_word_freq = properties.get_property(conn, DBCFG_MAXWORDFREQ)
|
|
|
|
modulepath = config.DATABASE_MODULE_PATH or \
|
|
|
|
str((config.project_dir / 'module').resolve())
|
|
|
|
sqlp = SQLPreprocessor(conn, config)
|
|
|
|
sqlp.run_sql_file(conn, 'tokenizer/legacy_tokenizer.sql',
|
|
|
|
max_word_freq=max_word_freq,
|
|
|
|
modulepath=modulepath)
|
|
|
|
|
|
|
|
|
2021-04-28 22:15:18 +03:00
|
|
|
def check_database(self):
|
|
|
|
""" Check that the tokenizer is set up correctly.
|
|
|
|
"""
|
|
|
|
hint = """\
|
|
|
|
The Postgresql extension nominatim.so was not correctly loaded.
|
|
|
|
|
|
|
|
Error: {error}
|
|
|
|
|
|
|
|
Hints:
|
|
|
|
* Check the output of the CMmake/make installation step
|
|
|
|
* Does nominatim.so exist?
|
|
|
|
* Does nominatim.so exist on the database server?
|
|
|
|
* Can nominatim.so be accessed by the database user?
|
|
|
|
"""
|
|
|
|
with connect(self.dsn) as conn:
|
|
|
|
with conn.cursor() as cur:
|
|
|
|
try:
|
|
|
|
out = cur.scalar("SELECT make_standard_name('a')")
|
|
|
|
except psycopg2.Error as err:
|
|
|
|
return hint.format(error=str(err))
|
|
|
|
|
|
|
|
if out != 'a':
|
|
|
|
return hint.format(error='Unexpected result for make_standard_name()')
|
|
|
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
2021-04-21 16:38:52 +03:00
|
|
|
def migrate_database(self, config):
|
|
|
|
""" Initialise the project directory of an existing database for
|
|
|
|
use with this tokenizer.
|
|
|
|
|
|
|
|
This is a special migration function for updating existing databases
|
|
|
|
to new software versions.
|
|
|
|
"""
|
2021-04-28 10:14:32 +03:00
|
|
|
self.normalization = config.TERM_NORMALIZATION
|
2021-04-21 16:38:52 +03:00
|
|
|
module_dir = _install_module(config.DATABASE_MODULE_PATH,
|
|
|
|
config.lib_dir.module,
|
|
|
|
config.project_dir / 'module')
|
|
|
|
|
|
|
|
with connect(self.dsn) as conn:
|
|
|
|
_check_module(module_dir, conn)
|
2021-04-22 23:47:34 +03:00
|
|
|
self._save_config(conn, config)
|
|
|
|
|
|
|
|
|
2021-04-24 23:35:46 +03:00
|
|
|
def name_analyzer(self):
|
|
|
|
""" Create a new analyzer for tokenizing names and queries
|
|
|
|
using this tokinzer. Analyzers are context managers and should
|
|
|
|
be used accordingly:
|
|
|
|
|
|
|
|
```
|
|
|
|
with tokenizer.name_analyzer() as analyzer:
|
|
|
|
analyser.tokenize()
|
|
|
|
```
|
|
|
|
|
|
|
|
When used outside the with construct, the caller must ensure to
|
|
|
|
call the close() function before destructing the analyzer.
|
|
|
|
|
|
|
|
Analyzers are not thread-safe. You need to instantiate one per thread.
|
|
|
|
"""
|
2021-04-27 22:50:35 +03:00
|
|
|
normalizer = Transliterator.createFromRules("phrase normalizer",
|
|
|
|
self.normalization)
|
|
|
|
return LegacyNameAnalyzer(self.dsn, normalizer)
|
2021-04-24 23:35:46 +03:00
|
|
|
|
|
|
|
|
2021-04-28 11:59:07 +03:00
|
|
|
def _install_php(self, config):
|
|
|
|
""" Install the php script for the tokenizer.
|
|
|
|
"""
|
|
|
|
php_file = self.data_dir / "tokenizer.php"
|
|
|
|
php_file.write_text(dedent("""\
|
|
|
|
<?php
|
|
|
|
@define('CONST_Max_Word_Frequency', {0.MAX_WORD_FREQUENCY});
|
|
|
|
@define('CONST_Term_Normalization_Rules', "{0.TERM_NORMALIZATION}");
|
|
|
|
require_once('{0.lib_dir.php}/tokenizer/legacy_tokenizer.php');
|
|
|
|
""".format(config)))
|
|
|
|
|
|
|
|
|
2021-04-22 23:47:34 +03:00
|
|
|
def _init_db_tables(self, config):
|
|
|
|
""" Set up the word table and fill it with pre-computed word
|
|
|
|
frequencies.
|
|
|
|
"""
|
|
|
|
with connect(self.dsn) as conn:
|
|
|
|
sqlp = SQLPreprocessor(conn, config)
|
|
|
|
sqlp.run_sql_file(conn, 'tokenizer/legacy_tokenizer_tables.sql')
|
|
|
|
conn.commit()
|
|
|
|
|
|
|
|
LOG.warning("Precomputing word tokens")
|
|
|
|
db_utils.execute_file(self.dsn, config.lib_dir.data / 'words.sql')
|
2021-04-21 16:38:52 +03:00
|
|
|
|
|
|
|
|
2021-04-22 23:47:34 +03:00
|
|
|
def _save_config(self, conn, config):
|
2021-04-21 16:38:52 +03:00
|
|
|
""" Save the configuration that needs to remain stable for the given
|
|
|
|
database as database properties.
|
|
|
|
"""
|
|
|
|
properties.set_property(conn, DBCFG_NORMALIZATION, self.normalization)
|
2021-04-22 23:47:34 +03:00
|
|
|
properties.set_property(conn, DBCFG_MAXWORDFREQ, config.MAX_WORD_FREQUENCY)
|
2021-04-24 23:35:46 +03:00
|
|
|
|
|
|
|
|
|
|
|
class LegacyNameAnalyzer:
|
|
|
|
""" The legacy analyzer uses the special Postgresql module for
|
|
|
|
splitting names.
|
|
|
|
|
|
|
|
Each instance opens a connection to the database to request the
|
|
|
|
normalization.
|
|
|
|
"""
|
|
|
|
|
2021-04-27 22:50:35 +03:00
|
|
|
def __init__(self, dsn, normalizer):
|
2021-04-24 23:35:46 +03:00
|
|
|
self.conn = connect(dsn).connection
|
|
|
|
self.conn.autocommit = True
|
2021-04-27 22:50:35 +03:00
|
|
|
self.normalizer = normalizer
|
2021-04-24 23:35:46 +03:00
|
|
|
psycopg2.extras.register_hstore(self.conn)
|
|
|
|
|
2021-04-25 12:47:29 +03:00
|
|
|
self._cache = _TokenCache(self.conn)
|
|
|
|
|
2021-04-24 23:35:46 +03:00
|
|
|
|
|
|
|
def __enter__(self):
|
|
|
|
return self
|
|
|
|
|
|
|
|
|
|
|
|
def __exit__(self, exc_type, exc_value, traceback):
|
|
|
|
self.close()
|
|
|
|
|
|
|
|
|
|
|
|
def close(self):
|
|
|
|
""" Free all resources used by the analyzer.
|
|
|
|
"""
|
|
|
|
if self.conn:
|
|
|
|
self.conn.close()
|
|
|
|
self.conn = None
|
|
|
|
|
2021-04-25 19:26:36 +03:00
|
|
|
|
2021-05-05 11:00:34 +03:00
|
|
|
@staticmethod
|
|
|
|
def get_word_token_info(conn, words):
|
|
|
|
""" Return token information for the given list of words.
|
|
|
|
If a word starts with # it is assumed to be a full name
|
|
|
|
otherwise is a partial name.
|
|
|
|
|
|
|
|
The function returns a list of tuples with
|
|
|
|
(original word, word token, word id).
|
|
|
|
|
|
|
|
The function is used for testing and debugging only
|
|
|
|
and not necessarily efficient.
|
|
|
|
"""
|
|
|
|
with conn.cursor() as cur:
|
|
|
|
cur.execute("""SELECT t.term, word_token, word_id
|
|
|
|
FROM word, (SELECT unnest(%s::TEXT[]) as term) t
|
|
|
|
WHERE word_token = (CASE
|
|
|
|
WHEN left(t.term, 1) = '#' THEN
|
|
|
|
' ' || make_standard_name(substring(t.term from 2))
|
|
|
|
ELSE
|
|
|
|
make_standard_name(t.term)
|
|
|
|
END)
|
|
|
|
and class is null and country_code is null""",
|
|
|
|
(words, ))
|
|
|
|
|
|
|
|
return [(r[0], r[1], r[2]) for r in cur]
|
|
|
|
|
|
|
|
|
2021-04-27 22:50:35 +03:00
|
|
|
def normalize(self, phrase):
|
|
|
|
""" Normalize the given phrase, i.e. remove all properties that
|
|
|
|
are irrelevant for search.
|
|
|
|
"""
|
|
|
|
return self.normalizer.transliterate(phrase)
|
|
|
|
|
|
|
|
|
2021-05-12 20:57:48 +03:00
|
|
|
@staticmethod
|
|
|
|
def normalize_postcode(postcode):
|
|
|
|
""" Convert the postcode to a standardized form.
|
|
|
|
|
|
|
|
This function must yield exactly the same result as the SQL function
|
|
|
|
'token_normalized_postcode()'.
|
|
|
|
"""
|
|
|
|
return postcode.strip().upper()
|
|
|
|
|
|
|
|
|
|
|
|
def update_postcodes_from_db(self):
|
|
|
|
""" Update postcode tokens in the word table from the location_postcode
|
|
|
|
table.
|
2021-04-25 19:26:36 +03:00
|
|
|
"""
|
|
|
|
with self.conn.cursor() as cur:
|
2021-05-12 20:57:48 +03:00
|
|
|
# This finds us the rows in location_postcode and word that are
|
|
|
|
# missing in the other table.
|
|
|
|
cur.execute("""SELECT * FROM
|
|
|
|
(SELECT pc, word FROM
|
|
|
|
(SELECT distinct(postcode) as pc FROM location_postcode) p
|
|
|
|
FULL JOIN
|
|
|
|
(SELECT word FROM word
|
|
|
|
WHERE class ='place' and type = 'postcode') w
|
|
|
|
ON pc = word) x
|
|
|
|
WHERE pc is null or word is null""")
|
|
|
|
|
|
|
|
to_delete = []
|
|
|
|
to_add = []
|
|
|
|
|
|
|
|
for postcode, word in cur:
|
|
|
|
if postcode is None:
|
|
|
|
to_delete.append(word)
|
|
|
|
else:
|
|
|
|
to_add.append(postcode)
|
|
|
|
|
|
|
|
if to_delete:
|
|
|
|
cur.execute("""DELETE FROM WORD
|
|
|
|
WHERE class ='place' and type = 'postcode'
|
|
|
|
and word = any(%s)
|
|
|
|
""", (to_delete, ))
|
|
|
|
if to_add:
|
|
|
|
cur.execute("""SELECT count(create_postcode_id(pc))
|
|
|
|
FROM unnest(%s) as pc
|
|
|
|
""", (to_add, ))
|
|
|
|
|
2021-04-25 19:26:36 +03:00
|
|
|
|
2021-04-27 12:37:18 +03:00
|
|
|
|
2021-05-17 13:40:50 +03:00
|
|
|
def update_special_phrases(self, phrases, should_replace):
|
2021-04-27 22:50:35 +03:00
|
|
|
""" Replace the search index for special phrases with the new phrases.
|
|
|
|
"""
|
|
|
|
norm_phrases = set(((self.normalize(p[0]), p[1], p[2], p[3])
|
|
|
|
for p in phrases))
|
|
|
|
|
|
|
|
with self.conn.cursor() as cur:
|
|
|
|
# Get the old phrases.
|
|
|
|
existing_phrases = set()
|
|
|
|
cur.execute("""SELECT word, class, type, operator FROM word
|
|
|
|
WHERE class != 'place'
|
|
|
|
OR (type != 'house' AND type != 'postcode')""")
|
|
|
|
for label, cls, typ, oper in cur:
|
|
|
|
existing_phrases.add((label, cls, typ, oper or '-'))
|
|
|
|
|
|
|
|
to_add = norm_phrases - existing_phrases
|
|
|
|
to_delete = existing_phrases - norm_phrases
|
|
|
|
|
|
|
|
if to_add:
|
|
|
|
psycopg2.extras.execute_values(
|
|
|
|
cur,
|
|
|
|
""" INSERT INTO word (word_id, word_token, word, class, type,
|
|
|
|
search_name_count, operator)
|
|
|
|
(SELECT nextval('seq_word'), make_standard_name(name), name,
|
|
|
|
class, type, 0,
|
|
|
|
CASE WHEN op in ('in', 'near') THEN op ELSE null END
|
|
|
|
FROM (VALUES %s) as v(name, class, type, op))""",
|
|
|
|
to_add)
|
|
|
|
|
2021-05-17 13:40:50 +03:00
|
|
|
if to_delete and should_replace:
|
2021-04-27 22:50:35 +03:00
|
|
|
psycopg2.extras.execute_values(
|
|
|
|
cur,
|
|
|
|
""" DELETE FROM word USING (VALUES %s) as v(name, in_class, in_type, op)
|
|
|
|
WHERE word = name and class = in_class and type = in_type
|
|
|
|
and ((op = '-' and operator is null) or op = operator)""",
|
|
|
|
to_delete)
|
|
|
|
|
|
|
|
LOG.info("Total phrases: %s. Added: %s. Deleted: %s",
|
|
|
|
len(norm_phrases), len(to_add), len(to_delete))
|
|
|
|
|
|
|
|
|
2021-04-27 12:37:18 +03:00
|
|
|
def add_country_names(self, country_code, names):
|
|
|
|
""" Add names for the given country to the search index.
|
|
|
|
"""
|
|
|
|
with self.conn.cursor() as cur:
|
|
|
|
cur.execute(
|
|
|
|
"""INSERT INTO word (word_id, word_token, country_code)
|
|
|
|
(SELECT nextval('seq_word'), lookup_token, %s
|
|
|
|
FROM (SELECT ' ' || make_standard_name(n) as lookup_token
|
|
|
|
FROM unnest(%s)n) y
|
|
|
|
WHERE NOT EXISTS(SELECT * FROM word
|
|
|
|
WHERE word_token = lookup_token and country_code = %s))
|
|
|
|
""", (country_code, names, country_code))
|
|
|
|
|
|
|
|
|
2021-04-24 23:35:46 +03:00
|
|
|
def process_place(self, place):
|
|
|
|
""" Determine tokenizer information about the given place.
|
|
|
|
|
|
|
|
Returns a JSON-serialisable structure that will be handed into
|
|
|
|
the database via the token_info field.
|
|
|
|
"""
|
2021-04-25 12:47:29 +03:00
|
|
|
token_info = _TokenInfo(self._cache)
|
2021-04-25 11:38:29 +03:00
|
|
|
|
2021-04-27 12:37:18 +03:00
|
|
|
names = place.get('name')
|
|
|
|
|
|
|
|
if names:
|
|
|
|
token_info.add_names(self.conn, names)
|
|
|
|
|
|
|
|
country_feature = place.get('country_feature')
|
|
|
|
if country_feature and re.fullmatch(r'[A-Za-z][A-Za-z]', country_feature):
|
|
|
|
self.add_country_names(country_feature.lower(), list(names.values()))
|
2021-04-25 11:38:29 +03:00
|
|
|
|
2021-04-25 12:47:29 +03:00
|
|
|
address = place.get('address')
|
|
|
|
|
|
|
|
if address:
|
2021-04-26 17:50:28 +03:00
|
|
|
hnrs = []
|
|
|
|
addr_terms = []
|
|
|
|
for key, value in address.items():
|
|
|
|
if key == 'postcode':
|
|
|
|
self._add_postcode(value)
|
|
|
|
elif key in ('housenumber', 'streetnumber', 'conscriptionnumber'):
|
|
|
|
hnrs.append(value)
|
|
|
|
elif key == 'street':
|
|
|
|
token_info.add_street(self.conn, value)
|
|
|
|
elif key == 'place':
|
|
|
|
token_info.add_place(self.conn, value)
|
|
|
|
elif not key.startswith('_') and \
|
|
|
|
key not in ('country', 'full'):
|
|
|
|
addr_terms.append((key, value))
|
|
|
|
|
|
|
|
if hnrs:
|
|
|
|
token_info.add_housenumbers(self.conn, hnrs)
|
|
|
|
|
|
|
|
if addr_terms:
|
|
|
|
token_info.add_address_terms(self.conn, addr_terms)
|
2021-04-25 12:47:29 +03:00
|
|
|
|
2021-04-25 11:38:29 +03:00
|
|
|
return token_info.data
|
|
|
|
|
|
|
|
|
2021-04-25 19:26:36 +03:00
|
|
|
def _add_postcode(self, postcode):
|
|
|
|
""" Make sure the normalized postcode is present in the word table.
|
|
|
|
"""
|
2021-04-26 17:50:28 +03:00
|
|
|
if re.search(r'[:,;]', postcode) is None:
|
2021-05-13 17:14:12 +03:00
|
|
|
self._cache.add_postcode(self.conn, self.normalize_postcode(postcode))
|
2021-04-25 19:26:36 +03:00
|
|
|
|
|
|
|
|
2021-04-25 11:38:29 +03:00
|
|
|
class _TokenInfo:
|
2021-04-25 12:47:29 +03:00
|
|
|
""" Collect token information to be sent back to the database.
|
|
|
|
"""
|
|
|
|
def __init__(self, cache):
|
|
|
|
self.cache = cache
|
2021-04-25 11:38:29 +03:00
|
|
|
self.data = {}
|
|
|
|
|
|
|
|
|
2021-04-27 12:37:18 +03:00
|
|
|
def add_names(self, conn, names):
|
2021-04-25 11:38:29 +03:00
|
|
|
""" Add token information for the names of the place.
|
|
|
|
"""
|
|
|
|
with conn.cursor() as cur:
|
|
|
|
# Create the token IDs for all names.
|
|
|
|
self.data['names'] = cur.scalar("SELECT make_keywords(%s)::text",
|
|
|
|
(names, ))
|
|
|
|
|
2021-04-25 12:47:29 +03:00
|
|
|
|
2021-04-26 17:50:28 +03:00
|
|
|
def add_housenumbers(self, conn, hnrs):
|
2021-04-25 12:47:29 +03:00
|
|
|
""" Extract housenumber information from the address.
|
|
|
|
"""
|
|
|
|
if len(hnrs) == 1:
|
|
|
|
token = self.cache.get_housenumber(hnrs[0])
|
|
|
|
if token is not None:
|
|
|
|
self.data['hnr_tokens'] = token
|
|
|
|
self.data['hnr'] = hnrs[0]
|
|
|
|
return
|
|
|
|
|
|
|
|
# split numbers if necessary
|
|
|
|
simple_list = []
|
|
|
|
for hnr in hnrs:
|
|
|
|
simple_list.extend((x.strip() for x in re.split(r'[;,]', hnr)))
|
|
|
|
|
|
|
|
if len(simple_list) > 1:
|
|
|
|
simple_list = list(set(simple_list))
|
|
|
|
|
|
|
|
with conn.cursor() as cur:
|
|
|
|
cur.execute("SELECT (create_housenumbers(%s)).* ", (simple_list, ))
|
|
|
|
self.data['hnr_tokens'], self.data['hnr'] = cur.fetchone()
|
|
|
|
|
|
|
|
|
2021-04-26 17:50:28 +03:00
|
|
|
def add_street(self, conn, street):
|
|
|
|
""" Add addr:street match terms.
|
|
|
|
"""
|
|
|
|
def _get_street(name):
|
|
|
|
with conn.cursor() as cur:
|
|
|
|
return cur.scalar("SELECT word_ids_from_name(%s)::text", (name, ))
|
|
|
|
|
|
|
|
self.data['street'] = self.cache.streets.get(street, _get_street)
|
|
|
|
|
|
|
|
|
|
|
|
def add_place(self, conn, place):
|
|
|
|
""" Add addr:place search and match terms.
|
2021-04-25 23:04:07 +03:00
|
|
|
"""
|
2021-04-26 17:50:28 +03:00
|
|
|
def _get_place(name):
|
2021-04-25 23:04:07 +03:00
|
|
|
with conn.cursor() as cur:
|
2021-05-24 00:08:11 +03:00
|
|
|
cur.execute("""SELECT make_keywords(hstore('name' , %s))::text,
|
2021-04-25 23:04:07 +03:00
|
|
|
word_ids_from_name(%s)::text""",
|
2021-05-24 00:08:11 +03:00
|
|
|
(name, name))
|
2021-04-25 23:04:07 +03:00
|
|
|
return cur.fetchone()
|
|
|
|
|
2021-04-26 17:50:28 +03:00
|
|
|
self.data['place_search'], self.data['place_match'] = \
|
|
|
|
self.cache.places.get(place, _get_place)
|
2021-04-25 23:04:07 +03:00
|
|
|
|
|
|
|
|
2021-04-26 17:50:28 +03:00
|
|
|
def add_address_terms(self, conn, terms):
|
|
|
|
""" Add additional address terms.
|
2021-04-25 23:04:07 +03:00
|
|
|
"""
|
|
|
|
def _get_address_term(name):
|
|
|
|
with conn.cursor() as cur:
|
|
|
|
cur.execute("""SELECT addr_ids_from_name(%s)::text,
|
|
|
|
word_ids_from_name(%s)::text""",
|
|
|
|
(name, name))
|
|
|
|
return cur.fetchone()
|
|
|
|
|
|
|
|
tokens = {}
|
2021-04-26 17:50:28 +03:00
|
|
|
for key, value in terms:
|
|
|
|
tokens[key] = self.cache.address_terms.get(value, _get_address_term)
|
|
|
|
|
|
|
|
self.data['addr'] = tokens
|
2021-04-25 23:04:07 +03:00
|
|
|
|
|
|
|
|
2021-04-25 19:26:36 +03:00
|
|
|
class _LRU:
|
|
|
|
""" Least recently used cache that accepts a generator function to
|
|
|
|
produce the item when there is a cache miss.
|
|
|
|
"""
|
|
|
|
|
2021-04-26 18:30:10 +03:00
|
|
|
def __init__(self, maxsize=128, init_data=None):
|
|
|
|
self.data = init_data or OrderedDict()
|
2021-04-25 19:26:36 +03:00
|
|
|
self.maxsize = maxsize
|
2021-04-26 18:30:10 +03:00
|
|
|
if init_data is not None and len(init_data) > maxsize:
|
|
|
|
self.maxsize = len(init_data)
|
2021-04-25 19:26:36 +03:00
|
|
|
|
|
|
|
def get(self, key, generator):
|
|
|
|
""" Get the item with the given key from the cache. If nothing
|
|
|
|
is found in the cache, generate the value through the
|
|
|
|
generator function and store it in the cache.
|
|
|
|
"""
|
|
|
|
value = self.data.get(key)
|
|
|
|
if value is not None:
|
|
|
|
self.data.move_to_end(key)
|
|
|
|
else:
|
|
|
|
value = generator(key)
|
|
|
|
if len(self.data) >= self.maxsize:
|
|
|
|
self.data.popitem(last=False)
|
|
|
|
self.data[key] = value
|
|
|
|
|
|
|
|
return value
|
|
|
|
|
|
|
|
|
2021-04-25 12:47:29 +03:00
|
|
|
class _TokenCache:
|
|
|
|
""" Cache for token information to avoid repeated database queries.
|
|
|
|
|
|
|
|
This cache is not thread-safe and needs to be instantiated per
|
|
|
|
analyzer.
|
|
|
|
"""
|
|
|
|
def __init__(self, conn):
|
2021-04-25 19:26:36 +03:00
|
|
|
# various LRU caches
|
2021-04-25 23:04:07 +03:00
|
|
|
self.streets = _LRU(maxsize=256)
|
|
|
|
self.places = _LRU(maxsize=128)
|
|
|
|
self.address_terms = _LRU(maxsize=1024)
|
2021-04-25 19:26:36 +03:00
|
|
|
|
2021-04-25 12:47:29 +03:00
|
|
|
# Lookup houseunumbers up to 100 and cache them
|
|
|
|
with conn.cursor() as cur:
|
|
|
|
cur.execute("""SELECT i, ARRAY[getorcreate_housenumber_id(i::text)]::text
|
|
|
|
FROM generate_series(1, 100) as i""")
|
|
|
|
self._cached_housenumbers = {str(r[0]) : r[1] for r in cur}
|
|
|
|
|
2021-05-13 17:14:12 +03:00
|
|
|
# For postcodes remember the ones that have already been added
|
|
|
|
self.postcodes = set()
|
2021-04-25 12:47:29 +03:00
|
|
|
|
|
|
|
def get_housenumber(self, number):
|
|
|
|
""" Get a housenumber token from the cache.
|
|
|
|
"""
|
|
|
|
return self._cached_housenumbers.get(number)
|
2021-05-13 17:14:12 +03:00
|
|
|
|
|
|
|
|
|
|
|
def add_postcode(self, conn, postcode):
|
|
|
|
""" Make sure the given postcode is in the database.
|
|
|
|
"""
|
|
|
|
if postcode not in self.postcodes:
|
|
|
|
with conn.cursor() as cur:
|
|
|
|
cur.execute('SELECT create_postcode_id(%s)', (postcode, ))
|
|
|
|
self.postcodes.add(postcode)
|