fmtr.tools 1.3.67__tar.gz → 1.3.68__tar.gz

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

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

{fmtr_tools-1.3.67 → fmtr_tools-1.3.68}/fmtr/tools/data_modelling_tools.py

@@ -21,13 +21,14 @@ class Field(FieldInfo):
     """
     NAME = Auto
     ANNOTATION = Empty
+    EXCLUDE = False
     DEFAULT = Auto
     FILLS = None
     DESCRIPTION = None
     TITLE = Auto
     CONFIG = None
 
-    def __init__(self, annotation=Empty, default=Empty, description=None, title=None, fills=None, **kwargs):
+    def __init__(self, annotation=Empty, default=Empty, description=None, title=None, fills=None, exclude=None, **kwargs):
         """
 
         Infer default from type annotation, if enabled, use class/argument fills to create titles/descriptions, etc.
@@ -37,9 +38,12 @@ 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
+
         self.annotation = self.ANNOTATION if annotation is Empty else annotation
         if self.annotation is Empty:
             raise ValueError("Annotation must be specified.")
+        annotation = self.annotation
 
         default = self.get_default_auto(default)
         if default is Required:
@@ -49,7 +53,8 @@ class Field(FieldInfo):
         title = self.get_title_auto(title)
         kwargs |= (self.CONFIG or {})
 
-        super().__init__(default=default, title=title, description=description, **kwargs)
+        super().__init__(default=default, title=title, description=description, exclude=exclude, **kwargs)
+        self.annotation = annotation
 
     @classmethod
     def get_name_auto(cls) -> str:
@@ -215,9 +220,7 @@ class Base(BaseModel, MixinFromJson):
                 field = field()
 
             setattr(cls, name, field)
-
-            annotation = field.annotation
-            cls.__annotations__[name] = annotation
+            cls.__annotations__[name] = field.annotation
 
     def to_df(self, name_value='value'):
         """

fmtr_tools-1.3.68/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.68

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

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

fmtr_tools-1.3.67/fmtr/tools/version

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

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

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