fmtr.tools 1.3.71__tar.gz → 1.3.73__tar.gz

{fmtr_tools-1.3.71 → fmtr_tools-1.3.73}/PKG-INFO

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

{fmtr_tools-1.3.71 → fmtr_tools-1.3.73}/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-1.3.71 → fmtr_tools-1.3.73}/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-1.3.73/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.73

{fmtr_tools-1.3.71 → fmtr_tools-1.3.73}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.71/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.71

{fmtr_tools-1.3.71 → fmtr_tools-1.3.73}/fmtr.tools.egg-info/requires.txt

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