fmtr.tools 1.3.59__tar.gz → 1.3.61__tar.gz

{fmtr_tools-1.3.59 → fmtr_tools-1.3.61}/PKG-INFO

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

{fmtr_tools-1.3.59 → fmtr_tools-1.3.61}/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-1.3.61/fmtr/tools/docker_tools/__init__.py

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

fmtr_tools-1.3.61/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.61

{fmtr_tools-1.3.59 → fmtr_tools-1.3.61}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.59/fmtr/tools/docker_tools/__init__.py

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

fmtr_tools-1.3.59/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.59

{fmtr_tools-1.3.59 → fmtr_tools-1.3.61}/fmtr.tools.egg-info/requires.txt

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