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

fmtr/tools/dns_tools/client.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass
 from dns import query
 from functools import cached_property
 from httpx_retries import Retry, RetryTransport
+from typing import Optional
 
 from fmtr.tools import http_tools as http
 from fmtr.tools.dns_tools.dm import Exchange, Response
@@ -38,14 +39,17 @@ class Plain:
     """
     host: str
     port: int = 53
+    ttl_min: Optional[int] = None
 
     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 = Response.from_message(response_plain)
+            for answer in response.message.answer:
+                answer.ttl = max(answer.ttl, self.ttl_min or answer.ttl)
 
-        exchange.response.message.answer += response.message.answer
+        exchange.response = response
 
 
 @dataclass
@@ -86,7 +90,7 @@ class HTTP:
             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
+            exchange.response = response
 
         except Exception as exception:
             exchange.response.message.set_rcode(dnspython.rcode.SERVFAIL)

fmtr/tools/dns_tools/dm.py

@@ -1,11 +1,12 @@
 import dns
 import httpx
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from dns import rcode as dnsrcode
+from dns import reversename
 from dns.message import Message, QueryMessage
 from dns.rrset import RRset
 from functools import cached_property
-from typing import Self, Optional
+from typing import Self, Optional, List
 
 from fmtr.tools.string_tools import join
 
@@ -36,7 +37,7 @@ class Response(BaseDNSData):
     """
 
     http: Optional[httpx.Response] = None
-    is_complete: bool = False
+    blocked_by: Optional[str] = None
 
     @classmethod
     def from_http(cls, response: httpx.Response) -> Self:
@@ -142,14 +143,17 @@ class Exchange:
 
     request: Request
     response: Optional[Response] = None
+    answers_pre: List[RRset] = field(default_factory=list)
+    is_internal: bool = False
+    client_name: Optional[str] = None
+    is_complete: bool = False
 
 
     @classmethod
-    def from_wire(cls, wire: bytes, ip: str, port: int) -> Self:
+    def from_wire(cls, wire: bytes, **kwargs) -> Self:
         request = Request(wire)
         response = Response.from_message(request.get_response_template())
-
-        return cls(request=request, response=response, ip=ip, port=port)
+        return cls(request=request, response=response, **kwargs)
 
     @cached_property
     def client(self):
@@ -162,8 +166,8 @@ class Exchange:
         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
+        if self.answers_pre:
+            rrset = self.answers_pre[-1]
             ty = self.request.type
             ttl = self.request.question.ttl
             rdclass = self.request.question.rdclass
@@ -174,7 +178,6 @@ class Exchange:
                 ttl=ttl,
                 rdtype=ty,
                 rdclass=rdclass,
-
             )
 
             return rrset_contrived
@@ -190,7 +193,7 @@ class Exchange:
         """
 
         question_last = self.question_last
-        query = dns.message.make_query(qname=question_last.name, rdclass=question_last.rdclass, rdtype=question_last.rdtype)
+        query = dns.message.make_query(qname=question_last.name, rdclass=question_last.rdclass, rdtype=question_last.rdtype, id=self.request.message.id)
         return query
 
     @property
@@ -202,3 +205,15 @@ class Exchange:
         """
         data = tuple(self.request.question.to_text().split())
         return data
+
+    @cached_property
+    def reverse(self) -> Self:
+        """
+
+        Create an Exchange for a reverse lookup of this Exchange's client IP.
+
+        """
+        name = 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/proxy.py

@@ -31,6 +31,14 @@ class Proxy(server.Plain):
         """
         return
 
+    def finalize(self, exchange: Exchange):
+        """
+
+        Finalize a still open exchange.
+
+        """
+        exchange.is_complete = True
+
     def resolve(self, exchange: Exchange) -> Exchange:
         """
 
