fmtr.tools 1.3.19__py3-none-any.whl → 1.3.21__py3-none-any.whl

fmtr/tools/dns_tools/__init__.py

@@ -2,5 +2,6 @@ from fmtr.tools.import_tools import MissingExtraMockModule
 
 try:
     from fmtr.tools.dns_tools import server, client, dm, proxy
+    import dns
 except ImportError as exception:
-    server = client = dm = proxy = MissingExtraMockModule('dns', exception)
+    dns = server = client = dm = proxy = MissingExtraMockModule('dns', exception)

fmtr/tools/dns_tools/client.py

@@ -1,6 +1,5 @@
-import dns as dnspython
 from dataclasses import dataclass
-from dns import query
+from dns import query as dnspython_query, message as dnspython_message, rdatatype as dnspython_rdatatype, rcode as dnspython_rcode
 from functools import cached_property
 from httpx_retries import Retry, RetryTransport
 from typing import Optional
@@ -44,7 +43,7 @@ class Plain:
     def resolve(self, exchange: Exchange):
 
         with logger.span(f'UDP {self.host}:{self.port}'):
-            response_plain = query.udp(q=exchange.query_last, where=self.host, port=self.port)
+            response_plain = dnspython_query.udp(q=exchange.query_last, where=self.host, port=self.port)
             response = Response.from_message(response_plain)
             for answer in response.message.answer:
                 answer.ttl = max(answer.ttl, self.ttl_min or answer.ttl)
@@ -70,7 +69,7 @@ class HTTP:
 
     @cached_property
     def ip(self):
-        message = dnspython.message.make_query(self.host, dnspython.rdatatype.A, flags=0)
+        message = dnspython_message.make_query(self.host, dnspython_rdatatype.A, flags=0)
         exchange = Exchange.from_wire(message.to_wire(), ip=None, port=None)
         self.BOOTSTRAP.resolve(exchange)
         ip = next(iter(exchange.response.answer.items.keys())).address
@@ -93,6 +92,6 @@ class HTTP:
             exchange.response = response
 
         except Exception as exception:
-            exchange.response.message.set_rcode(dnspython.rcode.SERVFAIL)
+            exchange.response.message.set_rcode(dnspython_rcode.SERVFAIL)
             exchange.response.is_complete = True
             logger.exception(exception)

fmtr/tools/dns_tools/dm.py

@@ -1,8 +1,7 @@
 import dns
 import httpx
 from dataclasses import dataclass, field
-from dns import rcode as dnsrcode
-from dns import reversename
+from dns import rcode as dnspython_rcode, reversename as dnspython_reversename
 from dns.message import Message, QueryMessage
 from dns.rrset import RRset
 from functools import cached_property
@@ -11,17 +10,17 @@ from typing import Self, Optional, List
 from fmtr.tools.string_tools import join
 
 TTL_CODE_DEFAULTS = {
-    dnsrcode.NOERROR: 300,  # Successful query
-    dnsrcode.FORMERR: 60,  # Format error
-    dnsrcode.SERVFAIL: 10,  # Server failure
-    dnsrcode.NXDOMAIN: 60 * 60,  # Non-existent domain
-    dnsrcode.NOTIMP: 60,  # Not implemented
-    dnsrcode.REFUSED: 60,  # Refused
-    dnsrcode.YXDOMAIN: 600,  # Name exists when it should not
-    dnsrcode.YXRRSET: 600,  # RR Set exists when it should not
-    dnsrcode.NXRRSET: 300,  # RR Set that should exist does not
-    dnsrcode.NOTAUTH: 60,  # Not authorized
-    dnsrcode.NOTZONE: 60  # Name not contained in zone
+    dnspython_rcode.NOERROR: 300,  # Successful query
+    dnspython_rcode.FORMERR: 60,  # Format error
+    dnspython_rcode.SERVFAIL: 10,  # Server failure
+    dnspython_rcode.NXDOMAIN: 60 * 60,  # Non-existent domain
+    dnspython_rcode.NOTIMP: 60,  # Not implemented
+    dnspython_rcode.REFUSED: 60,  # Refused
+    dnspython_rcode.YXDOMAIN: 600,  # Name exists when it should not
+    dnspython_rcode.YXRRSET: 600,  # RR Set exists when it should not
+    dnspython_rcode.NXRRSET: 300,  # RR Set that should exist does not
+    dnspython_rcode.NOTAUTH: 60,  # Not authorized
+    dnspython_rcode.NOTZONE: 60  # Name not contained in zone
 }
 
 @dataclass
