fmtr.tools 1.3.7__tar.gz → 1.3.8__tar.gz

{fmtr_tools-1.3.7 → fmtr_tools-1.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.3.7
+Version: 1.3.8
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Home-page: https://github.com/fmtr/fmtr.tools
 Author: Frontmatter
@@ -97,6 +97,7 @@ Requires-Dist: google-auth-httplib2; extra == "google-api"
 Requires-Dist: google-api-python-client; extra == "google-api"
 Provides-Extra: caching
 Requires-Dist: diskcache; extra == "caching"
+Requires-Dist: cachetools; extra == "caching"
 Provides-Extra: pdf
 Requires-Dist: pymupdf; extra == "pdf"
 Requires-Dist: pydantic; extra == "pdf"
@@ -130,60 +131,61 @@ Requires-Dist: logfire[httpx]; extra == "http"
 Provides-Extra: setup
 Requires-Dist: setuptools; extra == "setup"
 Provides-Extra: all
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: regex; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: flet[all]; extra == "all"
-Requires-Dist: Unidecode; extra == "all"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: flet-webview; extra == "all"
+Requires-Dist: distributed; extra == "all"
 Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: fastapi; extra == "all"
 Requires-Dist: pytest-cov; extra == "all"
-Requires-Dist: json_repair; extra == "all"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: torchaudio; extra == "all"
+Requires-Dist: docker; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: openai; extra == "all"
 Requires-Dist: semver; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
-Requires-Dist: html2text; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: logfire; extra == "all"
+Requires-Dist: faker; extra == "all"
+Requires-Dist: appdirs; extra == "all"
 Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: flet-video; extra == "all"
-Requires-Dist: transformers[sentencepiece]; extra == "all"
-Requires-Dist: pydantic-settings; extra == "all"
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: distributed; extra == "all"
-Requires-Dist: httpx; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
+Requires-Dist: regex; extra == "all"
 Requires-Dist: google-auth; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: bokeh; extra == "all"
+Requires-Dist: ollama; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: pymupdf; extra == "all"
+Requires-Dist: uvicorn[standard]; extra == "all"
+Requires-Dist: httpx_retries; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: dask[bag]; extra == "all"
 Requires-Dist: tabulate; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: torchvision; extra == "all"
+Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: pymupdf4llm; extra == "all"
 Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
 Requires-Dist: diskcache; extra == "all"
-Requires-Dist: faker; extra == "all"
-Requires-Dist: docker; extra == "all"
+Requires-Dist: pydantic-settings; extra == "all"
+Requires-Dist: google-auth-httplib2; extra == "all"
+Requires-Dist: flet-video; extra == "all"
 Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: pydantic; extra == "all"
 Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
-Requires-Dist: appdirs; extra == "all"
-Requires-Dist: flet-webview; extra == "all"
-Requires-Dist: dask[bag]; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
-Requires-Dist: torchaudio; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: setuptools; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: pydantic; extra == "all"
+Requires-Dist: peft; extra == "all"
+Requires-Dist: transformers[sentencepiece]; extra == "all"
+Requires-Dist: torchvision; extra == "all"
 Requires-Dist: pandas; extra == "all"
+Requires-Dist: html2text; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: pyyaml; extra == "all"
 Requires-Dist: google-api-python-client; extra == "all"
-Requires-Dist: peft; extra == "all"
+Requires-Dist: openpyxl; extra == "all"
+Requires-Dist: setuptools; extra == "all"
+Requires-Dist: json_repair; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.3.7 → fmtr_tools-1.3.8}/fmtr/tools/caching_tools.py

@@ -1,6 +1,8 @@
+import cachetools
+from datetime import timedelta, datetime
 from diskcache import Cache
 
-from fmtr.tools import logger, Path
+from fmtr.tools import logger, Path, Constants
 
 
 class Dump(dict):
@@ -31,9 +33,9 @@ class Disk(Cache):
             if not path.parent.exists():
                 raise FileNotFoundError(f"Directory {path.parent=} does not exist")
             if path and not path.exists():
