fmtr.tools 1.0.30__tar.gz → 1.0.31__tar.gz

{fmtr.tools-1.0.30 → fmtr.tools-1.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.30
+Version: 1.0.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
@@ -140,7 +140,7 @@ The included modules, plus any extra requirements, are as follows:
   - Extras: `hfh`
 - `tools.html`: Utilities for converting HTML documents to plain text.
   - Extras: `html`
-- `tools.interface`: Provides a base class for building Streamlit interfaces with a class-based structure.
+- `tools.interface`: Provides a base class for building Flutter/Flet apps.
   - Extras: `interface`
 - `tools.iterator`: Pivoting/unpivoting data structures
     - Extras: None

{fmtr.tools-1.0.30 → fmtr.tools-1.0.31}/README.md

@@ -102,7 +102,7 @@ The included modules, plus any extra requirements, are as follows:
   - Extras: `hfh`
 - `tools.html`: Utilities for converting HTML documents to plain text.
   - Extras: `html`
-- `tools.interface`: Provides a base class for building Streamlit interfaces with a class-based structure.
+- `tools.interface`: Provides a base class for building Flutter/Flet apps.
   - Extras: `interface`
 - `tools.iterator`: Pivoting/unpivoting data structures
     - Extras: None

fmtr.tools-1.0.31/fmtr/tools/interface_tools.py

@@ -0,0 +1,64 @@
+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.0.31/fmtr/tools/version

@@ -0,0 +1 @@
+1.0.31

{fmtr.tools-1.0.30 → fmtr.tools-1.0.31}/fmtr.tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.30
+Version: 1.0.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
@@ -140,7 +140,7 @@ The included modules, plus any extra requirements, are as follows:
   - Extras: `hfh`
 - `tools.html`: Utilities for converting HTML documents to plain text.
   - Extras: `html`
-- `tools.interface`: Provides a base class for building Streamlit interfaces with a class-based structure.
+- `tools.interface`: Provides a base class for building Flutter/Flet apps.
   - Extras: `interface`
 - `tools.iterator`: Pivoting/unpivoting data structures
     - Extras: None

{fmtr.tools-1.0.30 → fmtr.tools-1.0.31}/fmtr.tools.egg-info/requires.txt

@@ -47,8 +47,10 @@ huggingface_hub
 html2text
 
 [interface]
+flet-video
+flet-webview
+flet[all]
 pydantic
-streamlit
 
 [json-fix]
 json_repair
@@ -99,6 +101,9 @@ distributed
 docker
 faker
 fastapi
+flet-video
+flet-webview
+flet[all]
 google-api-python-client
 google-auth
 google-auth-httplib2
@@ -118,7 +123,6 @@ pyyaml
 semver
 sentence_transformers
 sre_yield
-streamlit
 tinynetrc
 tokenizers
 torchaudio

fmtr.tools-1.0.30/fmtr/tools/interface_tools.py

@@ -1,218 +0,0 @@
-from time import sleep
-from typing import ClassVar
-
-from fmtr.tools.data_modelling_tools import Base
-from fmtr.tools.logging_tools import logger
-from fmtr.tools.path_tools import Path
-
-
-def material(name):
-    """
-
-    Get Material Design icon markdown
-
-    """
-    return f":material/{name}:"
-
-
-def color(name, text):
-    """
-
-    Get markdown coloured text
-
-    """
-    return f":{name}[{text}]"
-
-
-def get_streamlit():
-    import streamlit
-    return streamlit
-
-class Interface(Base):
-    """
-
-    Base for using streamlit via classes
-
-    """
-
-    PATH: ClassVar = __file__
-    LAYOUT: ClassVar = 'centered'
-    NAME: ClassVar = None
-    IS_ASYNC: ClassVar = False
-
-    parent: Base = None
-
-    @property
-    def st(self):
-        return get_streamlit()
-
-    @classmethod
-    def get_name(cls):
-        return cls.NAME or cls.__name__
-
-    def set_title(self):
-        """
-
-        Set page title and layout when root interface
-
-        """
-
-        self.st.set_page_config(page_title=self.get_name(), layout=self.LAYOUT)
-        self.st.title(self.get_name())
-
-    def render(self):
-        """
-
-        Render the Interface
-
-        """
-        raise NotImplementedError()
-
-    def get_key(self, seg=None):
-        """
-
-        Get a structure-friendly unique ID
-
-        """
-
-        suffix = f'{self.__class__.__name__}({self.get_key_self()})'
-
-        if self.parent is None:
-            base = Path(suffix)
-        else:
-            base = self.parent.get_key() / suffix
-
-        if seg:
-            path = base / seg
-        else:
-            path = base
-
-        return path
-
-    def get_url_data(self):
-        """
-
-        Get URL params data pertaining to the current object
-
-        """
-
-        if self.parent is None:
-            data = {}
-        else:
-            data = self.parent.get_url_data()
-
-        url_self = self.get_url_self()
-
-        if url_self:
-            data |= {self.__class__.__name__.lower(): url_self}
-
-        return data
-
-    def get_url_self(self):
-        """
-
-        Get URL params ID pertaining to the current object
-
-        """
-        return str(id(self))
-
-    def get_key_self(self):
-        """
-
-        Get a streamlit key pertaining to the current object
-
-        """
-        return str(id(self))
-
-    def get_url(self):
-        """
-
-        Get URL string suffix pertaining to the current object
-
-        """
-        import urllib
-        return urllib.parse.urlencode(self.get_url_data())
-
-    def to_tabs(self, *classes):
-        """
-
-        Add tabs from a list of interface classes
-
-        """
-        tab_names = [cls.get_name() for cls in classes]
-        tabs = st.tabs(tab_names)
-
-        for cls, tab in zip(classes, tabs):
-            with tab:
-                cls()
-
-    @classmethod
-    def is_streamlit(cls):
-        """
-
-        Infer whether we are running within StreamLit
-
-        """
-        return bool(get_streamlit().context.headers)
-
-    @classmethod
-    def get_state(cls):
-        """
-
-        Initialise this Interface and keep cached. This needs to be a cached_resource to avoid serialisation/copying.
-        This is global, so session handling needs to happen downstream.
-
-        """
-        msg = f'Initialising State "{cls.get_name()}"...'
-        logger.info(msg)
-        self = cls()
-        return self
-
-    @classmethod
-    def launch(cls):
-        """
-
-        Launch StreamLit, if not already running - otherwise get self from cache and render
-
-        """
-
-        st = get_streamlit()
-
-        if cls.is_streamlit():
-
-            if cls.IS_ASYNC:
-                from fmtr.tools import async_tools
-                async_tools.ensure_loop()
-
-            self = st.cache_resource(show_spinner=False)(cls.get_state)()
-            logger.debug(f'Rendering Interface "{self.get_name()}" with state: {st.session_state}...')
-            self.set_title()
-            self.render()
-        else:
-            logger.info(f'Launching Streamlit interface "{cls.get_name()}"...')
-            from streamlit.web import bootstrap
-            bootstrap.run(cls.PATH, False, [], {})
-
-
-class InterfaceTest(Interface):
-    NAME: ClassVar = 'Test Interface'
-
-    parent: Base = None
-
-    def render(self):
-        """
-
-        Render the Interface
-
-        """
-        if not self.st.button('Run Test'):
-            return
-        msg = 'Running test...'
-        with self.st.spinner(msg):
-            sleep(3)
-        self.st.success("Success!")
-
-
-if __name__ == '__main__':
-    InterfaceTest.launch()
-

fmtr.tools-1.0.30/fmtr/tools/version

@@ -1 +0,0 @@
-1.0.30