fmtr.tools 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

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/version

@@ -1 +1 @@
-1.2.0
+1.2.2

{fmtr_tools-1.2.0.dist-info → fmtr_tools-1.2.2.dist-info}/METADATA

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

{fmtr_tools-1.2.0.dist-info → fmtr_tools-1.2.2.dist-info}/RECORD

@@ -45,11 +45,11 @@ fmtr/tools/tabular_tools.py,sha256=tpIpZzYku1HcJrHZJL6BC39LmN3WUWVhFbK2N7nDVmE,1
 fmtr/tools/tokenization_tools.py,sha256=me-IBzSLyNYejLybwjO9CNB6Mj2NYfKPaOVThXyaGNg,4268
 fmtr/tools/tools.py,sha256=CAsApa1YwVdNE6H66Vjivs_mXYvOas3rh7fPELAnTpk,795
 fmtr/tools/unicode_tools.py,sha256=yS_9wpu8ogNoiIL7s1G_8bETFFO_YQlo4LNPv1NLDeY,52
-fmtr/tools/version,sha256=n3cDSx61fSTyGsfetlycyZ9jtyd14xHx8oCrK2wuBqI,5
+fmtr/tools/version,sha256=HsT6sNjdXq_vguZ_YaNcA-6ZSYilKT4Xzz0-l8NRGEc,5
 fmtr/tools/version_tools.py,sha256=yNs_CGqWpqE4jbK9wsPIi14peJVXYbhIcMqHAFOw3yE,1480
 fmtr/tools/yaml_tools.py,sha256=9kuYChqJelWQIjGlSnK4iDdOWWH06P0gp9jIcRrC3UI,1903
 fmtr/tools/ai_tools/__init__.py,sha256=JZrLuOFNV1A3wvJgonxOgz_4WS-7MfCuowGWA5uYCjs,372
-fmtr/tools/ai_tools/agentic_tools.py,sha256=YebH7R9ovVo3GzfWAZxY49e2fNt13APDMe290xx7zks,3720
+fmtr/tools/ai_tools/agentic_tools.py,sha256=acSEPFS-aguDXanWGs3fAAlRyJSYPZW7L-Kb2qDLm-I,4300
 fmtr/tools/ai_tools/inference_tools.py,sha256=2UP2gXEyOJUjyyV6zmFIYmIxUsh1rXkRH0IbFvr2bRs,11908
 fmtr/tools/entrypoints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/entrypoints/cache_hfh.py,sha256=fQNs4J9twQuZH_Yj98-oOvEX7-LrSUP3kO8nzw2HrHs,60
@@ -70,9 +70,9 @@ fmtr/tools/tests/test_environment.py,sha256=iHaiMQfECYZPkPKwfuIZV9uHuWe3aE-p_dN_
 fmtr/tools/tests/test_json.py,sha256=IeSP4ziPvRcmS8kq7k9tHonC9rN5YYq9GSNT2ul6Msk,287
 fmtr/tools/tests/test_path.py,sha256=AkZQa6_8BQ-VaCyL_J-iKmdf2ZaM-xFYR37Kun3k4_g,2188
 fmtr/tools/tests/test_yaml.py,sha256=jc0TwwKu9eC0LvFGNMERdgBue591xwLxYXFbtsRwXVM,287
-fmtr_tools-1.2.0.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.2.0.dist-info/METADATA,sha256=2QBz83ifUL0Z0Z5uFdQtn_WqvwzafB8OlzM-TAaIfCY,15738
-fmtr_tools-1.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.2.0.dist-info/entry_points.txt,sha256=fSQrDGNctdQXbUxpMWYVfVQ0mhZMDyaEDG3D3a0zOSc,278
-fmtr_tools-1.2.0.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.2.0.dist-info/RECORD,,
+fmtr_tools-1.2.2.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.2.2.dist-info/METADATA,sha256=tvVd8XZQ7rBtJ2d_gjBvw5orqsRHKnyewIIiyBXy7OY,15738
+fmtr_tools-1.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.2.2.dist-info/entry_points.txt,sha256=fSQrDGNctdQXbUxpMWYVfVQ0mhZMDyaEDG3D3a0zOSc,278
+fmtr_tools-1.2.2.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.2.2.dist-info/RECORD,,