fmtr.tools 1.3.29__tar.gz → 1.3.31__tar.gz

{fmtr_tools-1.3.29 → fmtr_tools-1.3.31}/PKG-INFO

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

{fmtr_tools-1.3.29 → fmtr_tools-1.3.31}/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.29 → fmtr_tools-1.3.31}/fmtr/tools/constants.py

@@ -32,6 +32,8 @@ class Constants:
     FMTR_AI_HOST_KEY = 'FMTR_URL_HOST'
     FMTR_AI_HOST_DEFAULT = 'ai.gex.fmtr.dev'
 
+    FMTR_DEV_INTERFACE_URL = 'https://ws.gex.fmtr.dev/'
+
     FILENAME_CONFIG = 'settings.yaml'
     DIR_NAME_REPO = 'repo'
     DIR_NAME_DATA = 'data'
@@ -50,4 +52,4 @@ class Constants:
 
     INFRA = 'infra'
 
-    PROMPT_NOT_SPECIFIED = '[None Specified]'
+    PROMPT_NONE_SPECIFIED = '[None Specified]'

{fmtr_tools-1.3.29 → fmtr_tools-1.3.31}/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
+    from fmtr.tools.interface_tools.interface_tools import Interface, update, progress
     from fmtr.tools.interface_tools import controls
 except ImportError as exception:
-    Interface = update = controls = MissingExtraMockModule('interface', exception)
+    Interface = update = progress = controls = MissingExtraMockModule('interface', exception)

fmtr_tools-1.3.31/fmtr/tools/interface_tools/controls.py

@@ -0,0 +1,13 @@
+import flet as ft
+
+class SliderSteps(ft.Slider):
+    """
+
+    Slider control using step instead of divisions
+
+    """
+
+    def __init__(self, *args, min=10, max=100, step=10, **kwargs):
+        self.step = step
+        divisions = (max - min) // step
+        super().__init__(*args, min=min, max=max, divisions=divisions, **kwargs)

{fmtr_tools-1.3.29 → fmtr_tools-1.3.31}/fmtr/tools/interface_tools/interface_tools.py

@@ -2,21 +2,58 @@ import flet as ft
 from flet.core.types import AppView
 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.logging_tools import logger
 
 
-def update(func):
+class update(BoundDecorator):
     """
 
-    Page update decorator
+    Update the page after the decorated function is called.
 
     """
 
-    def wrapped(*args, **kwargs):
-        func(*args, **kwargs)
-        func.__self__.page.update()
+    def stop(self, instance):
+        instance.page.update()
+
+
+class progress(update):
+    """
+
+    Run the function while a progress indicator (e.g. spinner) is and within the object-defined context (e.g. logging span).
+
+    """
+
+    def get_context(self, instance):
+        """
+
+        Use instance-defined context.
+
+        """
+        return instance.context
+
+    def start(self, instance):
+        """
+
+        Make progress visible and update.
+
+        """
+        instance.progress.visible = True
+        instance.page.update()
+
+    def stop(self, instance):
+        """
+
+         Make progress not visible and update.
+
+         """
+        instance.progress.visible = False
+        super().stop(instance)
+
+
 
-    return wrapped
 
 class Interface(ft.Column):
     """
@@ -27,7 +64,7 @@ class Interface(ft.Column):
     TITLE = 'Base Interface'
     HOST = '0.0.0.0'
     PORT = 8080
-    URL = None
+    URL = Constants.FMTR_DEV_INTERFACE_URL if environment_tools.IS_DEV else None
     APPVIEW = AppView.WEB_BROWSER
     PATH_ASSETS = None
     ROUTE_ROOT = '/'

fmtr_tools-1.3.31/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.31

{fmtr_tools-1.3.29 → fmtr_tools-1.3.31}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.29/fmtr/tools/interface_tools/controls.py

@@ -1,137 +0,0 @@
-import inspect
-
-import flet as ft
-
-
-class ContextBase:
-    """
-
-    A mixin base that can be used as both a synchronous and asynchronous context manager,
-    or as a decorator to wrap synchronous or asynchronous functions.
-    The control becomes visible when entering the context or invoking the wrapped function,
-    and is hidden again when exiting.
-
-    """
-
-    def start(self):
-        """
-
-        Show the control and update the page.
-        """
-
-        self.visible = True
-        self.page.update()
-
-    def stop(self):
-        """
-
-        Hide the control and update the page.
-        
-        """
-        self.visible = False
-        self.page.update()
-
-    def context(self, func):
-        """
-
-        Decorator that wraps a synchronous or asynchronous function.
-        While the function runs, the control is visible.
-
-        """
-        if inspect.iscoroutinefunction(func):
-            async def async_wrapped(*args, **kwargs):
-                async with self:
-                    return await func(*args, **kwargs)
-
-            return async_wrapped
-        else:
-            def sync_wrapped(*args, **kwargs):
-                with self:
-                    return func(*args, **kwargs)
-
-            return sync_wrapped
-
-    def __enter__(self):
-        """
-
-        Enter the control context (sync).
-
-        """
-        self.start()
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        """
-
-        Exit the control context (sync).
-
-        """
-        self.stop()
-
-    async def __aenter__(self):
-        """
-
-        Enter the control context (async).
-        """
-
-        result = self.start()
-        if inspect.isawaitable(result):
-            await result
-        return self
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        """
-
-        Exit the control context (async).
-        """
-
-        result = self.stop()
-        if inspect.isawaitable(result):
-            await result
-
-
-class ContextRing(ft.ProgressRing, ContextBase):
-    """
-
-    A progress ring as a context manager.
-
-    """
-
-    def __init__(self, *args, **kwargs):
-        """
-
-        Initialize the progress ring as hidden by default.
-
-        """
-        super().__init__(*args, **kwargs, visible=False)
-
-class ProgressButton(ft.Button):
-    """
-
-    Button containing a progress ring.
-
-    """
-
-    def __init__(self, *args, on_click=None, ring: ContextRing = None, **kwargs):
-        """
-
-        Run on_click in run context manager
-
-        """
-        self.ring = ring or ContextRing()
-
-        super().__init__(*args, content=self.ring, on_click=self.ring.context(on_click), **kwargs)
-        self.context = self.ring.context
-
-
-class SliderSteps(ft.Slider):
-    """
-
-    Slider control using step instead of divisions
-
-    """
-
-    def __init__(self, *args, min=10, max=100, step=10, **kwargs):
-        self.step = step
-        divisions = (max - min) // step
-        super().__init__(*args, min=min, max=max, divisions=divisions, **kwargs)

fmtr_tools-1.3.29/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.29

{fmtr_tools-1.3.29 → fmtr_tools-1.3.31}/fmtr.tools.egg-info/requires.txt

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