fmtr.tools 1.3.70__py3-none-any.whl → 1.3.72__py3-none-any.whl

fmtr/tools/data_modelling_tools.py

@@ -5,9 +5,10 @@ from typing import ClassVar, List, Any, Dict
 from pydantic import BaseModel
 from pydantic import RootModel, ConfigDict
 from pydantic.fields import FieldInfo
+from pydantic.json_schema import SkipJsonSchema
 from pydantic_core import PydanticUndefined, PydanticUndefinedType
 
-from fmtr.tools.datatype_tools import is_optional
+from fmtr.tools.datatype_tools import is_optional, none_else
 from fmtr.tools.iterator_tools import get_class_lookup
 from fmtr.tools.string_tools import camel_to_snake
 from fmtr.tools.tools import Auto, Required, Empty
@@ -21,14 +22,14 @@ class Field(FieldInfo):
     """
     NAME = Auto
     ANNOTATION = Empty
-    EXCLUDE = False
     DEFAULT = Auto
     FILLS = None
     DESCRIPTION = None
     TITLE = Auto
+    SKIP_SCHEMA = False
     CONFIG = None
 
-    def __init__(self, annotation=Empty, default=Empty, description=None, title=None, fills=None, exclude=None, **kwargs):
+    def __init__(self, annotation=Empty, default=Empty, description=None, title=None, fills=None, skip_schema=None, **kwargs):
         """
 
         Infer default from type annotation, if enabled, use class/argument fills to create titles/descriptions, etc.
@@ -38,12 +39,15 @@ class Field(FieldInfo):
         fills_super = getattr(super(), 'FILLS', None)
         self.fills = (fills_super or {}) | (self.FILLS or {}) | (fills or {})
 
-        exclude = exclude if exclude is not None else self.EXCLUDE
+        skip_schema = none_else(skip_schema, self.SKIP_SCHEMA)
 
         self.annotation = self.ANNOTATION if annotation is Empty else annotation
         if self.annotation is Empty:
             raise ValueError("Annotation must be specified.")
 
+        if skip_schema:
+            self.annotation = SkipJsonSchema[self.annotation]
+
         default = self.get_default_auto(default)
         if default is Required:
             default = PydanticUndefined
@@ -52,7 +56,7 @@ class Field(FieldInfo):
         title = self.get_title_auto(title)
         kwargs |= (self.CONFIG or {})
 
-        super().__init__(annotation=self.annotation, default=default, title=title, description=description, exclude=exclude, **kwargs)
+        super().__init__(annotation=self.annotation, default=default, title=title, description=description, **kwargs)
 
     @classmethod
     def get_name_auto(cls) -> str:
@@ -220,21 +224,16 @@ 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
 
 
@@ -245,11 +244,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/version

@@ -1 +1 @@
-1.3.70
+1.3.72

{fmtr_tools-1.3.70.dist-info → fmtr_tools-1.3.72.dist-info}/METADATA

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

{fmtr_tools-1.3.70.dist-info → fmtr_tools-1.3.72.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=0lTV8LSnsqRR7hZMY7r8B-1MoB-e7sTDwupIl4C1UKc,6055
+fmtr/tools/data_modelling_tools.py,sha256=PrlYPXEWH4HqRb01wcexDfWGb0zbeekM_gOKDWTvAso,6350
 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=-yW6m0NUFNhw0WCC_XSmQtpIOvu23CyMqcYLM_0guO0,6
+fmtr/tools/version,sha256=PGje1r_xsROztsBHUzPBFs4t22fimg89F3tW9Jrswf0,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
@@ -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.70.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.70.dist-info/METADATA,sha256=ow1onnJrFfNP-pYjuXbaLmf09nwBAe6fIRBpHDPxueA,18035
-fmtr_tools-1.3.70.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.70.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.70.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.70.dist-info/RECORD,,
+fmtr_tools-1.3.72.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.72.dist-info/METADATA,sha256=5RT9Wn0_p3Se72jS1jhWnmPFAgYOWrJBp0cZA8EMbWE,18035
+fmtr_tools-1.3.72.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.72.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.72.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.72.dist-info/RECORD,,