fmtr.tools 1.3.2__tar.gz → 1.3.4__tar.gz

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

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

{fmtr_tools-1.3.2 → fmtr_tools-1.3.4}/fmtr/tools/dns_tools/proxy.py

@@ -41,7 +41,7 @@ class Proxy(server.Plain):
 
         request = exchange.request
 
-        with logger.span(f'Handling request ID {request.message.id} for {request.name_text} from {exchange.client}...'):
+        with logger.span(f'Handling request {request.message.id=} {request.question=} {exchange.client=}...'):
 
             if not request.is_valid:
                 raise ValueError(f'Only one question per request is supported. Got {len(request.question)} questions.')
@@ -51,7 +51,7 @@ class Proxy(server.Plain):
             if exchange.response.is_complete:
                 return
 
-            with logger.span(f'Making upstream request for {request.name_text}...'):
+            with logger.span(f'Making upstream request...'):
                 self.client.resolve(exchange)
             if exchange.response.is_complete:
                 return
@@ -61,8 +61,7 @@ class Proxy(server.Plain):
             if exchange.response.is_complete:
                 return
 
-            if exchange.response:
-                return
-
             exchange.response.is_complete = True
-            return
+
+        logger.info(f'Resolution complete {request.message.id=} {exchange.response.answer=}')
+        return

{fmtr_tools-1.3.2 → 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.2 → fmtr_tools-1.3.4}/fmtr/tools/pattern_tools.py

@@ -1,8 +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.logging_tools import logger
 from fmtr.tools.string_tools import join
 
@@ -25,11 +26,6 @@ def alt(*patterns):
     pattern = MASK_GROUP.format(pattern=pattern)
     return pattern
 
-
-
-
-
-
 @dataclass
 class Key:
     RECORD_SEP = '␞'
@@ -93,17 +89,18 @@ class Item:
     Key-value pair
 
     """
-    key: Key
-    value: Key
+    source: Key
+    target: Key
 
 @dataclass
-class Mapper:
+class Transformer:
     """
     
     Pattern-based, dictionary-like mapper.
-    Compiles a single regex pattern from a list of rules, and determines which rule matched.
-    It supports initialization from structured rule data, execution of a single lookup pass, and
-    recursive lookups until a stable state is reached.
+    Compiles an complex set of rules into single regex pattern, and determines which rule matched.
+    Inputs are then transformed according to the matching rule.
+    Works like a pattern-based dictionary when is_recursive==False.
+    Works something like an FSA/transducer when is_recursive=True.
 
     """
     PREFIX_GROUP = '__'
@@ -111,22 +108,27 @@ class Mapper:
     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):
+    def pattern(self) -> str:
         """
         
-        Provides a dynamically generated regex pattern based on the rules provided.
+        Dynamically generated regex pattern based on the rules provided.
 
         """
         patterns = [
-            MASK_NAMED.format(key=f'{self.PREFIX_GROUP}{i}', pattern=item.key.pattern)
+            MASK_NAMED.format(key=f'{self.PREFIX_GROUP}{i}', pattern=item.source.pattern)
             for i, item in enumerate(self.items)
         ]
         pattern = alt(*patterns)
         return pattern
 
     @cached_property
-    def rx(self):
+    def rx(self) -> re.Pattern:
         """
 
         Regex object.
@@ -134,24 +136,31 @@ class Mapper:
         """
         return re.compile(self.pattern)
 
-    def get_default(self, key: Key):
+    def get_default(self, key: Key) -> Any:
+        """
+
+        Define what to return in case of no match
+
+        """
         if self.is_recursive:
             return key
         else:
             return self.default
 
-    def get(self, key: Key) -> Key:
+    def get(self, key: Key) -> Key | Any:
         """
 
         Use recursive or single lookup pass, depending on whether recursive lookups have been specified.
 
         """
         if self.is_recursive:
-            return self.get_recursive(key)
+            with logger.span(f'Transforming recursively {key=}...'):
+                return self.get_recursive(key)
         else:
-            return self.get_one(key)
+            with logger.span(f'Transforming linearly {key=}...'):
+                return self.get_one(key)
 
-    def get_one(self, key: Key):
+    def get_one(self, key: Key) -> Key | Any:
         """
 
         Single lookup pass.
@@ -163,7 +172,7 @@ class Mapper:
 
         if not match:
             value = self.get_default(key)
-            logger.debug(f'No match for {key=}.')
+            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}
@@ -179,19 +188,21 @@ class Mapper:
             rule_id = next(iter(rule_ids))
             rule = self.items[rule_id]
 
-            if isinstance(rule.value, Key):
-                value = rule.value.transform(match)
+            logger.debug(f'Matched using {rule_id=}: {rule.source=}')
+
+            if isinstance(rule.target, Key):
+                value = rule.target.transform(match)
             else:
-                value = rule.value
+                value = rule.target
 
-            logger.debug(f'Matched using {rule_id=}: {key=} → {value=}')
+            logger.debug(f'Transformed using {rule_id=}: {key=} → {value=}')
 
         return value
 
-    def get_recursive(self, key: Key) -> Key:
+    def get_recursive(self, key: Key) -> Key | Any:
         """
 
-        Lookup the provided text by continuously applying lookup rules until no changes are made
+        Lookup the provided key by continuously applying transforms until no changes are made
         or a circular loop is detected.
 
         """
@@ -201,29 +212,28 @@ class Mapper:
         def get_history_str():
             return join(history, sep=' → ')
 
-        with logger.span(f'Matching {key=}...'):
-            while True:
-                if previous in history:
-                    history.append(previous)
-                    msg = f'Loop detected on node "{previous}": {get_history_str()}'
-                    raise RewriteCircularLoopError(msg)
-
+        while True:
+            if previous in history:
                 history.append(previous)
+                msg = f'Loop detected on node "{previous}": {get_history_str()}'
+                raise RewriteCircularLoopError(msg)
 
-                new = previous
-
-                new = self.get_one(new)
+            history.append(previous)
+            new = previous
+            new = self.get_one(new)
+            if new == previous:
+                break
+            previous = new
 
-                if new == previous:
-                    break
-
-                previous = new
+            if not isinstance(new, Key):
+                history.append(previous)
+                break
 
         if len(history) == 1:
-            history_str = 'No matching performed.'
+            history_str = 'No transforms performed.'
         else:
             history_str = get_history_str()
-        logger.debug(f'Finished matching: {history_str}')
+        logger.debug(f'Finished transforming: {history_str}')
 
         return previous
 

fmtr_tools-1.3.4/fmtr/tools/version

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

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

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

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

{fmtr_tools-1.3.2 → 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.2/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.2