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

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/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 = '__'
@@ -112,21 +109,21 @@ class Mapper:
     is_recursive: bool = False
 
     @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 +131,26 @@ class Mapper:
         """
         return re.compile(self.pattern)
 
-    def get_default(self, key: Key):
+    def get_default(self, key: Key) -> Any:
         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 +162,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.default=}')
         else:
 
             match_ids = {name: v for name, v in match.groupdict().items() if v}
@@ -179,19 +178,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 +202,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
+            history.append(previous)
+            new = previous
+            new = self.get_one(new)
+            if new == previous:
+                break
+            previous = new
 
-                new = self.get_one(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/version

@@ -1 +1 @@
-1.3.2
+1.3.3

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

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

{fmtr_tools-1.3.2.dist-info → fmtr_tools-1.3.3.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=GzdhKt-nIHuKCGI9y3aGUaD5k9thbqbA9UXJoPPIcIY,5328
+fmtr/tools/pattern_tools.py,sha256=qlyMVpkkzsoxV-TRhaevsNvLekFotqUsgf2DA8L0sGk,5689
 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=exPSrztkeQgMZ8VTDFGwb8f-z8T_NbtvtmOtm7IiqvA,5
+fmtr/tools/version,sha256=pbg4E5bSWOYbKrcebHaTPc25w2I4kZ1HI9h4zfIedp8,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
@@ -53,7 +53,7 @@ fmtr/tools/ai_tools/inference_tools.py,sha256=2UP2gXEyOJUjyyV6zmFIYmIxUsh1rXkRH0
 fmtr/tools/dns_tools/__init__.py,sha256=PjD3Og6D5yvDVpKmsUsrnSpz_rjXpl4zBtvMqm8xKWU,237
 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=0TULVnD3FlZNAsNINy8bcbimTNvmkwvzXeMnOkdUqvw,1879
+fmtr/tools/dns_tools/proxy.py,sha256=L0utKw8D1JXtAW9IfXcBdNMb-AyPFgW5XGiPnWuk7D8,1878
 fmtr/tools/dns_tools/server.py,sha256=0RLsyVH8C-15PAJgqMNqxbHTPbTWkq_thh8nnS1clAg,892
 fmtr/tools/entrypoints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/entrypoints/cache_hfh.py,sha256=fQNs4J9twQuZH_Yj98-oOvEX7-LrSUP3kO8nzw2HrHs,60
@@ -74,9 +74,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.2.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.2.dist-info/METADATA,sha256=KlWOZL7_0eJCCM3bZtnujinv89YPLmtU4LcDg7JZx9I,16030
-fmtr_tools-1.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.2.dist-info/entry_points.txt,sha256=fSQrDGNctdQXbUxpMWYVfVQ0mhZMDyaEDG3D3a0zOSc,278
-fmtr_tools-1.3.2.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.2.dist-info/RECORD,,
+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,,