-                logger.warning(f'Cache does not exist. Will be created. "{path=}"...')
+                logger.warning(f'Cache does not exist. Will be created. {str(path)=}...')
 
-            logger.info(f'Initializing Disk Cache at path "{path=}"...')
+            logger.info(f'Initializing Disk Cache {str(path)=}...')
 
         super().__init__(directory=str(path / self.ROOT_KEY), **settings)
 
@@ -95,7 +97,101 @@ class Disk(Cache):
         return self.dump()
 
 
+class TLRU(cachetools.TLRUCache):
+    """
+
+    Subclass to include logging and simplify global TTU
+
+    """
+    MASK_MAPPING = '{key} ' + Constants.ARROW + ' {value}'
+
+    def __init__(self, maxsize=1_024, timer=datetime.now, getsizeof=None, ttu_static=None, desc=None):
+        """
+
+        Add overridable TTU method
+
+        """
+        super().__init__(maxsize=maxsize, ttu=self.get_ttu, timer=timer, getsizeof=getsizeof)
+        self.ttu_static = ttu_static
+        self.desc = desc
+
+    @property
+    def cache_desc(self):
+        """
+
+        Friendly description of cache
+
+        """
+        desc = self.desc or self.__class__.__name__
+        return desc
+
+    def get_ttu(self, _key, value, now) -> float | timedelta:
+        """
+
+        Default implementation just adds on the static TTU
+
+        """
+        return now + self.ttu_static
+
+    def expire(self, time=None):
+        """
+
+        Log expiry
+
+        """
+        items = super().expire(time)
+        if not items:
+            return items
+
+        with logger.span(f'{self.desc} cache expiry {len(items)=}...'):
+            for key, value in items:
+                logger.debug(self.MASK_MAPPING.format(key=key, value=value))
+
+        return items
+
+    def popitem(self):
+        """
+
+        Log eviction
+
+        """
+        key, value = super().popitem()
+        logger.debug(f'{self.desc} cache eviction: {self.MASK_MAPPING.format(key=key, value=value)}')
+        return key, value
+
+    def dump(self):
+        """
+
+        Dump contents
+
+        """
+        data = Dump(self.items())
+        return data
+
+    @property
+    def data(self):
+        """
+
+        Dump as property
+
+        """
+        return self.dump()
+
+
+
 if __name__ == '__main__':
+    sec10 = timedelta(seconds=10)
+    c = TLRU(ttu_static=sec10, maxsize=2, desc='Test Data')
+    c['test'] = 'val'
+    c['test2'] = 'val2'
+    c['test3'] = 'val3'
+    c
+
+
+
+
+
+
     path_tmp_cache = Path.cwd().parent.parent / 'data' / 'cache'
     tc = Disk(path_tmp_cache)
 

{fmtr_tools-1.3.7 → fmtr_tools-1.3.8}/fmtr/tools/constants.py

@@ -14,6 +14,9 @@ class Constants:
     DATETIME_NOW_STR = DATETIME_NOW.strftime(DATETIME_FILENAME_FORMAT)
     SERIALIZATION_INDENT = 4
 
+    ARROW = '→'
+    ARROW_SEP = f' {ARROW} '
+
     FMTR_LOG_LEVEL_KEY = 'FMTR_LOG_LEVEL'
     FMTR_OBS_API_KEY_KEY = 'FMTR_OBS_API_KEY'
     FMTR_OBS_HOST = 'obs.sv.fmtr.dev'
@@ -31,6 +34,7 @@ class Constants:
     FILENAME_CONFIG = 'settings.yaml'
     DIR_NAME_REPO = 'repo'
     DIR_NAME_DATA = 'data'
+    DIR_NAME_CACHE = 'cache'
     DIR_NAME_ARTIFACT = 'artifact'
     DIR_NAME_SOURCE = 'source'
     FILENAME_VERSION = 'version'

{fmtr_tools-1.3.7 → fmtr_tools-1.3.8}/fmtr/tools/logging_tools.py

