fmtr.tools 1.0.52__py3-none-any.whl → 1.0.54__py3-none-any.whl

fmtr/tools/ai_tools/agentic_tools.py

@@ -1,14 +1,100 @@
 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 fmtr.tools import environment_tools as env
+from fmtr.tools.config import ToolsConfig
 
-class Agent(pydantic_ai.Agent):
-    """
+pydantic_ai.Agent.instrument_all()
 
-    Agent stub
+class Task:
+    """
 
-    TODO base class is marked `@final`, so is it safe to subclass?
+    Linear task definition, as Agent configuration and typing, plus state history.
 
     """
 
+    PROVIDER = OpenAIProvider(api_key=env.get(ToolsConfig.FMTR_OPENAI_API_KEY_KEY))
+
+    API_HOST_FMTR = env.get(ToolsConfig.FMTR_AI_HOST_KEY, ToolsConfig.FMTR_AI_HOST_DEFAULT)
+    API_URL_FMTR = f'https://{API_HOST_FMTR}/v1'
+    PROVIDER_FMTR = OpenAIProvider(base_url=API_URL_FMTR)
+
+    MODEL_ID = 'gpt-4o'
+    SYSTEM_PROMPT = None
+    DEPS_TYPE = str
+    RESULT_TYPE = str
+    RESULT_RETRIES = 5
+
+    def __init__(self, *args, **kwargs):
+        """
+
+        Configure Agent
+
+        """
+
+        self.model = OpenAIModel(self.MODEL_ID, provider=self.PROVIDER)
+        self.agent = Agent(
+            *args,
+            model=self.model,
+            system_prompt=self.SYSTEM_PROMPT or [],
+            deps_type=self.DEPS_TYPE,
+            result_type=self.RESULT_TYPE,
+            result_retries=self.RESULT_RETRIES,
+            **kwargs
+        )
+
+        self.agent.output_validator(self.validate)
+        self.history = []
+
+    async def run(self, *args, **kwargs) -> AgentRunResult[RESULT_TYPE]:
+        """
+
+        Run Agent storing history
+
+        """
+
+        result = await self.agent.run(*args, message_history=self.history, **kwargs)
+        self.history = result.all_messages()
+        return result
+
+    async def revert(self, msg, deps):
+        """
+
+        Post-hoc, user-initiated tool retry.
+
+        """
+        msg_final = self.history.pop(-1)
+        tool_return_part = msg_final.parts[0]
+
+        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')
+
+        self.history.append(retry_request)
+
+        result = await Task.run(self, deps=deps)
+        return result
+
+    async def validate(self, ctx: RunContext[DEPS_TYPE], output: RESULT_TYPE) -> RESULT_TYPE:
+        """
+
+        Dummy validator
+
+        """
+        return output
+
+
+class TaskTest(Task):
+    PROVIDER = Task.PROVIDER_FMTR
+    MODEL_ID = 'mixtral:8x7b'
+
+
+if __name__ == '__main__':
+    import asyncio
 
-Agent.instrument_all()
+    task = TaskTest()
+    result = asyncio.run(task.run('Hello! What is your name?'))
+    result

fmtr/tools/config.py

@@ -24,3 +24,8 @@ class ToolsConfig(ConfigClass):
     FMTR_REMOTE_DEBUG_HOST_DEFAULT = 'ws.lan'
     FMTR_REMOTE_DEBUG_PORT_DEFAULT = 5679
     FMTR_REMOTE_DEBUG_ENABLED_KEY = 'FMTR_REMOTE_DEBUG_ENABLED'
+
+    FMTR_OPENAI_API_KEY_KEY = 'FMTR_OPENAI_API_KEY'
+
+    FMTR_AI_HOST_KEY = 'FMTR_URL_HOST'
+    FMTR_AI_HOST_DEFAULT = 'ai.gex.fmtr.dev'

fmtr/tools/data_modelling_tools.py

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, RootModel
+from pydantic import BaseModel, RootModel, ConfigDict
 
 
 def to_df(*objs, name_value='value'):
@@ -23,6 +23,14 @@ def to_df(*objs, name_value='value'):
     return df
 
 
+class MixinArbitraryTypes:
+    """
+
+    Convenience for when non-serializable types are needed
+    """
+
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
 class MixinFromJson:
 
     @classmethod

fmtr/tools/debugging_tools.py

@@ -29,12 +29,3 @@ def trace(is_debug=None, host=None, port=None, stdoutToServer=True, stderrToServ
     logger.info(msg)
 
     pydevd_pycharm.settrace(host, port=port, stdoutToServer=stdoutToServer, stderrToServer=stderrToServer, **kwargs)
-
-
-def test(**kwargs):
-    """
-
-    Test debugger connection
-
-    """
-    return trace(is_debug=True, **kwargs)

fmtr/tools/string_tools.py

@@ -129,7 +129,8 @@ class Mask:
     """
 
     def __init__(self, mask: str):
