fmtr.tools 1.3.51__py3-none-any.whl → 1.3.53__py3-none-any.whl

fmtr/tools/ai_tools/agentic_tools.py

@@ -1,10 +1,12 @@
 import pydantic_ai
 from pydantic import PlainValidator
 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.providers.openai import OpenAIProvider
-from typing import List, Optional, Any, Annotated
+from pydantic_ai.tools import AgentDepsT
+from typing import List, Optional, Any, Annotated, Generic
 
 from fmtr.tools import environment_tools as env
 from fmtr.tools.constants import Constants
@@ -25,15 +27,16 @@ class Validator:
         raise NotImplementedError()
 
 
-
-
-class Task:
+class Task(Generic[AgentDepsT, OutputDataT]):
     """
 
     Linear task definition, as Agent configuration and typing, plus state history.
 
     """
 
+    TypeDeps = str
+    TypeOutput = str
+
     PROVIDER = OpenAIProvider(api_key=env.get(Constants.FMTR_OPENAI_API_KEY_KEY))
 
     API_HOST_FMTR = env.get(Constants.FMTR_AI_HOST_KEY, Constants.FMTR_AI_HOST_DEFAULT)
@@ -43,8 +46,6 @@ class Task:
     MODEL_ID = 'gpt-4o'
     MODEL_ID_FMTR = 'qwen2.5-coder:14b'
     SYSTEM_PROMPT_STATIC = None
-    DEPS_TYPE = str
-    RESULT_TYPE = str
     RESULT_RETRIES = 5
     VALIDATORS: List[Validator] = []
 
@@ -56,13 +57,13 @@ class Task:
         """
 
         self.model = OpenAIModel(self.MODEL_ID, provider=self.PROVIDER)
-        self.agent = Agent(
+        self.agent = Agent[AgentDepsT, OutputDataT](
             *args,
             model=self.model,
             system_prompt=self.SYSTEM_PROMPT_STATIC or [],
-            deps_type=self.DEPS_TYPE,
-            result_type=self.RESULT_TYPE,
-            result_retries=self.RESULT_RETRIES,
+            deps_type=self.TypeDeps,
+            output_type=self.TypeOutput,
+            output_retries=self.RESULT_RETRIES,
             **kwargs
         )
 
@@ -80,7 +81,7 @@ class Task:
         import asyncio
         return asyncio.run
 
-    async def run(self, *args, deps=None, **kwargs) -> AgentRunResult[RESULT_TYPE]:
+    async def run(self, *args, deps=None, **kwargs) -> AgentRunResult[OutputDataT]:
         """
 
         Run Agent with deps-relative user prompt and while storing history
@@ -90,7 +91,7 @@ class Task:
         self.history = result.all_messages()
         return result
 
-    async def validate(self, ctx: RunContext[DEPS_TYPE], output: RESULT_TYPE) -> RESULT_TYPE:
+    async def validate(self, ctx: RunContext[AgentDepsT], output: OutputDataT) -> OutputDataT:
         """
 
         Aggregate any validation failures and combine them into a single ModelRetry exception
@@ -107,7 +108,7 @@ class Task:
 
         return output
 
-    def get_prompt(self, deps: Optional[DEPS_TYPE]) -> Optional[str]:
+    def get_prompt(self, deps: Optional[AgentDepsT]) -> Optional[str]:
         """
 
         Dummy prompt generator
@@ -115,7 +116,7 @@ class Task:
         """
         return None
 
-    def add_system_prompt(self, ctx: RunContext[DEPS_TYPE]) -> str | List[str]:
+    def add_system_prompt(self, ctx: RunContext[AgentDepsT]) -> str | List[str]:
         """
 
         Dummy system prompt append
@@ -181,7 +182,7 @@ if __name__ == '__main__':
     class TaskTest(Task):
         # PROVIDER = Task.PROVIDER_FMTR
         # MODEL_ID = 'qwen2.5-coder:14b'
