fmtr.tools 1.3.30__py3-none-any.whl → 1.3.32__py3-none-any.whl

fmtr/tools/ai_tools/agentic_tools.py

@@ -1,9 +1,11 @@
+from typing import List, Optional, Any, Annotated
+
 import pydantic_ai
+from pydantic import PlainValidator
 from pydantic_ai import RunContext, ModelRetry
 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
 
 from fmtr.tools import environment_tools as env
 from fmtr.tools.constants import Constants
@@ -131,6 +133,21 @@ class Task:
         """
         return f'{self.__class__.__name__}({repr(truncate_mid(self.SYSTEM_PROMPT_STATIC, 100))})'
 
+
+def default_prompt_none_specified(text):
+    """
+
+    If the prompt is falsey, explicitly state None Specified
+
+    """
+    if not (text or '').strip():
+        return Constants.PROMPT_NONE_SPECIFIED
+    return text
+
+
+StringDefaultNoneSpecified = Annotated[str, PlainValidator(default_prompt_none_specified)]
+
+
 if __name__ == '__main__':
     import asyncio
     from fmtr.tools import dm

fmtr/tools/constants.py

@@ -52,4 +52,4 @@ class Constants:
 
     INFRA = 'infra'
 
-    PROMPT_NOT_SPECIFIED = '[None Specified]'
+    PROMPT_NONE_SPECIFIED = '[None Specified]'

fmtr/tools/function_tools.py

@@ -1,6 +1,6 @@
 import functools
 import inspect
-from typing import Tuple
+from typing import Tuple, Callable, Self
 
 from fmtr.tools import context_tools
 
@@ -35,25 +35,43 @@ def split_args_kwargs(args_kwargs: dict) -> Tuple[list, dict]:
     return args, kwargs
 
 
-class BoundDecorator:
+class MethodDecorator:
     """
 
     Bound method decorator with overridable start/stop and context manager
 
     """
 
-    def __init__(self, func):
+    CONTEXT_KEY = 'context'
+
+    def __init__(self):
+        """
+
+        Initialise with decorator arguments
+
+        """
+        self.func = None
+
+    def __call__(self, func: Callable) -> Self:
+        """
+
+        If called, arguments were provided, so return the object with those applied.
+
+        """
         self.func = func
-        self.context_null = context_tools.null()
         functools.update_wrapper(self, func)
+        return self
 
     def get_context(self, instance):
         """
 
-        By default use a null context.
+        If the instance has a context attribute, use that - otherwise use a null context.
 
         """
-        return self.context_null
+        context = getattr(instance, self.CONTEXT_KEY, None)
+        if context:
+            return context
+        return context_tools.null()
 
     def __get__(self, instance, owner):
         """
@@ -61,7 +79,7 @@ class BoundDecorator:
         Wrap at runtime, call start/stop within context.
 
         """
-        if instance is None:
+        if instance is None:  # Class method called.
             return self.func
 
         if inspect.iscoroutinefunction(self.func):
@@ -72,7 +90,7 @@ class BoundDecorator:
                     self.stop(instance)
                     return result
 
-            return functools.update_wrapper(async_wrapper, self.func)
+            return async_wrapper
 
         else:
             def sync_wrapper(*args, **kwargs):
@@ -82,7 +100,7 @@ class BoundDecorator:
                     self.stop(instance)
                     return result
 
-            return functools.update_wrapper(sync_wrapper, self.func)
+            return sync_wrapper
 
     def start(self, instance):
         pass

fmtr/tools/interface_tools/interface_tools.py

@@ -4,11 +4,11 @@ from flet.core.view import View
 
 from fmtr.tools import environment_tools
 from fmtr.tools.constants import Constants
-from fmtr.tools.function_tools import BoundDecorator
+from fmtr.tools.function_tools import MethodDecorator
 from fmtr.tools.logging_tools import logger
 
 
-class update(BoundDecorator):
+class update(MethodDecorator):
     """
 
     Update the page after the decorated function is called.
@@ -48,7 +48,7 @@ class progress(update):
 
          Make progress not visible and update.
 
