fmtr.tools 1.3.30__tar.gz → 1.3.32__tar.gz

{fmtr_tools-1.3.30 → fmtr_tools-1.3.32}/PKG-INFO

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

{fmtr_tools-1.3.30 → fmtr_tools-1.3.32}/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-1.3.30 → fmtr_tools-1.3.32}/fmtr/tools/constants.py

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

{fmtr_tools-1.3.30 → fmtr_tools-1.3.32}/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-1.3.30 → fmtr_tools-1.3.32}/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-1.3.32/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.32

{fmtr_tools-1.3.30 → fmtr_tools-1.3.32}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.30/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.30

{fmtr_tools-1.3.30 → fmtr_tools-1.3.32}/fmtr.tools.egg-info/requires.txt

@@ -14,61 +14,61 @@ pydantic-ai[logfire,openai]
 ollama
 
 [all]
-sre_yield
-filetype
-huggingface_hub
-faker
 pytest-cov
-logfire[fastapi]
-contexttimer
-sentence_transformers
-httpx
-tokenizers
-distributed
-peft
+semver
+google-auth-oauthlib
+uvicorn[standard]
+docker
 transformers[sentencepiece]
+sentence_transformers
 tinynetrc
-json_repair
-httpx_retries
+openai
+pymupdf4llm
+dnspython[doh]
+google-auth-httplib2
+diskcache
+yamlscript
+peft
 logfire[httpx]
-fastapi
+faker
 pymupdf
-bokeh
-semver
+logfire
+torchvision
+pandas
+setuptools
+regex
 google-api-python-client
-deepmerge
-flet-webview
-pydantic
 html2text
-regex
-google-auth-oauthlib
-Unidecode
-pymupdf4llm
-yamlscript
-logfire
-docker
-pydantic-ai[logfire,openai]
+tabulate
+httpx_retries
+fastapi
+flet-webview
+appdirs
+huggingface_hub
+httpx
+logfire[fastapi]
 openpyxl
-torchaudio
-pandas
 google-auth
+pyyaml
+dask[bag]
+cachetools
+json_repair
+tokenizers
 pydevd-pycharm~=251.25410.159
-diskcache
+pydantic-ai[logfire,openai]
+distributed
+sre_yield
 flet[all]
-ollama
-appdirs
-google-auth-httplib2
+filetype
 flet-video
-openai
-dask[bag]
-torchvision
-setuptools
-cachetools
-pyyaml
+contexttimer
+deepmerge
+torchaudio
+ollama
+bokeh
 pydantic-settings
-uvicorn[standard]
-tabulate
-dnspython[doh]
+Unidecode
+pydantic
 
 [api]
 fastapi