fmtr.tools 1.2.5__tar.gz → 1.2.6__tar.gz

{fmtr_tools-1.2.5 → fmtr_tools-1.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.2.5
+Version: 1.2.6
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Home-page: https://github.com/fmtr/tools
 Author: Frontmatter
@@ -106,6 +106,8 @@ Requires-Dist: pydevd-pycharm; extra == "debug"
 Provides-Extra: sets
 Requires-Dist: pydantic-settings; extra == "sets"
 Requires-Dist: pydantic; extra == "sets"
+Requires-Dist: yamlscript; extra == "sets"
+Requires-Dist: pyyaml; extra == "sets"
 Provides-Extra: path-app
 Requires-Dist: appdirs; extra == "path-app"
 Provides-Extra: path-type
@@ -128,60 +130,60 @@ Requires-Dist: logfire[httpx]; extra == "http"
 Provides-Extra: setup
 Requires-Dist: setuptools; extra == "setup"
 Provides-Extra: all
-Requires-Dist: torchaudio; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: regex; extra == "all"
-Requires-Dist: dask[bag]; extra == "all"
-Requires-Dist: pytest-cov; extra == "all"
-Requires-Dist: flet-video; extra == "all"
+Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
 Requires-Dist: uvicorn[standard]; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
 Requires-Dist: logfire[fastapi]; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
 Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
 Requires-Dist: semver; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: torchvision; extra == "all"
-Requires-Dist: pydevd-pycharm; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: sentence_transformers; extra == "all"
 Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: pydantic-settings; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: tabulate; extra == "all"
-Requires-Dist: setuptools; extra == "all"
+Requires-Dist: bokeh; extra == "all"
+Requires-Dist: contexttimer; extra == "all"
 Requires-Dist: diskcache; extra == "all"
-Requires-Dist: distributed; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
-Requires-Dist: flet-webview; extra == "all"
 Requires-Dist: peft; extra == "all"
-Requires-Dist: google-api-python-client; extra == "all"
-Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: docker; extra == "all"
-Requires-Dist: pydantic; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: faker; extra == "all"
+Requires-Dist: dask[bag]; extra == "all"
+Requires-Dist: pydevd-pycharm; extra == "all"
 Requires-Dist: transformers[sentencepiece]; extra == "all"
-Requires-Dist: Unidecode; extra == "all"
+Requires-Dist: regex; extra == "all"
+Requires-Dist: json_repair; extra == "all"
+Requires-Dist: html2text; extra == "all"
+Requires-Dist: faker; extra == "all"
+Requires-Dist: openpyxl; extra == "all"
 Requires-Dist: appdirs; extra == "all"
 Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: html2text; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: sentence_transformers; extra == "all"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: torchvision; extra == "all"
 Requires-Dist: ollama; extra == "all"
-Requires-Dist: json_repair; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
+Requires-Dist: flet-video; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Requires-Dist: yamlscript; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: logfire; extra == "all"
+Requires-Dist: tabulate; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
 Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: pydantic-settings; extra == "all"
+Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: distributed; extra == "all"
+Requires-Dist: flet-webview; extra == "all"
+Requires-Dist: setuptools; extra == "all"
+Requires-Dist: pyyaml; extra == "all"
+Requires-Dist: sre_yield; extra == "all"
 Requires-Dist: google-auth; extra == "all"
-Requires-Dist: pandas; extra == "all"
+Requires-Dist: torchaudio; extra == "all"
+Requires-Dist: pydantic; extra == "all"
+Requires-Dist: google-auth-httplib2; extra == "all"
+Requires-Dist: docker; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: httpx_retries; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.2.5 → fmtr_tools-1.2.6}/fmtr/tools/dns_tools/client.py

@@ -1,4 +1,5 @@
 import dns
+from dataclasses import dataclass
 from dns import query
 from functools import cached_property
 from httpx_retries import Retry, RetryTransport
@@ -39,6 +40,7 @@ class ClientBasePlain:
             exchange.response_upstream = Response.from_message(response)
 
 
+@dataclass
 class ClientDoH:
     """
 
@@ -47,19 +49,19 @@ class ClientDoH:
     """
 
     HEADERS = {"Content-Type": "application/dns-message"}
-    client = HTTPClientDoH()
+    CLIENT = HTTPClientDoH()
+    BOOTSTRAP = ClientBasePlain('8.8.8.8')
+
+    host: str
+    url: str
 
-    def __init__(self, host, url):
-        self.host = host
-        self.url = url
-        self.bootstrap = ClientBasePlain('8.8.8.8')
 
     @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)
-        self.bootstrap.resolve(exchange)
+        self.BOOTSTRAP.resolve(exchange)
         ip = next(iter(exchange.response_upstream.answer.items.keys())).address
         return ip
 
@@ -72,7 +74,7 @@ class ClientDoH:
         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=request.wire)
         response_doh.raise_for_status()
         response = Response.from_http(response_doh)
         exchange.response_upstream = response

{fmtr_tools-1.2.5 → fmtr_tools-1.2.6}/fmtr/tools/dns_tools/server.py

@@ -1,10 +1,12 @@
 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, Response
+from fmtr.tools.dns_tools.dm import Exchange
 
 
+@dataclass
 class ServerBasePlain:
     """
 
@@ -12,9 +14,11 @@ class ServerBasePlain:
 
     """
 
-    def __init__(self, host, port):
-        self.host = host
-        self.port = port
+    host: str
+    port: int
+
+    def __post_init__(self):
+
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
     def resolve(self, exchange: Exchange):
