hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 13:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

precompute replacements while loading configuration

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-10-05 10:20:08 +02:00
parent c171d88194
commit 9ba2019470
2 changed files with 56 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
nominatim/tokenizer/token_analysis/generic.py
View File

@@ -17,14 +17,12 @@ import nominatim.tokenizer.icu_variants as variants
def configure(rules, normalization_rules): def configure(rules, normalization_rules):
""" Extract and preprocess the configuration for this module. """ Extract and preprocess the configuration for this module.
""" """
return {'variants': _parse_variant_list(rules.get('variants'), rules = rules.get('variants')
normalization_rules)} immediate = defaultdict(list)
chars = set()
def _parse_variant_list(rules, normalization_rules):
vset = set()
if rules: if rules:
vset = set()
rules = flatten_config_list(rules, 'variants') rules = flatten_config_list(rules, 'variants')
vmaker = _VariantMaker(normalization_rules) vmaker = _VariantMaker(normalization_rules)
@@ -44,7 +42,17 @@ def _parse_variant_list(rules, normalization_rules):
for rule in (section.get('words') or []): for rule in (section.get('words') or []):
vset.update(vmaker.compute(rule, props)) vset.update(vmaker.compute(rule, props))
return vset # Intermediate reorder by source. Also compute required character set.
for variant in vset:
if variant.source[-1] == ' ' and variant.replacement[-1] == ' ':
replstr = variant.replacement[:-1]
else:
replstr = variant.replacement
immediate[variant.source].append(replstr)
chars.update(variant.source)
return {'replacements': list(immediate.items()),
'chars': ''.join(chars)}
class _VariantMaker: class _VariantMaker:
@@ -136,7 +144,7 @@ def _create_variants(src, preflag, postflag, repl, decompose):
def create(norm_rules, trans_rules, config): def create(norm_rules, trans_rules, config):
""" Create a new token analysis instance for this module. """ Create a new token analysis instance for this module.
""" """
return GenericTokenAnalysis(norm_rules, trans_rules, config['variants']) return GenericTokenAnalysis(norm_rules, trans_rules, config)
class GenericTokenAnalysis: class GenericTokenAnalysis:
@@ -144,7 +152,7 @@ class GenericTokenAnalysis:
and provides the functions to apply the transformations. and provides the functions to apply the transformations.
""" """
def __init__(self, norm_rules, trans_rules, replacements): def __init__(self, norm_rules, trans_rules, config):
self.normalizer = Transliterator.createFromRules("icu_normalization", self.normalizer = Transliterator.createFromRules("icu_normalization",
norm_rules) norm_rules)
self.to_ascii = Transliterator.createFromRules("icu_to_ascii", self.to_ascii = Transliterator.createFromRules("icu_to_ascii",
@@ -153,19 +161,9 @@ class GenericTokenAnalysis:
self.search = Transliterator.createFromRules("icu_search", self.search = Transliterator.createFromRules("icu_search",
norm_rules + trans_rules) norm_rules + trans_rules)
# Intermediate reorder by source. Also compute required character set. # Set up datrie
immediate = defaultdict(list) self.replacements = datrie.Trie(config['chars'])
chars = set() for src, repllist in config['replacements']:
for variant in replacements:
if variant.source[-1] == ' ' and variant.replacement[-1] == ' ':
replstr = variant.replacement[:-1]
else:
replstr = variant.replacement
immediate[variant.source].append(replstr)
chars.update(variant.source)
# Then copy to datrie
self.replacements = datrie.Trie(''.join(chars))
for src, repllist in immediate.items():
self.replacements[src] = repllist self.replacements[src] = repllist

81
test/python/test_tokenizer_icu_rule_loader.py
View File

@@ -130,9 +130,9 @@ class TestGetReplacements:
def get_replacements(self, *variants): def get_replacements(self, *variants):
loader = ICURuleLoader(self.cfgrules(*variants)) loader = ICURuleLoader(self.cfgrules(*variants))
rules = loader.analysis[None].config['variants'] rules = loader.analysis[None].config['replacements']
return set((v.source, v.replacement) for v in rules) return sorted((k, sorted(v)) for k,v in rules)
@pytest.mark.parametrize("variant", ['foo > bar', 'foo -> bar -> bar', @pytest.mark.parametrize("variant", ['foo > bar', 'foo -> bar -> bar',
@@ -144,131 +144,122 @@ class TestGetReplacements:
def test_add_full(self): def test_add_full(self):
repl = self.get_replacements("foo -> bar") repl = self.get_replacements("foo -> bar")
assert repl == {(' foo ', ' bar '), (' foo ', ' foo ')} assert repl == [(' foo ', [' bar', ' foo'])]
def test_replace_full(self): def test_replace_full(self):
repl = self.get_replacements("foo => bar") repl = self.get_replacements("foo => bar")
assert repl == {(' foo ', ' bar ')} assert repl == [(' foo ', [' bar'])]
def test_add_suffix_no_decompose(self): def test_add_suffix_no_decompose(self):
repl = self.get_replacements("~berg |-> bg") repl = self.get_replacements("~berg |-> bg")
assert repl == {('berg ', 'berg '), ('berg ', 'bg '), assert repl == [(' berg ', [' berg', ' bg']),
(' berg ', ' berg '), (' berg ', ' bg ')} ('berg ', ['berg', 'bg'])]
def test_replace_suffix_no_decompose(self): def test_replace_suffix_no_decompose(self):
repl = self.get_replacements("~berg |=> bg") repl = self.get_replacements("~berg |=> bg")
assert repl == {('berg ', 'bg '), (' berg ', ' bg ')} assert repl == [(' berg ', [' bg']),('berg ', ['bg'])]
def test_add_suffix_decompose(self): def test_add_suffix_decompose(self):
repl = self.get_replacements("~berg -> bg") repl = self.get_replacements("~berg -> bg")
assert repl == {('berg ', 'berg '), ('berg ', ' berg '), assert repl == [(' berg ', [' berg', ' bg', 'berg', 'bg']),
(' berg ', ' berg '), (' berg ', 'berg '), ('berg ', [' berg', ' bg', 'berg', 'bg'])]
('berg ', 'bg '), ('berg ', ' bg '),
(' berg ', 'bg '), (' berg ', ' bg ')}
def test_replace_suffix_decompose(self): def test_replace_suffix_decompose(self):
repl = self.get_replacements("~berg => bg") repl = self.get_replacements("~berg => bg")
assert repl == {('berg ', 'bg '), ('berg ', ' bg '), assert repl == [(' berg ', [' bg', 'bg']),
(' berg ', 'bg '), (' berg ', ' bg ')} ('berg ', [' bg', 'bg'])]
def test_add_prefix_no_compose(self): def test_add_prefix_no_compose(self):
repl = self.get_replacements("hinter~ |-> hnt") repl = self.get_replacements("hinter~ |-> hnt")
assert repl == {(' hinter', ' hinter'), (' hinter ', ' hinter '), assert repl == [(' hinter', [' hinter', ' hnt']),
(' hinter', ' hnt'), (' hinter ', ' hnt ')} (' hinter ', [' hinter', ' hnt'])]
def test_replace_prefix_no_compose(self): def test_replace_prefix_no_compose(self):
repl = self.get_replacements("hinter~ |=> hnt") repl = self.get_replacements("hinter~ |=> hnt")
assert repl == {(' hinter', ' hnt'), (' hinter ', ' hnt ')} assert repl == [(' hinter', [' hnt']), (' hinter ', [' hnt'])]
def test_add_prefix_compose(self): def test_add_prefix_compose(self):
repl = self.get_replacements("hinter~-> h") repl = self.get_replacements("hinter~-> h")
assert repl == {(' hinter', ' hinter'), (' hinter', ' hinter '), assert repl == [(' hinter', [' h', ' h ', ' hinter', ' hinter ']),
(' hinter', ' h'), (' hinter', ' h '), (' hinter ', [' h', ' h', ' hinter', ' hinter'])]
(' hinter ', ' hinter '), (' hinter ', ' hinter'),
(' hinter ', ' h '), (' hinter ', ' h')}
def test_replace_prefix_compose(self): def test_replace_prefix_compose(self):
repl = self.get_replacements("hinter~=> h") repl = self.get_replacements("hinter~=> h")
assert repl == {(' hinter', ' h'), (' hinter', ' h '), assert repl == [(' hinter', [' h', ' h ']),
(' hinter ', ' h '), (' hinter ', ' h')} (' hinter ', [' h', ' h'])]
def test_add_beginning_only(self): def test_add_beginning_only(self):
repl = self.get_replacements("^Premier -> Pr") repl = self.get_replacements("^Premier -> Pr")
assert repl == {('^ premier ', '^ premier '), ('^ premier ', '^ pr ')} assert repl == [('^ premier ', ['^ pr', '^ premier'])]
def test_replace_beginning_only(self): def test_replace_beginning_only(self):
repl = self.get_replacements("^Premier => Pr") repl = self.get_replacements("^Premier => Pr")
assert repl == {('^ premier ', '^ pr ')} assert repl == [('^ premier ', ['^ pr'])]
def test_add_final_only(self): def test_add_final_only(self):
repl = self.get_replacements("road$ -> rd") repl = self.get_replacements("road$ -> rd")
assert repl == {(' road ^', ' road ^'), (' road ^', ' rd ^')} assert repl == [(' road ^', [' rd ^', ' road ^'])]
def test_replace_final_only(self): def test_replace_final_only(self):
repl = self.get_replacements("road$ => rd") repl = self.get_replacements("road$ => rd")
assert repl == {(' road ^', ' rd ^')} assert repl == [(' road ^', [' rd ^'])]
def test_decompose_only(self): def test_decompose_only(self):
repl = self.get_replacements("~foo -> foo") repl = self.get_replacements("~foo -> foo")
assert repl == {('foo ', 'foo '), ('foo ', ' foo '), assert repl == [(' foo ', [' foo', 'foo']),
(' foo ', 'foo '), (' foo ', ' foo ')} ('foo ', [' foo', 'foo'])]
def test_add_suffix_decompose_end_only(self): def test_add_suffix_decompose_end_only(self):
repl = self.get_replacements("~berg |-> bg", "~berg$ -> bg") repl = self.get_replacements("~berg |-> bg", "~berg$ -> bg")
assert repl == {('berg ', 'berg '), ('berg ', 'bg '), assert repl == [(' berg ', [' berg', ' bg']),
(' berg ', ' berg '), (' berg ', ' bg '), (' berg ^', [' berg ^', ' bg ^', 'berg ^', 'bg ^']),
('berg ^', 'berg ^'), ('berg ^', ' berg ^'), ('berg ', ['berg', 'bg']),
('berg ^', 'bg ^'), ('berg ^', ' bg ^'), ('berg ^', [' berg ^', ' bg ^', 'berg ^', 'bg ^'])]
(' berg ^', 'berg ^'), (' berg ^', 'bg ^'),
(' berg ^', ' berg ^'), (' berg ^', ' bg ^')}
def test_replace_suffix_decompose_end_only(self): def test_replace_suffix_decompose_end_only(self):
repl = self.get_replacements("~berg |=> bg", "~berg$ => bg") repl = self.get_replacements("~berg |=> bg", "~berg$ => bg")
assert repl == {('berg ', 'bg '), (' berg ', ' bg '), assert repl == [(' berg ', [' bg']),
('berg ^', 'bg ^'), ('berg ^', ' bg ^'), (' berg ^', [' bg ^', 'bg ^']),
(' berg ^', 'bg ^'), (' berg ^', ' bg ^')} ('berg ', ['bg']),
('berg ^', [' bg ^', 'bg ^'])]
def test_add_multiple_suffix(self): def test_add_multiple_suffix(self):
repl = self.get_replacements("~berg,~burg -> bg") repl = self.get_replacements("~berg,~burg -> bg")
assert repl == {('berg ', 'berg '), ('berg ', ' berg '), assert repl == [(' berg ', [' berg', ' bg', 'berg', 'bg']),
(' berg ', ' berg '), (' berg ', 'berg '), (' burg ', [' bg', ' burg', 'bg', 'burg']),
('berg ', 'bg '), ('berg ', ' bg '), ('berg ', [' berg', ' bg', 'berg', 'bg']),
(' berg ', 'bg '), (' berg ', ' bg '), ('burg ', [' bg', ' burg', 'bg', 'burg'])]
('burg ', 'burg '), ('burg ', ' burg '),
(' burg ', ' burg '), (' burg ', 'burg '),
('burg ', 'bg '), ('burg ', ' bg '),
(' burg ', 'bg '), (' burg ', ' bg ')}