fmtr.tools 1.3.50__tar.gz → 1.3.52__tar.gz

{fmtr_tools-1.3.50 → fmtr_tools-1.3.52}/PKG-INFO

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

{fmtr_tools-1.3.50 → fmtr_tools-1.3.52}/fmtr/tools/interface_tools/__init__.py

@@ -1,7 +1,7 @@
 from fmtr.tools.import_tools import MissingExtraMockModule
 
 try:
-    from fmtr.tools.interface_tools.interface_tools import Interface, update, progress
+    from fmtr.tools.interface_tools.interface_tools import Base, update, progress
     from fmtr.tools.interface_tools import controls
     from fmtr.tools.interface_tools.context import Context
 except ModuleNotFoundError as exception:

{fmtr_tools-1.3.50 → fmtr_tools-1.3.52}/fmtr/tools/interface_tools/interface_tools.py

@@ -1,8 +1,9 @@
+from typing import TypeVar, Generic, Type
+
 import flet as ft
+from flet.core.control_event import ControlEvent
 from flet.core.types import AppView
 from flet.core.view import View
-from functools import cached_property
-from typing import TypeVar, Generic, Type, Self
 
 from fmtr.tools import environment_tools
 from fmtr.tools.constants import Constants
@@ -18,7 +19,7 @@ class update(MethodDecorator):
 
     """
 
-    def stop(self, instance):
+    def stop(self, instance, *args, **kwargs):
         instance.page.update()
 
 
@@ -37,7 +38,7 @@ class progress(update):
         """
         return instance.context
 
-    def start(self, instance):
+    def start(self, instance, *args, **kwargs):
         """
 
         Make progress visible and update.
@@ -46,7 +47,7 @@ class progress(update):
         instance.progress.visible = True
         instance.page.update()
 
-    def stop(self, instance):
+    def stop(self, instance, *args, **kwargs):
         """
 
          Make progress not visible and update.
@@ -59,7 +60,7 @@ class progress(update):
 T = TypeVar('T', bound=Context)
 
 
-class Interface(Generic[T], ft.Column):
+class Base(Generic[T], ft.Column):
     """
 
     Simple interface base class.
@@ -76,58 +77,31 @@ class Interface(Generic[T], ft.Column):
 
     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
-    async def render(cls, page: ft.Page):
-        """
-
-        Interface entry point. Set relevant callbacks, and add instantiated self to page views
-
+    async def new(cls, page: ft.Page):
         """
-        if not page.on_route_change:
-            page.title = cls.TITLE
-            page.theme = cls.get_theme()
-            page.views.clear()
-            context = cls.TypeContext(page=page)
-
-            self = await cls.create(context)
 
-            view = self.view
-            if not view:
-                view = self
-            page.views.append(view)
-            page.on_route_change = cls.route
-            page.on_view_pop = cls.pop
+        Interface entry point/async constructor. Set relevant callbacks, and add instantiated self to page views.
 
-            page.go(cls.ROUTE_ROOT)
+        Override this to work with `Context`, do async setup. Otherwise, override __init__ (which is regular Column __init__) for a simple interface.
 
-    @classmethod
-    async def create(cls, context: T) -> Self:
         """
+        page.scroll = cls.SCROLL
+        page.title = cls.TITLE
+        page.on_connect = cls.on_connect
+        page.on_disconnect = cls.on_disconnect
+        page.on_route_change = cls.route
+        page.on_view_pop = cls.pop
+        page.theme = cls.get_theme()
 
-        Overridable async interface constructor.
-
-        """
-        self = cls(context)
-        return self
-
-
-    @cached_property
-    def view(self):
-        """
+        context = cls.TypeContext(page=page)
+        self = cls()
+        self.context = context
 
-        Overridable view definition.
+        page.controls.append(self)
+        page.update()
 
-        """
-        return None
+        return self
 
     @classmethod
     def route(cls, event: ft.RouteChangeEvent):
@@ -148,20 +122,25 @@ class Interface(Generic[T], ft.Column):
         logger.debug(f'View popped: {page.route=} {len(page.views)=} {view=}')
 
     @classmethod
-    def launch(cls):
+    def on_connect(cls, event: ControlEvent):
         """
 
-        Launch via render method
+        Log connections
 
         """
+        page = event.control
+        logger.warning(f'Connect: {page.client_user_agent=} {page.platform.name=}')
 
-        if cls.URL:
-            url = cls.URL
-        else:
-            url = f'http://{cls.HOST}:{cls.PORT}'
+    @classmethod
+    def on_disconnect(cls, event: ControlEvent):
+        """
+
+        Log disconnections
+
+        """
+        page = event.control
+        logger.warning(f'Disconnect {page.client_user_agent=} {page.platform.name=}')
 
-        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)
 
     @classmethod
     def get_theme(self):
@@ -176,8 +155,24 @@ class Interface(Generic[T], ft.Column):
         )
         return theme
 
+    @classmethod
+    def launch(cls):
+        """
+
+        Launch via async constructor 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.new, view=cls.APPVIEW, host=cls.HOST, port=cls.PORT, assets_dir=cls.PATH_ASSETS, )
+
 
-class Test(Interface[Context]):
+class Test(Base[Context]):
     """
 
     Simple test interface, showing typing example.
@@ -187,9 +182,9 @@ class Test(Interface[Context]):
 
     TITLE = 'Test Interface'
 
-    def __init__(self, context: Context):
+    def __init__(self):
         controls = [ft.Text(self.TITLE)]
-        super().__init__(context=context, controls=controls)
+        super().__init__(controls=controls)
 
 if __name__ == "__main__":
     Test.launch()

{fmtr_tools-1.3.50 → fmtr_tools-1.3.52}/fmtr/tools/logging_tools.py

@@ -14,6 +14,14 @@ IS_DEBUG = environment_tools.get(Constants.FMTR_LOG_LEVEL_KEY, None, converter=s
 LEVEL_DEFAULT = logging.DEBUG if IS_DEBUG else logging.INFO
 
 
+def null_scrubber(match):
+    """
+
+    Effectively disable scrubbing
+
+    """
+    return match.value
+
 def get_logger(name, version=None, host=Constants.FMTR_OBS_HOST, key=None, org=Constants.ORG_NAME,
                stream=STREAM_DEFAULT, environment=ENVIRONMENT_DEFAULT, level=LEVEL_DEFAULT):
     """
@@ -64,7 +72,8 @@ def get_logger(name, version=None, host=Constants.FMTR_OBS_HOST, key=None, org=C
         service_version=version,
         environment=environment,
         send_to_logfire=False,
-        console=console_opts
+        console=console_opts,
+        scrubbing=logfire.ScrubbingOptions(callback=null_scrubber)
     )
 
     if key is None:

fmtr_tools-1.3.52/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.52

{fmtr_tools-1.3.50 → fmtr_tools-1.3.52}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.50/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.50

{fmtr_tools-1.3.50 → fmtr_tools-1.3.52}/fmtr.tools.egg-info/requires.txt

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