fmtr.tools 1.3.78__py3-none-any.whl → 1.3.80__py3-none-any.whl

fmtr/tools/interface_tools/controls.py

@@ -41,7 +41,7 @@ class Cell(ft.DataCell):
 
         super().__init__(self.gesture_detector)
 
-    @property
+    @cached_property
     def text(self):
         """
 
@@ -72,8 +72,7 @@ class Cell(ft.DataCell):
         """
         return None
 
-
-    @property
+    @cached_property
     def gesture_detector(self):
         """
 
@@ -98,7 +97,7 @@ class Cell(ft.DataCell):
         Default cell click behavior — override in subclass if needed
 
         """
-        logger.info(f"Clicked {self.column=} {self.series.id=} {self.value=}")
+        logger.info(f"Clicked {self.column=} {self.series.name=} {self.value=}")
 
     async def click_double_tap(self, event: TapEvent):
         """
@@ -126,7 +125,7 @@ class Row(ft.DataRow):
 
     """
 
-    TypeCell = Cell
+    TypesCells = {None: Cell}
 
     def __init__(self, series):
         self.series = series
@@ -141,7 +140,9 @@ class Row(ft.DataRow):
         """
         data = {}
         for col in self.series.index:
-            data.setdefault(col, []).append(self.TypeCell(self.series, col))
+            default = self.TypesCells[None]
+            TypeCell = self.TypesCells.get(col, default)
+            data.setdefault(col, []).append(TypeCell(self.series, col))
         return data
 
     @cached_property
@@ -193,7 +194,7 @@ class Column(ft.DataColumn):
 
         super().__init__(label=self.text)
 
-    @property
+    @cached_property
     def text(self):
         """
 
@@ -219,8 +220,8 @@ class Table(ft.DataTable):
 
     """
 
-    TypeRow = Row
-    TypeColumn = Column
+    TypesRows = {None: Row}
+    TypesColumns = {None: Column}
 
     def __init__(self, df):  # todo move to submodule with tabular deps
         """
@@ -229,8 +230,34 @@ class Table(ft.DataTable):
 
         """
         self.df = df
-        columns = [self.TypeColumn(col) for col in df.columns]
-        super().__init__(columns=columns, rows=self.rows_controls)
+        super().__init__(columns=self.columns_controls, rows=self.rows_controls)
+
+    @cached_property
+    def columns_data(self) -> dict[str, list[Column]]:
+        """
+
+        Columns controls lookup
+
+        """
+        data = {}
+        for col in self.df.columns:
+            default = self.TypesColumns[None]
+            TypeColumn = self.TypesColumns.get(col, default)
+            data.setdefault(col, []).append(TypeColumn(col))
+        return data
+
+    @cached_property
+    def columns_controls(self) -> list[Column]:
+        """
+
+        Flat list of controls
+
+        """
+        controls = []
+        for columns in self.columns_data.values():
+            for column in columns:
+                controls.append(column)
+        return controls
 
     @cached_property
     def rows_data(self) -> dict[str, list[Row]]:
@@ -241,7 +268,9 @@ class Table(ft.DataTable):
         """
         data = {}
         for index, row in self.df.iterrows():
-            data.setdefault(index, []).append(self.TypeRow(row))
+            default = self.TypesRows[None]
+            TypeRow = self.TypesRows.get(index, default)
+            data.setdefault(index, []).append(TypeRow(row))
         return data
 
     @cached_property

fmtr/tools/version

@@ -1 +1 @@
-1.3.78
+1.3.80

{fmtr_tools-1.3.78.dist-info → fmtr_tools-1.3.80.dist-info}/METADATA

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

{fmtr_tools-1.3.78.dist-info → fmtr_tools-1.3.80.dist-info}/RECORD

@@ -45,7 +45,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=sLMXk8juOL8_n_D776cJ-kzjyMHqFI_fctDEjy6PIKs,1115
 fmtr/tools/unicode_tools.py,sha256=yS_9wpu8ogNoiIL7s1G_8bETFFO_YQlo4LNPv1NLDeY,52
-fmtr/tools/version,sha256=44MKGTtDIpnJNALvNTzMb92ej4gSGvmp9z8gUKxi5A4,6
+fmtr/tools/version,sha256=56AUcdQogqzsIrs56Mo-4LZmWCw_xrUs-x8c1DwJd8Q,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
@@ -67,7 +67,7 @@ fmtr/tools/entrypoints/remote_debug_test.py,sha256=wmKg9o2pQq7eqeHmaO8oviujNgtns
 fmtr/tools/entrypoints/shell_debug.py,sha256=0No3tAg9Ri4_vvSlQCUtAY-11HR0nE45i0VVtiAViwY,106
 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=NoKau9oZtAUn9UNqrOdefc4iKp-IUhguv1i-oD9VbX4,6804
+fmtr/tools/interface_tools/controls.py,sha256=8cI7Jq4SsxRUD1CFVwQRAr4Ci6GSqyfQ5RDZqmPId2w,7673
 fmtr/tools/interface_tools/interface_tools.py,sha256=jSRwpdHqOTmNLndE-wFqTQdkT4z2BBdclSxmvs11FnU,4400
 fmtr/tools/path_tools/__init__.py,sha256=XrJXt7Zzo90tYUVksMlDfKkWt775zJ9OSi2NbhnqMDI,459
 fmtr/tools/path_tools/app_path_tools.py,sha256=JrJvtTDd_gkCKcZtBCDTMktsM77PZwGV_hzQX0g5GU8,1722
@@ -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.78.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.78.dist-info/METADATA,sha256=WO3YLT3mBryS_7VMQ_PWt2782eJ6KtTkJjw9pRLfP-4,17916
-fmtr_tools-1.3.78.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.78.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.78.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.78.dist-info/RECORD,,
+fmtr_tools-1.3.80.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.80.dist-info/METADATA,sha256=jvaj6sPXxLQx_FH4IouebVrETAAm6DkSfVsK8Zcz2p8,17916
+fmtr_tools-1.3.80.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.80.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.80.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.80.dist-info/RECORD,,