fmtr.tools 1.3.8__tar.gz → 1.3.9__tar.gz

{fmtr_tools-1.3.8 → fmtr_tools-1.3.9}/PKG-INFO

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

{fmtr_tools-1.3.8 → fmtr_tools-1.3.9}/fmtr/tools/caching_tools.py

@@ -2,7 +2,9 @@ import cachetools
 from datetime import timedelta, datetime
 from diskcache import Cache
 
-from fmtr.tools import logger, Path, Constants
+from fmtr.tools.constants import Constants
+from fmtr.tools.logging_tools import logger
+from fmtr.tools.path_tools.path_tools import Path
 
 
 class Dump(dict):

{fmtr_tools-1.3.8 → fmtr_tools-1.3.9}/fmtr/tools/dns_tools/dm.py

@@ -1,11 +1,12 @@
-from dataclasses import dataclass
-from functools import cached_property
-from typing import Self, Optional
-
 import dns
 import httpx
+from dataclasses import dataclass
 from dns.message import Message, QueryMessage
 from dns.rrset import RRset
+from functools import cached_property
+from typing import Self, Optional
+
+from fmtr.tools.string_tools import join
 
 
 @dataclass
@@ -25,7 +26,6 @@ class BaseDNSData:
     def from_message(cls, message: Message) -> Self:
         return cls(message.to_wire())
 
-
 @dataclass
 class Response(BaseDNSData):
     """
@@ -39,15 +39,41 @@ class Response(BaseDNSData):
 
     @classmethod
     def from_http(cls, response: httpx.Response) -> Self:
+        """
+
+        Initialise from an HTTP response.
+
+        """
         self = cls(response.content, http=response)
         return self
 
     @property
     def answer(self) -> Optional[RRset]:
+        """
+
+        Get the latest answer, if one exists.
+
+        """
         if not self.message.answer:
             return None
         return self.message.answer[-1]
 
+    def __str__(self):
+        """
+
+        Put answer and ID text in string representation.
+
+        """
+        answer = self.answer
+
+        if answer:
+            answer = join(answer.to_text().splitlines(), sep=', ')
+
+        string = join([answer, self.message.flags], sep=', ')
+        string = f'{self.__class__.__name__}({string})'
+        return string
+
+
 
 @dataclass
 class Request(BaseDNSData):
@@ -157,3 +183,13 @@ class Exchange:
         question_last = self.question_last
         query = dns.message.make_query(qname=question_last.name, rdclass=question_last.rdclass, rdtype=question_last.rdtype)
         return query
+
+    @property
+    def key(self):
+        """
+
+        Hashable key for caching
+
+        """
+        data = tuple(self.request.question.to_text().split())
+        return data

fmtr_tools-1.3.9/fmtr/tools/dns_tools/proxy.py

@@ -0,0 +1,57 @@
+from dataclasses import dataclass
+
+from fmtr.tools.dns_tools import server, client
+from fmtr.tools.dns_tools.dm import Exchange
+from fmtr.tools.logging_tools import logger
+
+
+@dataclass(kw_only=True, eq=False)
+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) -> Exchange:
+        """
+
+        Resolve a request, processing each stage, initial question, upstream response etc.
+        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:
+            return exchange
+
+        with logger.span(f'Making upstream request...'):
+            self.client.resolve(exchange)
+        if exchange.response.is_complete:
+            return exchange
+
+        with logger.span(f'Processing upstream response...'):
+            self.process_upstream(exchange)
+        if exchange.response.is_complete:
+            return exchange
+
+        return exchange

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

@@ -0,0 +1,94 @@
+import socket
+from dataclasses import dataclass
+from datetime import timedelta
+from functools import cached_property
+
+from fmtr.tools import caching_tools as caching
+from fmtr.tools.dns_tools.dm import Exchange
+from fmtr.tools.logging_tools import logger
+
+
+@dataclass(kw_only=True, eq=False)
+class Plain:
+    """
+
+    Base for starting a plain DNS server
+
+    """
+
+    host: str
+    port: int
+
+    @cached_property
+    def sock(self):
+        return socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+
+    @cached_property
+    def cache(self):
+        """
+
+        Overridable cache.
+
+        """
+        cache = caching.TLRU(maxsize=1_024, ttu_static=timedelta(hours=1), desc='DNS Request')
+        return cache
+
+    def start(self):
+        """
+
+        Listen and resolve via overridden resolve method.
+
+        """
+        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        sock.bind((self.host, self.port))
+        logger.info(f'Listening on {self.host}:{self.port}')
+        while True:
+            data, (ip, port) = sock.recvfrom(512)
+            exchange = Exchange.from_wire(data, ip=ip, port=port)
+            self.handle(exchange)
+            sock.sendto(exchange.response.message.to_wire(), (ip, port))
+
+    def resolve(self, exchange: Exchange) -> Exchange:
+        """
+
+        Defined in subclasses
+
+        """
+        raise NotImplemented
+
+    def check_cache(self, exchange: Exchange):
+        """
+
+        Check cache, patch in in new ID and mark complete
+
+        """
+        if exchange.key in self.cache:
+            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
+
+    def handle(self, exchange: Exchange):
+        """
+
+        Check validity of request, presence in cache and resolve.
+
+        """
+        request = exchange.request
+
+        if not request.is_valid:
+            raise ValueError(f'Only one question per request is supported. Got {len(request.question)} questions.')
+
+        with logger.span(f'Handling request {request.message.id=} {request.question=} {exchange.client=}...'):
+
+            with logger.span(f'Checking cache...'):
+                self.check_cache(exchange)
+
+            if not exchange.response.is_complete:
+                exchange = self.resolve(exchange)
+                exchange.response.is_complete = True
+
+        self.cache[exchange.key] = exchange.response
+
+        logger.info(f'Resolution complete {request.message.id=} {exchange.response.answer=}')
+        return exchange

{fmtr_tools-1.3.8 → fmtr_tools-1.3.9}/fmtr/tools/pattern_tools.py

@@ -92,7 +92,8 @@ class Item:
     source: Key
     target: Key
 
-@dataclass
+
+@dataclass(kw_only=True)
 class Transformer:
     """
     

fmtr_tools-1.3.9/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.9

{fmtr_tools-1.3.8 → fmtr_tools-1.3.9}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.8/fmtr/tools/dns_tools/proxy.py

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

@@ -1,39 +0,0 @@
-import socket
-from dataclasses import dataclass
-
-from fmtr.tools.dns_tools.dm import Exchange
-from fmtr.tools.logging_tools import logger
-
-
-@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))
-        logger.info(f'Listening on {self.host}:{self.port}')
-        while True:
-            data, (ip, port) = sock.recvfrom(512)
-            exchange = Exchange.from_wire(data, ip=ip, port=port)
-            self.resolve(exchange)
-            sock.sendto(exchange.response.message.to_wire(), (ip, port))

fmtr_tools-1.3.8/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.8

{fmtr_tools-1.3.8 → fmtr_tools-1.3.9}/fmtr.tools.egg-info/requires.txt

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