fmtr.tools 1.2.5__py3-none-any.whl → 1.2.6__py3-none-any.whl

fmtr/tools/dns_tools/client.py

@@ -1,4 +1,5 @@
 import dns
+from dataclasses import dataclass
 from dns import query
 from functools import cached_property
 from httpx_retries import Retry, RetryTransport
@@ -39,6 +40,7 @@ class ClientBasePlain:
             exchange.response_upstream = Response.from_message(response)
 
 
+@dataclass
 class ClientDoH:
     """
 
@@ -47,19 +49,19 @@ class ClientDoH:
     """
 
     HEADERS = {"Content-Type": "application/dns-message"}
-    client = HTTPClientDoH()
+    CLIENT = HTTPClientDoH()
+    BOOTSTRAP = ClientBasePlain('8.8.8.8')
+
+    host: str
+    url: str
 
-    def __init__(self, host, url):
-        self.host = host
-        self.url = url
-        self.bootstrap = ClientBasePlain('8.8.8.8')
 
     @cached_property
     def ip(self):
         message = dns.message.make_query(self.host, dns.rdatatype.A, flags=0)
         request = Request.from_message(message)
         exchange = Exchange(request=request, ip=None, port=None)
-        self.bootstrap.resolve(exchange)
+        self.BOOTSTRAP.resolve(exchange)
         ip = next(iter(exchange.response_upstream.answer.items.keys())).address
         return ip
 
@@ -72,7 +74,7 @@ class ClientDoH:
         request = exchange.request
         headers = self.HEADERS | dict(Host=self.host)
         url = self.url.format(host=self.ip)
-        response_doh = self.client.post(url, headers=headers, content=request.wire)
+        response_doh = self.CLIENT.post(url, headers=headers, content=request.wire)
         response_doh.raise_for_status()
         response = Response.from_http(response_doh)
         exchange.response_upstream = response

fmtr/tools/dns_tools/server.py

@@ -1,10 +1,12 @@
 import socket
+from dataclasses import dataclass
 
 from fmtr.tools import logger
 from fmtr.tools.dns_tools.client import ClientDoH
-from fmtr.tools.dns_tools.dm import Exchange, Response
+from fmtr.tools.dns_tools.dm import Exchange
 
 
+@dataclass
 class ServerBasePlain:
     """
 
@@ -12,9 +14,11 @@ class ServerBasePlain:
 
     """
 
-    def __init__(self, host, port):
-        self.host = host
-        self.port = port
+    host: str
+    port: int
+
+    def __post_init__(self):
+
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
     def resolve(self, exchange: Exchange):
@@ -36,6 +40,7 @@ class ServerBasePlain:
             sock.sendto(exchange.response.wire, (ip, port))
 
 
+@dataclass
 class ServerBaseDoHProxy(ServerBasePlain):
     """
 
@@ -43,9 +48,7 @@ class ServerBaseDoHProxy(ServerBasePlain):
 
     """
 
-    def __init__(self, host, port, client: ClientDoH):
-        super().__init__(host, port)
-        self.client = client
+    client: ClientDoH
 
     def process_question(self, exchange: Exchange):
         return
@@ -53,16 +56,6 @@ class ServerBaseDoHProxy(ServerBasePlain):
     def process_upstream(self, exchange: Exchange):
         return
 
