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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of fmtr.tools might be problematic. Click here for more details.

Files changed (8) hide show
  1. fmtr/tools/ai_tools/agentic_tools.py +19 -4
  2. fmtr/tools/version +1 -1
  3. {fmtr_tools-1.3.60.dist-info → fmtr_tools-1.3.61.dist-info}/METADATA +52 -52
  4. {fmtr_tools-1.3.60.dist-info → fmtr_tools-1.3.61.dist-info}/RECORD +8 -8
  5. {fmtr_tools-1.3.60.dist-info → fmtr_tools-1.3.61.dist-info}/WHEEL +0 -0
  6. {fmtr_tools-1.3.60.dist-info → fmtr_tools-1.3.61.dist-info}/entry_points.txt +0 -0
  7. {fmtr_tools-1.3.60.dist-info → fmtr_tools-1.3.61.dist-info}/licenses/LICENSE +0 -0
  8. {fmtr_tools-1.3.60.dist-info → fmtr_tools-1.3.61.dist-info}/top_level.txt +0 -0
fmtr/tools/ai_tools/agentic_tools.py CHANGED
@@ -6,6 +6,7 @@ from pydantic_ai import RunContext, ModelRetry
6
6
  from pydantic_ai._output import OutputDataT
7
7
  from pydantic_ai.agent import AgentRunResult, Agent
8
8
  from pydantic_ai.models.openai import OpenAIModel
9
+ from pydantic_ai.output import OutputSpec, NativeOutput, ToolOutput
9
10
  from pydantic_ai.providers.openai import OpenAIProvider
10
11
  from pydantic_ai.tools import AgentDepsT
11
12
 
@@ -47,7 +48,7 @@ class Task(Generic[AgentDepsT, OutputDataT]):
47
48
  PROVIDER_FMTR = OpenAIProvider(base_url=API_URL_FMTR)
48
49
 
49
50
  MODEL_ID = 'gpt-4o'
50
- MODEL_ID_FMTR = 'qwen2.5-coder:14b'
51
+ MODEL_ID_FMTR = 'qwen2.5-coder:32b'
51
52
  SYSTEM_PROMPT_STATIC = None
52
53
  RESULT_RETRIES = 5
53
54
  VALIDATORS: List[Validator] = []
@@ -65,7 +66,7 @@ class Task(Generic[AgentDepsT, OutputDataT]):
65
66
  model=self.model,
66
67
  system_prompt=self.SYSTEM_PROMPT_STATIC or [],
67
68
  deps_type=self.TypeDeps,
68
- output_type=self.TypeOutput,
69
+ output_type=self.tool_output,
69
70
  output_retries=self.RESULT_RETRIES,
70
71
  **kwargs
71
72
  )
@@ -74,6 +75,16 @@ class Task(Generic[AgentDepsT, OutputDataT]):
74
75
  self.agent.system_prompt(self.add_system_prompt)
75
76
  self.history = []
76
77
 
78
+ @property
79
+ def tool_output(self) -> OutputSpec[OutputDataT]:
80
+ """
81
+
82
+ Tool output specification (e.g. ToolOutput/NativeOutput etc.)
83
+
84
+ """
85
+ return ToolOutput(self.TypeOutput)
86
+
87
+
77
88
  @property
78
89
  def sync_runner(self):
