fmtr.tools 1.3.68__tar.gz → 1.3.70__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.3.68
+Version: 1.3.70
 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: flet-webview; extra == "all"
-Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: appdirs; extra == "all"
-Requires-Dist: python-on-whales; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: motor; extra == "all"
-Requires-Dist: pycountry; 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: tokenizers; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: ollama; extra == "all"
+Requires-Dist: uvicorn[standard]; extra == "all"
 Requires-Dist: json_repair; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: google-auth; 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: dnspython[doh]; 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: pytest-cov; extra == "all"
-Requires-Dist: semver; extra == "all"
-Requires-Dist: pandas; 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: transformers[sentencepiece]; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: deepdiff; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
+Requires-Dist: pydantic; extra == "all"
 Requires-Dist: peft; extra == "all"
-Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
+Requires-Dist: beanie[odm]; extra == "all"
+Requires-Dist: regex; 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: cachetools; 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: deepdiff; extra == "all"
-Requires-Dist: deepmerge; 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: contexttimer; extra == "all"
-Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: fastapi; 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: 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: tokenizers; extra == "all"
+Requires-Dist: tinynetrc; 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"
+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: fastapi; 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"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

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

@@ -43,7 +43,6 @@ class Field(FieldInfo):
         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:
@@ -53,8 +52,7 @@ class Field(FieldInfo):
         title = self.get_title_auto(title)
         kwargs |= (self.CONFIG or {})
 
-        super().__init__(default=default, title=title, description=description, exclude=exclude, **kwargs)
-        self.annotation = annotation
+        super().__init__(annotation=self.annotation, default=default, title=title, description=description, exclude=exclude, **kwargs)
 
     @classmethod
     def get_name_auto(cls) -> str:

{fmtr_tools-1.3.68 → fmtr_tools-1.3.70}/fmtr/tools/datatype_tools.py

@@ -1,5 +1,5 @@
 from types import UnionType, NoneType
-from typing import Any, get_origin, get_args
+from typing import Any, get_origin, get_args, Union, Annotated
 
 from fmtr.tools.tools import Raise
 
@@ -98,5 +98,9 @@ def is_optional(annotation) -> bool:
 
     origin = get_origin(annotation)
     args = get_args(annotation)
-    is_opt = origin is UnionType and NoneType in args
+
+    if origin is Annotated:
+        return is_optional(args[0])
+
+    is_opt = (origin is UnionType or origin is Union) and NoneType in args
     return is_opt

fmtr_tools-1.3.70/fmtr/tools/version

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.3.68
+Version: 1.3.70
 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: flet-webview; extra == "all"
-Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: appdirs; extra == "all"
-Requires-Dist: python-on-whales; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: motor; extra == "all"
-Requires-Dist: pycountry; 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: tokenizers; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: ollama; extra == "all"
+Requires-Dist: uvicorn[standard]; extra == "all"
 Requires-Dist: json_repair; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: google-auth; 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: dnspython[doh]; 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: pytest-cov; extra == "all"
-Requires-Dist: semver; extra == "all"
-Requires-Dist: pandas; 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: transformers[sentencepiece]; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: deepdiff; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
+Requires-Dist: pydantic; extra == "all"
 Requires-Dist: peft; extra == "all"
-Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
+Requires-Dist: beanie[odm]; extra == "all"
+Requires-Dist: regex; 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: cachetools; 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: deepdiff; extra == "all"
-Requires-Dist: deepmerge; 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: contexttimer; extra == "all"
-Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: fastapi; 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: 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: tokenizers; extra == "all"
+Requires-Dist: tinynetrc; 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"
+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: fastapi; 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"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

fmtr_tools-1.3.68/fmtr/tools/version

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

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

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