fmtr.tools 1.3.66__tar.gz → 1.3.67__tar.gz

{fmtr_tools-1.3.66 → fmtr_tools-1.3.67}/PKG-INFO

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

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

@@ -0,0 +1 @@
+1.3.67

{fmtr_tools-1.3.66 → fmtr_tools-1.3.67}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.66/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.66

{fmtr_tools-1.3.66 → fmtr_tools-1.3.67}/fmtr.tools.egg-info/requires.txt

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