fmtr.tools 1.3.7__py3-none-any.whl → 1.3.8__py3-none-any.whl

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/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/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/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/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/version

@@ -1 +1 @@
-1.3.7
+1.3.8

{fmtr_tools-1.3.7.dist-info → fmtr_tools-1.3.8.dist-info}/METADATA

@@ -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: html2text; extra == "all"
+Requires-Dist: appdirs; extra == "all"
+Requires-Dist: httpx_retries; extra == "all"
+Requires-Dist: diskcache; extra == "all"
+Requires-Dist: google-auth; extra == "all"
+Requires-Dist: docker; extra == "all"
+Requires-Dist: faker; extra == "all"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: sre_yield; extra == "all"
 Requires-Dist: fastapi; extra == "all"
-Requires-Dist: flet-video; extra == "all"
 Requires-Dist: bokeh; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: pydantic-settings; extra == "all"
-Requires-Dist: json_repair; extra == "all"
-Requires-Dist: html2text; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: torchaudio; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
+Requires-Dist: pymupdf; extra == "all"
+Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: pydantic; extra == "all"
 Requires-Dist: dnspython[doh]; extra == "all"
 Requires-Dist: pandas; extra == "all"
-Requires-Dist: google-api-python-client; extra == "all"
-Requires-Dist: diskcache; extra == "all"
+Requires-Dist: yamlscript; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: regex; extra == "all"
 Requires-Dist: peft; extra == "all"
+Requires-Dist: transformers[sentencepiece]; extra == "all"
+Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: flet-video; extra == "all"
+Requires-Dist: logfire; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: distributed; extra == "all"
+Requires-Dist: contexttimer; extra == "all"
 Requires-Dist: pymupdf4llm; extra == "all"
 Requires-Dist: setuptools; extra == "all"
-Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: flet[all]; extra == "all"
-Requires-Dist: tabulate; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
-Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: flet-webview; extra == "all"
+Requires-Dist: uvicorn[standard]; extra == "all"
 Requires-Dist: logfire[httpx]; extra == "all"
+Requires-Dist: json_repair; extra == "all"
+Requires-Dist: pyyaml; extra == "all"
+Requires-Dist: openpyxl; extra == "all"
 Requires-Dist: semver; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: regex; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
-Requires-Dist: distributed; extra == "all"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: torchaudio; extra == "all"
+Requires-Dist: pydantic-settings; extra == "all"
 Requires-Dist: dask[bag]; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: pytest-cov; extra == "all"
-Requires-Dist: faker; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: tabulate; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: torchvision; extra == "all"
 Requires-Dist: Unidecode; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
-Requires-Dist: appdirs; extra == "all"
-Requires-Dist: transformers[sentencepiece]; extra == "all"
+Requires-Dist: sentence_transformers; extra == "all"
 Requires-Dist: google-auth-httplib2; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
-Requires-Dist: pydantic; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: torchvision; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: docker; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: google-auth; extra == "all"
+Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: flet-webview; extra == "all"
+Requires-Dist: ollama; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.3.7.dist-info → fmtr_tools-1.3.8.dist-info}/RECORD

@@ -2,8 +2,8 @@ fmtr/tools/__init__.py,sha256=vCxKR0SymygpO-EtCGPmGZEQv5O1goM7Jr8P4m-eJsQ,5676
 fmtr/tools/api_tools.py,sha256=w8Zrp_EwN5KlUghwLoTCXo4z1irg5tAsReCqDLjASfE,2133
 fmtr/tools/async_tools.py,sha256=ewz757WcveQJd-G5SVr2JDOQVbdLGecCgl-tsBGVZz4,284
 fmtr/tools/augmentation_tools.py,sha256=-6ESbO4CDlKqVOV1J1V6qBeoBMzbFIinkDHRHnCBej0,55
