fmtr.tools 1.1.2__py3-none-any.whl → 1.1.4__py3-none-any.whl

fmtr/tools/ai_tools/agentic_tools.py

@@ -1,9 +1,9 @@
 import pydantic_ai
 from pydantic_ai import RunContext
 from pydantic_ai.agent import AgentRunResult, Agent
-from pydantic_ai.messages import ModelRequest, RetryPromptPart
 from pydantic_ai.models.openai import OpenAIModel
 from pydantic_ai.providers.openai import OpenAIProvider
+from typing import List, Optional
 
 from fmtr.tools import environment_tools as env
 from fmtr.tools.constants import Constants
@@ -25,7 +25,7 @@ class Task:
 
     MODEL_ID = 'gpt-4o'
     MODEL_ID_FMTR = 'qwen2.5-coder:14b'
-    SYSTEM_PROMPT = None
+    SYSTEM_PROMPT_STATIC = None
     DEPS_TYPE = str
     RESULT_TYPE = str
     RESULT_RETRIES = 5
@@ -41,7 +41,7 @@ class Task:
         self.agent = Agent(
             *args,
             model=self.model,
-            system_prompt=self.SYSTEM_PROMPT or [],
+            system_prompt=self.SYSTEM_PROMPT_STATIC or [],
             deps_type=self.DEPS_TYPE,
             result_type=self.RESULT_TYPE,
             result_retries=self.RESULT_RETRIES,
@@ -49,58 +49,85 @@ class Task:
         )
 
         self.agent.output_validator(self.validate)
+        self.agent.system_prompt(self.add_system_prompt)
         self.history = []
 
-    async def run(self, *args, **kwargs) -> AgentRunResult[RESULT_TYPE]:
+    @property
+    def sync_runner(self):
         """
 
-        Run Agent storing history
+        Convenience/debug function to run without async.
 
         """
+        import asyncio
+        return asyncio.run
 
-        result = await self.agent.run(*args, message_history=self.history, **kwargs)
+    async def run(self, *args, deps=None, **kwargs) -> AgentRunResult[RESULT_TYPE]:
+        """
+
+        Run Agent with deps-relative user prompt and while storing history
+
+        """
+        result = await self.agent.run(*args, user_prompt=self.get_prompt(deps), deps=deps, message_history=self.history, **kwargs)
         self.history = result.all_messages()
         return result
 
-    async def revert(self, msg, deps):
+    async def validate(self, ctx: RunContext[DEPS_TYPE], output: RESULT_TYPE) -> RESULT_TYPE:
         """
 
-        Post-hoc, user-initiated tool retry.
+        Dummy validator
 
         """
-        msg_final = self.history.pop(-1)
-        tool_return_part = msg_final.parts[0]
+        return output
 
-        retry_prompt = RetryPromptPart(content=msg, tool_name=tool_return_part.tool_name, tool_call_id=tool_return_part.tool_call_id, timestamp=tool_return_part.timestamp, part_kind='retry-prompt')
-        retry_request = ModelRequest(parts=[retry_prompt], instructions=msg_final.instructions, kind='request')
+    def get_prompt(self, deps: Optional[DEPS_TYPE]) -> Optional[str]:
+        """
 
-        self.history.append(retry_request)
+        Dummy prompt generator
 
-        result = await Task.run(self, deps=deps)
-        return result
+        """
+        return None
 
-    async def validate(self, ctx: RunContext[DEPS_TYPE], output: RESULT_TYPE) -> RESULT_TYPE:
+    def add_system_prompt(self, ctx: RunContext[DEPS_TYPE]) -> str | List[str]:
         """
 
-        Dummy validator
+        Dummy system prompt append
 
         """
-        return output
+
+        return []
 
 if __name__ == '__main__':
     import asyncio
     from fmtr.tools import dm
 
 
-    class TestOutput(dm.BaseModel):
+    class TestOutput(dm.Base):
         text: str
 
 
+    class TestDeps(dm.Base):
+        lang: str
+        subject: str
+
+
     class TaskTest(Task):
-        PROVIDER = Task.PROVIDER_FMTR
-        MODEL_ID = 'qwen2.5-coder:14b'
+        # PROVIDER = Task.PROVIDER_FMTR
+        # MODEL_ID = 'qwen2.5-coder:14b'
         RESULT_TYPE = TestOutput
+        SYSTEM_PROMPT_STATIC = 'Tell the user jokes.'
+
+        def add_system_prompt(self, ctx: RunContext[TestDeps]) -> str:
+            return f'The jokes must be in the {ctx.deps.lang} language.'
+
+        def get_prompt(self, deps: Optional[TestDeps]) -> str:
+            return f'Tell me one about {deps.subject}.'
 
     task = TaskTest()
