fmtr.tools 1.3.64__tar.gz → 1.3.66__tar.gz

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

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

{fmtr_tools-1.3.64 → fmtr_tools-1.3.66}/fmtr/tools/data_modelling_tools.py

@@ -8,6 +8,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
 
 
@@ -17,12 +18,13 @@ class Field(FieldInfo):
     Allow DRYer field definitions, set annotation and defaults at the same time, easier field inheritance, etc.
 
     """
+    NAME = Auto
     ANNOTATION = None
     DEFAULT = Auto
     FILLS = None
     DESCRIPTION = None
     TITLE = Auto
-    KWARGS = None
+    CONFIG = None
 
     def __init__(self):
         """
@@ -33,13 +35,27 @@ class Field(FieldInfo):
         title = self.get_title_auto()
         description = self.get_desc()
         default = self.get_default_auto()
-        kwargs = self.KWARGS or {}
+        kwargs = self.CONFIG or {}
 
         if default is Required:
             default = PydanticUndefined
 
         super().__init__(default=default, title=title, description=description, **kwargs)
 
+    @classmethod
+    def get_name_auto(cls) -> str:
+        """
+
+        Infer field name, if set to auto.
+
+        """
+        if cls.NAME is Auto:
+            return camel_to_snake(cls.__name__)
+        elif cls.NAME is None:
+            return cls.__name__
+
+        return cls.NAME
+
     @cached_property
     def fills(self) -> Dict[str, str]:
         """
@@ -169,7 +185,7 @@ class Base(BaseModel, MixinFromJson):
             if isinstance(raw, dict):
                 fields |= raw
             else:
-                fields |= get_class_lookup(*raw, name_function=str.lower)
+                fields |= get_class_lookup(*raw, name_function=lambda cls_field: cls_field.get_name_auto())
 
         cls.FIELDS = fields
 

{fmtr_tools-1.3.64 → fmtr_tools-1.3.66}/fmtr/tools/database_tools/document.py

@@ -2,13 +2,23 @@ from functools import cached_property
 from typing import List
 
 import beanie
+from beanie.odm import actions
 from motor.motor_asyncio import AsyncIOMotorClient
 
+from fmtr.tools import data_modelling_tools
 from fmtr.tools.constants import Constants
 from fmtr.tools.logging_tools import logger
 
+ModifyEvents = [
+    actions.Insert,
+    actions.Replace,
+    actions.Save,
+    actions.SaveChanges,
+    actions.Update
+]
 
-class Document(beanie.Document):
+
+class Document(beanie.Document, data_modelling_tools.Base):
     """
 
     Document stub.

{fmtr_tools-1.3.64 → fmtr_tools-1.3.66}/fmtr/tools/iterator_tools.py

@@ -2,7 +2,6 @@ from itertools import chain, batched
 from typing import List, Dict, Any
 
 from fmtr.tools.datatype_tools import is_none
-from fmtr.tools.tools import identity
 
 
 def enlist(value) -> List[Any]:
@@ -75,10 +74,10 @@ def dedupe(items):
     return list(dict.fromkeys(items))
 
 
-def get_class_lookup(*classes, name_function=identity):
+def get_class_lookup(*classes, name_function=lambda cls: cls.__name__):
     """
 
     Dictionary of class names to classes
 
     """
-    return {name_function(cls.__name__): cls for cls in classes}
+    return {name_function(cls): cls for cls in classes}

{fmtr_tools-1.3.64 → fmtr_tools-1.3.66}/fmtr/tools/string_tools.py

@@ -241,3 +241,18 @@ def trim(text: str) -> str:
 
     """
     return dedent(text).strip()
+
+
+ACRONYM_BOUNDARY = re.compile(r'([A-Z]+)([A-Z][a-z])')
+CAMEL_BOUNDARY = re.compile(r'([a-z0-9])([A-Z])')
+
+
+def camel_to_snake(name: str) -> str:
+    """
+
+    Camel case to snake case
+
+    """
+    name = ACRONYM_BOUNDARY.sub(r'\1_\2', name)
+    name = CAMEL_BOUNDARY.sub(r'\1_\2', name)
+    return name.lower()

fmtr_tools-1.3.66/fmtr/tools/version

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

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

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

fmtr_tools-1.3.64/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.64

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

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