fmtr.tools 1.3.18__tar.gz → 1.3.20__tar.gz

{fmtr_tools-1.3.18 → fmtr_tools-1.3.20}/PKG-INFO

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

{fmtr_tools-1.3.18 → fmtr_tools-1.3.20}/fmtr/tools/dns_tools/client.py

@@ -1,6 +1,5 @@
-import dns as dnspython
 from dataclasses import dataclass
-from dns import query
+from dns import query as dnspython_query, message as dnspython_message, rdatatype as dnspython_rdatatype, rcode as dnspython_rcode
 from functools import cached_property
 from httpx_retries import Retry, RetryTransport
 from typing import Optional
@@ -44,7 +43,7 @@ class Plain:
     def resolve(self, exchange: Exchange):
 
         with logger.span(f'UDP {self.host}:{self.port}'):
-            response_plain = query.udp(q=exchange.query_last, where=self.host, port=self.port)
+            response_plain = dnspython_query.udp(q=exchange.query_last, where=self.host, port=self.port)
             response = Response.from_message(response_plain)
             for answer in response.message.answer:
                 answer.ttl = max(answer.ttl, self.ttl_min or answer.ttl)
@@ -70,7 +69,7 @@ class HTTP:
 
     @cached_property
     def ip(self):
-        message = dnspython.message.make_query(self.host, dnspython.rdatatype.A, flags=0)
+        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.answer.items.keys())).address
@@ -93,6 +92,6 @@ class HTTP:
             exchange.response = response
 
         except Exception as exception:
-            exchange.response.message.set_rcode(dnspython.rcode.SERVFAIL)
+            exchange.response.message.set_rcode(dnspython_rcode.SERVFAIL)
             exchange.response.is_complete = True
             logger.exception(exception)

{fmtr_tools-1.3.18 → fmtr_tools-1.3.20}/fmtr/tools/dns_tools/dm.py

@@ -1,8 +1,7 @@
 import dns
 import httpx
 from dataclasses import dataclass, field
-from dns import rcode as dnsrcode
-from dns import reversename
+from dns import rcode as dnspython_rcode, reversename as dnspython_reversename
 from dns.message import Message, QueryMessage
 from dns.rrset import RRset
 from functools import cached_property
@@ -11,17 +10,17 @@ from typing import Self, Optional, List
 from fmtr.tools.string_tools import join
 
 TTL_CODE_DEFAULTS = {
-    dnsrcode.NOERROR: 300,  # Successful query
-    dnsrcode.FORMERR: 60,  # Format error
-    dnsrcode.SERVFAIL: 10,  # Server failure
-    dnsrcode.NXDOMAIN: 60 * 60,  # Non-existent domain
-    dnsrcode.NOTIMP: 60,  # Not implemented
-    dnsrcode.REFUSED: 60,  # Refused
-    dnsrcode.YXDOMAIN: 600,  # Name exists when it should not
-    dnsrcode.YXRRSET: 600,  # RR Set exists when it should not
-    dnsrcode.NXRRSET: 300,  # RR Set that should exist does not
-    dnsrcode.NOTAUTH: 60,  # Not authorized
-    dnsrcode.NOTZONE: 60  # Name not contained in zone
+    dnspython_rcode.NOERROR: 300,  # Successful query
+    dnspython_rcode.FORMERR: 60,  # Format error
+    dnspython_rcode.SERVFAIL: 10,  # Server failure
+    dnspython_rcode.NXDOMAIN: 60 * 60,  # Non-existent domain
+    dnspython_rcode.NOTIMP: 60,  # Not implemented
+    dnspython_rcode.REFUSED: 60,  # Refused
+    dnspython_rcode.YXDOMAIN: 600,  # Name exists when it should not
+    dnspython_rcode.YXRRSET: 600,  # RR Set exists when it should not
+    dnspython_rcode.NXRRSET: 300,  # RR Set that should exist does not
+    dnspython_rcode.NOTAUTH: 60,  # Not authorized
+    dnspython_rcode.NOTZONE: 60  # Name not contained in zone
 }
 
 @dataclass
@@ -74,12 +73,12 @@ class Response(BaseDNSData):
         return self.message.answer[-1]
 
     @property
-    def rcode(self) -> dnsrcode.Rcode:
+    def rcode(self) -> dnspython_rcode.Rcode:
         return self.message.rcode()
 
     @property
     def rcode_text(self) -> str:
-        return dnsrcode.to_text(self.rcode)
+        return dnspython_rcode.to_text(self.rcode)
 
     @property
     def ttl(self) -> int:
@@ -94,7 +93,7 @@ class Response(BaseDNSData):
             ttl = min(ttls)
             return ttl
 
-        ttl = TTL_CODE_DEFAULTS.get(self.rcode, dnsrcode.NXDOMAIN)
+        ttl = TTL_CODE_DEFAULTS.get(self.rcode, dnspython_rcode.NXDOMAIN)
         return ttl
 
 
@@ -252,7 +251,7 @@ class Exchange:
         Create an Exchange for a reverse lookup of this Exchange's client IP.
 
         """
-        name = reversename.from_address(self.ip)
+        name = dnspython_reversename.from_address(self.ip)
         query = dns.message.make_query(name, dns.rdatatype.PTR)
         exchange = self.__class__.from_wire(query.to_wire(), ip=self.ip, port=self.port, is_internal=True)
         return exchange

{fmtr_tools-1.3.18 → fmtr_tools-1.3.20}/fmtr/tools/dns_tools/server.py

@@ -1,7 +1,7 @@
 import asyncio
-import dns.rcode
 from dataclasses import dataclass, field
 from datetime import timedelta
+from dns import rcode as dnspython_rcode
 from functools import cached_property
 from typing import Optional
 
@@ -102,7 +102,7 @@ class Plain(asyncio.DatagramProtocol):
         Warn about any errors
 
         """
-        if exchange.response.rcode != dns.rcode.NOERROR:
+        if exchange.response.rcode != dnspython_rcode.NOERROR:
             logger.warning(f'Error {exchange.response.rcode_text=}')
 
     async def handle(self, exchange: Exchange):
@@ -132,4 +132,7 @@ class Plain(asyncio.DatagramProtocol):
             self.log_dns_errors(exchange)
             self.log_response(exchange)
 
+        if exchange.is_internal:
+            return
+
         self.transport.sendto(exchange.response.message.to_wire(), exchange.addr)

fmtr_tools-1.3.20/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.20

{fmtr_tools-1.3.18 → fmtr_tools-1.3.20}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.18/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.18

{fmtr_tools-1.3.18 → fmtr_tools-1.3.20}/fmtr.tools.egg-info/requires.txt

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