fmtr.tools 1.3.52__tar.gz → 1.3.53__tar.gz

{fmtr_tools-1.3.52 → fmtr_tools-1.3.53}/PKG-INFO

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

{fmtr_tools-1.3.52 → fmtr_tools-1.3.53}/fmtr/tools/ai_tools/agentic_tools.py

@@ -1,10 +1,12 @@
 import pydantic_ai
 from pydantic import PlainValidator
 from pydantic_ai import RunContext, ModelRetry
+from pydantic_ai._output import OutputDataT
 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, Annotated
+from pydantic_ai.tools import AgentDepsT
+from typing import List, Optional, Any, Annotated, Generic
 
 from fmtr.tools import environment_tools as env
 from fmtr.tools.constants import Constants
@@ -25,15 +27,16 @@ class Validator:
         raise NotImplementedError()
 
 
-
-
-class Task:
+class Task(Generic[AgentDepsT, OutputDataT]):
     """
 
     Linear task definition, as Agent configuration and typing, plus state history.
 
     """
 
+    TypeDeps = str
+    TypeOutput = str
+
     PROVIDER = OpenAIProvider(api_key=env.get(Constants.FMTR_OPENAI_API_KEY_KEY))
 
     API_HOST_FMTR = env.get(Constants.FMTR_AI_HOST_KEY, Constants.FMTR_AI_HOST_DEFAULT)
@@ -43,8 +46,6 @@ class Task:
     MODEL_ID = 'gpt-4o'
     MODEL_ID_FMTR = 'qwen2.5-coder:14b'
     SYSTEM_PROMPT_STATIC = None
-    DEPS_TYPE = str
-    RESULT_TYPE = str
     RESULT_RETRIES = 5
     VALIDATORS: List[Validator] = []
 
@@ -56,13 +57,13 @@ class Task:
         """
 
         self.model = OpenAIModel(self.MODEL_ID, provider=self.PROVIDER)
-        self.agent = Agent(
+        self.agent = Agent[AgentDepsT, OutputDataT](
             *args,
             model=self.model,
             system_prompt=self.SYSTEM_PROMPT_STATIC or [],
-            deps_type=self.DEPS_TYPE,
-            result_type=self.RESULT_TYPE,
-            result_retries=self.RESULT_RETRIES,
+            deps_type=self.TypeDeps,
+            output_type=self.TypeOutput,
+            output_retries=self.RESULT_RETRIES,
             **kwargs
         )
 
@@ -80,7 +81,7 @@ class Task:
         import asyncio
         return asyncio.run
 
-    async def run(self, *args, deps=None, **kwargs) -> AgentRunResult[RESULT_TYPE]:
+    async def run(self, *args, deps=None, **kwargs) -> AgentRunResult[OutputDataT]:
         """
 
         Run Agent with deps-relative user prompt and while storing history
@@ -90,7 +91,7 @@ class Task:
         self.history = result.all_messages()
         return result
 
-    async def validate(self, ctx: RunContext[DEPS_TYPE], output: RESULT_TYPE) -> RESULT_TYPE:
+    async def validate(self, ctx: RunContext[AgentDepsT], output: OutputDataT) -> OutputDataT:
         """
 
         Aggregate any validation failures and combine them into a single ModelRetry exception
@@ -107,7 +108,7 @@ class Task:
 
         return output
 
-    def get_prompt(self, deps: Optional[DEPS_TYPE]) -> Optional[str]:
+    def get_prompt(self, deps: Optional[AgentDepsT]) -> Optional[str]:
         """
 
         Dummy prompt generator
@@ -115,7 +116,7 @@ class Task:
         """
         return None
 
-    def add_system_prompt(self, ctx: RunContext[DEPS_TYPE]) -> str | List[str]:
+    def add_system_prompt(self, ctx: RunContext[AgentDepsT]) -> str | List[str]:
         """
 
         Dummy system prompt append
@@ -181,7 +182,7 @@ if __name__ == '__main__':
     class TaskTest(Task):
         # PROVIDER = Task.PROVIDER_FMTR
         # MODEL_ID = 'qwen2.5-coder:14b'
-        RESULT_TYPE = TestOutput
+        TypeOutput = TestOutput
         SYSTEM_PROMPT_STATIC = 'Tell the user jokes.'
 
         def add_system_prompt(self, ctx: RunContext[TestDeps]) -> str:

fmtr_tools-1.3.53/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.53

{fmtr_tools-1.3.52 → fmtr_tools-1.3.53}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.52/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.52

{fmtr_tools-1.3.52 → fmtr_tools-1.3.53}/fmtr.tools.egg-info/requires.txt

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