-         """
+        """
         instance.progress.visible = False
         super().stop(instance)
 
@@ -68,6 +68,15 @@ class Interface(ft.Column):
     APPVIEW = AppView.WEB_BROWSER
     PATH_ASSETS = None
     ROUTE_ROOT = '/'
+    SCROLL = ft.ScrollMode.AUTO
+
+    def __init__(self, *args, **kwargs):
+        """
+
+        Instantiate and apply interface config
+
+        """
+        super().__init__(*args, **kwargs, scroll=self.SCROLL)
 
     @classmethod
     def render(cls, page: ft.Page):
@@ -80,7 +89,6 @@ class Interface(ft.Column):
             page.theme = cls.get_theme()
             page.views.clear()
             page.views.append(cls())
-
             page.on_route_change = cls.route
             page.on_view_pop = cls.pop
 

fmtr/tools/version

@@ -1 +1 @@
-1.3.30
+1.3.32

{fmtr_tools-1.3.30.dist-info → fmtr_tools-1.3.32.dist-info}/METADATA

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

{fmtr_tools-1.3.30.dist-info → fmtr_tools-1.3.32.dist-info}/RECORD

@@ -3,7 +3,7 @@ fmtr/tools/api_tools.py,sha256=RyZUlTefSQozfl-8feZGauyUkwcFd-jU0KtKHFxHea4,2272
 fmtr/tools/async_tools.py,sha256=ewz757WcveQJd-G5SVr2JDOQVbdLGecCgl-tsBGVZz4,284
 fmtr/tools/augmentation_tools.py,sha256=-6ESbO4CDlKqVOV1J1V6qBeoBMzbFIinkDHRHnCBej0,55
 fmtr/tools/caching_tools.py,sha256=74p7m2GLFfeP41LX69wxgfkilxEAoWkMIfFMjKsYpyg,4976
-fmtr/tools/constants.py,sha256=Fn2slqXD3H-aNRtAWlMC_917QLQE3j6EoluubluU7K0,1647
+fmtr/tools/constants.py,sha256=iyn8cKNJ4tnX4BKpR0tWjD_U3RUa2THzU4jDhoWn17A,1648
 fmtr/tools/context_tools.py,sha256=4UvIHYgLqAh7dXMX9EBrLEpYp81qfzhSVrkffOSAoGA,350
 fmtr/tools/data_modelling_tools.py,sha256=0BFm-F_cYzVTxftWQwORkPd0FM2BTLVh9-s0-rTTFoo,1744
 fmtr/tools/dataclass_tools.py,sha256=0Gt6KeLhtPgubo_2tYkIVqB8oQ91Qzag8OAGZDdjvMU,1209
@@ -11,7 +11,7 @@ fmtr/tools/datatype_tools.py,sha256=3P4AWIFGkJ-UqvXlj0Jc9IvkIIgTOE9jRrOk3NVbpH8,
 fmtr/tools/debugging_tools.py,sha256=_xzqS0V5BpL8d06j-jVQjGgI7T020QsqVXKAKMz7Du8,2082
 fmtr/tools/docker_tools.py,sha256=rdaZje2xhlmnfQqZnR7IHgRdWncTLjrJcViUTt5oEwk,617
 fmtr/tools/environment_tools.py,sha256=jlx6LYFVv9tyNBT_pVD-tDhyR3ccNC7w6ENVlnoxCLM,1823
-fmtr/tools/function_tools.py,sha256=fbOCk2_o9RB1Eps7lrduf7nm93a1H62w9Z49x2FvAWA,2375
+fmtr/tools/function_tools.py,sha256=c3exfRVTd3fN8N1lT1sdbj7M50XL-GoevkSOb7Eo7EU,2752
 fmtr/tools/google_api_tools.py,sha256=owWE0GlnJjmVbXus8ENxT2PH7Fnd3m_r-14xyR7lAnA,1107
 fmtr/tools/hash_tools.py,sha256=tr4HXpeT6rRrDk6TvMlRPUSrLRRaov96y128OI2tzsc,729
 fmtr/tools/hfh_tools.py,sha256=DCDIWuWlhtmIGCtp9cLcOTTEw_4yN_NocLX8w5NZsbk,2384
