fmtr.tools 1.3.21__py3-none-any.whl → 1.3.23__py3-none-any.whl

fmtr/tools/api_tools.py

@@ -24,7 +24,7 @@ class Endpoint:
         self.tags = enlist(self.tags)
 
 
-class ApiBase:
+class Base:
     """
 
     Simple API base class, generalising endpoint-as-method config.
@@ -33,6 +33,8 @@ class ApiBase:
     TITLE = 'Base API'
     HOST = '0.0.0.0'
     PORT = 8080
+    SWAGGER_PARAMS = dict(tryItOutEnabled=True)
+    URL_DOCS = '/docs'
 
     def add_endpoint(self, endpoint: Endpoint):
         """
@@ -51,7 +53,7 @@ class ApiBase:
         )(endpoint.method)
 
     def __init__(self):
-        self.app = FastAPI(title=self.TITLE)
+        self.app = FastAPI(title=self.TITLE, swagger_ui_parameters=self.SWAGGER_PARAMS, docs_url=self.URL_DOCS)
         logger.instrument_fastapi(self.app)
 
         for endpoint in self.get_endpoints():
@@ -95,4 +97,4 @@ class ApiBase:
 
 
 if __name__ == '__main__':
-    ApiBase.launch()
+    Base.launch()

fmtr/tools/interface_tools.py

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

fmtr/tools/version

@@ -1 +1 @@
-1.3.21
+1.3.23

{fmtr_tools-1.3.21.dist-info → fmtr_tools-1.3.23.dist-info}/METADATA

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

{fmtr_tools-1.3.21.dist-info → fmtr_tools-1.3.23.dist-info}/RECORD

@@ -1,5 +1,5 @@
 fmtr/tools/__init__.py,sha256=sjXo4eRDOPp20zlLpJqaB48h7RQXKJd_RwR3fwD6oGk,5731
-fmtr/tools/api_tools.py,sha256=u2uEw-5OGN-eU4bNMC7ef5nmopVZTPyVN5eb_rr8ZS0,2140
+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
@@ -18,7 +18,7 @@ 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/interface_tools.py,sha256=jcuh__ahk_F5x0katwsSQsbsBHa90pxhb21i_d6ec-s,1877
 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 +44,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=cvhadKKPw11qd560krb_gX5ym6Wvv3xEb6FFkldcumQ,6
+fmtr/tools/version,sha256=fyYacWqslyvbFGoOxwPoTbxyGmbIDUYy3MT7r0EJ6Xw,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
@@ -76,9 +76,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.21.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.21.dist-info/METADATA,sha256=maUC1a0Pjda8V8J5YTJhkSKa-YQLW_QU4cfaSUCOHMo,15938
-fmtr_tools-1.3.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.21.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.21.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.21.dist-info/RECORD,,
+fmtr_tools-1.3.23.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.23.dist-info/METADATA,sha256=jAci6A-xdl04D7Bd6MXzy63MiZXyFudVV5sDy-32L3E,15938
+fmtr_tools-1.3.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.23.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.23.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.23.dist-info/RECORD,,