fmtr.tools 1.3.17__tar.gz → 1.3.19__tar.gz

{fmtr_tools-1.3.17 → fmtr_tools-1.3.19}/PKG-INFO

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

{fmtr_tools-1.3.17 → fmtr_tools-1.3.19}/fmtr/tools/dns_tools/dm.py

@@ -197,11 +197,17 @@ class Exchange:
     def question_last(self) -> RRset:
         """
 
-        Create an RRset surrogate representing the latest/current question. This can be the original question - or a hybrid one if we've injected our own answers into the Exchange.
+        Create an RRset surrogate representing the latest/current question.
+        This can be the original question - or a hybrid one if we've injected our own answers into the Exchange.
+        If there's a response, use its answers, else fall back to answers_pre, else to the original question.
 
         """
-        if self.answers_pre:
-            rrset = self.answers_pre[-1]
+        answers = self.answers_pre
+        if self.response:
+            answers = self.response.message.answer or answers
+
+        if answers:
+            rrset = answers[-1]
             rdtype = self.request.type
             ttl = self.request.question.ttl
             rdclass = self.request.question.rdclass

{fmtr_tools-1.3.17 → fmtr_tools-1.3.19}/fmtr/tools/dns_tools/server.py

@@ -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.19/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.19

{fmtr_tools-1.3.17 → fmtr_tools-1.3.19}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.17/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.17

{fmtr_tools-1.3.17 → fmtr_tools-1.3.19}/fmtr.tools.egg-info/requires.txt

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