fmtr.tools 1.3.16__py3-none-any.whl → 1.3.18__py3-none-any.whl

fmtr/tools/dns_tools/dm.py

@@ -179,6 +179,9 @@ class Exchange:
     client_name: Optional[str] = None
     is_complete: bool = False
 
+    @property
+    def addr(self):
+        return self.ip, self.port
 
     @classmethod
     def from_wire(cls, wire: bytes, **kwargs) -> Self:
@@ -194,11 +197,17 @@ class Exchange:
     def question_last(self) -> RRset:
         """
 
-        Create an RRset surrogate 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.
+        Create an RRset surrogate 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 there's a response, use its answers, else fall back to answers_pre, else to the original question.
 
         """
-        if self.answers_pre:
-            rrset = self.answers_pre[-1]
+        answers = self.answers_pre
+        if self.response:
+            answers = self.response.message.answer or answers
+
+        if answers:
+            rrset = answers[-1]
             rdtype = self.request.type
             ttl = self.request.question.ttl
             rdclass = self.request.question.rdclass

fmtr/tools/dns_tools/proxy.py

@@ -39,7 +39,7 @@ class Proxy(server.Plain):
         """
         exchange.is_complete = True
 
-    def resolve(self, exchange: Exchange) -> Exchange:
+    async def resolve(self, exchange: Exchange) -> Exchange:
         """
 
         Resolve a request, processing each stage, initial question, upstream response etc.

fmtr/tools/dns_tools/server.py

@@ -1,8 +1,9 @@
-import dns
-import socket
-from dataclasses import dataclass
+import asyncio
+import dns.rcode
+from dataclasses import dataclass, field
 from datetime import timedelta
 from functools import cached_property
+from typing import Optional
 
 from fmtr.tools import caching_tools as caching
 from fmtr.tools.dns_tools.dm import Exchange
@@ -10,59 +11,61 @@ from fmtr.tools.logging_tools import logger
 
 
 @dataclass(kw_only=True, eq=False)
-class Plain:
+class Plain(asyncio.DatagramProtocol):
     """
 
-    Base for starting a plain DNS server
-
+    Async base class for a plain DNS server using asyncio DatagramProtocol.
     """
 
     host: str
     port: int
+    transport: Optional[asyncio.DatagramTransport] = field(default=None, init=False)
 
     @cached_property
-    def sock(self):
-        return socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    def loop(self):
+        return asyncio.get_event_loop()
+
 
     @cached_property
     def cache(self):
         """
 
         Overridable cache.
-
         """
         cache = caching.TLRU(maxsize=1_024, ttu_static=timedelta(hours=1), desc='DNS Request')
         return cache
 
-    def start(self):
-        """
+    def connection_made(self, transport: asyncio.DatagramTransport):
+        self.transport = transport
+        logger.info(f'Listening on {self.host}:{self.port}')
 
-        Listen and resolve via overridden resolve method.
+    def datagram_received(self, data: bytes, addr):
+        ip, port = addr
+        exchange = Exchange.from_wire(data, ip=ip, port=port)
+        asyncio.create_task(self.handle(exchange))
 
+    async def start(self):
         """
-        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        sock.bind((self.host, self.port))
-        logger.info(f'Listening on {self.host}:{self.port}')
-        while True:
-            data, (ip, port) = sock.recvfrom(512)
-            exchange = Exchange.from_wire(data, ip=ip, port=port)
-            self.handle(exchange)
-            sock.sendto(exchange.response.message.to_wire(), (ip, port))
 
-    def resolve(self, exchange: Exchange) -> Exchange:
+        Start the async UDP server.
         """
 
-        Defined in subclasses
+        logger.info(f'Starting async DNS server on {self.host}:{self.port}...')
+        await self.loop.create_datagram_endpoint(
+            lambda: self,
+            local_addr=(self.host, self.port)
+        )
+        await asyncio.Future()  # Prevent exit by blocking forever
 
+    async def resolve(self, exchange: Exchange) -> Exchange:
         """
-        raise NotImplemented
 
-    def check_cache(self, exchange: Exchange):
-        """
-
-        Check cache, patch in in new ID and mark complete
+        To be defined in subclasses.
 
         """
