fmtr.tools 1.3.3__tar.gz → 1.3.4__tar.gz

{fmtr_tools-1.3.3 → fmtr_tools-1.3.4}/PKG-INFO

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

{fmtr_tools-1.3.3 → fmtr_tools-1.3.4}/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-1.3.3 → fmtr_tools-1.3.4}/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-1.3.4/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.4

{fmtr_tools-1.3.3 → fmtr_tools-1.3.4}/fmtr.tools.egg-info/PKG-INFO

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

{fmtr_tools-1.3.3 → fmtr_tools-1.3.4}/fmtr.tools.egg-info/requires.txt

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

{fmtr_tools-1.3.3 → fmtr_tools-1.3.4}/setup.py

@@ -31,7 +31,7 @@ DEPENDENCIES = {
     'google.api': ['google-auth', 'google-auth-oauthlib', 'google-auth-httplib2', 'google-api-python-client'],
     'caching': ['diskcache'],
     'pdf': ['pymupdf', 'dm', 'pymupdf4llm'],
-    'debug': ['pydevd-pycharm'],
+    'debug': ['pydevd-pycharm~=251.25410.159'],
     'sets': ['pydantic-settings', 'dm', 'yaml'],
     'path.app': ['appdirs'],
     'path.type': ['filetype'],

fmtr_tools-1.3.3/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.3