fmtr.tools 1.3.23__tar.gz → 1.3.25__tar.gz

{fmtr_tools-1.3.23 → fmtr_tools-1.3.25}/PKG-INFO

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

{fmtr_tools-1.3.23 → fmtr_tools-1.3.25}/fmtr/tools/__init__.py

@@ -18,6 +18,7 @@ import fmtr.tools.setup_tools as setup
 import fmtr.tools.string_tools as string
 from fmtr.tools import ai_tools as ai
 from fmtr.tools import dns_tools as dns
+from fmtr.tools import interface_tools as interface
 from fmtr.tools import version_tools as version
 from fmtr.tools.constants import Constants
 from fmtr.tools.import_tools import MissingExtraMockModule
@@ -120,11 +121,6 @@ try:
 except ImportError as exception:
     html = MissingExtraMockModule('html', exception)
 
-try:
-    from fmtr.tools import interface_tools as interface
-except ImportError as exception:
-    interface = MissingExtraMockModule('interface', exception)
-
 try:
     from fmtr.tools import openai_tools as openai
 except ImportError as exception:

fmtr_tools-1.3.25/fmtr/tools/interface_tools/__init__.py

@@ -0,0 +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 import controls
+except ImportError as exception:
+    Interface = update = controls = MissingExtraMockModule('interface', exception)

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

@@ -0,0 +1,73 @@
+import flet as ft
+
+
+class ContextRing(ft.ProgressRing):
+    """
+
+    Context manager progress ring.
+
+    """
+
+    def __init__(self, *args, **kwargs):
+        """
+
+        Start out not visible.
+
+        """
+        super().__init__(*args, **kwargs, visible=False)
+
+    def start(self):
+        """
+
+        Update to visible when in context.
+
+        """
+        self.visible = True
+        self.page.update()
+
+    def stop(self):
+        """
+
+        Update to not visible when exiting context.
+
+        """
+        self.visible = False
+        self.page.update()
+
+    def context(self, func):
+        """
+
+        Context manager decorator.
+
+        """
+
+        def wrapped(*args, **kwargs):
+            with self:
+                func(*args, **kwargs)
+
+        return wrapped
+
+    def __enter__(self):
+        self.start()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.stop()
+
+
+class ProgressButton(ft.Button):
+    """
+
+    Button with progress ring.
+
+    """
+
+    def __init__(self, *args, on_click=None, **kwargs):
+        """
+
+        Run on_click in run context manager
+
+        """
+        self.ring = ContextRing()
+        super().__init__(*args, content=self.ring, on_click=self.ring.context(on_click), **kwargs)
+        self.context = self.ring.context

{fmtr_tools-1.3.23/fmtr/tools → fmtr_tools-1.3.25/fmtr/tools/interface_tools}/interface_tools.py

@@ -5,6 +5,19 @@ from flet.core.view import View
 from fmtr.tools.logging_tools import logger
 
 
+def update(func):
+    """
+
+    Page update decorator
+
+    """
+
+    def wrapped(*args, **kwargs):
+        func(*args, **kwargs)
+        func.__self__.page.update()
+
+    return wrapped
+
 class Interface(ft.Column):
     """
 
@@ -19,8 +32,6 @@ class Interface(ft.Column):
     PATH_ASSETS = None
     ROUTE_ROOT = '/'
 
-    THEME = ft.Theme(color_scheme=ft.ColorScheme(primary=ft.Colors.PINK))
-
     @classmethod
     def render(cls, page: ft.Page):
         """
@@ -29,7 +40,7 @@ class Interface(ft.Column):
 
         """
         if not page.on_route_change:
-            page.theme = cls.THEME
+            page.theme = cls.get_theme()
             page.views.clear()
             page.views.append(cls())
 
@@ -72,8 +83,20 @@ class Interface(ft.Column):
         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):
+        """
+
+        Overridable theme definition
+
+        """
+        text_style = ft.TextStyle(size=20)
+        theme = ft.Theme(
+            text_theme=ft.TextTheme(body_large=text_style),
+        )
+        return theme
 
-class Test(ft.Column):
+class Test(Interface):
     """
 
     Simple test interface.
@@ -86,4 +109,4 @@ class Test(ft.Column):
         super().__init__(controls=controls)
 
 if __name__ == "__main__":
-    Interface.launch()
+    Test.launch()

fmtr_tools-1.3.25/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.25

{fmtr_tools-1.3.23 → fmtr_tools-1.3.25}/fmtr.tools.egg-info/PKG-INFO

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

{fmtr_tools-1.3.23 → fmtr_tools-1.3.25}/fmtr.tools.egg-info/SOURCES.txt

@@ -22,7 +22,6 @@ setup.py
 ./fmtr/tools/http_tools.py
 ./fmtr/tools/import_tools.py
 ./fmtr/tools/inspection_tools.py
-./fmtr/tools/interface_tools.py
 ./fmtr/tools/iterator_tools.py
 ./fmtr/tools/json_fix_tools.py
 ./fmtr/tools/json_tools.py
@@ -64,6 +63,9 @@ setup.py
 ./fmtr/tools/entrypoints/install_yamlscript.py
 ./fmtr/tools/entrypoints/remote_debug_test.py
 ./fmtr/tools/entrypoints/shell_debug.py
+./fmtr/tools/interface_tools/__init__.py
+./fmtr/tools/interface_tools/controls.py
+./fmtr/tools/interface_tools/interface_tools.py
 ./fmtr/tools/path_tools/__init__.py
 ./fmtr/tools/path_tools/app_path_tools.py
 ./fmtr/tools/path_tools/path_tools.py
@@ -106,7 +108,6 @@ fmtr/tools/html_tools.py
 fmtr/tools/http_tools.py
 fmtr/tools/import_tools.py
 fmtr/tools/inspection_tools.py
-fmtr/tools/interface_tools.py
 fmtr/tools/iterator_tools.py
 fmtr/tools/json_fix_tools.py
 fmtr/tools/json_tools.py
@@ -148,6 +149,9 @@ fmtr/tools/entrypoints/ep_test.py
 fmtr/tools/entrypoints/install_yamlscript.py
 fmtr/tools/entrypoints/remote_debug_test.py
 fmtr/tools/entrypoints/shell_debug.py
+fmtr/tools/interface_tools/__init__.py
+fmtr/tools/interface_tools/controls.py
+fmtr/tools/interface_tools/interface_tools.py
 fmtr/tools/path_tools/__init__.py
 fmtr/tools/path_tools/app_path_tools.py
 fmtr/tools/path_tools/path_tools.py

fmtr_tools-1.3.23/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.23

{fmtr_tools-1.3.23 → fmtr_tools-1.3.25}/fmtr.tools.egg-info/requires.txt

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