-        RESULT_TYPE = TestOutput
+        TypeOutput = TestOutput
         SYSTEM_PROMPT_STATIC = 'Tell the user jokes.'
 
         def add_system_prompt(self, ctx: RunContext[TestDeps]) -> str:

fmtr/tools/interface_tools/__init__.py

@@ -1,7 +1,7 @@
 from fmtr.tools.import_tools import MissingExtraMockModule
 
 try:
-    from fmtr.tools.interface_tools.interface_tools import Interface, update, progress
+    from fmtr.tools.interface_tools.interface_tools import Base, update, progress
     from fmtr.tools.interface_tools import controls
     from fmtr.tools.interface_tools.context import Context
 except ModuleNotFoundError as exception:

fmtr/tools/interface_tools/interface_tools.py

@@ -1,8 +1,9 @@
+from typing import TypeVar, Generic, Type
+
 import flet as ft
+from flet.core.control_event import ControlEvent
 from flet.core.types import AppView
 from flet.core.view import View
-from functools import cached_property
-from typing import TypeVar, Generic, Type, Self
 
 from fmtr.tools import environment_tools
 from fmtr.tools.constants import Constants
@@ -18,7 +19,7 @@ class update(MethodDecorator):
 
     """
 
-    def stop(self, instance):
+    def stop(self, instance, *args, **kwargs):
         instance.page.update()
 
 
@@ -37,7 +38,7 @@ class progress(update):
         """
         return instance.context
 
-    def start(self, instance):
+    def start(self, instance, *args, **kwargs):
         """
 
         Make progress visible and update.
@@ -46,7 +47,7 @@ class progress(update):
         instance.progress.visible = True
         instance.page.update()
 
-    def stop(self, instance):
+    def stop(self, instance, *args, **kwargs):
         """
 
          Make progress not visible and update.
@@ -59,7 +60,7 @@ class progress(update):
 T = TypeVar('T', bound=Context)
 
 
-class Interface(Generic[T], ft.Column):
+class Base(Generic[T], ft.Column):
     """
 
     Simple interface base class.
@@ -76,58 +77,31 @@ class Interface(Generic[T], ft.Column):
 
     TypeContext: Type[T] = Context
 
-    def __init__(self, context: T, *args, **kwargs):
-        """
-
-        Instantiate and apply interface config
-
-        """
-        self.context = context
-        super().__init__(*args, **kwargs, scroll=self.SCROLL)
-
     @classmethod
-    async def render(cls, page: ft.Page):
-        """
-
-        Interface entry point. Set relevant callbacks, and add instantiated self to page views
-
+    async def new(cls, page: ft.Page):
         """
-        if not page.on_route_change:
-            page.title = cls.TITLE
-            page.theme = cls.get_theme()
-            page.views.clear()
-            context = cls.TypeContext(page=page)
-
-            self = await cls.create(context)
 
-            view = self.view
-            if not view:
-                view = self
-            page.views.append(view)
-            page.on_route_change = cls.route
-            page.on_view_pop = cls.pop
+        Interface entry point/async constructor. Set relevant callbacks, and add instantiated self to page views.
 
-            page.go(cls.ROUTE_ROOT)
+        Override this to work with `Context`, do async setup. Otherwise, override __init__ (which is regular Column __init__) for a simple interface.
 
-    @classmethod
-    async def create(cls, context: T) -> Self:
         """
+        page.scroll = cls.SCROLL
+        page.title = cls.TITLE
+        page.on_connect = cls.on_connect
+        page.on_disconnect = cls.on_disconnect
+        page.on_route_change = cls.route
+        page.on_view_pop = cls.pop
+        page.theme = cls.get_theme()
 
-        Overridable async interface constructor.
-
-        """
-        self = cls(context)
-        return self
-
-
-    @cached_property
-    def view(self):
-        """
+        context = cls.TypeContext(page=page)
+        self = cls()
+        self.context = context
 
-        Overridable view definition.
+        page.controls.append(self)
+        page.update()
 
