fmtr.tools 1.3.22__py3-none-any.whl → 1.3.24__py3-none-any.whl

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/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/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/interface_tools/interface_tools.py

@@ -0,0 +1,102 @@
+import flet as ft
+from flet.core.types import AppView
+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):
+    """
+
+    Simple interface base class.
+
+    """
+    TITLE = 'Base Interface'
+    HOST = '0.0.0.0'
+    PORT = 8080
+    URL = None
+    APPVIEW = AppView.WEB_BROWSER
+    PATH_ASSETS = None
+    ROUTE_ROOT = '/'
+
+    THEME = ft.Theme(color_scheme=ft.ColorScheme(primary=ft.Colors.PINK))
+
+    @classmethod
+    def render(cls, page: ft.Page):
+        """
+
+        Interface entry point. Set relevant callbacks, and add instantiated self to page views
+
+        """
+        if not page.on_route_change:
+            page.theme = cls.THEME
+            page.views.clear()
+            page.views.append(cls())
+
+            page.on_route_change = cls.route
+            page.on_view_pop = cls.pop
+
+            page.go(cls.ROUTE_ROOT)
+
+    @classmethod
+    def route(cls, event: ft.RouteChangeEvent):
+        """
+
+        Overridable router.
+
+        """
+        logger.debug(f'Route change: {event=}')
+
+    @classmethod
+    def pop(cls, view: View, page: ft.Page):
+        """
+
+        Overridable view pop.
+
+        """
+        logger.debug(f'View popped: {page.route=} {len(page.views)=} {view=}')
+
+    @classmethod
+    def launch(cls):
+        """
+
+        Launch via render 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.render, view=cls.APPVIEW, host=cls.HOST, port=cls.PORT, assets_dir=cls.PATH_ASSETS)
+
+
+class Test(Interface):
+    """
+
+    Simple test interface.
+
+    """
+    TITLE = 'Test Interface'
+
+    def __init__(self):
+        controls = [ft.Text(self.TITLE)]
+        super().__init__(controls=controls)
+
+if __name__ == "__main__":
+    Test.launch()

fmtr/tools/version

@@ -1 +1 @@
-1.3.22
+1.3.24

{fmtr_tools-1.3.22.dist-info → fmtr_tools-1.3.24.dist-info}/METADATA

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

{fmtr_tools-1.3.22.dist-info → fmtr_tools-1.3.24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fmtr/tools/__init__.py,sha256=sjXo4eRDOPp20zlLpJqaB48h7RQXKJd_RwR3fwD6oGk,5731
+fmtr/tools/__init__.py,sha256=9wmfLcYMilcfMS5NfOnaxUn7qxT4YZJ0MFwzOxeh-cQ,5625
 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
@@ -18,7 +18,6 @@ fmtr/tools/html_tools.py,sha256=0nN8Nz5HtG9bXyApYfHSKEivLlxjsm3Gn6Mg2TK0brI,394
 fmtr/tools/http_tools.py,sha256=RVwGrBNMyjfbpgAPCSnxEkXfSzXXWARb3ayq981ONQE,464
 fmtr/tools/import_tools.py,sha256=XJmiWLukRncJAcaGReDn4jIz1_IpVBjfYCQHH1hIg7c,588
 fmtr/tools/inspection_tools.py,sha256=tLTRvzy9XVomQPi0dfnF_cgwc7KiDVZAr7gPTk4S_bQ,278
-fmtr/tools/interface_tools.py,sha256=JVYUV7wuMr24BORuUtNaBlTeBFt8VDGJ3HPRajd7Y_4,1341
 fmtr/tools/iterator_tools.py,sha256=xj5f0c7LgLK53dddRRRJxBoLaBzlZoQS3_GfmpDPMoo,1311
 fmtr/tools/json_fix_tools.py,sha256=vNSlswVQnujPmKEqDjFJcO901mjMyv59q3awsT7mlhs,477
 fmtr/tools/json_tools.py,sha256=WkFc5q7oqMtcFejhN1K5zQFULa9TdLOup83Fr0saDRY,348
@@ -44,7 +43,7 @@ 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=1S8waPxV74wCdn2itKFyhvvnbb7aVuX28-VkRL33YZg,6
+fmtr/tools/version,sha256=6y8OlusXXRQ5CPOH7-e5z_iU7cHYXzBXhelkUzwZ9A4,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
@@ -60,6 +59,9 @@ 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=RBg-QC7OO-PdAbFBadzHTzgjASchrKavAqdVbmBq4nM,310
+fmtr/tools/interface_tools/controls.py,sha256=6C-estOVk4sHCyOFVJfMg3gcqhFADecI3jfxjBfHvg4,1305
+fmtr/tools/interface_tools/interface_tools.py,sha256=3FJRlQfJFztQezBdGZ_izO1Az3jk3INrN4A75jatAlo,2056
 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
@@ -76,9 +78,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.22.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.22.dist-info/METADATA,sha256=yUEzCAR0OIWjGPaYvZVbZiGY52sHLyz2rPXQgMVlWxM,15938
-fmtr_tools-1.3.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.22.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.22.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.22.dist-info/RECORD,,
+fmtr_tools-1.3.24.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.24.dist-info/METADATA,sha256=9rp92m_r7Ir_xQIhKccZpv_YSQgQcH4YK2TWjc1XEBo,15938
+fmtr_tools-1.3.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.24.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.24.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.24.dist-info/RECORD,,

fmtr/tools/interface_tools.py

@@ -1,64 +0,0 @@
-import flet as ft
-from flet.core.event import Event
-from flet.core.types import AppView
-from flet.core.view import View
-
-from fmtr.tools.logging_tools import logger
-
-
-class Interface:
-    """
-
-    Simple interface base class.
-
-    """
-    TITLE = 'Base Interface'
-    HOST = '0.0.0.0'
-    PORT = 8080
-    APPVIEW = AppView.WEB_BROWSER
-    PATH_ASSETS = None
-    ROUTE_ROOT = '/'
-
-    def render(self, page: ft.Page):
-        """
-
-        Interface entry point.
-
-        """
-
-        if not page.on_route_change:
-            page.on_route_change = lambda e, page=page: self.route(page, e)
-            page.on_view_pop = lambda view, page=page: self.pop(page, view)
-
-            page.go(self.ROUTE_ROOT)
-
-    def route(self, page: ft.Page, event: Event):
-        """
-
-        Overridable router.
-
-        """
-        raise NotImplementedError
-
-    def pop(self, page: ft.Page, view: View):
-        """
-
-        Overridable view pop.
-
-        """
-        raise NotImplementedError
-
-    @classmethod
-    def launch(cls):
-        """
-
-        Initialise self and launch.
-
-        """
-        self = cls()
-        logger.info(f"Launching {self.TITLE} at http://{self.HOST}:{self.PORT}")
-        ft.app(self.render, view=self.APPVIEW, host=self.HOST, port=self.PORT, assets_dir=self.PATH_ASSETS)
-
-
-if __name__ == "__main__":
-    Interface.launch()