fmtr.tools 1.3.69__tar.gz → 1.3.71__tar.gz

{fmtr_tools-1.3.69 → fmtr_tools-1.3.71}/PKG-INFO

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

{fmtr_tools-1.3.69 → fmtr_tools-1.3.71}/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:

{fmtr_tools-1.3.69 → fmtr_tools-1.3.71}/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.71/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.71

{fmtr_tools-1.3.69 → fmtr_tools-1.3.71}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.69/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.69

{fmtr_tools-1.3.69 → fmtr_tools-1.3.71}/fmtr.tools.egg-info/requires.txt

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