fmtr.tools 1.3.1__tar.gz → 1.3.3__tar.gz

{fmtr_tools-1.3.1 → fmtr_tools-1.3.3}/PKG-INFO

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

fmtr_tools-1.3.3/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, proxy
+except ImportError as exception:
+    server = client = dm = proxy = MissingExtraMockModule('dns', exception)

{fmtr_tools-1.3.1 → fmtr_tools-1.3.3}/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-1.3.1 → fmtr_tools-1.3.3}/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-1.3.3/fmtr/tools/dns_tools/proxy.py

@@ -0,0 +1,67 @@
+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 {request.message.id=} {request.question=} {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...'):
+                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
+
+            exchange.response.is_complete = True
+
+        logger.info(f'Resolution complete {request.message.id=} {exchange.response.answer=}')
+        return

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

@@ -0,0 +1,38 @@
+import socket
+from dataclasses import dataclass
+
+from fmtr.tools.dns_tools.dm import Exchange
+
+
+@dataclass
+class Plain:
+    """
+
+    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.message.to_wire(), (ip, port))

{fmtr_tools-1.3.1 → fmtr_tools-1.3.3}/fmtr/tools/pattern_tools.py

@@ -1,8 +1,9 @@
-import regex as re
 from dataclasses import dataclass, asdict
 from functools import cached_property
 from typing import List, Any
 
+import regex as re
+
 from fmtr.tools.logging_tools import logger
 from fmtr.tools.string_tools import join
 
@@ -25,11 +26,6 @@ def alt(*patterns):
     pattern = MASK_GROUP.format(pattern=pattern)
     return pattern
 
-
-
-
-
-
 @dataclass
 class Key:
     RECORD_SEP = '␞'
@@ -93,17 +89,18 @@ class Item:
     Key-value pair
 
     """
-    key: Key
-    value: Key
+    source: Key
+    target: Key
 
 @dataclass
-class Mapper:
+class Transformer:
     """
     
     Pattern-based, dictionary-like mapper.
-    Compiles a single regex pattern from a list of rules, and determines which rule matched.
-    It supports initialization from structured rule data, execution of a single lookup pass, and
-    recursive lookups until a stable state is reached.
+    Compiles an complex set of rules into single regex pattern, and determines which rule matched.
+    Inputs are then transformed according to the matching rule.
+    Works like a pattern-based dictionary when is_recursive==False.
+    Works something like an FSA/transducer when is_recursive=True.
 
     """
     PREFIX_GROUP = '__'
@@ -112,21 +109,21 @@ class Mapper:
     is_recursive: bool = False
 
     @cached_property
-    def pattern(self):
+    def pattern(self) -> str:
         """
         
-        Provides a dynamically generated regex pattern based on the rules provided.
+        Dynamically generated regex pattern based on the rules provided.
 
         """
         patterns = [
-            MASK_NAMED.format(key=f'{self.PREFIX_GROUP}{i}', pattern=item.key.pattern)
+            MASK_NAMED.format(key=f'{self.PREFIX_GROUP}{i}', pattern=item.source.pattern)
             for i, item in enumerate(self.items)
         ]
         pattern = alt(*patterns)
         return pattern
 
     @cached_property
-    def rx(self):
+    def rx(self) -> re.Pattern:
         """
 
         Regex object.
@@ -134,24 +131,26 @@ class Mapper:
         """
         return re.compile(self.pattern)
 
-    def get_default(self, key: Key):
+    def get_default(self, key: Key) -> Any:
         if self.is_recursive:
             return key
         else:
             return self.default
 
-    def get(self, key: Key) -> Key:
+    def get(self, key: Key) -> Key | Any:
         """
 
         Use recursive or single lookup pass, depending on whether recursive lookups have been specified.
 
         """
         if self.is_recursive:
-            return self.get_recursive(key)
+            with logger.span(f'Transforming recursively {key=}...'):
+                return self.get_recursive(key)
         else:
-            return self.get_one(key)
+            with logger.span(f'Transforming linearly {key=}...'):
+                return self.get_one(key)
 
-    def get_one(self, key: Key):
+    def get_one(self, key: Key) -> Key | Any:
         """
 
         Single lookup pass.
@@ -163,7 +162,7 @@ class Mapper:
 
         if not match:
             value = self.get_default(key)
-            logger.debug(f'No match for {key=}.')
+            logger.debug(f'No match for {key=}. Returning {self.default=}')
         else:
 
             match_ids = {name: v for name, v in match.groupdict().items() if v}
@@ -179,19 +178,21 @@ class Mapper:
             rule_id = next(iter(rule_ids))
             rule = self.items[rule_id]
 
-            if isinstance(rule.value, Key):
-                value = rule.value.transform(match)
+            logger.debug(f'Matched using {rule_id=}: {rule.source=}')
+
+            if isinstance(rule.target, Key):
+                value = rule.target.transform(match)
             else:
-                value = rule.value
+                value = rule.target
 
-            logger.debug(f'Matched using {rule_id=}: {key=} → {value=}')
+            logger.debug(f'Transformed using {rule_id=}: {key=} → {value=}')
 
         return value
 
-    def get_recursive(self, key: Key) -> Key:
+    def get_recursive(self, key: Key) -> Key | Any:
         """
 
-        Lookup the provided text by continuously applying lookup rules until no changes are made
+        Lookup the provided key by continuously applying transforms until no changes are made
         or a circular loop is detected.
 
         """
@@ -201,29 +202,28 @@ class Mapper:
         def get_history_str():
             return join(history, sep=' → ')
 
-        with logger.span(f'Matching {key=}...'):
-            while True:
-                if previous in history:
-                    history.append(previous)
-                    msg = f'Loop detected on node "{previous}": {get_history_str()}'
-                    raise RewriteCircularLoopError(msg)
-
+        while True:
+            if previous in history:
                 history.append(previous)
+                msg = f'Loop detected on node "{previous}": {get_history_str()}'
+                raise RewriteCircularLoopError(msg)
 
-                new = previous
+            history.append(previous)
+            new = previous
+            new = self.get_one(new)
+            if new == previous:
+                break
+            previous = new
 
-                new = self.get_one(new)
-
-                if new == previous:
-                    break
-
-                previous = new
+            if not isinstance(new, Key):
+                history.append(previous)
+                break
 
         if len(history) == 1:
-            history_str = 'No matching performed.'
+            history_str = 'No transforms performed.'
         else:
             history_str = get_history_str()
-        logger.debug(f'Finished matching: {history_str}')
+        logger.debug(f'Finished transforming: {history_str}')
 
         return previous
 

fmtr_tools-1.3.3/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.3

{fmtr_tools-1.3.1 → fmtr_tools-1.3.3}/fmtr.tools.egg-info/PKG-INFO

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

{fmtr_tools-1.3.1 → fmtr_tools-1.3.3}/fmtr.tools.egg-info/SOURCES.txt

@@ -57,6 +57,7 @@ setup.py
 ./fmtr/tools/dns_tools/__init__.py
 ./fmtr/tools/dns_tools/client.py
 ./fmtr/tools/dns_tools/dm.py
+./fmtr/tools/dns_tools/proxy.py
 ./fmtr/tools/dns_tools/server.py
 ./fmtr/tools/entrypoints/__init__.py
 ./fmtr/tools/entrypoints/cache_hfh.py
@@ -138,6 +139,7 @@ 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/proxy.py
 fmtr/tools/dns_tools/server.py
 fmtr/tools/entrypoints/__init__.py
 fmtr/tools/entrypoints/cache_hfh.py

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

@@ -1,6 +0,0 @@
-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.3.1/fmtr/tools/dns_tools/server.py

@@ -1,89 +0,0 @@
-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 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

fmtr_tools-1.3.1/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.1

{fmtr_tools-1.3.1 → fmtr_tools-1.3.3}/fmtr.tools.egg-info/requires.txt

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