fmtr.tools 1.3.70__tar.gz → 1.3.72__tar.gz

{fmtr_tools-1.3.70 → fmtr_tools-1.3.72}/PKG-INFO

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

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

@@ -0,0 +1 @@
+1.3.72

{fmtr_tools-1.3.70 → fmtr_tools-1.3.72}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.70/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.70

{fmtr_tools-1.3.70 → fmtr_tools-1.3.72}/fmtr.tools.egg-info/requires.txt

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