@@ -36,6 +40,7 @@ class ServerBasePlain:
             sock.sendto(exchange.response.wire, (ip, port))
 
 
+@dataclass
 class ServerBaseDoHProxy(ServerBasePlain):
     """
 
@@ -43,9 +48,7 @@ class ServerBaseDoHProxy(ServerBasePlain):
 
     """
 
-    def __init__(self, host, port, client: ClientDoH):
-        super().__init__(host, port)
-        self.client = client
+    client: ClientDoH
 
     def process_question(self, exchange: Exchange):
         return
@@ -53,16 +56,6 @@ class ServerBaseDoHProxy(ServerBasePlain):
     def process_upstream(self, exchange: Exchange):
         return
 
-    def from_upstream(self, exchange: Exchange) -> Exchange:
-
-        request = exchange.request
-        response_doh = self.client.post(self.URL, headers=self.HEADERS, content=request.wire)
-        response_doh.raise_for_status()
-        response = Response.from_http(response_doh)
-        exchange.response_upstream = response
-
-        return exchange
-
     def resolve(self, exchange: Exchange):
         """
 

fmtr_tools-1.2.6/fmtr/tools/version

@@ -0,0 +1 @@
+1.2.6

{fmtr_tools-1.2.5 → fmtr_tools-1.2.6}/fmtr.tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.2.5
+Version: 1.2.6
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Home-page: https://github.com/fmtr/tools
 Author: Frontmatter
@@ -106,6 +106,8 @@ Requires-Dist: pydevd-pycharm; extra == "debug"
 Provides-Extra: sets
 Requires-Dist: pydantic-settings; extra == "sets"
 Requires-Dist: pydantic; extra == "sets"
+Requires-Dist: yamlscript; extra == "sets"
+Requires-Dist: pyyaml; extra == "sets"
 Provides-Extra: path-app
 Requires-Dist: appdirs; extra == "path-app"
 Provides-Extra: path-type
@@ -128,60 +130,60 @@ Requires-Dist: logfire[httpx]; extra == "http"
 Provides-Extra: setup
 Requires-Dist: setuptools; extra == "setup"
 Provides-Extra: all
-Requires-Dist: torchaudio; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: regex; extra == "all"
-Requires-Dist: dask[bag]; extra == "all"
-Requires-Dist: pytest-cov; extra == "all"
-Requires-Dist: flet-video; extra == "all"
+Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
 Requires-Dist: uvicorn[standard]; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
 Requires-Dist: logfire[fastapi]; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
 Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
 Requires-Dist: semver; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: torchvision; extra == "all"
-Requires-Dist: pydevd-pycharm; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: sentence_transformers; extra == "all"
 Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: pydantic-settings; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: tabulate; extra == "all"
-Requires-Dist: setuptools; extra == "all"
+Requires-Dist: bokeh; extra == "all"
+Requires-Dist: contexttimer; extra == "all"
 Requires-Dist: diskcache; extra == "all"
-Requires-Dist: distributed; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
-Requires-Dist: flet-webview; extra == "all"
 Requires-Dist: peft; extra == "all"
-Requires-Dist: google-api-python-client; extra == "all"
-Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: docker; extra == "all"
-Requires-Dist: pydantic; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: faker; extra == "all"
+Requires-Dist: dask[bag]; extra == "all"
+Requires-Dist: pydevd-pycharm; extra == "all"
 Requires-Dist: transformers[sentencepiece]; extra == "all"
-Requires-Dist: Unidecode; extra == "all"
+Requires-Dist: regex; extra == "all"
+Requires-Dist: json_repair; extra == "all"
+Requires-Dist: html2text; extra == "all"
+Requires-Dist: faker; extra == "all"
+Requires-Dist: openpyxl; extra == "all"
 Requires-Dist: appdirs; extra == "all"
 Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: html2text; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: sentence_transformers; extra == "all"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: torchvision; extra == "all"
 Requires-Dist: ollama; extra == "all"
-Requires-Dist: json_repair; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
+Requires-Dist: flet-video; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Requires-Dist: yamlscript; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: logfire; extra == "all"
+Requires-Dist: tabulate; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
 Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: pydantic-settings; extra == "all"
+Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: distributed; extra == "all"
+Requires-Dist: flet-webview; extra == "all"
+Requires-Dist: setuptools; extra == "all"
+Requires-Dist: pyyaml; extra == "all"
+Requires-Dist: sre_yield; extra == "all"
 Requires-Dist: google-auth; extra == "all"
-Requires-Dist: pandas; extra == "all"
+Requires-Dist: torchaudio; extra == "all"
+Requires-Dist: pydantic; extra == "all"
+Requires-Dist: google-auth-httplib2; extra == "all"
+Requires-Dist: docker; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: httpx_retries; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.2.5 → fmtr_tools-1.2.6}/fmtr.tools.egg-info/requires.txt

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

{fmtr_tools-1.2.5 → fmtr_tools-1.2.6}/setup.py

@@ -32,7 +32,7 @@ DEPENDENCIES = {
     'caching': ['diskcache'],
     'pdf': ['pymupdf', 'dm', 'pymupdf4llm'],
     'debug': ['pydevd-pycharm'],
-    'sets': ['pydantic-settings', 'dm'],
+    'sets': ['pydantic-settings', 'dm', 'yaml'],
     'path.app': ['appdirs'],
     'path.type': ['filetype'],
     'dns': ['dnspython[doh]', 'http'],

fmtr_tools-1.2.5/fmtr/tools/version

@@ -1 +0,0 @@
-1.2.5