fmtr.tools 1.0.52__tar.gz → 1.0.54__tar.gz

{fmtr.tools-1.0.52 → fmtr.tools-1.0.54}/PKG-INFO

@@ -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.54/fmtr/tools/ai_tools/agentic_tools.py

@@ -0,0 +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
+
+pydantic_ai.Agent.instrument_all()
+
+class Task:
+    """
+
+    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
+
+    task = TaskTest()
+    result = asyncio.run(task.run('Hello! What is your name?'))
+    result

{fmtr.tools-1.0.52 → fmtr.tools-1.0.54}/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-1.0.52 → fmtr.tools-1.0.54}/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-1.0.52 → fmtr.tools-1.0.54}/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-1.0.52 → fmtr.tools-1.0.54}/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-1.0.54/fmtr/tools/tabular_tools.py

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

fmtr.tools-1.0.54/fmtr/tools/version

@@ -0,0 +1 @@
+1.0.54

{fmtr.tools-1.0.52 → fmtr.tools-1.0.54}/fmtr.tools.egg-info/PKG-INFO

@@ -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/fmtr/tools/ai_tools/agentic_tools.py

@@ -1,14 +0,0 @@
-import pydantic_ai
-
-
-class Agent(pydantic_ai.Agent):
-    """
-
-    Agent stub
-
-    TODO base class is marked `@final`, so is it safe to subclass?
-
-    """
-
-
-Agent.instrument_all()

fmtr.tools-1.0.52/fmtr/tools/tabular_tools.py

@@ -1,4 +0,0 @@
-import pandas as pd
-
-DataFrame = pd.DataFrame
-Series = pd.Series

fmtr.tools-1.0.52/fmtr/tools/version

@@ -1 +0,0 @@
-1.0.52