fmtr.tools 1.2.2__tar.gz → 1.2.4__tar.gz

{fmtr_tools-1.2.2 → fmtr_tools-1.2.4}/PKG-INFO

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

fmtr_tools-1.2.4/fmtr/tools/dns_tools.py

@@ -0,0 +1,221 @@
+import dns
+import httpx
+import socket
+from dataclasses import dataclass
+from dns.message import Message
+from functools import cached_property
+from httpx_retries import Retry, RetryTransport
+from typing import Optional, Self
+
+from fmtr.tools import Client, logger
+
+RETRY_STRATEGY = Retry(
+    total=2,  # initial + 1 retry
+    allowed_methods={"GET", "POST"},
+    status_forcelist={502, 503, 504},
+    retry_on_exceptions=None,  # defaults to httpx.TransportError etc.
+    backoff_factor=0.25,  # short backoff (e.g. 0.25s, 0.5s)
+    max_backoff_wait=0.75,  # max total delay before giving up
+    backoff_jitter=0.1,  # small jitter to avoid retry bursts
+    respect_retry_after_header=False,  # DoH resolvers probably won't set this
+)
+
+
+class HTTPClientDoH(Client):
+    """
+
+    Base HTTP client for DoH-appropriate retry strategy.
+
+    """
+    TRANSPORT = RetryTransport(retry=RETRY_STRATEGY)
+
+
+@dataclass
+class BaseDNSData:
+    """
+
+    DNS response object.
+
+    """
+    wire: bytes
+
+    @cached_property
+    def message(self) -> Message:
+        return dns.message.from_wire(self.wire)
+
+    @classmethod
+    def from_message(cls, message: Message) -> Self:
+        return cls(message.to_wire())
+
+
+@dataclass
+class Response(BaseDNSData):
+    """
+
+    DNS response object.
+
+    """
+
+    http: Optional[httpx.Response] = None
+
+    @classmethod
+    def from_http(cls, response: httpx.Response) -> Self:
+        self = cls(response.content, http=response)
+        return self
+
+
+@dataclass
+class Request(BaseDNSData):
+    """
+
+    DNS request object.
+
+    """
+    wire: bytes
+
+    @cached_property
+    def question(self):
+        return self.message.question[0]
+
+    @cached_property
+    def is_valid(self):
+        return len(self.message.question) != 0
+
+    @cached_property
+    def type(self):
+        return self.question.rdtype
+
+    @cached_property
+    def type_text(self):
+        return dns.rdatatype.to_text(self.type)
+
+    @cached_property
+    def name(self):
+        return self.question.name
+
+    @cached_property
+    def name_text(self):
+        return self.name.to_text()
+
+    @cached_property
+    def blackhole(self) -> Response:
+        blackhole = dns.message.make_response(self.message)
+        blackhole.flags |= dns.flags.RA
+        blackhole.set_rcode(dns.rcode.NXDOMAIN)
+        response = Response.from_message(blackhole)
+        return response
+
+
+@dataclass
+class Exchange:
+    """
+
+    Entire DNS exchange for a DNS Proxy: request -> upstream response -> response
+
+    """
+    ip: str
+    port: int
+
+    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)
+
+    @cached_property
+    def client(self):
+        return f'{self.ip}:{self.port}'
+
+
+class BasePlain:
+    """
+
+    Base for starting a plain DNS server
+
+    """
+
+    def __init__(self, host, port):
+        self.host = host
+        self.port = port
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+
+    def resolve(self, exchange: Exchange):
+        raise NotImplemented
+
+    def start(self):
+        """
+
+        Listen and resolve via overridden resolve method.
+
+        """
+        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        sock.bind((self.host, self.port))
+        print(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.resolve(exchange)
+            sock.sendto(exchange.response.wire, (ip, port))
+
+
+class BaseDoHProxy(BasePlain):
+    """
+
+    Base for a DNS Proxy server
+
+    """
+
+    URL = None
+    HEADERS = {"Content-Type": "application/dns-message"}
+    client = HTTPClientDoH()
+
+    def process_question(self, exchange: Exchange):
+        return
+
+    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):
+        """
+
+        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 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.from_upstream(exchange)
+
+            with logger.span(f'Processing upstream response...'):
+                self.process_upstream(exchange)
+
+            if exchange.response:
+                return
+
+            exchange.response = exchange.response_upstream
+            return

{fmtr_tools-1.2.2 → fmtr_tools-1.2.4}/fmtr/tools/pattern_tools.py

@@ -1,9 +1,8 @@
+import regex as re
 from dataclasses import dataclass
 from functools import cached_property
 from typing import List
 
-import regex as re
-
 from fmtr.tools.logging_tools import logger
 
 
@@ -158,7 +157,11 @@ class Rewriter:
 
                 previous = new
 
-            logger.debug(f'Finished rewriting: {get_history_str()}')
+        if len(history) == 1:
+            history_str = 'No rewrites performed.'
+        else:
+            history_str = get_history_str()
+        logger.debug(f'Finished rewriting: {history_str}')
 
         return previous
 

fmtr_tools-1.2.4/fmtr/tools/version

@@ -0,0 +1 @@
+1.2.4

{fmtr_tools-1.2.2 → fmtr_tools-1.2.4}/fmtr.tools.egg-info/PKG-INFO

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

{fmtr_tools-1.2.2 → fmtr_tools-1.2.4}/fmtr.tools.egg-info/requires.txt

@@ -15,60 +15,60 @@ pydantic-ai[logfire,openai]
 ollama
 
 [all]
-tinynetrc
-openpyxl
 httpx
-regex
-logfire[fastapi]
-dask[bag]
+pydantic-ai[logfire,openai]
+Unidecode
+huggingface_hub
+faker
+bokeh
+docker
 deepmerge
+uvicorn[standard]
+regex
+tinynetrc
 pydantic-settings
-yamlscript
-pydantic-ai[logfire,openai]
-ollama
+contexttimer
+flet-webview
+pandas
 openai
-diskcache
-pydevd-pycharm
-sre_yield
+pytest-cov
 distributed
-contexttimer
 html2text
-filetype
+diskcache
+json_repair
 flet-video
-logfire[httpx]
-flet-webview
+pyyaml
+openpyxl
+filetype
+google-api-python-client
+google-auth
 pymupdf4llm
-uvicorn[standard]
+dask[bag]
+httpx_retries
+torchvision
+tabulate
+logfire[httpx]
 tokenizers
-google-auth
+logfire
+pymupdf
 dnspython[doh]
+yamlscript
 sentence_transformers
-setuptools
-pymupdf
+fastapi
 google-auth-oauthlib
+pydevd-pycharm
 pydantic
-docker
-json_repair
-tabulate
-appdirs
-faker
-torchaudio
-pandas
-transformers[sentencepiece]
-pyyaml
-semver
 flet[all]
-Unidecode
-huggingface_hub
-fastapi
-bokeh
-torchvision
+semver
+logfire[fastapi]
+torchaudio
+ollama
 google-auth-httplib2
-pytest-cov
-httpx_retries
-google-api-python-client
+appdirs
+transformers[sentencepiece]
+setuptools
+sre_yield
 peft
-logfire
 
 [api]
 fastapi
@@ -93,6 +93,11 @@ pydantic
 
 [dns]
 dnspython[doh]
+httpx
+httpx_retries
+logfire
+semver
+logfire[httpx]
 
 [docker.api]
 docker

{fmtr_tools-1.2.2 → fmtr_tools-1.2.4}/setup.py

@@ -35,7 +35,7 @@ DEPENDENCIES = {
     'sets': ['pydantic-settings', 'dm'],
     'path.app': ['appdirs'],
     'path.type': ['filetype'],
-    'dns': ['dnspython[doh]'],
+    'dns': ['dnspython[doh]', 'http'],
     'patterns': ['regex'],
     'http': ['httpx', 'httpx_retries', 'logging', 'logfire[httpx]'],
     'setup': ['setuptools']

fmtr_tools-1.2.2/fmtr/tools/dns_tools.py

@@ -1,57 +0,0 @@
-import dns
-import httpx
-import socket
-from dns.message import Message, QueryMessage
-
-
-class Server:
-
-    def __init__(self, host, port):
-        self.host = host
-        self.port = port
-        self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-
-    def resolve(self, message: Message) -> QueryMessage:
-        raise NotImplemented
-
-    def start(self):
-        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        sock.bind((self.host, self.port))
-        print(f"Listening on {self.host}:{self.port}")
-        while True:
-            data, addr = sock.recvfrom(512)
-            question = dns.message.from_wire(data)
-            answer = self.resolve(question)
-            sock.sendto(answer.to_wire(), addr)
-
-
-class Proxy(Server):
-    url = "https://cloudflare-dns.com/dns-query"
-    headers = {"accept": "application/dns-json"}
-
-    def resolve(self, question: Message) -> Message:
-        qname = question.question[0].name.to_text()
-        qtype = dns.rdatatype.to_text(question.question[0].rdtype)
-        params = {"name": qname, "type": qtype}
-
-        response = httpx.get(self.url, headers=self.headers, params=params)
-        response.raise_for_status()
-
-        answer = dns.message.make_response(question)
-        answer.flags |= dns.flags.RA
-
-        data = response.json()
-        for answer_rr in data.get("Answer", []):
-            name = dns.name.from_text(answer_rr["name"])
-            rtype = answer_rr["type"]
-            ttl = answer_rr["TTL"]
-            rdata = dns.rdata.from_text(dns.rdataclass.IN, rtype, answer_rr["data"])
-            rrset = dns.rrset.from_rdata(name, ttl, rdata)
-            answer.answer.append(rrset)
-
-        return answer
-
-
-if __name__ == "__main__":
-    proxy = Proxy("127.0.0.1", 5354)
-    proxy.start()

fmtr_tools-1.2.2/fmtr/tools/version

@@ -1 +0,0 @@
-1.2.2