-    def from_upstream(self, exchange: Exchange) -> Exchange:
-
-        request = exchange.request
-        response_doh = self.client.post(self.URL, headers=self.HEADERS, content=request.wire)
-        response_doh.raise_for_status()
-        response = Response.from_http(response_doh)
-        exchange.response_upstream = response
-
-        return exchange
-
     def resolve(self, exchange: Exchange):
         """
 

fmtr/tools/version

@@ -1 +1 @@
-1.2.5
+1.2.6

{fmtr_tools-1.2.5.dist-info → fmtr_tools-1.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.2.5
+Version: 1.2.6
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Home-page: https://github.com/fmtr/tools
 Author: Frontmatter
@@ -106,6 +106,8 @@ Requires-Dist: pydevd-pycharm; extra == "debug"
 Provides-Extra: sets
 Requires-Dist: pydantic-settings; extra == "sets"
 Requires-Dist: pydantic; extra == "sets"
+Requires-Dist: yamlscript; extra == "sets"
+Requires-Dist: pyyaml; extra == "sets"
 Provides-Extra: path-app
 Requires-Dist: appdirs; extra == "path-app"
 Provides-Extra: path-type
@@ -128,60 +130,60 @@ 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: google-auth-httplib2; extra == "all"
+Requires-Dist: html2text; extra == "all"
 Requires-Dist: distributed; extra == "all"
-Requires-Dist: pydevd-pycharm; extra == "all"
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: flet-webview; extra == "all"
-Requires-Dist: dask[bag]; extra == "all"
-Requires-Dist: semver; extra == "all"
-Requires-Dist: diskcache; extra == "all"
 Requires-Dist: tabulate; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: pytest-cov; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
-Requires-Dist: Unidecode; extra == "all"
-Requires-Dist: json_repair; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: google-auth; extra == "all"
+Requires-Dist: pydantic; extra == "all"
+Requires-Dist: openpyxl; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
 Requires-Dist: fastapi; extra == "all"
-Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: logfire; extra == "all"
+Requires-Dist: ollama; extra == "all"
+Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: flet-webview; extra == "all"
 Requires-Dist: flet-video; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: appdirs; extra == "all"
-Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
-Requires-Dist: transformers[sentencepiece]; extra == "all"
 Requires-Dist: torchvision; extra == "all"
 Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: pymupdf; extra == "all"
+Requires-Dist: tinynetrc; extra == "all"
 Requires-Dist: docker; extra == "all"
-Requires-Dist: regex; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: pydantic; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
-Requires-Dist: html2text; extra == "all"
-Requires-Dist: flet[all]; extra == "all"
-Requires-Dist: torchaudio; extra == "all"
 Requires-Dist: setuptools; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
+Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: transformers[sentencepiece]; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
 Requires-Dist: sentence_transformers; extra == "all"
+Requires-Dist: semver; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
+Requires-Dist: faker; extra == "all"
+Requires-Dist: sre_yield; extra == "all"
+Requires-Dist: regex; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: pymupdf; extra == "all"
+Requires-Dist: yamlscript; extra == "all"
+Requires-Dist: bokeh; extra == "all"
+Requires-Dist: contexttimer; extra == "all"
+Requires-Dist: json_repair; extra == "all"
 Requires-Dist: peft; extra == "all"
 Requires-Dist: google-api-python-client; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: faker; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: torchaudio; extra == "all"
+Requires-Dist: google-auth; extra == "all"
+Requires-Dist: pyyaml; extra == "all"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: appdirs; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
 Requires-Dist: pandas; extra == "all"
+Requires-Dist: diskcache; extra == "all"
+Requires-Dist: logfire[httpx]; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: pydevd-pycharm; extra == "all"
 Requires-Dist: pydantic-settings; extra == "all"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: dask[bag]; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
+Requires-Dist: pymupdf4llm; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.2.5.dist-info → fmtr_tools-1.2.6.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=Cl1xpTAk2dakEAYnido_4VW6RMyhUhB5H7iuCcdJQmw,5
+fmtr/tools/version,sha256=PP3XZe61jmbow_ljgcG-wbwzB5i9ZhqLLvJeoEEgV60,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
 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=PwHxnpiy6_isQfUmz_5V1hL0dcPaA6ItqvoGWW8MOfk,222
-fmtr/tools/dns_tools/client.py,sha256=zYMUc63iFRSPtCnhqx_nvsHHf-VQrLt3Vor0qxImfLs,2390
+fmtr/tools/dns_tools/client.py,sha256=omHdk9bA_8u2-VMQhh0c9r9e-oG4mZ0MWA9lfbtSEIc,2371
 fmtr/tools/dns_tools/dm.py,sha256=mvXacq6QJ86G0S0tkzJFhU7bOaSJytvsMNlxs5X9hfE,2236
-fmtr/tools/dns_tools/server.py,sha256=8oGCJZ-xTJhJ0gq21ro8Z0ZpfRYIdoWy7bLm9LOQcU0,2764
+fmtr/tools/dns_tools/server.py,sha256=hSZhK4EZD6Ox4uRI3ldbnyyZf6DYgMUcTfffbrZN5pk,2329
 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
@@ -73,9 +73,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.2.5.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.2.5.dist-info/METADATA,sha256=XH7DX192P5cYVOFAn4DR6Yh1lkAniyNoe6GWJA4p_ug,15943
-fmtr_tools-1.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.2.5.dist-info/entry_points.txt,sha256=fSQrDGNctdQXbUxpMWYVfVQ0mhZMDyaEDG3D3a0zOSc,278
-fmtr_tools-1.2.5.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.2.5.dist-info/RECORD,,
+fmtr_tools-1.2.6.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.2.6.dist-info/METADATA,sha256=NE-9BBFqSBwTTLeaO5Fz2VpZO1KmolLzAoEmTl_Z5xA,16025
+fmtr_tools-1.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.2.6.dist-info/entry_points.txt,sha256=fSQrDGNctdQXbUxpMWYVfVQ0mhZMDyaEDG3D3a0zOSc,278
+fmtr_tools-1.2.6.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.2.6.dist-info/RECORD,,