-fmtr/tools/caching_tools.py,sha256=UOCYUNvLQ-NofR_dhqBmZF96-HRPf4At5MmxVk3gAIk,2943
-fmtr/tools/constants.py,sha256=FOHvjovW_pHIvym9OXKZnztPvPVvudyG5S01i7XtXKE,1352
+fmtr/tools/caching_tools.py,sha256=BZ5HSzcyCSnvJ6h5xtu5jELPSPDazVsMU7q7OX_oKBE,4886
+fmtr/tools/constants.py,sha256=QHJWu2UZwdV1ceGKT-pq-eYGPw4t7aFxb_W8r4G9VVk,1429
 fmtr/tools/data_modelling_tools.py,sha256=0BFm-F_cYzVTxftWQwORkPd0FM2BTLVh9-s0-rTTFoo,1744
 fmtr/tools/dataclass_tools.py,sha256=0Gt6KeLhtPgubo_2tYkIVqB8oQ91Qzag8OAGZDdjvMU,1209
 fmtr/tools/datatype_tools.py,sha256=3P4AWIFGkJ-UqvXlj0Jc9IvkIIgTOE9jRrOk3NVbpH8,1508
@@ -22,7 +22,7 @@ fmtr/tools/interface_tools.py,sha256=JVYUV7wuMr24BORuUtNaBlTeBFt8VDGJ3HPRajd7Y_4
 fmtr/tools/iterator_tools.py,sha256=xj5f0c7LgLK53dddRRRJxBoLaBzlZoQS3_GfmpDPMoo,1311
 fmtr/tools/json_fix_tools.py,sha256=vNSlswVQnujPmKEqDjFJcO901mjMyv59q3awsT7mlhs,477
 fmtr/tools/json_tools.py,sha256=WkFc5q7oqMtcFejhN1K5zQFULa9TdLOup83Fr0saDRY,348
-fmtr/tools/logging_tools.py,sha256=XYAkthur0Nrc9uCuw7QYupfRWt-MSdcb9Y1YH1GcTKM,2374
+fmtr/tools/logging_tools.py,sha256=rVNoq46hsO3wF1dnpaGZxu_usFV_SLy16MlKbhivN_M,2332
 fmtr/tools/merging_tools.py,sha256=KDxCEFJEQJEwGw1qGKAgR55uUE2X2S5NWLKcfHRmX_k,227
 fmtr/tools/metric_tools.py,sha256=Lvia5CGFRIfrDFA8s37btIfTU5zHbo04cPJdAMtbndQ,272
 fmtr/tools/name_tools.py,sha256=5CB_phqhHjl66iI8oLxOGPF2odC1apdul-M8Fv2xBhs,5514
@@ -30,7 +30,7 @@ fmtr/tools/netrc_tools.py,sha256=PpNpz_mWlQi6VHGromKwFfTyLpHUXsd4LY6-OKLCbeI,376
 fmtr/tools/openai_tools.py,sha256=6SUgejgzUzmlKKct2_ePXntvMegu3FJgfk9x7aqtqYc,742
 fmtr/tools/packaging_tools.py,sha256=FlgOTnDRHZWQL2iR-wucTsyGEHRE-MlddKL30MPmUqE,253
 fmtr/tools/parallel_tools.py,sha256=QEb_gN1StkxsqYaH4HSjiJX8Y3gpb2uKNsOzG4uFpaM,3071
-fmtr/tools/pattern_tools.py,sha256=EYKtBPnoBwTpvTPZWLYGrRFIGnSg2R6Tv2VmxvoJDog,5959
+fmtr/tools/pattern_tools.py,sha256=Rmengjn_Ya246mlkAVR9fxVxXJUqEHWdDYu8Hsl9pXw,6003
 fmtr/tools/pdf_tools.py,sha256=xvv9B84uAF81rFJRnXhSsxYuP42vY9ZdPVFrSMVe8G8,4069
 fmtr/tools/platform_tools.py,sha256=7p69CmAHe_sF68Fx9uVhns1k5EewTHTWgUYzkl6ZQKA,308
 fmtr/tools/process_tools.py,sha256=Ysh5Dk2QFBhXQerArjKdt7xZd3JrN5Ho02AaOjH0Nnw,1425