@@ -52,7 +52,7 @@ def get_logger(name, version=None, host=Constants.FMTR_OBS_HOST, key=None, org=C
     lev_name_otel = logfire._internal.constants.NUMBER_TO_LEVEL[lev_num_otel]
 
     console_opts = logfire.ConsoleOptions(
-        colors='always' if environment_tools.IS_DEBUG else 'auto',
+        colors='always',
         min_log_level=lev_name_otel,
     )
 

{fmtr_tools-1.3.7 → fmtr_tools-1.3.8}/fmtr/tools/path_tools/path_tools.py

@@ -305,6 +305,16 @@ class PackagePaths(FromCallerMixin):
 
         return self.dev / Constants.DIR_NAME_REPO / self.name_ns / self.dir_name_data
 
+    @property
+    def cache(self) -> Path:
+        """
+
+        Path of cache directory.
+
+        """
+
+        return self.data / Constants.DIR_NAME_CACHE
+
     @property
     def artifact(self) -> Path:
         """

{fmtr_tools-1.3.7 → fmtr_tools-1.3.8}/fmtr/tools/pattern_tools.py

@@ -1,9 +1,9 @@
+import regex as re
 from dataclasses import dataclass, asdict
 from functools import cached_property
 from typing import List, Any
 
-import regex as re
-
+from fmtr.tools import Constants
 from fmtr.tools.logging_tools import logger
 from fmtr.tools.string_tools import join
 
@@ -210,7 +210,7 @@ class Transformer:
         previous = key
 
         def get_history_str():
-            return join(history, sep=' → ')
+            return join(history, sep=Constants.ARROW_SEP)
 
         while True:
             if previous in history:

fmtr_tools-1.3.8/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.8

{fmtr_tools-1.3.7 → fmtr_tools-1.3.8}/fmtr.tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.3.7
+Version: 1.3.8
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Home-page: https://github.com/fmtr/fmtr.tools
 Author: Frontmatter
@@ -97,6 +97,7 @@ Requires-Dist: google-auth-httplib2; extra == "google-api"
 Requires-Dist: google-api-python-client; extra == "google-api"
 Provides-Extra: caching
 Requires-Dist: diskcache; extra == "caching"
+Requires-Dist: cachetools; extra == "caching"
 Provides-Extra: pdf
 Requires-Dist: pymupdf; extra == "pdf"
 Requires-Dist: pydantic; extra == "pdf"
@@ -130,60 +131,61 @@ Requires-Dist: logfire[httpx]; extra == "http"
 Provides-Extra: setup
 Requires-Dist: setuptools; extra == "setup"
 Provides-Extra: all
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: regex; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: flet[all]; extra == "all"
-Requires-Dist: Unidecode; extra == "all"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: flet-webview; extra == "all"
+Requires-Dist: distributed; extra == "all"
 Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: fastapi; extra == "all"
 Requires-Dist: pytest-cov; extra == "all"
-Requires-Dist: json_repair; extra == "all"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: torchaudio; extra == "all"
+Requires-Dist: docker; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: openai; extra == "all"
 Requires-Dist: semver; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
-Requires-Dist: html2text; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: logfire; extra == "all"
+Requires-Dist: faker; extra == "all"
+Requires-Dist: appdirs; extra == "all"
 Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: flet-video; extra == "all"
-Requires-Dist: transformers[sentencepiece]; extra == "all"
-Requires-Dist: pydantic-settings; extra == "all"
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: distributed; extra == "all"
-Requires-Dist: httpx; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
+Requires-Dist: regex; extra == "all"
 Requires-Dist: google-auth; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: bokeh; extra == "all"
+Requires-Dist: ollama; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: pymupdf; extra == "all"
+Requires-Dist: uvicorn[standard]; extra == "all"
+Requires-Dist: httpx_retries; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: dask[bag]; extra == "all"
 Requires-Dist: tabulate; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: torchvision; extra == "all"
+Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: pymupdf4llm; extra == "all"
 Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
 Requires-Dist: diskcache; extra == "all"
-Requires-Dist: faker; extra == "all"
-Requires-Dist: docker; extra == "all"
+Requires-Dist: pydantic-settings; extra == "all"
+Requires-Dist: google-auth-httplib2; extra == "all"
+Requires-Dist: flet-video; extra == "all"
 Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: pydantic; extra == "all"
 Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
-Requires-Dist: appdirs; extra == "all"
-Requires-Dist: flet-webview; extra == "all"
-Requires-Dist: dask[bag]; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
-Requires-Dist: torchaudio; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: setuptools; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: pydantic; extra == "all"
+Requires-Dist: peft; extra == "all"
+Requires-Dist: transformers[sentencepiece]; extra == "all"
+Requires-Dist: torchvision; extra == "all"
 Requires-Dist: pandas; extra == "all"
+Requires-Dist: html2text; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: pyyaml; extra == "all"
 Requires-Dist: google-api-python-client; extra == "all"
-Requires-Dist: peft; extra == "all"
+Requires-Dist: openpyxl; extra == "all"
+Requires-Dist: setuptools; extra == "all"
+Requires-Dist: json_repair; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.3.7 → fmtr_tools-1.3.8}/fmtr.tools.egg-info/requires.txt

@@ -15,60 +15,61 @@ pydantic-ai[logfire,openai]
 ollama
 
 [all]
-dnspython[doh]
-pymupdf4llm
-regex
-uvicorn[standard]
-tokenizers
-filetype
-flet[all]
-Unidecode
-pydantic-ai[logfire,openai]
+tinynetrc
+flet-webview
+distributed
 logfire[httpx]
-bokeh
-fastapi
 pytest-cov
-json_repair
+pydevd-pycharm~=251.25410.159
+torchaudio
+docker
+httpx
+pydantic-ai[logfire,openai]
+logfire[fastapi]
+filetype
+openai
 semver
-google-auth-oauthlib
-google-auth-httplib2
-html2text
+fastapi
+logfire
+faker
+appdirs
 sre_yield
-pymupdf
-flet-video
-transformers[sentencepiece]
-pydantic-settings
-ollama
-distributed
-httpx
+huggingface_hub
+regex
 google-auth
-openpyxl
-logfire[fastapi]
+bokeh
+ollama
+Unidecode
+deepmerge
+pymupdf
+uvicorn[standard]
+httpx_retries
+tokenizers
+dask[bag]
 tabulate
-tinynetrc
-torchvision
+flet[all]
+cachetools
+pymupdf4llm
 sentence_transformers
-pyyaml
 diskcache
-faker
-docker
+pydantic-settings
+google-auth-httplib2
+flet-video
 yamlscript
-pydantic
 contexttimer
-pydevd-pycharm~=251.25410.159
-appdirs
-flet-webview
-dask[bag]
-openai
-huggingface_hub
-torchaudio
-httpx_retries
-setuptools
-logfire
-deepmerge
+pydantic
+peft
+transformers[sentencepiece]
+torchvision
 pandas
+html2text
+google-auth-oauthlib
+pyyaml
 google-api-python-client
-peft
+openpyxl
+setuptools
+json_repair
+dnspython[doh]
 
 [api]
 fastapi
@@ -84,6 +85,7 @@ sre_yield
 
 [caching]
 diskcache
+cachetools
 
 [debug]
 pydevd-pycharm~=251.25410.159

{fmtr_tools-1.3.7 → fmtr_tools-1.3.8}/setup.py

@@ -29,7 +29,7 @@ DEPENDENCIES = {
     'html': ['html2text'],
     'interface': ['flet[all]', 'flet-video', 'flet-webview', 'dm'],
     'google.api': ['google-auth', 'google-auth-oauthlib', 'google-auth-httplib2', 'google-api-python-client'],
-    'caching': ['diskcache'],
+    'caching': ['diskcache', 'cachetools'],
     'pdf': ['pymupdf', 'dm', 'pymupdf4llm'],
     'debug': ['pydevd-pycharm~=251.25410.159'],
     'sets': ['pydantic-settings', 'dm', 'yaml'],

fmtr_tools-1.3.7/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.7