-        """
-        return None
+        return self
 
     @classmethod
     def route(cls, event: ft.RouteChangeEvent):
@@ -148,20 +122,25 @@ class Interface(Generic[T], ft.Column):
         logger.debug(f'View popped: {page.route=} {len(page.views)=} {view=}')
 
     @classmethod
-    def launch(cls):
+    def on_connect(cls, event: ControlEvent):
         """
 
-        Launch via render method
+        Log connections
 
         """
+        page = event.control
+        logger.warning(f'Connect: {page.client_user_agent=} {page.platform.name=}')
 
-        if cls.URL:
-            url = cls.URL
-        else:
-            url = f'http://{cls.HOST}:{cls.PORT}'
+    @classmethod
+    def on_disconnect(cls, event: ControlEvent):
+        """
+
+        Log disconnections
+
+        """
+        page = event.control
+        logger.warning(f'Disconnect {page.client_user_agent=} {page.platform.name=}')
 
-        logger.info(f"Launching {cls.TITLE} at {url}")
-        ft.app(cls.render, view=cls.APPVIEW, host=cls.HOST, port=cls.PORT, assets_dir=cls.PATH_ASSETS)
 
     @classmethod
     def get_theme(self):
@@ -176,8 +155,24 @@ class Interface(Generic[T], ft.Column):
         )
         return theme
 
+    @classmethod
+    def launch(cls):
+        """
+
+        Launch via async constructor method
+
+        """
+
+        if cls.URL:
+            url = cls.URL
+        else:
+            url = f'http://{cls.HOST}:{cls.PORT}'
+
+        logger.info(f"Launching {cls.TITLE} at {url}")
+        ft.app(cls.new, view=cls.APPVIEW, host=cls.HOST, port=cls.PORT, assets_dir=cls.PATH_ASSETS, )
+
 
-class Test(Interface[Context]):
+class Test(Base[Context]):
     """
 
     Simple test interface, showing typing example.
@@ -187,9 +182,9 @@ class Test(Interface[Context]):
 
     TITLE = 'Test Interface'
 
-    def __init__(self, context: Context):
+    def __init__(self):
         controls = [ft.Text(self.TITLE)]
-        super().__init__(context=context, controls=controls)
+        super().__init__(controls=controls)
 
 if __name__ == "__main__":
     Test.launch()

fmtr/tools/version

@@ -1 +1 @@
-1.3.51
+1.3.53

{fmtr_tools-1.3.51.dist-info → fmtr_tools-1.3.53.dist-info}/METADATA

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

{fmtr_tools-1.3.51.dist-info → fmtr_tools-1.3.53.dist-info}/RECORD

@@ -46,11 +46,11 @@ fmtr/tools/tabular_tools.py,sha256=mw6vOij1Ch-pVAyHMPtm5zj__ULZN_TKeBYOfj33wFM,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=NVeTYfBvMTN0J69eaRYiRCXF4MfMOA8PxBnn8ZHiogg,6
+fmtr/tools/version,sha256=H5VB8s4ADhl0W048HjCfuXefF06oOfGfyQBDNfQ1N9A,6
 fmtr/tools/webhook_tools.py,sha256=q3pVJ1NCem2SrMuFcLxiWd7DibFs7Q-uGtojfXd3Qcg,380
 fmtr/tools/yaml_tools.py,sha256=Bhhyd6GQVKO72Lp8ky7bAUjIB_65Hdh0Q45SKIEe6S8,1901
 fmtr/tools/ai_tools/__init__.py,sha256=O8VRlPnnQCncg2ZZ2l_VdWLJf4jkKH6dkZFVbv6o7IM,388
-fmtr/tools/ai_tools/agentic_tools.py,sha256=aLejbLSmftXQpxnt1Kgia9UcCmj108U1pqOiAUI6l_I,4939
+fmtr/tools/ai_tools/agentic_tools.py,sha256=-bYP5Kjlz1E75CDBW_qZEQjVWegyx_7BOgqx8C5vWl0,5089
 fmtr/tools/ai_tools/inference_tools.py,sha256=2UP2gXEyOJUjyyV6zmFIYmIxUsh1rXkRH0IbFvr2bRs,11908
 fmtr/tools/database_tools/__init__.py,sha256=-YXEs3P4nwg7hdvALpaW4K2Pg9FIc49rD53smqnBgT4,221
 fmtr/tools/database_tools/document.py,sha256=QLW-Ll2uVp1UTjA4leiJ3gtrUJHQPzwpFT_AZ3jow3A,812