@@ -45,10 +45,10 @@ 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=YBoYNR9WchaLncc91xeTHbs6ppdY4HdAcbzle2w5d90,6
+fmtr/tools/version,sha256=BaHHu_eJfjAeG_8dZj7pz6IaLdjEddy4Hn2gYRrl5-s,6
 fmtr/tools/yaml_tools.py,sha256=Bhhyd6GQVKO72Lp8ky7bAUjIB_65Hdh0Q45SKIEe6S8,1901
 fmtr/tools/ai_tools/__init__.py,sha256=JZrLuOFNV1A3wvJgonxOgz_4WS-7MfCuowGWA5uYCjs,372
-fmtr/tools/ai_tools/agentic_tools.py,sha256=acSEPFS-aguDXanWGs3fAAlRyJSYPZW7L-Kb2qDLm-I,4300
+fmtr/tools/ai_tools/agentic_tools.py,sha256=XwiI3K2w_bIawqrlmUpSdd5kGN6Dpr5ut6WPUHK_HC4,4660
 fmtr/tools/ai_tools/inference_tools.py,sha256=2UP2gXEyOJUjyyV6zmFIYmIxUsh1rXkRH0IbFvr2bRs,11908
 fmtr/tools/dns_tools/__init__.py,sha256=Mzaepy8lEdT0SJtUOCnF3IkpOt0vrZn-IOgOf4xfd8Q,258
 fmtr/tools/dns_tools/client.py,sha256=IBbd7Xgx9ExTn_EPoL7ts9JfXokHHuOiD9m4K6tl1Q0,2817
@@ -63,7 +63,7 @@ fmtr/tools/entrypoints/remote_debug_test.py,sha256=wmKg9o2pQq7eqeHmaO8oviujNgtns
 fmtr/tools/entrypoints/shell_debug.py,sha256=0No3tAg9Ri4_vvSlQCUtAY-11HR0nE45i0VVtiAViwY,106
 fmtr/tools/interface_tools/__init__.py,sha256=nODVT7v657onpmak7qbW4P8NoW2HQqyeEDUSx5pZAFg,331
 fmtr/tools/interface_tools/controls.py,sha256=oOl0_sZB8fkvYB-9A5yjArfQmFQLMCsVGgRNrJAFJm4,332
-fmtr/tools/interface_tools/interface_tools.py,sha256=wo5lVJrk3SxsByFTT0L1dkZpxsSdvx7U-Oh0-c_GowE,3098
+fmtr/tools/interface_tools/interface_tools.py,sha256=kQusNsZZU2VWQ_IZu78muS8RpOZRNNmORRBIA7HKXYY,3307
 fmtr/tools/path_tools/__init__.py,sha256=v5CpmzXq5Ii90FtcmxAJKiLxmguZMrPnQ_HdT872Np0,443
 fmtr/tools/path_tools/app_path_tools.py,sha256=JrJvtTDd_gkCKcZtBCDTMktsM77PZwGV_hzQX0g5GU8,1722
 fmtr/tools/path_tools/path_tools.py,sha256=eh30PpmH0wopy0wNWuPT84cmXY1EvqsTSDT7AV_GPOY,8034
@@ -80,9 +80,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=pg4iLtmIr5HtyEW_j0fMFoIdzqi_w9xH8-grQaXLB28,318
 fmtr/tools/version_tools/version_tools.py,sha256=Hcc6yferZS1hHbugRTdiHhSNmXEEG0hjCiTTXKna-YY,1127
-fmtr_tools-1.3.30.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.30.dist-info/METADATA,sha256=3Y6GKGZBoESk3d08CtLk00Z81uweyiQK30uB-6lmfBY,15938
-fmtr_tools-1.3.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.30.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.30.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.30.dist-info/RECORD,,
+fmtr_tools-1.3.32.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.32.dist-info/METADATA,sha256=_36o22xgtUH3_iAsUMD5Sj4WnmNBnOLw56Q-_If6KOI,15938
+fmtr_tools-1.3.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.32.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.32.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.32.dist-info/RECORD,,