-    result = asyncio.run(task.run('Hello! What is your name?'))
-    result
+    deps = TestDeps(lang='English', subject='eggs')
+    result1 = task.sync_runner(task.run(deps=deps))
+    result1
+
+    deps = TestDeps(lang='German', subject='sausages')
+    result2 = task.sync_runner(task.run(deps=deps))
+    result2

fmtr/tools/api_tools.py

@@ -52,6 +52,7 @@ class ApiBase:
 
     def __init__(self):
         self.app = FastAPI(title=self.TITLE)
+        logger.instrument_fastapi(self.app)
 
         for endpoint in self.get_endpoints():
             self.add_endpoint(endpoint)

fmtr/tools/version

@@ -1 +1 @@
-1.1.2
+1.1.4

{fmtr_tools-1.1.2.dist-info → fmtr_tools-1.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.1.2
+Version: 1.1.4
 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
@@ -9,50 +9,51 @@ License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: test
-Requires-Dist: flet[all]; extra == "test"
-Requires-Dist: semver; extra == "test"
-Requires-Dist: pandas; extra == "test"
-Requires-Dist: pydantic-settings; extra == "test"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
-Requires-Dist: tinynetrc; extra == "test"
-Requires-Dist: deepmerge; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: torchaudio; extra == "test"
-Requires-Dist: peft; extra == "test"
-Requires-Dist: google-auth-oauthlib; extra == "test"
-Requires-Dist: huggingface_hub; extra == "test"
-Requires-Dist: uvicorn; extra == "test"
-Requires-Dist: ollama; extra == "test"
-Requires-Dist: sre_yield; extra == "test"
-Requires-Dist: torchvision; extra == "test"
-Requires-Dist: json_repair; extra == "test"
-Requires-Dist: flet-video; extra == "test"
-Requires-Dist: sentence_transformers; extra == "test"
-Requires-Dist: logfire; extra == "test"
-Requires-Dist: google-auth; extra == "test"
+Requires-Dist: tokenizers; extra == "test"
+Requires-Dist: faker; extra == "test"
 Requires-Dist: pydantic; extra == "test"
+Requires-Dist: logfire; extra == "test"
+Requires-Dist: tabulate; extra == "test"
 Requires-Dist: diskcache; extra == "test"
+Requires-Dist: sre_yield; extra == "test"
+Requires-Dist: distributed; extra == "test"
+Requires-Dist: bokeh; extra == "test"
+Requires-Dist: flet[all]; extra == "test"
 Requires-Dist: fastapi; extra == "test"
-Requires-Dist: pydevd-pycharm; extra == "test"
+Requires-Dist: uvicorn[standard]; extra == "test"
+Requires-Dist: google-auth; extra == "test"
+Requires-Dist: logfire[fastapi]; extra == "test"
+Requires-Dist: contexttimer; extra == "test"
 Requires-Dist: pyyaml; extra == "test"
+Requires-Dist: flet-webview; extra == "test"
+Requires-Dist: transformers[sentencepiece]; extra == "test"
+Requires-Dist: sentence_transformers; extra == "test"
+Requires-Dist: pandas; extra == "test"
+Requires-Dist: dask[bag]; extra == "test"
+Requires-Dist: pydevd-pycharm; extra == "test"
 Requires-Dist: openai; extra == "test"
-Requires-Dist: pymupdf; extra == "test"
-Requires-Dist: distributed; extra == "test"
+Requires-Dist: peft; extra == "test"
+Requires-Dist: tinynetrc; extra == "test"
+Requires-Dist: semver; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pymupdf4llm; extra == "test"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
+Requires-Dist: google-api-python-client; extra == "test"
 Requires-Dist: html2text; extra == "test"
-Requires-Dist: faker; extra == "test"
-Requires-Dist: tabulate; extra == "test"
-Requires-Dist: docker; extra == "test"
+Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: torchaudio; extra == "test"
+Requires-Dist: deepmerge; extra == "test"
+Requires-Dist: torchvision; extra == "test"
+Requires-Dist: google-auth-httplib2; extra == "test"
+Requires-Dist: pydantic-settings; extra == "test"
+Requires-Dist: google-auth-oauthlib; extra == "test"
 Requires-Dist: openpyxl; extra == "test"
-Requires-Dist: dask[bag]; extra == "test"
-Requires-Dist: contexttimer; extra == "test"
-Requires-Dist: pymupdf4llm; extra == "test"
-Requires-Dist: transformers[sentencepiece]; extra == "test"
-Requires-Dist: tokenizers; extra == "test"
-Requires-Dist: bokeh; extra == "test"
+Requires-Dist: pymupdf; extra == "test"
 Requires-Dist: Unidecode; extra == "test"
-Requires-Dist: flet-webview; extra == "test"
-Requires-Dist: google-auth-httplib2; extra == "test"
-Requires-Dist: google-api-python-client; extra == "test"
+Requires-Dist: flet-video; extra == "test"
+Requires-Dist: ollama; extra == "test"
+Requires-Dist: docker; extra == "test"
+Requires-Dist: json_repair; extra == "test"
 Provides-Extra: yaml
 Requires-Dist: pyyaml; extra == "yaml"
 Provides-Extra: logging
@@ -88,10 +89,11 @@ Provides-Extra: merging
 Requires-Dist: deepmerge; extra == "merging"
 Provides-Extra: api
 Requires-Dist: fastapi; extra == "api"
-Requires-Dist: uvicorn; extra == "api"
+Requires-Dist: uvicorn[standard]; extra == "api"
 Requires-Dist: logfire; extra == "api"
 Requires-Dist: semver; extra == "api"
 Requires-Dist: pydantic; extra == "api"
+Requires-Dist: logfire[fastapi]; extra == "api"
 Provides-Extra: ai
 Requires-Dist: peft; extra == "ai"
 Requires-Dist: transformers[sentencepiece]; extra == "ai"

{fmtr_tools-1.1.2.dist-info → fmtr_tools-1.1.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 fmtr/tools/__init__.py,sha256=_p8-qJSEfrdI5Kc1tTQ7RzIk7dbAcJ9yf0lpLEN4n80,5196
-fmtr/tools/api_tools.py,sha256=u5YEdKyKto8MKY8legULLU7xeJ7lY2Bgyaep_xa8iZg,2089
+fmtr/tools/api_tools.py,sha256=w8Zrp_EwN5KlUghwLoTCXo4z1irg5tAsReCqDLjASfE,2133
 fmtr/tools/async_tools.py,sha256=ewz757WcveQJd-G5SVr2JDOQVbdLGecCgl-tsBGVZz4,284
 fmtr/tools/augmentation_tools.py,sha256=-6ESbO4CDlKqVOV1J1V6qBeoBMzbFIinkDHRHnCBej0,55
 fmtr/tools/caching_tools.py,sha256=UOCYUNvLQ-NofR_dhqBmZF96-HRPf4At5MmxVk3gAIk,2943
@@ -43,11 +43,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=g9DE-d3AiatY4yLimLYZDyv1kdwiX_XN130F5qhCBhk,5
+fmtr/tools/version,sha256=s4n9aV0PFyXVJPIoNMaqvv68dMsxTpUy9-iiXCnuR9I,5
 fmtr/tools/version_tools.py,sha256=yNs_CGqWpqE4jbK9wsPIi14peJVXYbhIcMqHAFOw3yE,1480
 fmtr/tools/yaml_tools.py,sha256=Ol43ZwbnSXGnn1K98Uxx61KPGSqfC4axE-X2q1LKMwk,349
 fmtr/tools/ai_tools/__init__.py,sha256=JZrLuOFNV1A3wvJgonxOgz_4WS-7MfCuowGWA5uYCjs,372
-fmtr/tools/ai_tools/agentic_tools.py,sha256=LMF7Udj8Nu7_l2VKeyDZRgY3F6GMP7CrrH9C7FTs-z8,2930
+fmtr/tools/ai_tools/agentic_tools.py,sha256=pHmsWixulpIBEoIQvamfkQT9BDJ39unqS9ndVw0JVUw,3477
 fmtr/tools/ai_tools/inference_tools.py,sha256=yF8Oxph0L8W2CnK_o-MVztBhWVwBpgOEkx9_m3uqQww,11840
 fmtr/tools/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/tests/conftest.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -57,9 +57,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.1.2.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.1.2.dist-info/METADATA,sha256=tDmy5jsCWjmvw0lSIqAR5BOCu7t1T-9N21wsf1NJ8K4,14529
-fmtr_tools-1.1.2.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
-fmtr_tools-1.1.2.dist-info/entry_points.txt,sha256=Zmeyls-zo5S99SlKUmsy9ULUNmk-4B9WQCEjuPIH0Yw,142
-fmtr_tools-1.1.2.dist-info/top_level.txt,sha256=t5341a8ii3n4RFizwTeXGmcq_pf4GqL1h9ylE5LIWRk,12
-fmtr_tools-1.1.2.dist-info/RECORD,,
+fmtr_tools-1.1.4.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.1.4.dist-info/METADATA,sha256=q81Hj9eHRAlCzP5eEAW8xhuH5rjkkQ4uXc53VMpb5Ic,14646
+fmtr_tools-1.1.4.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+fmtr_tools-1.1.4.dist-info/entry_points.txt,sha256=Zmeyls-zo5S99SlKUmsy9ULUNmk-4B9WQCEjuPIH0Yw,142
+fmtr_tools-1.1.4.dist-info/top_level.txt,sha256=t5341a8ii3n4RFizwTeXGmcq_pf4GqL1h9ylE5LIWRk,12
+fmtr_tools-1.1.4.dist-info/RECORD,,

{fmtr_tools-1.1.2.dist-info → fmtr_tools-1.1.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any