fmtr.tools 1.2.4__tar.gz → 1.2.6__tar.gz

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

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

{fmtr_tools-1.2.4 → fmtr_tools-1.2.6}/fmtr/tools/__init__.py

@@ -29,6 +29,7 @@ from fmtr.tools.constants import Constants
 # Submodules
 from fmtr.tools.path_tools import Path, PackagePaths, AppPaths
 from fmtr.tools import ai_tools as ai
+from fmtr.tools import dns_tools as dns
 
 import fmtr.tools.setup_tools as setup
 from fmtr.tools.setup_tools import Setup, SetupPaths, Dependencies, Tools
@@ -172,11 +173,6 @@ try:
 except ImportError as exception:
     patterns = MissingExtraMockModule('patterns', exception)
 
-try:
-    from fmtr.tools import dns_tools as dns
-except ImportError as exception:
-    dns = MissingExtraMockModule('dns', exception)
-
 try:
     from fmtr.tools import http_tools as http
     from fmtr.tools.http_tools import Client

fmtr_tools-1.2.6/fmtr/tools/dns_tools/__init__.py

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

fmtr_tools-1.2.6/fmtr/tools/dns_tools/client.py

@@ -0,0 +1,80 @@
+import dns
+from dataclasses import dataclass
+from dns import query
+from functools import cached_property
+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.logging_tools import 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(http.Client):
+    """
+
+    Base HTTP client for DoH-appropriate retry strategy.
+
+    """
+    TRANSPORT = RetryTransport(retry=RETRY_STRATEGY)
+
+
+class ClientBasePlain:
+    def __init__(self, host, port=53):
+        self.host = host
+        self.port = port
+
+    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)
+
+
+@dataclass
+class ClientDoH:
+    """
+
+    Base DoH client.
+
+    """
+
+    HEADERS = {"Content-Type": "application/dns-message"}
+    CLIENT = HTTPClientDoH()
+    BOOTSTRAP = ClientBasePlain('8.8.8.8')
+
+    host: str
+    url: str
+
+
+    @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)
+        ip = next(iter(exchange.response_upstream.answer.items.keys())).address
+        return ip
+
+    def resolve(self, exchange: Exchange):
+        """
+
+        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.raise_for_status()
+        response = Response.from_http(response_doh)
+        exchange.response_upstream = response

fmtr_tools-1.2.6/fmtr/tools/dns_tools/dm.py

@@ -0,0 +1,110 @@
+import dns
+import httpx
+from dataclasses import dataclass
+from dns.message import Message
+from functools import cached_property
+from typing import Self, Optional
+
+
+@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
+
+    @cached_property
+    def answer(self):
+        return self.message.answer[-1]
+
+
+@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}'

fmtr_tools-1.2.6/fmtr/tools/dns_tools/server.py

@@ -0,0 +1,89 @@
+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:
+    """
+
+    Base for starting a plain DNS server
+
+    """
+
+    host: str
+    port: int
+
+    def __post_init__(self):
+
+        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))
+
+
+@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 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

fmtr_tools-1.2.6/fmtr/tools/version

@@ -0,0 +1 @@
+1.2.6

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

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

{fmtr_tools-1.2.4 → fmtr_tools-1.2.6}/fmtr.tools.egg-info/SOURCES.txt

@@ -12,7 +12,6 @@ setup.py
 ./fmtr/tools/dataclass_tools.py
 ./fmtr/tools/datatype_tools.py
 ./fmtr/tools/debugging_tools.py
-./fmtr/tools/dns_tools.py
 ./fmtr/tools/docker_tools.py
 ./fmtr/tools/environment_tools.py
 ./fmtr/tools/function_tools.py
@@ -55,6 +54,10 @@ setup.py
 ./fmtr/tools/ai_tools/__init__.py
 ./fmtr/tools/ai_tools/agentic_tools.py
 ./fmtr/tools/ai_tools/inference_tools.py
+./fmtr/tools/dns_tools/__init__.py
+./fmtr/tools/dns_tools/client.py
+./fmtr/tools/dns_tools/dm.py
+./fmtr/tools/dns_tools/server.py
 ./fmtr/tools/entrypoints/__init__.py
 ./fmtr/tools/entrypoints/cache_hfh.py
 ./fmtr/tools/entrypoints/ep_test.py
@@ -90,7 +93,6 @@ fmtr/tools/data_modelling_tools.py
 fmtr/tools/dataclass_tools.py
 fmtr/tools/datatype_tools.py
 fmtr/tools/debugging_tools.py
-fmtr/tools/dns_tools.py
 fmtr/tools/docker_tools.py
 fmtr/tools/environment_tools.py
 fmtr/tools/function_tools.py
@@ -133,6 +135,10 @@ fmtr/tools/yaml_tools.py
 fmtr/tools/ai_tools/__init__.py
 fmtr/tools/ai_tools/agentic_tools.py
 fmtr/tools/ai_tools/inference_tools.py
+fmtr/tools/dns_tools/__init__.py
+fmtr/tools/dns_tools/client.py
+fmtr/tools/dns_tools/dm.py
+fmtr/tools/dns_tools/server.py
 fmtr/tools/entrypoints/__init__.py
 fmtr/tools/entrypoints/cache_hfh.py
 fmtr/tools/entrypoints/ep_test.py

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

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

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

@@ -32,7 +32,7 @@ DEPENDENCIES = {
     'caching': ['diskcache'],
     'pdf': ['pymupdf', 'dm', 'pymupdf4llm'],
     'debug': ['pydevd-pycharm'],
-    'sets': ['pydantic-settings', 'dm'],
+    'sets': ['pydantic-settings', 'dm', 'yaml'],
     'path.app': ['appdirs'],
     'path.type': ['filetype'],
     'dns': ['dnspython[doh]', 'http'],

fmtr_tools-1.2.4/fmtr/tools/dns_tools.py

@@ -1,221 +0,0 @@
-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.4/fmtr/tools/version

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