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

fmtr/tools/dns_tools/__init__.py

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

fmtr/tools/dns_tools/client.py

@@ -1,11 +1,12 @@
-import dns
 from dataclasses import dataclass
-from dns import query
 from functools import cached_property
+
+import dns as dnspython
+from dns import query
 from httpx_retries import Retry, RetryTransport
 
 from fmtr.tools import http_tools as http
-from fmtr.tools.dns_tools.dm import Exchange, Response, Request
+from fmtr.tools.dns_tools.dm import Exchange, Response
 from fmtr.tools.logging_tools import logger
 
 RETRY_STRATEGY = Retry(
@@ -29,28 +30,36 @@ class HTTPClientDoH(http.Client):
     TRANSPORT = RetryTransport(retry=RETRY_STRATEGY)
 
 
-class ClientBasePlain:
-    def __init__(self, host, port=53):
-        self.host = host
-        self.port = port
+@dataclass
+class Plain:
+    """
+
+    Plain DNS
+
+    """
+    host: str
+    port: int = 53
 
     def resolve(self, exchange: Exchange):
+
         with logger.span(f'UDP {self.host}:{self.port}'):
-            response = query.udp(q=exchange.request.message, where=self.host, port=self.port)
-            exchange.response_upstream = Response.from_message(response)
+            response_plain = query.udp(q=exchange.query_last, where=self.host, port=self.port)
+            response = Response.from_message(response_plain)
+
+        exchange.response.message.answer += response.message.answer
 
 
 @dataclass
-class ClientDoH:
+class HTTP:
     """
 
-    Base DoH client.
+    DNS over HTTP
 
     """
 
     HEADERS = {"Content-Type": "application/dns-message"}
     CLIENT = HTTPClientDoH()
-    BOOTSTRAP = ClientBasePlain('8.8.8.8')
+    BOOTSTRAP = Plain('8.8.8.8')
 
     host: str
     url: str
@@ -58,11 +67,10 @@ class ClientDoH:
 
     @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)
+        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_upstream.answer.items.keys())).address
+        ip = next(iter(exchange.response.answer.items.keys())).address
         return ip
 
     def resolve(self, exchange: Exchange):
@@ -71,10 +79,11 @@ class ClientDoH:
         Resolve via DoH
 
         """
-        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=exchange.query_last.to_wire())
         response_doh.raise_for_status()
         response = Response.from_http(response_doh)
-        exchange.response_upstream = response
+
+        exchange.response.message.answer += response.message.answer

fmtr/tools/dns_tools/dm.py

@@ -1,10 +1,12 @@
-import dns
-import httpx
 from dataclasses import dataclass
-from dns.message import Message
 from functools import cached_property
 from typing import Self, Optional
 
+import dns
+import httpx
+from dns.message import Message, QueryMessage
+from dns.rrset import RRset
+
 
 @dataclass
 class BaseDNSData:
@@ -33,14 +35,17 @@ class Response(BaseDNSData):
     """
 
     http: Optional[httpx.Response] = None
+    is_complete: bool = False
 
     @classmethod
     def from_http(cls, response: httpx.Response) -> Self:
         self = cls(response.content, http=response)
         return self
 
-    @cached_property
-    def answer(self):
+    @property
+    def answer(self) -> Optional[RRset]:
+        if not self.message.answer:
+            return None
         return self.message.answer[-1]
 
 
@@ -54,7 +59,7 @@ class Request(BaseDNSData):
     wire: bytes
 
     @cached_property
-    def question(self):
+    def question(self) -> RRset:
         return self.message.question[0]
 
     @cached_property
@@ -77,10 +82,14 @@ class Request(BaseDNSData):
     def name_text(self):
         return self.name.to_text()
 
+    def get_response_template(self):
+        message = dns.message.make_response(self.message)
+        message.flags |= dns.flags.RA
+        return message
+
     @cached_property
     def blackhole(self) -> Response:
-        blackhole = dns.message.make_response(self.message)
-        blackhole.flags |= dns.flags.RA
+        blackhole = self.get_response_template()
         blackhole.set_rcode(dns.rcode.NXDOMAIN)
         response = Response.from_message(blackhole)
         return response
@@ -98,13 +107,53 @@ class Exchange:
 
     request: Request
     response: Optional[Response] = None
-    response_upstream: Optional[Response] = None
+
 
     @classmethod
     def from_wire(cls, wire: bytes, ip: str, port: int) -> Self:
         request = Request(wire)
-        return cls(request=request, ip=ip, port=port)
+        response = Response.from_message(request.get_response_template())
+
+        return cls(request=request, response=response, ip=ip, port=port)
 
     @cached_property
     def client(self):
         return f'{self.ip}:{self.port}'
+
+    @property
+    def question_last(self) -> RRset:
+        """
+
+        Contrive an RRset representing the latest/current question. This can be the original question - or a hybrid one if we've injected our own answers into the exchange.
+
+        """
+        if self.response.answer:
+            rrset = self.response.answer
+            ty = self.request.type
+            ttl = self.request.question.ttl
+            rdclass = self.request.question.rdclass
+            name = next(iter(rrset.items.keys())).to_text()
+
+            rrset_contrived = dns.rrset.from_text(
+                name=name,
+                ttl=ttl,
+                rdtype=ty,
+                rdclass=rdclass,
+
+            )
+
+            return rrset_contrived
+        else:
+            return self.request.question  # Solves the issue of digging out the name.
+
+    @property
+    def query_last(self) -> QueryMessage:
+        """
+
+        Create a query (e.g. for use by upstream) based on the last question.
+
+        """
+
+        question_last = self.question_last
+        query = dns.message.make_query(qname=question_last.name, rdclass=question_last.rdclass, rdtype=question_last.rdtype)
+        return query

