fmtr.tools 1.3.11__py3-none-any.whl → 1.3.13__py3-none-any.whl

fmtr/tools/dns_tools/client.py

@@ -1,8 +1,7 @@
-from dataclasses import dataclass
-from functools import cached_property
-
 import dns as dnspython
+from dataclasses import dataclass
 from dns import query
+from functools import cached_property
 from httpx_retries import Retry, RetryTransport
 
 from fmtr.tools import http_tools as http
@@ -82,8 +81,14 @@ class HTTP:
 
         headers = self.HEADERS | dict(Host=self.host)
         url = self.url.format(host=self.ip)
-        response_doh = self.CLIENT.post(url, headers=headers, content=exchange.query_last.to_wire())
-        response_doh.raise_for_status()
-        response = Response.from_http(response_doh)
 
-        exchange.response.message.answer += response.message.answer
+        try:
+            response_doh = self.CLIENT.post(url, headers=headers, content=exchange.query_last.to_wire())
+            response_doh.raise_for_status()
+            response = Response.from_http(response_doh)
+            exchange.response.message.answer += response.message.answer
+
+        except Exception as exception:
+            exchange.response.message.set_rcode(dnspython.rcode.SERVFAIL)
+            exchange.response.is_complete = True
+            logger.exception(exception)

fmtr/tools/dns_tools/dm.py

@@ -1,6 +1,7 @@
 import dns
 import httpx
 from dataclasses import dataclass
+from dns import rcode as dnsrcode
 from dns.message import Message, QueryMessage
 from dns.rrset import RRset
 from functools import cached_property
@@ -58,6 +59,14 @@ class Response(BaseDNSData):
             return None
         return self.message.answer[-1]
 
+    @property
+    def rcode(self) -> dnsrcode.Rcode:
+        return self.message.rcode()
+
+    @property
+    def rcode_text(self) -> str:
+        return dnsrcode.to_text(self.rcode)
+
     def __str__(self):
         """
 

fmtr/tools/dns_tools/server.py

@@ -79,7 +79,10 @@ class Plain:
         if not request.is_valid:
             raise ValueError(f'Only one question per request is supported. Got {len(request.question)} questions.')
 
-        with logger.span(f'Handling request {request.message.id=} {request.question=} {exchange.client=}...'):
+        span = logger.span(
+            f'Handling request {request.message.id=} {request.type_text} {request.name_text} {request.question=} {exchange.ip=} {exchange.port=}...'
+        )
+        with span:
 
             with logger.span(f'Checking cache...'):
                 self.check_cache(exchange)
@@ -89,6 +92,9 @@ class Plain:
                 exchange.response.is_complete = True
 
             self.cache[exchange.key] = exchange.response
+            logger.info(f'Resolution complete {request.message.id=} {exchange.response.rcode_text=} {exchange.response.answer=}')
+
+            attribs = dict(rcode=exchange.response.rcode, rcode_text=exchange.response.rcode_text)
+            span.set_attributes(attribs)
 
-            logger.info(f'Resolution complete {request.message.id=} {exchange.response.answer=}')
         return exchange

fmtr/tools/version

@@ -1 +1 @@
-1.3.11
+1.3.13

{fmtr_tools-1.3.11.dist-info → fmtr_tools-1.3.13.dist-info}/METADATA

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

{fmtr_tools-1.3.11.dist-info → fmtr_tools-1.3.13.dist-info}/RECORD

@@ -44,16 +44,16 @@ 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=NHwZLjrWn5Hn9sdgFA0ixXGem916c9K6ERwYF7z_-dc,6
+fmtr/tools/version,sha256=328hBDnJV-prjTlVQ7pm2D7s-V9Yds2R3yjA2Xc9M4Q,6
 fmtr/tools/yaml_tools.py,sha256=Bhhyd6GQVKO72Lp8ky7bAUjIB_65Hdh0Q45SKIEe6S8,1901
 fmtr/tools/ai_tools/__init__.py,sha256=JZrLuOFNV1A3wvJgonxOgz_4WS-7MfCuowGWA5uYCjs,372
 fmtr/tools/ai_tools/agentic_tools.py,sha256=acSEPFS-aguDXanWGs3fAAlRyJSYPZW7L-Kb2qDLm-I,4300
 fmtr/tools/ai_tools/inference_tools.py,sha256=2UP2gXEyOJUjyyV6zmFIYmIxUsh1rXkRH0IbFvr2bRs,11908
 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=QqEYebamLWMzr1KM1x4P4dUvPZL_zvymZrNj6ghw0rg,4445
+fmtr/tools/dns_tools/client.py,sha256=zAPJbQZIuNJPTA-HDBtrVZHvHRP_7QYWLgH7D73g5LU,2598
+fmtr/tools/dns_tools/dm.py,sha256=rg2y-zyMW8PzkzEkFah3KcbrIeInFBdLdemJHGwW8Vk,4661
 fmtr/tools/dns_tools/proxy.py,sha256=b3TdSwRO7IwcNjrWg1e8jVQb-YxJhT377rdVkeDc8_I,1466
-fmtr/tools/dns_tools/server.py,sha256=Owk5Oyf-9yyI9vzBo-j7VMYN6pOYE8K0rABL65Gpq_0,2631
+fmtr/tools/dns_tools/server.py,sha256=reHQvZq1kqMShpRyIK985u08XdkMnHlDOQh8vPUOiIg,2899
 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
@@ -76,9 +76,9 @@ fmtr/tools/tests/test_path.py,sha256=AkZQa6_8BQ-VaCyL_J-iKmdf2ZaM-xFYR37Kun3k4_g
 fmtr/tools/tests/test_yaml.py,sha256=jc0TwwKu9eC0LvFGNMERdgBue591xwLxYXFbtsRwXVM,287
 fmtr/tools/version_tools/__init__.py,sha256=pg4iLtmIr5HtyEW_j0fMFoIdzqi_w9xH8-grQaXLB28,318
 fmtr/tools/version_tools/version_tools.py,sha256=Hcc6yferZS1hHbugRTdiHhSNmXEEG0hjCiTTXKna-YY,1127
-fmtr_tools-1.3.11.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.11.dist-info/METADATA,sha256=KbWHkJ4m5OQMOCWma9Bnd53J77hAPvNKofIicPXgR_E,15938
-fmtr_tools-1.3.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.11.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.11.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.11.dist-info/RECORD,,
+fmtr_tools-1.3.13.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.13.dist-info/METADATA,sha256=-ichUA6JZb4dYc08MhnCKtZvyL6uuTIy824HI5QFpt4,15938
+fmtr_tools-1.3.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.13.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.13.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.13.dist-info/RECORD,,