@@ -65,10 +65,10 @@ fmtr/tools/entrypoints/ep_test.py,sha256=B8HfWISfSgw_xVX475CbJGh_QnpOe9MH65H8qGj
 fmtr/tools/entrypoints/install_yamlscript.py,sha256=D9-QET4uPkwMvOBQJAgzn1fYb7Z7VAgZzFdHSAXc3Qc,116
 fmtr/tools/entrypoints/remote_debug_test.py,sha256=wmKg9o2pQq7eqeHmaO8oviujNgtnsCVEXOdXLIcQWs4,123
 fmtr/tools/entrypoints/shell_debug.py,sha256=0No3tAg9Ri4_vvSlQCUtAY-11HR0nE45i0VVtiAViwY,106
-fmtr/tools/interface_tools/__init__.py,sha256=qTN0Hd4A65aWQ4wza48xTNiI2aXBZVEyObdQIsMR2Uk,398
+fmtr/tools/interface_tools/__init__.py,sha256=_bgZRTqmygtYM75o6_zyQRhT_XZnDERZEHmsYVrzyxw,393
 fmtr/tools/interface_tools/context.py,sha256=VpoR_ZCndDbwS0AzIPKi1hB2QckwJU5dJqAJavF3mqk,151
 fmtr/tools/interface_tools/controls.py,sha256=oOl0_sZB8fkvYB-9A5yjArfQmFQLMCsVGgRNrJAFJm4,332
-fmtr/tools/interface_tools/interface_tools.py,sha256=i1TqP_67pVGiRZotKdVxyH0b5OFwaTZ_5Tf60gip0ts,4214
+fmtr/tools/interface_tools/interface_tools.py,sha256=GXnBkSO_Y-F7E5sErJdyyEkO3PyTz97yQBXlTEw_Ufw,4295
 fmtr/tools/path_tools/__init__.py,sha256=XrJXt7Zzo90tYUVksMlDfKkWt775zJ9OSi2NbhnqMDI,459
 fmtr/tools/path_tools/app_path_tools.py,sha256=JrJvtTDd_gkCKcZtBCDTMktsM77PZwGV_hzQX0g5GU8,1722
 fmtr/tools/path_tools/path_tools.py,sha256=s3RTXsjnr2Ah7vXQGjpGs-4DlWaVGvChu0aTFXX3gsE,8867
@@ -85,9 +85,9 @@ fmtr/tools/tests/test_path.py,sha256=AkZQa6_8BQ-VaCyL_J-iKmdf2ZaM-xFYR37Kun3k4_g
 fmtr/tools/tests/test_yaml.py,sha256=jc0TwwKu9eC0LvFGNMERdgBue591xwLxYXFbtsRwXVM,287
 fmtr/tools/version_tools/__init__.py,sha256=cjE6nO6AoVOUp3RwgTbqL9wiw8J1l2pHJOz6Gn6bxjA,326
 fmtr/tools/version_tools/version_tools.py,sha256=Hcc6yferZS1hHbugRTdiHhSNmXEEG0hjCiTTXKna-YY,1127
-fmtr_tools-1.3.51.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.51.dist-info/METADATA,sha256=CM1ZEstQVxxg8jbZD_7xYjx9fCmcX5sd0gM-zmsCXRM,17429
-fmtr_tools-1.3.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.51.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.51.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.51.dist-info/RECORD,,
+fmtr_tools-1.3.53.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.53.dist-info/METADATA,sha256=7DVDWk_gdIXyusS908pwRl2UkqSuNSPkfcZWlFjPcNo,17429
+fmtr_tools-1.3.53.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.53.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.53.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.53.dist-info/RECORD,,