@@ -38,20 +46,21 @@ class Proxy(server.Plain):
         Subclasses can override the relevant processing methods to implement custom behaviour.
 
         """
-
         with logger.span(f'Processing question...'):
             self.process_question(exchange)
-        if exchange.response.is_complete:
+        if exchange.is_complete:
             return exchange
 
         with logger.span(f'Making upstream request...'):
             self.client.resolve(exchange)
-        if exchange.response.is_complete:
+        if exchange.is_complete:
             return exchange
 
         with logger.span(f'Processing upstream response...'):
             self.process_upstream(exchange)
-        if exchange.response.is_complete:
+        if exchange.is_complete:
             return exchange
 
+        self.finalize(exchange)
+
         return exchange

fmtr/tools/dns_tools/server.py

@@ -66,35 +66,61 @@ class Plain:
             logger.info(f'Request found in cache.')
             exchange.response = self.cache[exchange.key]
             exchange.response.message.id = exchange.request.message.id
-            exchange.response.is_complete = True
+            exchange.is_complete = True
 
-    def handle(self, exchange: Exchange):
+    def get_span(self, exchange: Exchange):
         """
 
-        Check validity of request, presence in cache and resolve.
+        Get handling span
 
         """
         request = exchange.request
+        span = logger.span(
+            f'Handling request {exchange.client_name=} {request.message.id=} {request.type_text} {request.name_text} {request.question=}...'
+        )
+        return span
 
-        if not request.is_valid:
-            raise ValueError(f'Only one question per request is supported. Got {len(request.question)} questions.')
+    def log_response(self, exchange: Exchange):
+        """
 
-        span = logger.span(
-            f'Handling request {request.message.id=} {request.type_text} {request.name_text} {request.question=} {exchange.ip=} {exchange.port=}...'
+        Log when resolution complete
+
+        """
+        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=}...'
         )
-        with span:
 
+
+
+    def handle(self, exchange: Exchange):
+        """
+
+        Check validity of request, reverse lookup client address, check presence in cache and resolve.
+
+        """
+
+        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)
+            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=}.')
+            exchange.client_name = client_name
+
+        with self.get_span(exchange):
             with logger.span(f'Checking cache...'):
                 self.check_cache(exchange)
 
-            if not exchange.response.is_complete:
+            if not exchange.is_complete:
                 exchange = self.resolve(exchange)
-                exchange.response.is_complete = True
+                exchange.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)
+            self.log_response(exchange)
 
         return exchange

fmtr/tools/version

@@ -1 +1 @@
-1.3.13
+1.3.15

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

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

{fmtr_tools-1.3.13.dist-info → fmtr_tools-1.3.15.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=328hBDnJV-prjTlVQ7pm2D7s-V9Yds2R3yjA2Xc9M4Q,6
+fmtr/tools/version,sha256=mv8tnhpePoHazD4Fsoh-tA0aqi5t684gOq6SnQNd-oE,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=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=reHQvZq1kqMShpRyIK985u08XdkMnHlDOQh8vPUOiIg,2899
+fmtr/tools/dns_tools/client.py,sha256=uUFoFRwoPtetPVH6PZ3ssHmx3WEquT6UW4FCBKq4n74,2722
+fmtr/tools/dns_tools/dm.py,sha256=_kjsJx9cyEH7qWDjSGj6C54KRvi21h1em5FZCagrFgk,5271
+fmtr/tools/dns_tools/proxy.py,sha256=0lgn1pq5KLoGA4644ZXYs2lPjXjRB-ibFb7JHzlMY9o,1618
+fmtr/tools/dns_tools/server.py,sha256=zLZIXJil6_FeZjIyBytkpaavkoQGN4e9lEjQdOWnazc,3629
 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.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,,
+fmtr_tools-1.3.15.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.15.dist-info/METADATA,sha256=63hO7H6HYE93QoQ0Osr-VPu6NUnkgdpz21Gt6-ifylM,15938
+fmtr_tools-1.3.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.15.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.15.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.15.dist-info/RECORD,,