fmtr.tools 1.3.71__py3-none-any.whl → 1.3.73__py3-none-any.whl

fmtr/tools/data_modelling_tools.py

@@ -224,23 +224,30 @@ class Base(BaseModel, MixinFromJson):
             setattr(cls, name, field)
             cls.__annotations__[name] = field.annotation
 
-    def to_df(self, name_value='value'):
+    def to_df(self, **kwargs):
         """
 
-        DataFrame representation with Fields as rows.
+        DataFrame representation of Data Model.
 
         """
+        from fmtr.tools import tabular
 
-        objs = []
-        for name in self.model_fields.keys():
-            val = getattr(self, name)
-            objs.append(val)
-
-        df = to_df(*objs, name_value=name_value)
-        df['id'] = list(self.model_fields.keys())
-        df = df.set_index('id', drop=True)
+        data = self.model_dump(**kwargs)
+        df = tabular.pd.json_normalize(data, sep='_')
         return df
 
+    @classmethod
+    def to_df_empty(cls):
+        """
+
+        Empty DataFrame
+
+        """
+        from fmtr.tools import tabular
+
+        row = {name: None for name in cls.model_fields.keys()}
+        df = tabular.pd.DataFrame([row])
+        return df
 
 class Root(RootModel, MixinFromJson):
     """
@@ -249,11 +256,21 @@ class Root(RootModel, MixinFromJson):
 
     """
 
-    def to_df(self):
+    def to_df(self, **kwargs):
         """
 
         DataFrame representation with items as rows.
 
         """
 
-        return to_df(*self.items)
+        """
+
+        DataFrame representation of Data Model.
+
+        """
+        from fmtr.tools import tabular
+
+        data = [item.model_dump(**kwargs) for item in self.items]
+        dfs = [tabular.pd.json_normalize(datum, sep='_') for datum in data]
+        df = tabular.pd.concat(dfs, axis=tabular.CONCAT_VERTICALLY)
+        return df

fmtr/tools/interface_tools/controls.py

@@ -46,7 +46,7 @@ class Cell(ft.DataCell):
 
         """
 
-        return ft.Text(str(self.value), color=self.color)
+        return ft.Text(str(self.value), color=self.color, bgcolor=self.bgcolor)
 
     @property
     def color(self):
@@ -60,6 +60,16 @@ class Cell(ft.DataCell):
         else:
             return None
 
+    @property
+    def bgcolor(self):
+        """
+
+        Basic conditional formatting
+
+        """
+        return None
+
+
     @property
     def gesture_detector(self):
         """
@@ -67,7 +77,7 @@ class Cell(ft.DataCell):
         Make arbitrary content clickable
 
         """
-        return ft.GestureDetector(content=self.text, on_tap=self.click_tap)
+        return ft.GestureDetector(content=self.text, on_tap=self.click_tap, on_double_tap=self.click_double_tap)
 
     async def click_tap(self, event: TapEvent):
         """
@@ -87,6 +97,24 @@ class Cell(ft.DataCell):
         """
         logger.info(f"Clicked {self.column=} {self.series.id=} {self.value=}")
 
+    async def click_double_tap(self, event: TapEvent):
+        """
+
+        Default cell click behavior — override in subclass if needed
+
+        """
+        value = await self.double_click(event=event)
+        event.page.update()
+        return value
+
+    async def double_click(self, event: Optional[TapEvent] = None):
+        """
+
+        Default cell double click behavior — override in subclass if needed
+
+        """
+        logger.info(f"Double-clicked {self.column=} {self.series.id=} {self.value=}")
+
 
 class Row(ft.DataRow):
     """
@@ -100,7 +128,16 @@ class Row(ft.DataRow):
     def __init__(self, series):
         self.series = series
         cells = [self.TypeCell(series, col) for col in series.index]
-        super().__init__(cells)
+        super().__init__(cells, color=self.row_color)
+
+    @property
+    def row_color(self):
+        """
+
+        Basic conditional formatting
+
+        """
+        return None
 
 
 class Column(ft.DataColumn):

fmtr/tools/version

@@ -1 +1 @@
-1.3.71
+1.3.73

{fmtr_tools-1.3.71.dist-info → fmtr_tools-1.3.73.dist-info}/METADATA

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

{fmtr_tools-1.3.71.dist-info → fmtr_tools-1.3.73.dist-info}/RECORD

@@ -5,7 +5,7 @@ fmtr/tools/augmentation_tools.py,sha256=-6ESbO4CDlKqVOV1J1V6qBeoBMzbFIinkDHRHnCB
 fmtr/tools/caching_tools.py,sha256=74p7m2GLFfeP41LX69wxgfkilxEAoWkMIfFMjKsYpyg,4976
 fmtr/tools/constants.py,sha256=90wCirUpw4bWMAbjhip0LL6k57eS5VmxRUP9pLCChBg,1812
 fmtr/tools/context_tools.py,sha256=4UvIHYgLqAh7dXMX9EBrLEpYp81qfzhSVrkffOSAoGA,350
-fmtr/tools/data_modelling_tools.py,sha256=qTKyLlSOnFnkJTa2Wg3eRlec9kiKsrddrO2Zi9vZvqA,6188
+fmtr/tools/data_modelling_tools.py,sha256=KZlY0BkGY1DWro0lhWE1ezgbnv9wPWaj9E2CEqMnTXM,6605
 fmtr/tools/dataclass_tools.py,sha256=0Gt6KeLhtPgubo_2tYkIVqB8oQ91Qzag8OAGZDdjvMU,1209
 fmtr/tools/datatype_tools.py,sha256=qFPFrZK70-an4w7H46g8eT5j6Jez--U2XnmFdrQibeE,1983
 fmtr/tools/datetime_tools.py,sha256=L7wmBoQbD9h_pJIL92WQOX32r_vrXgRvE-_0PVPRAGY,232
@@ -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=RKfpJYVUZqgI7UFHG-wGYsY7K7pJ5MVrkwjYpSOb6ro,6
+fmtr/tools/version,sha256=igGdG23ZKXmxPHu73EVw5gtOGr5KGif-26oVR4QTXis,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=KYjo-TLQuoh8gCgw6saZs6Sz1zDwCm5wfIgqta4mKrE,3030
+fmtr/tools/interface_tools/controls.py,sha256=gm8mlgrV014r8fQYHd5pVwnDIvxWiNkS8g_9sYSir5Y,3870
 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
@@ -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.71.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.71.dist-info/METADATA,sha256=t-oB0K3EpWbRCOh4g-3xeK7fmkfs1NM8BsudZY98i7Y,18035
-fmtr_tools-1.3.71.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.71.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.71.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.71.dist-info/RECORD,,
+fmtr_tools-1.3.73.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.73.dist-info/METADATA,sha256=EUuFhzj8FMERfXkqqQpPCSDcqCBJpsUjrJZsMwvxFvQ,18035
+fmtr_tools-1.3.73.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.73.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.73.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.73.dist-info/RECORD,,