fmtr.tools 1.3.59__py3-none-any.whl → 1.3.61__py3-none-any.whl

fmtr/tools/ai_tools/agentic_tools.py

@@ -6,6 +6,7 @@ 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.output import OutputSpec, NativeOutput, ToolOutput
 from pydantic_ai.providers.openai import OpenAIProvider
 from pydantic_ai.tools import AgentDepsT
 
@@ -47,7 +48,7 @@ class Task(Generic[AgentDepsT, OutputDataT]):
     PROVIDER_FMTR = OpenAIProvider(base_url=API_URL_FMTR)
 
     MODEL_ID = 'gpt-4o'
-    MODEL_ID_FMTR = 'qwen2.5-coder:14b'
+    MODEL_ID_FMTR = 'qwen2.5-coder:32b'
     SYSTEM_PROMPT_STATIC = None
     RESULT_RETRIES = 5
     VALIDATORS: List[Validator] = []
@@ -65,7 +66,7 @@ class Task(Generic[AgentDepsT, OutputDataT]):
             model=self.model,
             system_prompt=self.SYSTEM_PROMPT_STATIC or [],
             deps_type=self.TypeDeps,
-            output_type=self.TypeOutput,
+            output_type=self.tool_output,
             output_retries=self.RESULT_RETRIES,
             **kwargs
         )
@@ -74,6 +75,16 @@ class Task(Generic[AgentDepsT, OutputDataT]):
         self.agent.system_prompt(self.add_system_prompt)
         self.history = []
 