+        raise NotImplementedError
+
+    def check_cache(self, exchange: Exchange):
         if exchange.key in self.cache:
             logger.info(f'Request found in cache.')
             exchange.response = self.cache[exchange.key]
@@ -89,7 +92,6 @@ class Plain:
         """
         request = exchange.request
         response = exchange.response
-
         logger.info(
             f'Resolution complete {exchange.client_name=} {request.message.id=} {request.type_text} {request.name_text} {request.question=} {exchange.is_complete=} {response.rcode=} {response.rcode_text=} {response.answer=} {response.blocked_by=}...'
         )
@@ -100,24 +102,20 @@ class Plain:
         Warn about any errors
 
         """
+        if exchange.response.rcode != dns.rcode.NOERROR:
+            logger.warning(f'Error {exchange.response.rcode_text=}')
 
-        if exchange.response.rcode == dns.rcode.NOERROR:
-            return
-
-        logger.warning(f'Error {exchange.response.rcode_text=}')
-
-    def handle(self, exchange: Exchange):
+    async def handle(self, exchange: Exchange):
         """
 
-        Check validity of request, reverse lookup client address, check presence in cache and resolve.
+        Warn about any errors
 
         """
-
         if not exchange.request.is_valid:
             raise ValueError(f'Only one question per request is supported. Got {len(exchange.request.question)} questions.')
 
         if not exchange.is_internal:
-            self.handle(exchange.reverse)
+            await self.handle(exchange.reverse)
             client_name = exchange.reverse.question_last.name.to_text()
             if not exchange.reverse.response.answer:
                 logger.warning(f'Client name could not be resolved {client_name=}.')
@@ -128,10 +126,10 @@ class Plain:
                 self.check_cache(exchange)
 
             if not exchange.is_complete:
-                exchange = self.resolve(exchange)
+                exchange = await self.resolve(exchange)
                 self.cache[exchange.key] = exchange.response
 
             self.log_dns_errors(exchange)
             self.log_response(exchange)
 
-        return exchange
+        self.transport.sendto(exchange.response.message.to_wire(), exchange.addr)

fmtr/tools/version

@@ -1 +1 @@
-1.3.16
+1.3.18

{fmtr_tools-1.3.16.dist-info → fmtr_tools-1.3.18.dist-info}/METADATA

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

{fmtr_tools-1.3.16.dist-info → fmtr_tools-1.3.18.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=BGvCUIvG-zhY8XPNIcDdYZpZkRSi1ad9zjGx1qmjmTU,6
+fmtr/tools/version,sha256=1HhblnKFU7qvP6wf1fM-3EpDM8YGR1sNW7I8m0TTfYc,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=KKIcxJ5Dni2PFtOEHNNSi1Y4NCZ0bp3tifpSZRXtMTM,6261
-fmtr/tools/dns_tools/proxy.py,sha256=0lgn1pq5KLoGA4644ZXYs2lPjXjRB-ibFb7JHzlMY9o,1618
-fmtr/tools/dns_tools/server.py,sha256=c2ZxhF3EUgYLl1fnBEfLbM_URP3t7GdXeYOc6PQEmd0,3890
+fmtr/tools/dns_tools/dm.py,sha256=DOXcySjcnwviz8tQXjl34W_hz1bh0ue-ew7aNylvOfo,6553
+fmtr/tools/dns_tools/proxy.py,sha256=gCWfH1pyWjj8xnJ8Pm4id7bsBWqcar3dQ9PeP5XjRXY,1624
+fmtr/tools/dns_tools/server.py,sha256=7XqG2csuYjXmsEzcHVCd5LBytXkefCPiK3HCRA5v1zQ,4180
 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.16.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.16.dist-info/METADATA,sha256=MunCjEPB35a78qpSMM10MHjcuJjl3gcGHjC3JvVwA4I,15938
-fmtr_tools-1.3.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.16.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.16.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.16.dist-info/RECORD,,
+fmtr_tools-1.3.18.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.18.dist-info/METADATA,sha256=HRh5NKxOfbIObmQOmHgef02WijAE-teUrSEuOPuU4e8,15938
+fmtr_tools-1.3.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.18.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.18.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.18.dist-info/RECORD,,