fmtr.tools 1.3.8__py3-none-any.whl → 1.3.9__py3-none-any.whl

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/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/dns_tools/proxy.py

@@ -1,11 +1,11 @@
 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
+from fmtr.tools.logging_tools import logger
 
 
-@dataclass
+@dataclass(kw_only=True, eq=False)
 class Proxy(server.Plain):
     """
 
@@ -31,7 +31,7 @@ class Proxy(server.Plain):
         """
         return
 
-    def resolve(self, exchange: Exchange):
+    def resolve(self, exchange: Exchange) -> Exchange:
         """
 
         Resolve a request, processing each stage, initial question, upstream response etc.
@@ -39,29 +39,19 @@ class Proxy(server.Plain):
 
         """
 
-        request = exchange.request
+        with logger.span(f'Processing question...'):
+            self.process_question(exchange)
+        if exchange.response.is_complete:
+            return exchange
 
-        with logger.span(f'Handling request {request.message.id=} {request.question=} {exchange.client=}...'):
+        with logger.span(f'Making upstream request...'):
+            self.client.resolve(exchange)
+        if exchange.response.is_complete:
+            return exchange
 
-            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 upstream response...'):
+            self.process_upstream(exchange)
+        if exchange.response.is_complete:
+            return exchange
 
-            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
+        return exchange

fmtr/tools/dns_tools/server.py

@@ -1,11 +1,14 @@
 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
+@dataclass(kw_only=True, eq=False)
 class Plain:
     """
 
@@ -16,12 +19,19 @@ class Plain:
     host: str
     port: int
 
-    def __post_init__(self):
+    @cached_property
+    def sock(self):
+        return socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
-        self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    @cached_property
+    def cache(self):
+        """
 
-    def resolve(self, exchange: Exchange):
-        raise NotImplemented
+        Overridable cache.
+
+        """
+        cache = caching.TLRU(maxsize=1_024, ttu_static=timedelta(hours=1), desc='DNS Request')
+        return cache
 
     def start(self):
         """
@@ -35,5 +45,50 @@ class Plain:
         while True:
             data, (ip, port) = sock.recvfrom(512)
             exchange = Exchange.from_wire(data, ip=ip, port=port)
-            self.resolve(exchange)
+            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/pattern_tools.py

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

fmtr/tools/version

@@ -1 +1 @@
-1.3.8
+1.3.9

{fmtr_tools-1.3.8.dist-info → fmtr_tools-1.3.9.dist-info}/METADATA

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

{fmtr_tools-1.3.8.dist-info → fmtr_tools-1.3.9.dist-info}/RECORD

@@ -2,7 +2,7 @@ fmtr/tools/__init__.py,sha256=vCxKR0SymygpO-EtCGPmGZEQv5O1goM7Jr8P4m-eJsQ,5676
 fmtr/tools/api_tools.py,sha256=w8Zrp_EwN5KlUghwLoTCXo4z1irg5tAsReCqDLjASfE,2133
 fmtr/tools/async_tools.py,sha256=ewz757WcveQJd-G5SVr2JDOQVbdLGecCgl-tsBGVZz4,284
 fmtr/tools/augmentation_tools.py,sha256=-6ESbO4CDlKqVOV1J1V6qBeoBMzbFIinkDHRHnCBej0,55
-fmtr/tools/caching_tools.py,sha256=BZ5HSzcyCSnvJ6h5xtu5jELPSPDazVsMU7q7OX_oKBE,4886
+fmtr/tools/caching_tools.py,sha256=74p7m2GLFfeP41LX69wxgfkilxEAoWkMIfFMjKsYpyg,4976
 fmtr/tools/constants.py,sha256=QHJWu2UZwdV1ceGKT-pq-eYGPw4t7aFxb_W8r4G9VVk,1429
 fmtr/tools/data_modelling_tools.py,sha256=0BFm-F_cYzVTxftWQwORkPd0FM2BTLVh9-s0-rTTFoo,1744
 fmtr/tools/dataclass_tools.py,sha256=0Gt6KeLhtPgubo_2tYkIVqB8oQ91Qzag8OAGZDdjvMU,1209
@@ -30,7 +30,7 @@ fmtr/tools/netrc_tools.py,sha256=PpNpz_mWlQi6VHGromKwFfTyLpHUXsd4LY6-OKLCbeI,376
 fmtr/tools/openai_tools.py,sha256=6SUgejgzUzmlKKct2_ePXntvMegu3FJgfk9x7aqtqYc,742
 fmtr/tools/packaging_tools.py,sha256=FlgOTnDRHZWQL2iR-wucTsyGEHRE-MlddKL30MPmUqE,253
 fmtr/tools/parallel_tools.py,sha256=QEb_gN1StkxsqYaH4HSjiJX8Y3gpb2uKNsOzG4uFpaM,3071
-fmtr/tools/pattern_tools.py,sha256=Rmengjn_Ya246mlkAVR9fxVxXJUqEHWdDYu8Hsl9pXw,6003
+fmtr/tools/pattern_tools.py,sha256=DlEKzNJKhwFmU3-awoGkN5Xy-yLF_bsoj8eoSMCEytE,6018
 fmtr/tools/pdf_tools.py,sha256=xvv9B84uAF81rFJRnXhSsxYuP42vY9ZdPVFrSMVe8G8,4069
 fmtr/tools/platform_tools.py,sha256=7p69CmAHe_sF68Fx9uVhns1k5EewTHTWgUYzkl6ZQKA,308
 fmtr/tools/process_tools.py,sha256=Ysh5Dk2QFBhXQerArjKdt7xZd3JrN5Ho02AaOjH0Nnw,1425
