From 2a508b6c99b26dbe64ca185af5f63617d4b5d271 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Fri, 30 May 2025 12:03:00 +0200 Subject: [PATCH] fix missing optional return --- src/nominatim_db/tokenizer/base.py | 2 +- src/nominatim_db/tokenizer/icu_tokenizer.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nominatim_db/tokenizer/base.py b/src/nominatim_db/tokenizer/base.py index af2816ec..4295aaf4 100644 --- a/src/nominatim_db/tokenizer/base.py +++ b/src/nominatim_db/tokenizer/base.py @@ -37,7 +37,7 @@ class AbstractAnalyzer(ABC): """ @abstractmethod - def get_word_token_info(self, words: List[str]) -> List[Tuple[str, str, int]]: + def get_word_token_info(self, words: List[str]) -> List[Tuple[str, str, Optional[int]]]: """ Return token information for the given list of words. The function is used for testing and debugging only diff --git a/src/nominatim_db/tokenizer/icu_tokenizer.py b/src/nominatim_db/tokenizer/icu_tokenizer.py index 889bf531..b7fa8682 100644 --- a/src/nominatim_db/tokenizer/icu_tokenizer.py +++ b/src/nominatim_db/tokenizer/icu_tokenizer.py @@ -338,7 +338,7 @@ class ICUNameAnalyzer(AbstractAnalyzer): """ return cast(str, self.token_analysis.normalizer.transliterate(name)).strip() - def get_word_token_info(self, words: Sequence[str]) -> List[Tuple[str, str, int]]: + def get_word_token_info(self, words: Sequence[str]) -> List[Tuple[str, str, Optional[int]]]: """ 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. @@ -362,11 +362,11 @@ class ICUNameAnalyzer(AbstractAnalyzer): cur.execute("""SELECT word_token, word_id FROM word WHERE word_token = ANY(%s) and type = 'W' """, (list(full_tokens.values()),)) - full_ids = {r[0]: r[1] for r in cur} + full_ids = {r[0]: cast(int, r[1]) for r in cur} cur.execute("""SELECT word_token, word_id FROM word WHERE word_token = ANY(%s) and type = 'w'""", (list(partial_tokens.values()),)) - part_ids = {r[0]: r[1] for r in cur} + part_ids = {r[0]: cast(int, r[1]) for r in cur} return [(k, v, full_ids.get(v, None)) for k, v in full_tokens.items()] \ + [(k, v, part_ids.get(v, None)) for k, v in partial_tokens.items()] -- 2.39.5