fmtr.tools 1.2.1__tar.gz → 1.2.2__tar.gz

{fmtr_tools-1.2.1 → fmtr_tools-1.2.2}/PKG-INFO

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

{fmtr_tools-1.2.1 → fmtr_tools-1.2.2}/fmtr/tools/ai_tools/agentic_tools.py

@@ -1,17 +1,31 @@
-from typing import List, Optional
-
 import pydantic_ai
-from pydantic_ai import RunContext
+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
+from fmtr.tools.logging_tools import logger
 from fmtr.tools.string_tools import truncate_mid
 
 pydantic_ai.Agent.instrument_all()
 
+
+class Validator:
+    """
+
+    Subclassable validator
+
+    """
+
+    async def validate(self, ctx: RunContext[Any], output: Any) -> List[str]:
+        raise NotImplementedError()
+
+
+
+
 class Task:
     """
 
@@ -31,6 +45,7 @@ class Task:
     DEPS_TYPE = str
     RESULT_TYPE = str
     RESULT_RETRIES = 5
+    VALIDATORS: List[Validator] = []
 
     def __init__(self, *args, **kwargs):
         """
@@ -77,9 +92,18 @@ class Task:
     async def validate(self, ctx: RunContext[DEPS_TYPE], output: RESULT_TYPE) -> RESULT_TYPE:
         """
 
-        Dummy validator
+        Aggregate any validation failures and combine them into a single ModelRetry exception
 
         """
+        msgs = []
+        for validator in self.VALIDATORS:
+            msgs += validator.validate(ctx, output)
+
+        if msgs:
+            msg = '. '.join(msgs)
+            logger.warning(msg)
+            raise ModelRetry(msg)
+
         return output
 
     def get_prompt(self, deps: Optional[DEPS_TYPE]) -> Optional[str]:

fmtr_tools-1.2.2/fmtr/tools/version

@@ -0,0 +1 @@
+1.2.2

{fmtr_tools-1.2.1 → fmtr_tools-1.2.2}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.2.1/fmtr/tools/version

@@ -1 +0,0 @@
-1.2.1

{fmtr_tools-1.2.1 → fmtr_tools-1.2.2}/fmtr.tools.egg-info/requires.txt

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