@@ -74,12 +73,12 @@ class Response(BaseDNSData):
         return self.message.answer[-1]
 
     @property
-    def rcode(self) -> dnsrcode.Rcode:
+    def rcode(self) -> dnspython_rcode.Rcode:
         return self.message.rcode()
 
     @property
     def rcode_text(self) -> str:
-        return dnsrcode.to_text(self.rcode)
+        return dnspython_rcode.to_text(self.rcode)
 
     @property
     def ttl(self) -> int:
@@ -94,7 +93,7 @@ class Response(BaseDNSData):
             ttl = min(ttls)
             return ttl
 
-        ttl = TTL_CODE_DEFAULTS.get(self.rcode, dnsrcode.NXDOMAIN)
+        ttl = TTL_CODE_DEFAULTS.get(self.rcode, dnspython_rcode.NXDOMAIN)
         return ttl
 
 
@@ -252,7 +251,7 @@ class Exchange:
         Create an Exchange for a reverse lookup of this Exchange's client IP.
 
         """
-        name = reversename.from_address(self.ip)
+        name = dnspython_reversename.from_address(self.ip)
         query = dns.message.make_query(name, dns.rdatatype.PTR)
         exchange = self.__class__.from_wire(query.to_wire(), ip=self.ip, port=self.port, is_internal=True)
         return exchange

fmtr/tools/dns_tools/server.py

@@ -1,7 +1,7 @@
 import asyncio
-import dns.rcode
 from dataclasses import dataclass, field
 from datetime import timedelta
+from dns import rcode as dnspython_rcode
 from functools import cached_property
 from typing import Optional
 
@@ -102,7 +102,7 @@ class Plain(asyncio.DatagramProtocol):
         Warn about any errors
 
         """
-        if exchange.response.rcode != dns.rcode.NOERROR:
+        if exchange.response.rcode != dnspython_rcode.NOERROR:
             logger.warning(f'Error {exchange.response.rcode_text=}')
 
     async def handle(self, exchange: Exchange):

fmtr/tools/version

@@ -1 +1 @@
-1.3.19
+1.3.21

{fmtr_tools-1.3.19.dist-info → fmtr_tools-1.3.21.dist-info}/METADATA

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

{fmtr_tools-1.3.19.dist-info → fmtr_tools-1.3.21.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=IkHMYSQ-ZduD7nl7WkIfpgHFu3tdHPQP47CtOYb2gsM,6
+fmtr/tools/version,sha256=cvhadKKPw11qd560krb_gX5ym6Wvv3xEb6FFkldcumQ,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=uUFoFRwoPtetPVH6PZ3ssHmx3WEquT6UW4FCBKq4n74,2722
-fmtr/tools/dns_tools/dm.py,sha256=DOXcySjcnwviz8tQXjl34W_hz1bh0ue-ew7aNylvOfo,6553
+fmtr/tools/dns_tools/__init__.py,sha256=Mzaepy8lEdT0SJtUOCnF3IkpOt0vrZn-IOgOf4xfd8Q,258
+fmtr/tools/dns_tools/client.py,sha256=IBbd7Xgx9ExTn_EPoL7ts9JfXokHHuOiD9m4K6tl1Q0,2817
+fmtr/tools/dns_tools/dm.py,sha256=Lp1HaF7rpVtL_Ji4Bd32B29105H9ZKQ8AcVj_AB7nsA,6678
 fmtr/tools/dns_tools/proxy.py,sha256=gCWfH1pyWjj8xnJ8Pm4id7bsBWqcar3dQ9PeP5XjRXY,1624
-fmtr/tools/dns_tools/server.py,sha256=TN2ds53lpkhEE-tZBJlNeXqh0Fxq-56XKvF-ruHOf9M,4233
+fmtr/tools/dns_tools/server.py,sha256=_Y5w5bGHhBI32fYWl-SmnOALAw_eF9fEbmrOqqgzSq8,4263
 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.19.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.19.dist-info/METADATA,sha256=WoledZuozS64C9mggi1Ir6kgWC88fpePaALih3iil5c,15938
-fmtr_tools-1.3.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.19.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.19.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.19.dist-info/RECORD,,
+fmtr_tools-1.3.21.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.21.dist-info/METADATA,sha256=maUC1a0Pjda8V8J5YTJhkSKa-YQLW_QU4cfaSUCOHMo,15938
+fmtr_tools-1.3.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.21.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.21.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.21.dist-info/RECORD,,