@@ -44,7 +44,7 @@ fmtr/tools/tabular_tools.py,sha256=tpIpZzYku1HcJrHZJL6BC39LmN3WUWVhFbK2N7nDVmE,1
 fmtr/tools/tokenization_tools.py,sha256=me-IBzSLyNYejLybwjO9CNB6Mj2NYfKPaOVThXyaGNg,4268
 fmtr/tools/tools.py,sha256=CAsApa1YwVdNE6H66Vjivs_mXYvOas3rh7fPELAnTpk,795
 fmtr/tools/unicode_tools.py,sha256=yS_9wpu8ogNoiIL7s1G_8bETFFO_YQlo4LNPv1NLDeY,52
-fmtr/tools/version,sha256=TcdU53CiqvG9NX8A4sH_s0eyfztzmjd5EWmCXTCwpQE,5
+fmtr/tools/version,sha256=rYr-rxNeNGGn5FNcTOuOuB3sW8Jcy6nF6Mog8vY8Ivg,5
 fmtr/tools/version_tools.py,sha256=yNs_CGqWpqE4jbK9wsPIi14peJVXYbhIcMqHAFOw3yE,1480
 fmtr/tools/yaml_tools.py,sha256=9kuYChqJelWQIjGlSnK4iDdOWWH06P0gp9jIcRrC3UI,1903
 fmtr/tools/ai_tools/__init__.py,sha256=JZrLuOFNV1A3wvJgonxOgz_4WS-7MfCuowGWA5uYCjs,372
@@ -52,9 +52,9 @@ fmtr/tools/ai_tools/agentic_tools.py,sha256=acSEPFS-aguDXanWGs3fAAlRyJSYPZW7L-Kb
 fmtr/tools/ai_tools/inference_tools.py,sha256=2UP2gXEyOJUjyyV6zmFIYmIxUsh1rXkRH0IbFvr2bRs,11908
 fmtr/tools/dns_tools/__init__.py,sha256=PjD3Og6D5yvDVpKmsUsrnSpz_rjXpl4zBtvMqm8xKWU,237
 fmtr/tools/dns_tools/client.py,sha256=c2vzWBDZSxijwL1KvWUoDGc8wqk_KTAFxCr0P1rNjy8,2367
-fmtr/tools/dns_tools/dm.py,sha256=KWQeeZhsDyrKoXzAD5zEOoHH3aiD4uKRqwnD8fFP1nI,3725
-fmtr/tools/dns_tools/proxy.py,sha256=L0utKw8D1JXtAW9IfXcBdNMb-AyPFgW5XGiPnWuk7D8,1878
-fmtr/tools/dns_tools/server.py,sha256=t38TmSpra3FRoMk351eHzOOPlSuaCyjxbvPwX9o15ak,942
+fmtr/tools/dns_tools/dm.py,sha256=QqEYebamLWMzr1KM1x4P4dUvPZL_zvymZrNj6ghw0rg,4445
+fmtr/tools/dns_tools/proxy.py,sha256=b3TdSwRO7IwcNjrWg1e8jVQb-YxJhT377rdVkeDc8_I,1466
+fmtr/tools/dns_tools/server.py,sha256=FK5S9r34aWapD3tv7rYG1dvHZrfCgg0hL9yGpZkZHkc,2623
 fmtr/tools/entrypoints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/entrypoints/cache_hfh.py,sha256=fQNs4J9twQuZH_Yj98-oOvEX7-LrSUP3kO8nzw2HrHs,60
 fmtr/tools/entrypoints/ep_test.py,sha256=B8HfWISfSgw_xVX475CbJGh_QnpOe9MH65H8qGjTWbY,46
@@ -75,9 +75,9 @@ fmtr/tools/tests/test_environment.py,sha256=iHaiMQfECYZPkPKwfuIZV9uHuWe3aE-p_dN_
 fmtr/tools/tests/test_json.py,sha256=IeSP4ziPvRcmS8kq7k9tHonC9rN5YYq9GSNT2ul6Msk,287
 fmtr/tools/tests/test_path.py,sha256=AkZQa6_8BQ-VaCyL_J-iKmdf2ZaM-xFYR37Kun3k4_g,2188
 fmtr/tools/tests/test_yaml.py,sha256=jc0TwwKu9eC0LvFGNMERdgBue591xwLxYXFbtsRwXVM,287
-fmtr_tools-1.3.8.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.8.dist-info/METADATA,sha256=m6mbZy-IYtew40xeEmDdyBYhxDLdfiLg_hhR_H2xMEc,16148
-fmtr_tools-1.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.8.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.8.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.8.dist-info/RECORD,,
+fmtr_tools-1.3.9.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.9.dist-info/METADATA,sha256=AD-iCYJ7Y80H55Q7R61JUA5NHnLPvuIGfD5PGA0zLcw,16148
+fmtr_tools-1.3.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.9.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.9.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.9.dist-info/RECORD,,