79
90
  """
@@ -183,11 +194,15 @@ if __name__ == '__main__':
183
194
 
184
195
 
185
196
  class TaskTest(Task):
186
- # PROVIDER = Task.PROVIDER_FMTR
187
- # MODEL_ID = 'qwen2.5-coder:14b'
197
+ PROVIDER = Task.PROVIDER_FMTR
198
+ MODEL_ID = Task.MODEL_ID_FMTR
188
199
  TypeOutput = TestOutput
189
200
  SYSTEM_PROMPT_STATIC = 'Tell the user jokes.'
190
201
 
202
+ @property
203
+ def tool_output(self) -> OutputSpec[TestOutput]:
204
+ return NativeOutput(self.TypeOutput)
205
+
191
206
  def add_system_prompt(self, ctx: RunContext[TestDeps]) -> str:
192
207
  return f'The jokes must be in the {ctx.deps.lang} language.'
193
208
 
fmtr/tools/version CHANGED
@@ -1 +1 @@
1
- 1.3.60
1
+ 1.3.61
{fmtr_tools-1.3.60.dist-info → fmtr_tools-1.3.61.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: fmtr.tools
3
- Version: 1.3.60
3
+ Version: 1.3.61
4
4
  Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
5
5
  Home-page: https://github.com/fmtr/fmtr.tools
6
6
  Author: Frontmatter
@@ -154,68 +154,68 @@ Provides-Extra: db-document
154
154
  Requires-Dist: beanie[odm]; extra == "db-document"
155
155
  Requires-Dist: motor; extra == "db-document"
156
156
  Provides-Extra: all
157
- Requires-Dist: yamlscript; extra == "all"
158
- Requires-Dist: Unidecode; extra == "all"
159
- Requires-Dist: google-auth-httplib2; extra == "all"
160
- Requires-Dist: google-auth; extra == "all"
161
- Requires-Dist: faker; extra == "all"
157
+ Requires-Dist: sre_yield; extra == "all"
158
+ Requires-Dist: dask[bag]; extra == "all"
162
159
  Requires-Dist: bokeh; extra == "all"
163
- Requires-Dist: logfire[fastapi]; extra == "all"
164
- Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
165
- Requires-Dist: pytest-cov; extra == "all"
166
- Requires-Dist: pydantic-extra-types; extra == "all"
167
- Requires-Dist: google-auth-oauthlib; extra == "all"
168
- Requires-Dist: peft; extra == "all"
169
- Requires-Dist: ollama; extra == "all"
170
- Requires-Dist: tabulate; extra == "all"
171
- Requires-Dist: filetype; extra == "all"
160
+ Requires-Dist: tinynetrc; extra == "all"
161
+ Requires-Dist: python-on-whales; extra == "all"
162
+ Requires-Dist: json_repair; extra == "all"
163
+ Requires-Dist: dnspython[doh]; extra == "all"
172
164
  Requires-Dist: pymupdf4llm; extra == "all"
173
- Requires-Dist: dask[bag]; extra == "all"
165
+ Requires-Dist: transformers[sentencepiece]; extra == "all"
174
166
  Requires-Dist: httpx; extra == "all"
175
- Requires-Dist: openpyxl; extra == "all"
176
- Requires-Dist: fastapi; extra == "all"
177
- Requires-Dist: deepdiff; extra == "all"
167
+ Requires-Dist: cachetools; extra == "all"
168
+ Requires-Dist: pandas; extra == "all"
169
+ Requires-Dist: torchvision; extra == "all"
170
+ Requires-Dist: peft; extra == "all"
171
+ Requires-Dist: pydantic-settings; extra == "all"
172
+ Requires-Dist: httpx_retries; extra == "all"
173
+ Requires-Dist: torchaudio; extra == "all"
174
+ Requires-Dist: distributed; extra == "all"
175
+ Requires-Dist: flet-webview; extra == "all"
176
+ Requires-Dist: tokenizers; extra == "all"
177
+ Requires-Dist: google-auth; extra == "all"
178
+ Requires-Dist: pytest-cov; extra == "all"
179
+ Requires-Dist: pycountry; extra == "all"
180
+ Requires-Dist: regex; extra == "all"
178
181
  Requires-Dist: semver; extra == "all"
179
- Requires-Dist: diskcache; extra == "all"
180
- Requires-Dist: logfire[httpx]; extra == "all"
181
- Requires-Dist: json_repair; extra == "all"
182
- Requires-Dist: deepmerge; extra == "all"
183
182
  Requires-Dist: pyyaml; extra == "all"
184
- Requires-Dist: flet[all]; extra == "all"
185
- Requires-Dist: uvicorn[standard]; extra == "all"
186
- Requires-Dist: pymupdf; extra == "all"
187
- Requires-Dist: pydantic; extra == "all"
188
- Requires-Dist: sentence_transformers; extra == "all"
183
+ Requires-Dist: pydantic-extra-types; extra == "all"
184
+ Requires-Dist: fastapi; extra == "all"
185
+ Requires-Dist: ollama; extra == "all"
186
+ Requires-Dist: odfpy; extra == "all"
189
187
  Requires-Dist: setuptools; extra == "all"
190
- Requires-Dist: torchvision; extra == "all"
191
- Requires-Dist: huggingface_hub; extra == "all"
192
- Requires-Dist: flet-webview; extra == "all"
188
+ Requires-Dist: openpyxl; extra == "all"
189
+ Requires-Dist: uvicorn[standard]; extra == "all"
190
+ Requires-Dist: google-auth-oauthlib; extra == "all"
191
+ Requires-Dist: yamlscript; extra == "all"
193
192
  Requires-Dist: html2text; extra == "all"
194
- Requires-Dist: motor; extra == "all"
195
- Requires-Dist: pydantic-settings; extra == "all"
196
- Requires-Dist: sre_yield; extra == "all"
197
193
  Requires-Dist: appdirs; extra == "all"
198
- Requires-Dist: dnspython[doh]; extra == "all"
199
- Requires-Dist: regex; extra == "all"
200
- Requires-Dist: python-on-whales; extra == "all"
201
- Requires-Dist: pandas; extra == "all"
202
- Requires-Dist: playwright; extra == "all"
203
- Requires-Dist: contexttimer; extra == "all"
204
194
  Requires-Dist: google-api-python-client; extra == "all"
205
- Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
206
- Requires-Dist: openai; extra == "all"
207
- Requires-Dist: pycountry; extra == "all"
208
- Requires-Dist: cachetools; extra == "all"
209
- Requires-Dist: httpx_retries; extra == "all"
210
- Requires-Dist: distributed; extra == "all"
211
- Requires-Dist: transformers[sentencepiece]; extra == "all"
212
- Requires-Dist: tokenizers; extra == "all"
195
+ Requires-Dist: beanie[odm]; extra == "all"
213
196
  Requires-Dist: logfire; extra == "all"
214
- Requires-Dist: torchaudio; extra == "all"
197
+ Requires-Dist: faker; extra == "all"
198
+ Requires-Dist: Unidecode; extra == "all"
199
+ Requires-Dist: huggingface_hub; extra == "all"
200
+ Requires-Dist: openai; extra == "all"
201
+ Requires-Dist: sentence_transformers; extra == "all"
202
+ Requires-Dist: logfire[fastapi]; extra == "all"
203
+ Requires-Dist: filetype; extra == "all"
204
+ Requires-Dist: deepdiff; extra == "all"
205
+ Requires-Dist: google-auth-httplib2; extra == "all"
206
+ Requires-Dist: pymupdf; extra == "all"
207
+ Requires-Dist: motor; extra == "all"
215
208
  Requires-Dist: flet-video; extra == "all"
216
- Requires-Dist: beanie[odm]; extra == "all"
217
- Requires-Dist: odfpy; extra == "all"
218
- Requires-Dist: tinynetrc; extra == "all"
209
+ Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
210
+ Requires-Dist: logfire[httpx]; extra == "all"
211
+ Requires-Dist: contexttimer; extra == "all"
212
+ Requires-Dist: diskcache; extra == "all"
213
+ Requires-Dist: flet[all]; extra == "all"
214
+ Requires-Dist: playwright; extra == "all"
215
+ Requires-Dist: tabulate; extra == "all"
216
+ Requires-Dist: pydantic; extra == "all"
217
+ Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
218
+ Requires-Dist: deepmerge; extra == "all"
219
219
  Dynamic: author
220
220
  Dynamic: author-email
221
221
  Dynamic: description
{fmtr_tools-1.3.60.dist-info → fmtr_tools-1.3.61.dist-info}/RECORD RENAMED
@@ -45,11 +45,11 @@ fmtr/tools/tabular_tools.py,sha256=mw6vOij1Ch-pVAyHMPtm5zj__ULZN_TKeBYOfj33wFM,1
45
45
  fmtr/tools/tokenization_tools.py,sha256=me-IBzSLyNYejLybwjO9CNB6Mj2NYfKPaOVThXyaGNg,4268
46
46
  fmtr/tools/tools.py,sha256=CAsApa1YwVdNE6H66Vjivs_mXYvOas3rh7fPELAnTpk,795
47
47
  fmtr/tools/unicode_tools.py,sha256=yS_9wpu8ogNoiIL7s1G_8bETFFO_YQlo4LNPv1NLDeY,52
48
- fmtr/tools/version,sha256=IXmFJo48YhTLScaJd_aidWKXC2ncdolMTReBD7RNA9A,6
48
+ fmtr/tools/version,sha256=Z9USkquVEFCARqM5U6DLcxzsj6T0ruK_4fsrwxu4VXU,6
49
49
  fmtr/tools/webhook_tools.py,sha256=q3pVJ1NCem2SrMuFcLxiWd7DibFs7Q-uGtojfXd3Qcg,380
50
50
  fmtr/tools/yaml_tools.py,sha256=Bhhyd6GQVKO72Lp8ky7bAUjIB_65Hdh0Q45SKIEe6S8,1901
51
51
  fmtr/tools/ai_tools/__init__.py,sha256=O8VRlPnnQCncg2ZZ2l_VdWLJf4jkKH6dkZFVbv6o7IM,388
52
- fmtr/tools/ai_tools/agentic_tools.py,sha256=fRb5M3A2avICmrhTgLq-FpCVgWiSp3_Bn2j9yP6hxo0,5136
52
+ fmtr/tools/ai_tools/agentic_tools.py,sha256=Zj6WcbDc1yLFi3raTSD0BeOkWR3l5RmmccFYGx8-0XE,5534
53
53
  fmtr/tools/ai_tools/inference_tools.py,sha256=2UP2gXEyOJUjyyV6zmFIYmIxUsh1rXkRH0IbFvr2bRs,11908
54
54
  fmtr/tools/database_tools/__init__.py,sha256=-YXEs3P4nwg7hdvALpaW4K2Pg9FIc49rD53smqnBgT4,221
55
55
  fmtr/tools/database_tools/document.py,sha256=YciaSNYyLSPRFZbHQEVwN-G_7RXgXFaq27IN62--fDA,989
@@ -85,9 +85,9 @@ fmtr/tools/tests/test_path.py,sha256=AkZQa6_8BQ-VaCyL_J-iKmdf2ZaM-xFYR37Kun3k4_g
85
85
  fmtr/tools/tests/test_yaml.py,sha256=jc0TwwKu9eC0LvFGNMERdgBue591xwLxYXFbtsRwXVM,287
86
86
  fmtr/tools/version_tools/__init__.py,sha256=cjE6nO6AoVOUp3RwgTbqL9wiw8J1l2pHJOz6Gn6bxjA,326
87
87
  fmtr/tools/version_tools/version_tools.py,sha256=Hcc6yferZS1hHbugRTdiHhSNmXEEG0hjCiTTXKna-YY,1127
88
- fmtr_tools-1.3.60.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
89
- fmtr_tools-1.3.60.dist-info/METADATA,sha256=YzIabPQ0qKI4BK807t4bkM8Zz52QKC2-ouYKXJu2XsM,17455
90
- fmtr_tools-1.3.60.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
91
- fmtr_tools-1.3.60.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
92
- fmtr_tools-1.3.60.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
93
- fmtr_tools-1.3.60.dist-info/RECORD,,
88
+ fmtr_tools-1.3.61.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
89
+ fmtr_tools-1.3.61.dist-info/METADATA,sha256=fqS-UiWsEhwxOhJPB3BHTE9apKaAHvujkNXfU-vSWTs,17455
90
+ fmtr_tools-1.3.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
91
+ fmtr_tools-1.3.61.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
92
+ fmtr_tools-1.3.61.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
93
+ fmtr_tools-1.3.61.dist-info/RECORD,,