fmtr.tools 1.3.30__tar.gz → 1.3.31__tar.gz

{fmtr_tools-1.3.30 → fmtr_tools-1.3.31}/PKG-INFO

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

{fmtr_tools-1.3.30 → fmtr_tools-1.3.31}/fmtr/tools/ai_tools/agentic_tools.py

@@ -1,9 +1,11 @@
+from typing import List, Optional, Any, Annotated
+
 import pydantic_ai
+from pydantic import PlainValidator
 from pydantic_ai import RunContext, ModelRetry
 from pydantic_ai.agent import AgentRunResult, Agent
 from pydantic_ai.models.openai import OpenAIModel
 from pydantic_ai.providers.openai import OpenAIProvider
-from typing import List, Optional, Any
 
 from fmtr.tools import environment_tools as env
 from fmtr.tools.constants import Constants
@@ -131,6 +133,21 @@ class Task:
         """
         return f'{self.__class__.__name__}({repr(truncate_mid(self.SYSTEM_PROMPT_STATIC, 100))})'
 
+
+def default_prompt_none_specified(text):
+    """
+
+    If the prompt is falsey, explicitly state None Specified
+
+    """
+    if not (text or '').strip():
+        return Constants.PROMPT_NONE_SPECIFIED
+    return text
+
+
+StringDefaultNoneSpecified = Annotated[str, PlainValidator(default_prompt_none_specified)]
+
+
 if __name__ == '__main__':
     import asyncio
     from fmtr.tools import dm

{fmtr_tools-1.3.30 → fmtr_tools-1.3.31}/fmtr/tools/constants.py

@@ -52,4 +52,4 @@ class Constants:
 
     INFRA = 'infra'
 
-    PROMPT_NOT_SPECIFIED = '[None Specified]'
+    PROMPT_NONE_SPECIFIED = '[None Specified]'

fmtr_tools-1.3.31/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.31

{fmtr_tools-1.3.30 → fmtr_tools-1.3.31}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.30/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.30

{fmtr_tools-1.3.30 → fmtr_tools-1.3.31}/fmtr.tools.egg-info/requires.txt

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