+    @property
+    def tool_output(self) -> OutputSpec[OutputDataT]:
+        """
+
+        Tool output specification (e.g. ToolOutput/NativeOutput etc.)
+
+        """
+        return ToolOutput(self.TypeOutput)
+
+
     @property
     def sync_runner(self):
         """
@@ -183,11 +194,15 @@ if __name__ == '__main__':
 
 
     class TaskTest(Task):
-        # PROVIDER = Task.PROVIDER_FMTR
-        # MODEL_ID = 'qwen2.5-coder:14b'
+        PROVIDER = Task.PROVIDER_FMTR
+        MODEL_ID = Task.MODEL_ID_FMTR
         TypeOutput = TestOutput
         SYSTEM_PROMPT_STATIC = 'Tell the user jokes.'
 
+        @property
+        def tool_output(self) -> OutputSpec[TestOutput]:
+            return NativeOutput(self.TypeOutput)
+
         def add_system_prompt(self, ctx: RunContext[TestDeps]) -> str:
             return f'The jokes must be in the {ctx.deps.lang} language.'
 

fmtr/tools/docker_tools/__init__.py

@@ -1,6 +1,6 @@
 from fmtr.tools.import_tools import MissingExtraMockModule
 
 try:
-    from python_on_whales import docker as client
+    from python_on_whales import DockerClient
 except ModuleNotFoundError as exception:
-    client = MissingExtraMockModule('docker.client', exception)
+    DockerClient = MissingExtraMockModule('docker.client', exception)

fmtr/tools/version

@@ -1 +1 @@
-1.3.59
+1.3.61

{fmtr_tools-1.3.59.dist-info → fmtr_tools-1.3.61.dist-info}/METADATA

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

{fmtr_tools-1.3.59.dist-info → fmtr_tools-1.3.61.dist-info}/RECORD

@@ -45,11 +45,11 @@ fmtr/tools/tabular_tools.py,sha256=mw6vOij1Ch-pVAyHMPtm5zj__ULZN_TKeBYOfj33wFM,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=GLIvT9UpgOfR5eMy3tLt3pC5v1vyNChBHJb4URw1OpY,6
+fmtr/tools/version,sha256=Z9USkquVEFCARqM5U6DLcxzsj6T0ruK_4fsrwxu4VXU,6
 fmtr/tools/webhook_tools.py,sha256=q3pVJ1NCem2SrMuFcLxiWd7DibFs7Q-uGtojfXd3Qcg,380
 fmtr/tools/yaml_tools.py,sha256=Bhhyd6GQVKO72Lp8ky7bAUjIB_65Hdh0Q45SKIEe6S8,1901
 fmtr/tools/ai_tools/__init__.py,sha256=O8VRlPnnQCncg2ZZ2l_VdWLJf4jkKH6dkZFVbv6o7IM,388
-fmtr/tools/ai_tools/agentic_tools.py,sha256=fRb5M3A2avICmrhTgLq-FpCVgWiSp3_Bn2j9yP6hxo0,5136
+fmtr/tools/ai_tools/agentic_tools.py,sha256=Zj6WcbDc1yLFi3raTSD0BeOkWR3l5RmmccFYGx8-0XE,5534
 fmtr/tools/ai_tools/inference_tools.py,sha256=2UP2gXEyOJUjyyV6zmFIYmIxUsh1rXkRH0IbFvr2bRs,11908
 fmtr/tools/database_tools/__init__.py,sha256=-YXEs3P4nwg7hdvALpaW4K2Pg9FIc49rD53smqnBgT4,221
 fmtr/tools/database_tools/document.py,sha256=YciaSNYyLSPRFZbHQEVwN-G_7RXgXFaq27IN62--fDA,989
@@ -58,7 +58,7 @@ fmtr/tools/dns_tools/client.py,sha256=IBbd7Xgx9ExTn_EPoL7ts9JfXokHHuOiD9m4K6tl1Q
 fmtr/tools/dns_tools/dm.py,sha256=Lp1HaF7rpVtL_Ji4Bd32B29105H9ZKQ8AcVj_AB7nsA,6678
 fmtr/tools/dns_tools/proxy.py,sha256=gCWfH1pyWjj8xnJ8Pm4id7bsBWqcar3dQ9PeP5XjRXY,1624
 fmtr/tools/dns_tools/server.py,sha256=_Y5w5bGHhBI32fYWl-SmnOALAw_eF9fEbmrOqqgzSq8,4263
-fmtr/tools/docker_tools/__init__.py,sha256=yEw5v6aqA_PSiEu7uTvq2DhXiZ2DmA9LqV4R7qAxI_4,220
+fmtr/tools/docker_tools/__init__.py,sha256=NzUFbOX3eQCJ9ex0YL7xZPKLb65HngvZCBRTz839A8Y,222
 fmtr/tools/entrypoints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/entrypoints/cache_hfh.py,sha256=fQNs4J9twQuZH_Yj98-oOvEX7-LrSUP3kO8nzw2HrHs,60
 fmtr/tools/entrypoints/ep_test.py,sha256=B8HfWISfSgw_xVX475CbJGh_QnpOe9MH65H8qGjTWbY,46
@@ -85,9 +85,9 @@ fmtr/tools/tests/test_path.py,sha256=AkZQa6_8BQ-VaCyL_J-iKmdf2ZaM-xFYR37Kun3k4_g
 fmtr/tools/tests/test_yaml.py,sha256=jc0TwwKu9eC0LvFGNMERdgBue591xwLxYXFbtsRwXVM,287
 fmtr/tools/version_tools/__init__.py,sha256=cjE6nO6AoVOUp3RwgTbqL9wiw8J1l2pHJOz6Gn6bxjA,326
 fmtr/tools/version_tools/version_tools.py,sha256=Hcc6yferZS1hHbugRTdiHhSNmXEEG0hjCiTTXKna-YY,1127
-fmtr_tools-1.3.59.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.59.dist-info/METADATA,sha256=7iNgPOAPyFzPnFk27qaw51DComPnrtV28w7W_0E8toE,17455
-fmtr_tools-1.3.59.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.59.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.59.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.59.dist-info/RECORD,,
+fmtr_tools-1.3.61.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.61.dist-info/METADATA,sha256=fqS-UiWsEhwxOhJPB3BHTE9apKaAHvujkNXfU-vSWTs,17455
+fmtr_tools-1.3.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.61.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.61.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.61.dist-info/RECORD,,