-        self.mask = mask
+        self.mask = trim(mask)
+        self.mask_data = parse_string(self.mask)
         self.kwargs = {}
         self.args = []
 
@@ -147,6 +148,21 @@ class Mask:
         except (KeyError, IndexError):
             return self
 
+    def __str__(self):
+        """
+
+        Force string output, leaving any unfilled slots as-is.
+
+        """
+
+        fills = {}
+
+        for seg in self.mask_data:
+            if seg.field_name:
+                fill = self.kwargs.get(seg.field_name, f'{{{seg.field_name}}}')
+                fills[seg.field_name] = fill
+
+        return self.mask.format(**fills)
 
 def trim(text: str) -> str:
     """

fmtr/tools/tabular_tools.py

@@ -1,4 +1,7 @@
 import pandas as pd
 
-DataFrame = pd.DataFrame
+Table = DataFrame = pd.DataFrame
 Series = pd.Series
+
+CONCAT_HORIZONTALLY = 1
+CONCAT_VERTICALLY = 0

fmtr/tools/version

@@ -1 +1 @@
-1.0.52
+1.0.54

{fmtr.tools-1.0.52.dist-info → fmtr.tools-1.0.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.52
+Version: 1.0.54
 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

{fmtr.tools-1.0.52.dist-info → fmtr.tools-1.0.54.dist-info}/RECORD

@@ -3,13 +3,13 @@ fmtr/tools/api_tools.py,sha256=u5YEdKyKto8MKY8legULLU7xeJ7lY2Bgyaep_xa8iZg,2089
 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
-fmtr/tools/config.py,sha256=C_UwYyUi0-pPl9yRhbzOy79EmDm4K1jI4iFHw5xSD5k,919
+fmtr/tools/config.py,sha256=3jHO3KhRlzJUCdQmJ_j1DFzep00MSD5qTJHfK6i3FZA,1057
 fmtr/tools/config_tools.py,sha256=27PbPYj90ClIW4QcRoUoiFM3SbWeMIIZsZR32IPU4V8,805
 fmtr/tools/console_script_tools.py,sha256=Jcmm4WPhCQdPZfd468xD0epkt29sgcPROwKu79V_ehg,203
-fmtr/tools/data_modelling_tools.py,sha256=_WBcinjzg1JSMgYiloDMLo4f-lGjl4g1zPq9J4Vqkyg,1567
+fmtr/tools/data_modelling_tools.py,sha256=0BFm-F_cYzVTxftWQwORkPd0FM2BTLVh9-s0-rTTFoo,1744
 fmtr/tools/dataclass_tools.py,sha256=0Gt6KeLhtPgubo_2tYkIVqB8oQ91Qzag8OAGZDdjvMU,1209
 fmtr/tools/datatype_tools.py,sha256=3P4AWIFGkJ-UqvXlj0Jc9IvkIIgTOE9jRrOk3NVbpH8,1508
-fmtr/tools/debugging_tools.py,sha256=bqzluVhxl0uDz5Uim9NMLe5EoGDw7abgBlEAE3osFMs,1070
+fmtr/tools/debugging_tools.py,sha256=SUub3Ycp9k5TVx7CI_bah6fgdPr03VrpAvaCUc8eICs,959
 fmtr/tools/docker_tools.py,sha256=rdaZje2xhlmnfQqZnR7IHgRdWncTLjrJcViUTt5oEwk,617
 fmtr/tools/environment_tools.py,sha256=34NKG-BJrobYyJeM3FH3VE6G1rv6kQ41bvTxkEYfNi8,1850
 fmtr/tools/function_tools.py,sha256=_oW3-HZXMst2pcU-I-U7KTMmzo0g9MIQKmX-c2_NEoE,858
@@ -38,16 +38,16 @@ fmtr/tools/profiling_tools.py,sha256=jpXVjaNKPydTasEQVNXvxzGtMhXPit08AnJddkU8uIc
 fmtr/tools/random_tools.py,sha256=4VlQdk5THbR8ka4pZaLbk_ZO_4yy6PF_lHZes_rgenY,2223
 fmtr/tools/semantic_tools.py,sha256=cxY9NSAHWj4nEc6Oj4qA1omR3dWbl2OuH7_PkINc6_E,1386
 fmtr/tools/spaces_tools.py,sha256=D_he3mve6DruB3OPS6QyzqD05ChHnRTb4buViKPe7To,1099
-fmtr/tools/string_tools.py,sha256=9zsqShVf1VUfD7hsJBYcuk43L3qCKm1eVwGBn1-wK9Q,3458
-fmtr/tools/tabular_tools.py,sha256=L0yNsU_c8dGTmsUlMFERfTt2a3aZv_pKr2YQc7C9OvA,65
+fmtr/tools/string_tools.py,sha256=Q2vv7kuGVMaQlNSUxJYhex6WUQHDus40ht0PGImPjNQ,3879
+fmtr/tools/tabular_tools.py,sha256=tpIpZzYku1HcJrHZJL6BC39LmN3WUWVhFbK2N7nDVmE,120
 fmtr/tools/tokenization_tools.py,sha256=9FP5vgPufWv0XA961eVKObFll0d_2mM0W3ut3rtZyeo,4329
 fmtr/tools/tools.py,sha256=xnfUrOnrT4OxFYez6vV5tAhydzCICJFiGVnviiZDEQo,796
 fmtr/tools/unicode_tools.py,sha256=yS_9wpu8ogNoiIL7s1G_8bETFFO_YQlo4LNPv1NLDeY,52
-fmtr/tools/version,sha256=i4u89BEwbqIVnTb0hUzHQcR-YHQap8bHT6kp89Df7fM,6
+fmtr/tools/version,sha256=sOToo55hxhnwyn90ru8LQoJIOtiDp6Wvn8_KEB9wC0w,6
 fmtr/tools/version_tools.py,sha256=axzzHBS9V1n6YuSacsDKG3VfAvRqR8qr6aENCibR8vs,1248
 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=nAMVwk-3UR9B3n0Sgdp1HQVzsEC-5N7m7-sYFOwMLi0,179
+fmtr/tools/ai_tools/agentic_tools.py,sha256=Y4MhkGqQ9wL1gFXAsaaO8BIYS1mncVcUPsH-iZ0-UY8,2760
 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.0.52.dist-info/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr.tools-1.0.52.dist-info/METADATA,sha256=Ly7sdNl6-LSCnxaoQtCbxzQEqrcIbKNCh00WCatIWt4,13978
-fmtr.tools-1.0.52.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-fmtr.tools-1.0.52.dist-info/entry_points.txt,sha256=Zmeyls-zo5S99SlKUmsy9ULUNmk-4B9WQCEjuPIH0Yw,142
-fmtr.tools-1.0.52.dist-info/top_level.txt,sha256=t5341a8ii3n4RFizwTeXGmcq_pf4GqL1h9ylE5LIWRk,12
-fmtr.tools-1.0.52.dist-info/RECORD,,
+fmtr.tools-1.0.54.dist-info/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr.tools-1.0.54.dist-info/METADATA,sha256=ZDGuHZCut80jtW-g5xM65BhSvakwjiW8NEkhjWmGZsg,13978
+fmtr.tools-1.0.54.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+fmtr.tools-1.0.54.dist-info/entry_points.txt,sha256=Zmeyls-zo5S99SlKUmsy9ULUNmk-4B9WQCEjuPIH0Yw,142
+fmtr.tools-1.0.54.dist-info/top_level.txt,sha256=t5341a8ii3n4RFizwTeXGmcq_pf4GqL1h9ylE5LIWRk,12
+fmtr.tools-1.0.54.dist-info/RECORD,,