fmtr.tools 1.3.21__tar.gz → 1.3.23__tar.gz

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

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

{fmtr_tools-1.3.21 → fmtr_tools-1.3.23}/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-1.3.23/fmtr/tools/interface_tools.py

@@ -0,0 +1,89 @@
+import flet as ft
+from flet.core.types import AppView
+from flet.core.view import View
+
+from fmtr.tools.logging_tools import logger
+
+
+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(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-1.3.23/fmtr/tools/version

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

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

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

fmtr_tools-1.3.21/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()

fmtr_tools-1.3.21/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.21

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

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