fmtr.tools 1.3.50__py3-none-any.whl → 1.3.52__py3-none-any.whl

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/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/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/version

@@ -1 +1 @@
-1.3.50
+1.3.52

{fmtr_tools-1.3.50.dist-info → fmtr_tools-1.3.52.dist-info}/METADATA

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

{fmtr_tools-1.3.50.dist-info → fmtr_tools-1.3.52.dist-info}/RECORD

@@ -24,7 +24,7 @@ fmtr/tools/inspection_tools.py,sha256=tLTRvzy9XVomQPi0dfnF_cgwc7KiDVZAr7gPTk4S_b
 fmtr/tools/iterator_tools.py,sha256=ymxo2U9MrPhouIhWCVvh1TrP1bXJPm_p0Lqwgi5Jr6w,1628
 fmtr/tools/json_fix_tools.py,sha256=vNSlswVQnujPmKEqDjFJcO901mjMyv59q3awsT7mlhs,477
 fmtr/tools/json_tools.py,sha256=WkFc5q7oqMtcFejhN1K5zQFULa9TdLOup83Fr0saDRY,348
-fmtr/tools/logging_tools.py,sha256=M7I5igs_tX5SIRv4f-jfb75LOODclSdmEg5ziAAMSPE,2503
+fmtr/tools/logging_tools.py,sha256=jZFKnL-7HHOaPkn7F3fT9DyffIgwY-g7SEQ0p1RhzBo,2673
 fmtr/tools/merging_tools.py,sha256=KDxCEFJEQJEwGw1qGKAgR55uUE2X2S5NWLKcfHRmX_k,227
 fmtr/tools/metric_tools.py,sha256=Lvia5CGFRIfrDFA8s37btIfTU5zHbo04cPJdAMtbndQ,272
 fmtr/tools/name_tools.py,sha256=5CB_phqhHjl66iI8oLxOGPF2odC1apdul-M8Fv2xBhs,5514
@@ -46,7 +46,7 @@ fmtr/tools/tabular_tools.py,sha256=mw6vOij1Ch-pVAyHMPtm5zj__ULZN_TKeBYOfj33wFM,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=pIwgw6x6cpMRuvIX3K9LJTDMOR9_BeC8rJjjlbxqDUY,6
+fmtr/tools/version,sha256=6mg-f0Dob6XPK21vB0XIalETo4iilcVpjzUomZIQS3Y,6
 fmtr/tools/webhook_tools.py,sha256=q3pVJ1NCem2SrMuFcLxiWd7DibFs7Q-uGtojfXd3Qcg,380
 fmtr/tools/yaml_tools.py,sha256=Bhhyd6GQVKO72Lp8ky7bAUjIB_65Hdh0Q45SKIEe6S8,1901
 fmtr/tools/ai_tools/__init__.py,sha256=O8VRlPnnQCncg2ZZ2l_VdWLJf4jkKH6dkZFVbv6o7IM,388
@@ -65,10 +65,10 @@ fmtr/tools/entrypoints/ep_test.py,sha256=B8HfWISfSgw_xVX475CbJGh_QnpOe9MH65H8qGj
 fmtr/tools/entrypoints/install_yamlscript.py,sha256=D9-QET4uPkwMvOBQJAgzn1fYb7Z7VAgZzFdHSAXc3Qc,116
 fmtr/tools/entrypoints/remote_debug_test.py,sha256=wmKg9o2pQq7eqeHmaO8oviujNgtnsCVEXOdXLIcQWs4,123
 fmtr/tools/entrypoints/shell_debug.py,sha256=0No3tAg9Ri4_vvSlQCUtAY-11HR0nE45i0VVtiAViwY,106
-fmtr/tools/interface_tools/__init__.py,sha256=qTN0Hd4A65aWQ4wza48xTNiI2aXBZVEyObdQIsMR2Uk,398
+fmtr/tools/interface_tools/__init__.py,sha256=_bgZRTqmygtYM75o6_zyQRhT_XZnDERZEHmsYVrzyxw,393
 fmtr/tools/interface_tools/context.py,sha256=VpoR_ZCndDbwS0AzIPKi1hB2QckwJU5dJqAJavF3mqk,151
 fmtr/tools/interface_tools/controls.py,sha256=oOl0_sZB8fkvYB-9A5yjArfQmFQLMCsVGgRNrJAFJm4,332
-fmtr/tools/interface_tools/interface_tools.py,sha256=i1TqP_67pVGiRZotKdVxyH0b5OFwaTZ_5Tf60gip0ts,4214
+fmtr/tools/interface_tools/interface_tools.py,sha256=GXnBkSO_Y-F7E5sErJdyyEkO3PyTz97yQBXlTEw_Ufw,4295
 fmtr/tools/path_tools/__init__.py,sha256=XrJXt7Zzo90tYUVksMlDfKkWt775zJ9OSi2NbhnqMDI,459
 fmtr/tools/path_tools/app_path_tools.py,sha256=JrJvtTDd_gkCKcZtBCDTMktsM77PZwGV_hzQX0g5GU8,1722
 fmtr/tools/path_tools/path_tools.py,sha256=s3RTXsjnr2Ah7vXQGjpGs-4DlWaVGvChu0aTFXX3gsE,8867
@@ -85,9 +85,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=cjE6nO6AoVOUp3RwgTbqL9wiw8J1l2pHJOz6Gn6bxjA,326
 fmtr/tools/version_tools/version_tools.py,sha256=Hcc6yferZS1hHbugRTdiHhSNmXEEG0hjCiTTXKna-YY,1127
-fmtr_tools-1.3.50.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.50.dist-info/METADATA,sha256=-42D0Ay9KhMXpGowQtlII6Xx4QGu7XKbfuoGWMR_Ej0,17429
-fmtr_tools-1.3.50.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.50.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.50.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.50.dist-info/RECORD,,
+fmtr_tools-1.3.52.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.52.dist-info/METADATA,sha256=beQhHRoQiWwSuBgp-9GIoWywNE6bI3BnoASw75lPYhM,17429
+fmtr_tools-1.3.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.52.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.52.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.52.dist-info/RECORD,,