fmtr/tools/dns_tools/proxy.py

@@ -0,0 +1,68 @@
+from dataclasses import dataclass
+
+from fmtr.tools import logger
+from fmtr.tools.dns_tools import server, client
+from fmtr.tools.dns_tools.dm import Exchange
+
+
+@dataclass
+class Proxy(server.Plain):
+    """
+
+    Base for a DNS Proxy server (plain server) TODO: Allow subclassing of any server type.
+
+    """
+
+    client: client.HTTP
+
+    def process_question(self, exchange: Exchange):
+        """
+
+        Modify exchange based on initial question.
+
+        """
+        return
+
+    def process_upstream(self, exchange: Exchange):
+        """
+
+        Modify exchange after upstream response.
+
+        """
+        return
+
+    def resolve(self, exchange: Exchange):
+        """
+
+        Resolve a request, processing each stage, initial question, upstream response etc.
+        Subclasses can override the relevant processing methods to implement custom behaviour.
+
+        """
+
+        request = exchange.request
+
+        with logger.span(f'Handling request ID {request.message.id} for {request.name_text} from {exchange.client}...'):
+
+            if not request.is_valid:
+                raise ValueError(f'Only one question per request is supported. Got {len(request.question)} questions.')
+
+            with logger.span(f'Processing question...'):
+                self.process_question(exchange)
+            if exchange.response.is_complete:
+                return
+
+            with logger.span(f'Making upstream request for {request.name_text}...'):
+                self.client.resolve(exchange)
+            if exchange.response.is_complete:
+                return
+
+            with logger.span(f'Processing upstream response...'):
+                self.process_upstream(exchange)
+            if exchange.response.is_complete:
+                return
+
+            if exchange.response:
+                return
+
+            exchange.response.is_complete = True
+            return

fmtr/tools/dns_tools/server.py

@@ -1,13 +1,11 @@
 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
 
 
 @dataclass
-class ServerBasePlain:
+class Plain:
     """
 
     Base for starting a plain DNS server
@@ -37,53 +35,4 @@ class ServerBasePlain:
             data, (ip, port) = sock.recvfrom(512)
             exchange = Exchange.from_wire(data, ip=ip, port=port)
             self.resolve(exchange)
-            sock.sendto(exchange.response.wire, (ip, port))
-
-
-@dataclass
-class ServerBaseDoHProxy(ServerBasePlain):
-    """
-
-    Base for a DNS Proxy server
-
-    """
-
-    client: ClientDoH
-
-    def process_question(self, exchange: Exchange):
-        return
-
-    def process_upstream(self, exchange: Exchange):
-        return
-
-    def resolve(self, exchange: Exchange):
-        """
-
-        Resolve a request, processing each stage, initial question, upstream response etc.
-        Subclasses can override the relevant processing methods to implement custom behaviour.
-
-        """
-
-        request = exchange.request
-
-        with logger.span(f'Handling request ID {request.message.id} for {request.name_text} from {exchange.client}...'):
-
-            if not request.is_valid:
-                raise ValueError(f'Only one question per request is supported. Got {len(request.question)} questions.')
-
-            with logger.span(f'Processing question...'):
-                self.process_question(exchange)
-            if exchange.response:
-                return
-
-            with logger.span(f'Making upstream request for {request.name_text}...'):
-                self.client.resolve(exchange)
-
-            with logger.span(f'Processing upstream response...'):
-                self.process_upstream(exchange)
-
-            if exchange.response:
-                return
-
-            exchange.response = exchange.response_upstream
-            return
+            sock.sendto(exchange.response.message.to_wire(), (ip, port))

fmtr/tools/version

@@ -1 +1 @@
-1.3.1
+1.3.2

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

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

{fmtr_tools-1.3.1.dist-info → fmtr_tools-1.3.2.dist-info}/RECORD

@@ -44,16 +44,17 @@ 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=BcZMtqlHZBH1wb4kRct-FjtXUmLPdsHBFjSDNdT5aG4,5
+fmtr/tools/version,sha256=exPSrztkeQgMZ8VTDFGwb8f-z8T_NbtvtmOtm7IiqvA,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=omHdk9bA_8u2-VMQhh0c9r9e-oG4mZ0MWA9lfbtSEIc,2371
-fmtr/tools/dns_tools/dm.py,sha256=mvXacq6QJ86G0S0tkzJFhU7bOaSJytvsMNlxs5X9hfE,2236
-fmtr/tools/dns_tools/server.py,sha256=X6-4pC8u5BG_BnOHTPcmkT3455Cd10CddwrDUYrGUOw,2353
+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/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
 fmtr/tools/entrypoints/ep_test.py,sha256=B8HfWISfSgw_xVX475CbJGh_QnpOe9MH65H8qGjTWbY,46
@@ -73,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.1.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.1.dist-info/METADATA,sha256=GGUnLRCnkgzFvhy9nRRjxMAP76MrO7APhIMdueIst2Q,16030
-fmtr_tools-1.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.1.dist-info/entry_points.txt,sha256=fSQrDGNctdQXbUxpMWYVfVQ0mhZMDyaEDG3D3a0zOSc,278
-fmtr_tools-1.3.1.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.1.dist-info/RECORD,,
+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,,