fmtr.tools 1.3.66__py3-none-any.whl → 1.3.67__py3-none-any.whl

fmtr/tools/data_modelling_tools.py

@@ -1,3 +1,4 @@
+import inspect
 from functools import cached_property
 from typing import ClassVar, List, Any, Dict
 
@@ -9,7 +10,7 @@ from pydantic_core import PydanticUndefined, PydanticUndefinedType
 from fmtr.tools.datatype_tools import is_optional
 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
+from fmtr.tools.tools import Auto, Required, Empty
 
 
 class Field(FieldInfo):
@@ -19,27 +20,35 @@ class Field(FieldInfo):
 
     """
     NAME = Auto
-    ANNOTATION = None
+    ANNOTATION = Empty
     DEFAULT = Auto
     FILLS = None
     DESCRIPTION = None
     TITLE = Auto
     CONFIG = None
 
-    def __init__(self):
+    def __init__(self, annotation=Empty, default=Empty, description=None, title=None, fills=None, **kwargs):
         """
 
         Infer default from type annotation, if enabled, use class/argument fills to create titles/descriptions, etc.
 
         """
-        title = self.get_title_auto()
-        description = self.get_desc()
-        default = self.get_default_auto()
-        kwargs = self.CONFIG or {}
 
+        fills_super = getattr(super(), 'FILLS', None)
+        self.fills = (fills_super or {}) | (self.FILLS or {}) | (fills or {})
+
+        self.annotation = self.ANNOTATION if annotation is Empty else annotation
+        if self.annotation is Empty:
+            raise ValueError("Annotation must be specified.")
+
+        default = self.get_default_auto(default)
         if default is Required:
             default = PydanticUndefined
 
+        description = self.get_desc(description)
+        title = self.get_title_auto(title)
+        kwargs |= (self.CONFIG or {})
+
         super().__init__(default=default, title=title, description=description, **kwargs)
 
     @classmethod
@@ -63,46 +72,55 @@ class Field(FieldInfo):
         Get fills with filled title merged in
 
         """
-        return (self.FILLS or {}) | dict(title=self.get_title_auto())
 
-    def get_default_auto(self) -> type[Any] | None | PydanticUndefinedType:
+        fills_super = getattr(super(), 'FILLS', None)
+
+        return (fills_super or {}) | (self.FILLS or {}) | dict(title=self.get_title_auto())
+
+    def get_default_auto(self, default) -> type[Any] | None | PydanticUndefinedType:
         """
 
         Infer default, if not specified.
 
         """
+
+        if default is not Empty:
+            return default
+
         if self.DEFAULT is not Auto:
             return self.DEFAULT
 
-        if is_optional(self.ANNOTATION):
+        if is_optional(self.annotation):
             return None
         else:
             return Required
 
-    def get_title_auto(self) -> str | None:
+    def get_title_auto(self, mask) -> str | None:
         """
 
         Get title from classname/mask
 
         """
 
-        mask = self.__class__.__name__ if self.TITLE is Auto else self.TITLE
-        fills = (self.FILLS or {})
+        if not mask:
+            mask = self.__class__.__name__ if self.TITLE is Auto else self.TITLE
 
         if mask:
-            return mask.format(**fills)
+            return mask.format(**self.fills)
 
         return None
 
-    def get_desc(self) -> str | None:
+    def get_desc(self, mask) -> str | None:
         """
 
-        Get description from classname/mask
+        Fill description mask, if specified
 
         """
 
-        if self.DESCRIPTION:
-            return self.DESCRIPTION.format(**self.fills)
+        mask = mask or self.DESCRIPTION
+
+        if mask:
+            return mask.format(**self.fills)
 
         return None
 
@@ -189,14 +207,16 @@ class Base(BaseModel, MixinFromJson):
 
         cls.FIELDS = fields
 
-        for name, FieldInfoType in fields.items():
+        for name, field in fields.items():
             if name in cls.__annotations__:
                 continue
 
-            field = FieldInfoType()
+            if inspect.isclass(field):
+                field = field()
+
             setattr(cls, name, field)
 
-            annotation = FieldInfoType.ANNOTATION
+            annotation = field.annotation
             cls.__annotations__[name] = annotation
 
     def to_df(self, name_value='value'):

fmtr/tools/datatype_tools.py

@@ -93,6 +93,9 @@ def is_optional(annotation) -> bool:
     Is type/annotation optional? todo should be in typing_tools?
 
     """
+    if annotation is None:
+        return True
+
     origin = get_origin(annotation)
     args = get_args(annotation)
     is_opt = origin is UnionType and NoneType in args

fmtr/tools/version

@@ -1 +1 @@
-1.3.66
+1.3.67

{fmtr_tools-1.3.66.dist-info → fmtr_tools-1.3.67.dist-info}/METADATA

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

{fmtr_tools-1.3.66.dist-info → fmtr_tools-1.3.67.dist-info}/RECORD

@@ -5,9 +5,9 @@ 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=vD7nbqeQh_azoNZUiVWvK8GuyNE-Qagcqg_RE7wYNBk,5303
+fmtr/tools/data_modelling_tools.py,sha256=XLteLdfihxey8_nDbLsOWlycSj4r5DRVpgH6VdaZwRs,5945
 fmtr/tools/dataclass_tools.py,sha256=0Gt6KeLhtPgubo_2tYkIVqB8oQ91Qzag8OAGZDdjvMU,1209
-fmtr/tools/datatype_tools.py,sha256=1XznVwlY4-DkYa6FwhHMstD8qz27vCcV64IvCrcJgMA,1830
+fmtr/tools/datatype_tools.py,sha256=89QmlQ_fANqFQKsEMzhhRftfby-1PcrR3cylfbQNt9U,1878
 fmtr/tools/datetime_tools.py,sha256=L7wmBoQbD9h_pJIL92WQOX32r_vrXgRvE-_0PVPRAGY,232
 fmtr/tools/debugging_tools.py,sha256=_xzqS0V5BpL8d06j-jVQjGgI7T020QsqVXKAKMz7Du8,2082
 fmtr/tools/environment_tools.py,sha256=43uqfj1G1bNX0IwKz-NKbu3AbFYSdbBuGN9rlThe030,1845
@@ -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=n4zX1YVX0dMhq7mFDh_xh19zo5isz-FQXXDc31JZieI,6
+fmtr/tools/version,sha256=Q_Iz5eCc4ybT-tWgBcfd4BENxHt_W707uGCdp8EvsCs,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.66.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.66.dist-info/METADATA,sha256=FDYRqOEAr_MdQkPYIjC9UYvo2_XIUvpAWDsXPj3Jmc8,18035
-fmtr_tools-1.3.66.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.66.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.66.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.66.dist-info/RECORD,,
+fmtr_tools-1.3.67.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.67.dist-info/METADATA,sha256=WEZSR3WZEPJ6LggCgFD6yt-M0qiAgWNdZ8lxkAyeKaA,18035
+fmtr_tools-1.3.67.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.67.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.67.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.67.dist-info/RECORD,,