fmtr.tools 1.3.39__tar.gz → 1.3.41__tar.gz

{fmtr_tools-1.3.39 → fmtr_tools-1.3.41}/PKG-INFO

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

{fmtr_tools-1.3.39 → fmtr_tools-1.3.41}/fmtr/tools/interface_tools/__init__.py

@@ -3,5 +3,6 @@ from fmtr.tools.import_tools import MissingExtraMockModule
 try:
     from fmtr.tools.interface_tools.interface_tools import Interface, update, progress
     from fmtr.tools.interface_tools import controls
+    from fmtr.tools.interface_tools.context import Context
 except ImportError as exception:
     Interface = update = progress = controls = MissingExtraMockModule('interface', exception)

fmtr_tools-1.3.41/fmtr/tools/interface_tools/context.py

@@ -0,0 +1,13 @@
+from dataclasses import dataclass
+
+from flet.core.page import Page
+
+
+@dataclass
+class Context:
+    """
+
+    Base context class
+
+    """
+    page: Page

{fmtr_tools-1.3.39 → fmtr_tools-1.3.41}/fmtr/tools/interface_tools/interface_tools.py

@@ -1,12 +1,13 @@
-from functools import cached_property
-
 import flet as ft
 from flet.core.types import AppView
 from flet.core.view import View
+from functools import cached_property
+from typing import TypeVar, Generic, Type
 
 from fmtr.tools import environment_tools
 from fmtr.tools.constants import Constants
 from fmtr.tools.function_tools import MethodDecorator
+from fmtr.tools.interface_tools.context import Context
 from fmtr.tools.logging_tools import logger
 
 
@@ -55,9 +56,10 @@ class progress(update):
         super().stop(instance)
 
 
+T = TypeVar('T', bound=Context)
 
 
-class Interface(ft.Column):
+class Interface(Generic[T], ft.Column):
     """
 
     Simple interface base class.
@@ -72,12 +74,15 @@ class Interface(ft.Column):
     ROUTE_ROOT = '/'
     SCROLL = ft.ScrollMode.AUTO
 
-    def __init__(self, *args, **kwargs):
+    TypeContext: Type[T] = Context
+
+    def __init__(self, context: T, *args, **kwargs):
         """
 
         Instantiate and apply interface config
 
         """
+        self.context = context
         super().__init__(*args, **kwargs, scroll=self.SCROLL)
 
     @classmethod
@@ -88,9 +93,11 @@ class Interface(ft.Column):
 
         """
         if not page.on_route_change:
+            page.title = cls.TITLE
             page.theme = cls.get_theme()
             page.views.clear()
-            self = cls()
+            context = cls.TypeContext(page=page)
+            self = cls(context)
             view = self.view
             if not view:
                 view = self
@@ -156,17 +163,20 @@ class Interface(ft.Column):
         )
         return theme
 
-class Test(Interface):
+
+class Test(Interface[Context]):
     """
 
-    Simple test interface.
+    Simple test interface, showing typing example.
 
     """
+    TypeContext: Type[Context] = Context
+
     TITLE = 'Test Interface'
 
-    def __init__(self):
+    def __init__(self, context: Context):
         controls = [ft.Text(self.TITLE)]
-        super().__init__(controls=controls)
+        super().__init__(context=context, controls=controls)
 
 if __name__ == "__main__":
     Test.launch()

fmtr_tools-1.3.41/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.41

{fmtr_tools-1.3.39 → fmtr_tools-1.3.41}/fmtr.tools.egg-info/PKG-INFO

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

{fmtr_tools-1.3.39 → fmtr_tools-1.3.41}/fmtr.tools.egg-info/SOURCES.txt

@@ -67,6 +67,7 @@ setup.py
 ./fmtr/tools/entrypoints/remote_debug_test.py
 ./fmtr/tools/entrypoints/shell_debug.py
 ./fmtr/tools/interface_tools/__init__.py
+./fmtr/tools/interface_tools/context.py
 ./fmtr/tools/interface_tools/controls.py
 ./fmtr/tools/interface_tools/interface_tools.py
 ./fmtr/tools/path_tools/__init__.py
@@ -156,6 +157,7 @@ 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/context.py
 fmtr/tools/interface_tools/controls.py
 fmtr/tools/interface_tools/interface_tools.py
 fmtr/tools/path_tools/__init__.py

{fmtr_tools-1.3.39 → fmtr_tools-1.3.41}/fmtr.tools.egg-info/requires.txt

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

{fmtr_tools-1.3.39 → fmtr_tools-1.3.41}/setup.py

@@ -28,7 +28,7 @@ DEPENDENCIES = {
     'metric': ['tabular'],
     'tabular': ['pandas', 'tabulate', 'openpyxl'],
     'html': ['html2text'],
-    'interface': ['flet[all]', 'flet-video', 'flet-webview', 'dm'],
+    'interface': ['flet[all]', 'flet-video', 'flet-webview'],
     'google.api': ['google-auth', 'google-auth-oauthlib', 'google-auth-httplib2', 'google-api-python-client'],
     'caching': ['diskcache', 'cachetools'],
     'pdf': ['pymupdf', 'dm', 'pymupdf4llm'],

fmtr_tools-1.3.39/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.39