fmtr.tools 1.3.11__tar.gz → 1.3.13__tar.gz

{fmtr_tools-1.3.11 → fmtr_tools-1.3.13}/PKG-INFO

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

{fmtr_tools-1.3.11 → fmtr_tools-1.3.13}/fmtr/tools/dns_tools/client.py

@@ -1,8 +1,7 @@
-from dataclasses import dataclass
-from functools import cached_property
-
 import dns as dnspython
+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
@@ -82,8 +81,14 @@ class HTTP:
 
         headers = self.HEADERS | dict(Host=self.host)
         url = self.url.format(host=self.ip)
-        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.message.answer += response.message.answer
+        try:
+            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.message.answer += response.message.answer
+
+        except Exception as exception:
+            exchange.response.message.set_rcode(dnspython.rcode.SERVFAIL)
+            exchange.response.is_complete = True
+            logger.exception(exception)

{fmtr_tools-1.3.11 → fmtr_tools-1.3.13}/fmtr/tools/dns_tools/dm.py

@@ -1,6 +1,7 @@
 import dns
 import httpx
 from dataclasses import dataclass
+from dns import rcode as dnsrcode
 from dns.message import Message, QueryMessage
 from dns.rrset import RRset
 from functools import cached_property
@@ -58,6 +59,14 @@ class Response(BaseDNSData):
             return None
         return self.message.answer[-1]
 
+    @property
+    def rcode(self) -> dnsrcode.Rcode:
+        return self.message.rcode()
+
+    @property
+    def rcode_text(self) -> str:
+        return dnsrcode.to_text(self.rcode)
+
     def __str__(self):
         """
 

{fmtr_tools-1.3.11 → fmtr_tools-1.3.13}/fmtr/tools/dns_tools/server.py

@@ -79,7 +79,10 @@ class Plain:
         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=}...'):
+        span = logger.span(
+            f'Handling request {request.message.id=} {request.type_text} {request.name_text} {request.question=} {exchange.ip=} {exchange.port=}...'
+        )
+        with span:
 
             with logger.span(f'Checking cache...'):
                 self.check_cache(exchange)
@@ -89,6 +92,9 @@ class Plain:
                 exchange.response.is_complete = True
 
             self.cache[exchange.key] = exchange.response
+            logger.info(f'Resolution complete {request.message.id=} {exchange.response.rcode_text=} {exchange.response.answer=}')
+
+            attribs = dict(rcode=exchange.response.rcode, rcode_text=exchange.response.rcode_text)
+            span.set_attributes(attribs)
 
-            logger.info(f'Resolution complete {request.message.id=} {exchange.response.answer=}')
         return exchange

fmtr_tools-1.3.13/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.13

{fmtr_tools-1.3.11 → fmtr_tools-1.3.13}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.11/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.11

{fmtr_tools-1.3.11 → fmtr_tools-1.3.13}/fmtr.tools.egg-info/requires.txt

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