forked from adbar/simplemma
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a dictionary factory backed by MARISA-tries (adbar#133)
* Add a dictionary factory backed by MARISA-tries This adds an additional dictionary factory backed by MARISA-tries. This dictionary factory on average offers 20x lower memory usage and 100x faster initialization time, in exchange for reduced lemmatization and language detection performance. The first time loading a dictionary with the `TrieDictionaryFactory` requires more memory and will take a few seconds, as the trie-backed dictionary has to be generated on-the-fly from the pickled dict-based dictionary first. * Change dictionary format to use strings again This changes the format of the dictionary returned by `DictionaryFactory().get_dictionary()` from `Dict[ByteString, ByteString]` to `Mapping[str, str] to accommodate alternative dictionary factory implementations better and to ease the dictionary handling again. This keeps the storage of pickled dictionaries with byte strings though, as they're smaller than when using strings.
- Loading branch information
Showing
14 changed files
with
450 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,8 @@ | ||
black==24.4.2 | ||
flake8==7.0.0 | ||
marisa_trie==1.2.0 | ||
mypy==1.10.0 | ||
platformdirs==4.2.2 | ||
pytest==8.2.1 | ||
pytest-cov==5.0.0 | ||
types-requests==2.32.0.20240523 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
"""Dictionary-based lemmatization strategy.""" | ||
|
||
from .dictionary_factory import DefaultDictionaryFactory, DictionaryFactory | ||
from .trie_directory_factory import TrieDictionaryFactory |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
simplemma/strategies/dictionaries/trie_directory_factory.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,123 @@ | ||
import logging | ||
from collections.abc import MutableMapping | ||
from functools import lru_cache | ||
from pathlib import Path | ||
from typing import List, Mapping, Optional | ||
|
||
from marisa_trie import BytesTrie, HUGE_CACHE # type: ignore[import-not-found] | ||
from platformdirs import user_cache_dir | ||
|
||
from simplemma import __version__ as SIMPLEMMA_VERSION | ||
from simplemma.strategies.dictionaries.dictionary_factory import ( | ||
DefaultDictionaryFactory, | ||
DictionaryFactory, | ||
SUPPORTED_LANGUAGES, | ||
) | ||
|
||
logger = logging.getLogger(__name__) | ||
|
||
|
||
class TrieWrapDict(MutableMapping): | ||
"""Wrapper around BytesTrie to make them behave like dicts.""" | ||
|
||
def __init__(self, trie: BytesTrie): | ||
self._trie = trie | ||
|
||
def __getitem__(self, item): | ||
return self._trie[item][0].decode() | ||
|
||
def __setitem__(self, key, value): | ||
raise NotImplementedError | ||
|
||
def __delitem__(self, key): | ||
raise NotImplementedError | ||
|
||
def __iter__(self): | ||
for key in self._trie.iterkeys(): | ||
yield key | ||
|
||
def __len__(self): | ||
return len(self._trie) | ||
|
||
|
||
class TrieDictionaryFactory(DictionaryFactory): | ||
"""Memory optimized DictionaryFactory backed by MARISA-tries. | ||
This dictionary factory creates dictionaries, which are backed by a | ||
MARISA-trie instead of a dict, to make them consume very little | ||
memory compared to the DefaultDictionaryFactory. Trade-offs are that | ||
lookup performance isn't as good as with dicts. | ||
""" | ||
|
||
__slots__: List[str] = [] | ||
|
||
def __init__( | ||
self, | ||
cache_max_size: int = 8, | ||
use_disk_cache: bool = True, | ||
disk_cache_dir: Optional[str] = None, | ||
) -> None: | ||
"""Initialize the TrieDictionaryFactory. | ||
Args: | ||
cache_max_size (int): The maximum number dictionaries to | ||
keep in memory. Defaults to `8`. | ||
use_disk_cache (bool): Whether to cache the tries on disk to | ||
speed up loading time. Defaults to `True`. | ||
disk_cache_dir (Optional[str]): Path where the generated | ||
tries should be stored in. Defaults to a Simplemma- | ||
specific subdirectory of the user's cache directory. | ||
""" | ||
|
||
if disk_cache_dir: | ||
self._cache_dir = Path(disk_cache_dir) | ||
else: | ||
self._cache_dir = ( | ||
Path(user_cache_dir("simplemma")) / "marisa_trie" / SIMPLEMMA_VERSION | ||
) | ||
self._use_disk_cache = use_disk_cache | ||
self._get_dictionary = lru_cache(maxsize=cache_max_size)( | ||
self._get_dictionary_uncached | ||
) | ||
|
||
def _create_trie_from_pickled_dict(self, lang: str) -> BytesTrie: | ||
"""Create a trie from a pickled dictionary.""" | ||
unpickled_dict = DefaultDictionaryFactory(cache_max_size=0).get_dictionary(lang) | ||
return BytesTrie( | ||
zip( | ||
unpickled_dict.keys(), | ||
[value.encode() for value in unpickled_dict.values()], | ||
), | ||
cache_size=HUGE_CACHE, | ||
) | ||
|
||
def _write_trie_to_disk(self, lang: str, trie: BytesTrie) -> None: | ||
"""Persist the trie to disk for later usage. | ||
The persisted trie can be loaded by subsequent runs to speed up | ||
loading times. | ||
""" | ||
logger.debug("Caching trie on disk. This might take a second.") | ||
self._cache_dir.mkdir(parents=True, exist_ok=True) | ||
|
||
trie.save(self._cache_dir / f"{lang}.dic") | ||
|
||
def _get_dictionary_uncached(self, lang: str) -> Mapping[str, str]: | ||
"""Get the dictionary for the given language.""" | ||
if lang not in SUPPORTED_LANGUAGES: | ||
raise ValueError(f"Unsupported language: {lang}") | ||
|
||
if self._use_disk_cache and (self._cache_dir / f"{lang}.dic").exists(): | ||
trie = BytesTrie().load(str(self._cache_dir / f"{lang}.dic")) | ||
else: | ||
trie = self._create_trie_from_pickled_dict(lang) | ||
if self._use_disk_cache: | ||
self._write_trie_to_disk(lang, trie) | ||
|
||
return TrieWrapDict(trie) | ||
|
||
def get_dictionary( | ||
self, | ||
lang: str, | ||
) -> Mapping[str, str]: | ||
return self._get_dictionary(lang) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.