fmtr.tools 1.3.3__py3-none-any.whl → 1.3.5__py3-none-any.whl

fmtr/tools/dns_tools/server.py

@@ -2,6 +2,7 @@ import socket
 from dataclasses import dataclass
 
 from fmtr.tools.dns_tools.dm import Exchange
+from fmtr.tools.logging_tools import logger
 
 
 @dataclass
@@ -30,7 +31,7 @@ class Plain:
         """
         sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         sock.bind((self.host, self.port))
-        print(f"Listening on {self.host}:{self.port}")
+        logger.info(f'Listening on {self.host}:{self.port}')
         while True:
             data, (ip, port) = sock.recvfrom(512)
             exchange = Exchange.from_wire(data, ip=ip, port=port)

fmtr/tools/entrypoints/install_yamlscript.py

@@ -0,0 +1,8 @@
+def main():
+    """
+
+    Ensure YS binary is installed.
+
+    """
+    from fmtr.tools import yaml
+    return yaml.install()

fmtr/tools/pattern_tools.py

@@ -108,6 +108,11 @@ class Transformer:
     default: Any = None
     is_recursive: bool = False
 
+    def __post_init__(self):
+        with logger.span(f'Compiling expression {len(self.items)=}'):
+            rx = self.rx
+        logger.debug(f'Compiled successfully {rx.groups=}')
+
     @cached_property
     def pattern(self) -> str:
         """
@@ -132,6 +137,11 @@ class Transformer:
         return re.compile(self.pattern)
 
     def get_default(self, key: Key) -> Any:
+        """
+
+        Define what to return in case of no match
+
+        """
         if self.is_recursive:
             return key
         else:
@@ -162,7 +172,7 @@ class Transformer:
 
         if not match:
             value = self.get_default(key)
-            logger.debug(f'No match for {key=}. Returning {self.default=}')
+            logger.debug(f'No match for {key=}. Returning {self.get_default(key)=}')
         else:
 
             match_ids = {name: v for name, v in match.groupdict().items() if v}

fmtr/tools/version

@@ -1 +1 @@
-1.3.3
+1.3.5

{fmtr_tools-1.3.3.dist-info → fmtr_tools-1.3.5.dist-info}/METADATA

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

{fmtr_tools-1.3.3.dist-info → fmtr_tools-1.3.5.dist-info}/RECORD

@@ -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=qlyMVpkkzsoxV-TRhaevsNvLekFotqUsgf2DA8L0sGk,5689
+fmtr/tools/pattern_tools.py,sha256=EYKtBPnoBwTpvTPZWLYGrRFIGnSg2R6Tv2VmxvoJDog,5959
 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=pbg4E5bSWOYbKrcebHaTPc25w2I4kZ1HI9h4zfIedp8,5
+fmtr/tools/version,sha256=A3CRagPGF-vPgHHT1p_3Z_XER8Hoz9D7TibYsZEJVmU,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
@@ -54,10 +54,11 @@ fmtr/tools/dns_tools/__init__.py,sha256=PjD3Og6D5yvDVpKmsUsrnSpz_rjXpl4zBtvMqm8x
 fmtr/tools/dns_tools/client.py,sha256=c2vzWBDZSxijwL1KvWUoDGc8wqk_KTAFxCr0P1rNjy8,2367
 fmtr/tools/dns_tools/dm.py,sha256=KWQeeZhsDyrKoXzAD5zEOoHH3aiD4uKRqwnD8fFP1nI,3725
 fmtr/tools/dns_tools/proxy.py,sha256=L0utKw8D1JXtAW9IfXcBdNMb-AyPFgW5XGiPnWuk7D8,1878
-fmtr/tools/dns_tools/server.py,sha256=0RLsyVH8C-15PAJgqMNqxbHTPbTWkq_thh8nnS1clAg,892
+fmtr/tools/dns_tools/server.py,sha256=t38TmSpra3FRoMk351eHzOOPlSuaCyjxbvPwX9o15ak,942
 fmtr/tools/entrypoints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/entrypoints/cache_hfh.py,sha256=fQNs4J9twQuZH_Yj98-oOvEX7-LrSUP3kO8nzw2HrHs,60
 fmtr/tools/entrypoints/ep_test.py,sha256=B8HfWISfSgw_xVX475CbJGh_QnpOe9MH65H8qGjTWbY,46
+fmtr/tools/entrypoints/install_yamlscript.py,sha256=_q1OSjV2eja0JFlyS6Fyhx0xx4cFU1esX3X6TKZGG04,123
 fmtr/tools/entrypoints/remote_debug_test.py,sha256=wmKg9o2pQq7eqeHmaO8oviujNgtnsCVEXOdXLIcQWs4,123
 fmtr/tools/entrypoints/shell_debug.py,sha256=0No3tAg9Ri4_vvSlQCUtAY-11HR0nE45i0VVtiAViwY,106
 fmtr/tools/path_tools/__init__.py,sha256=v5CpmzXq5Ii90FtcmxAJKiLxmguZMrPnQ_HdT872Np0,443
@@ -74,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.3.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.3.dist-info/METADATA,sha256=mqGPV0sovCZznll14sPWlH6fr1oa1WdyPit9_WiOu0I,16030
-fmtr_tools-1.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.3.dist-info/entry_points.txt,sha256=fSQrDGNctdQXbUxpMWYVfVQ0mhZMDyaEDG3D3a0zOSc,278
-fmtr_tools-1.3.3.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.3.dist-info/RECORD,,
+fmtr_tools-1.3.5.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.5.dist-info/METADATA,sha256=BZUlxcIQC0rSnj6GtCK86nkFIqmDK7ArsG8sRi1VRrc,16060
+fmtr_tools-1.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.5.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.5.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.5.dist-info/RECORD,,

{fmtr_tools-1.3.3.dist-info → fmtr_tools-1.3.5.dist-info}/entry_points.txt

@@ -1,5 +1,6 @@
 [console_scripts]
 fmtr-tools-cache-hfh = fmtr.tools.entrypoints.cache_hfh:main
 fmtr-tools-ep-test = fmtr.tools.entrypoints.ep_test:main
+fmtr-tools-install-yamlscript = fmtr.tools.entrypoints.install_yamlscript:main
 fmtr-tools-remote-debug-test = fmtr.tools.entrypoints.remote_debug_test:main
 fmtr-tools-shell-debug = fmtr.tools.entrypoints.shell_debug:main