@@ -44,7 +44,7 @@ fmtr/tools/tabular_tools.py,sha256=tpIpZzYku1HcJrHZJL6BC39LmN3WUWVhFbK2N7nDVmE,1
 fmtr/tools/tokenization_tools.py,sha256=me-IBzSLyNYejLybwjO9CNB6Mj2NYfKPaOVThXyaGNg,4268
 fmtr/tools/tools.py,sha256=CAsApa1YwVdNE6H66Vjivs_mXYvOas3rh7fPELAnTpk,795
 fmtr/tools/unicode_tools.py,sha256=yS_9wpu8ogNoiIL7s1G_8bETFFO_YQlo4LNPv1NLDeY,52
-fmtr/tools/version,sha256=D6_5-XKSRJ7uMrgd-I-BK8oDjUQ8WiJUgC32EIRj8P4,5
+fmtr/tools/version,sha256=TcdU53CiqvG9NX8A4sH_s0eyfztzmjd5EWmCXTCwpQE,5
 fmtr/tools/version_tools.py,sha256=yNs_CGqWpqE4jbK9wsPIi14peJVXYbhIcMqHAFOw3yE,1480
 fmtr/tools/yaml_tools.py,sha256=9kuYChqJelWQIjGlSnK4iDdOWWH06P0gp9jIcRrC3UI,1903
 fmtr/tools/ai_tools/__init__.py,sha256=JZrLuOFNV1A3wvJgonxOgz_4WS-7MfCuowGWA5uYCjs,372
@@ -63,7 +63,7 @@ fmtr/tools/entrypoints/remote_debug_test.py,sha256=wmKg9o2pQq7eqeHmaO8oviujNgtns
 fmtr/tools/entrypoints/shell_debug.py,sha256=0No3tAg9Ri4_vvSlQCUtAY-11HR0nE45i0VVtiAViwY,106
 fmtr/tools/path_tools/__init__.py,sha256=v5CpmzXq5Ii90FtcmxAJKiLxmguZMrPnQ_HdT872Np0,443
 fmtr/tools/path_tools/app_path_tools.py,sha256=JrJvtTDd_gkCKcZtBCDTMktsM77PZwGV_hzQX0g5GU8,1722
-fmtr/tools/path_tools/path_tools.py,sha256=8WBzNctpds5tVT1-FcizAORrBCGlkUbPcfOel-Js7ps,7878
+fmtr/tools/path_tools/path_tools.py,sha256=eh30PpmH0wopy0wNWuPT84cmXY1EvqsTSDT7AV_GPOY,8034
 fmtr/tools/path_tools/type_path_tools.py,sha256=Zgs-ek-GXRKDIlVDGdg3muB0PIxTg2ba0NeHw6y8FWQ,40
 fmtr/tools/setup_tools/__init__.py,sha256=fUCjzyE4JBPEOZhC4B--VPj_eOCkQb1QG5PIgiGj03U,386
 fmtr/tools/setup_tools/setup_tools.py,sha256=7Z6jlU6UE8P4cntGQ_hJR7hGvoqwh15xzZY63cnxG7E,10363
@@ -75,9 +75,9 @@ fmtr/tools/tests/test_environment.py,sha256=iHaiMQfECYZPkPKwfuIZV9uHuWe3aE-p_dN_
 fmtr/tools/tests/test_json.py,sha256=IeSP4ziPvRcmS8kq7k9tHonC9rN5YYq9GSNT2ul6Msk,287
 fmtr/tools/tests/test_path.py,sha256=AkZQa6_8BQ-VaCyL_J-iKmdf2ZaM-xFYR37Kun3k4_g,2188
 fmtr/tools/tests/test_yaml.py,sha256=jc0TwwKu9eC0LvFGNMERdgBue591xwLxYXFbtsRwXVM,287
-fmtr_tools-1.3.7.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.7.dist-info/METADATA,sha256=k4qiny1GqJwYqNMhP27A0fmtJMk_z70R8KisCzcms-c,16060
-fmtr_tools-1.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.7.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.7.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.7.dist-info/RECORD,,
+fmtr_tools-1.3.8.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.8.dist-info/METADATA,sha256=m6mbZy-IYtew40xeEmDdyBYhxDLdfiLg_hhR_H2xMEc,16148
+fmtr_tools-1.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.8.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.8.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.8.dist-info/RECORD,,