fmtr.tools 1.3.62__tar.gz → 1.3.64__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.3.62
+Version: 1.3.64
 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
@@ -8,6 +8,20 @@ Author-email: innovative.fowler@mask.pro.fmtr.dev
 License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Provides-Extra: dev
+Requires-Dist: logfire; extra == "dev"
+Requires-Dist: semver; extra == "dev"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "dev"
+Requires-Dist: pydantic-settings; extra == "dev"
+Requires-Dist: pydantic; extra == "dev"
+Requires-Dist: pydantic-extra-types; extra == "dev"
+Requires-Dist: pycountry; extra == "dev"
+Requires-Dist: yamlscript; extra == "dev"
+Requires-Dist: pyyaml; extra == "dev"
+Requires-Dist: yamlscript; extra == "dev"
+Requires-Dist: pyyaml; extra == "dev"
+Requires-Dist: beanie[odm]; extra == "dev"
+Requires-Dist: motor; extra == "dev"
 Provides-Extra: test
 Requires-Dist: pytest-cov; extra == "test"
 Provides-Extra: yaml
@@ -154,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: setuptools; extra == "all"
-Requires-Dist: google-auth; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: cachetools; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: pydantic; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: json_repair; extra == "all"
-Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: tabulate; extra == "all"
-Requires-Dist: sre_yield; 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: regex; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: flet-video; extra == "all"
-Requires-Dist: pandas; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
-Requires-Dist: semver; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
 Requires-Dist: dask[bag]; extra == "all"
-Requires-Dist: peft; extra == "all"
-Requires-Dist: html2text; extra == "all"
-Requires-Dist: transformers[sentencepiece]; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: flet[all]; extra == "all"
-Requires-Dist: appdirs; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: huggingface_hub; 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: pytest-cov; extra == "all"
 Requires-Dist: beanie[odm]; extra == "all"
-Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: deepdiff; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: pycountry; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: faker; extra == "all"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
-Requires-Dist: odfpy; extra == "all"
-Requires-Dist: pydantic-settings; 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: motor; extra == "all"
-Requires-Dist: torchvision; extra == "all"
-Requires-Dist: filetype; 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: pymupdf4llm; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
 Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: fastapi; 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: Unidecode; extra == "all"
-Requires-Dist: distributed; 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: httpx_retries; 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: tokenizers; 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: torchvision; extra == "all"
+Requires-Dist: yamlscript; 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: cachetools; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
+Requires-Dist: motor; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

fmtr_tools-1.3.64/fmtr/tools/data_modelling_tools.py

@@ -0,0 +1,218 @@
+from functools import cached_property
+from typing import ClassVar, List, Any, Dict
+
+from pydantic import BaseModel
+from pydantic import RootModel, ConfigDict
+from pydantic.fields import FieldInfo
+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.tools import Auto, Required
+
+
+class Field(FieldInfo):
+    """
+
+    Allow DRYer field definitions, set annotation and defaults at the same time, easier field inheritance, etc.
+
+    """
+    ANNOTATION = None
+    DEFAULT = Auto
+    FILLS = None
+    DESCRIPTION = None
+    TITLE = Auto
+    KWARGS = None
+
+    def __init__(self):
+        """
+
+        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.KWARGS or {}
+
+        if default is Required:
+            default = PydanticUndefined
+
+        super().__init__(default=default, title=title, description=description, **kwargs)
+
+    @cached_property
+    def fills(self) -> Dict[str, str]:
+        """
+
+        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:
+        """
+
+        Infer default, if not specified.
+
+        """
+        if self.DEFAULT is not Auto:
+            return self.DEFAULT
+
+        if is_optional(self.ANNOTATION):
+            return None
+        else:
+            return Required
+
+    def get_title_auto(self) -> str | None:
+        """
+
+        Get title from classname/mask
+
+        """
+
+        mask = self.__class__.__name__ if self.TITLE is Auto else self.TITLE
+        fills = (self.FILLS or {})
+
+        if mask:
+            return mask.format(**fills)
+
+        return None
+
+    def get_desc(self) -> str | None:
+        """
+
+        Get description from classname/mask
+
+        """
+
+        if self.DESCRIPTION:
+            return self.DESCRIPTION.format(**self.fills)
+
+        return None
+
+
+def to_df(*objs, name_value='value'):
+    """
+
+    DataFrame representation of Data Models as rows.
+
+    """
+    from fmtr.tools import tabular
+
+    rows = []
+    for obj in objs:
+        if isinstance(obj, BaseModel):
+            row = obj.model_dump()
+        else:
+            row = {name_value: obj}
+        rows.append(row)
+
+    df = tabular.DataFrame(rows)
+    if 'id' in df.columns:
+        df.set_index('id', inplace=True, drop=True)
+    return df
+
+
+class MixinArbitraryTypes:
+    """
+
+    Convenience for when non-serializable types are needed
+    """
+
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+class MixinFromJson:
+
+    @classmethod
+    def from_json(cls, json_str):
+        """
+
+        Error-tolerant deserialization
+
+        """
+        from fmtr.tools import json_fix
+        data = json_fix.from_json(json_str, default={})
+
+        if type(data) is dict:
+            self = cls(**data)
+        else:
+            self = cls(data)
+
+        return self
+
+
+
+class Base(BaseModel, MixinFromJson):
+    """
+
+    Base model allowing model definition via a list of custom Field objects.
+
+    """
+    FIELDS: ClassVar[List[Field] | Dict[str, Field]] = []
+
+    def __init_subclass__(cls, **kwargs):
+        """
+
+        Fetch aggregated fields metadata from the hierarchy and set annotations and FieldInfo objects in the class.
+
+        """
+        super().__init_subclass__(**kwargs)
+
+        fields = {}
+        for base in reversed(cls.__mro__):
+
+            try:
+                raw = base.FIELDS
+            except AttributeError:
+                raw = {}
+
+            if isinstance(raw, dict):
+                fields |= raw
+            else:
+                fields |= get_class_lookup(*raw, name_function=str.lower)
+
+        cls.FIELDS = fields
+
+        for name, FieldInfoType in fields.items():
+            if name in cls.__annotations__:
+                continue
+
+            field = FieldInfoType()
+            setattr(cls, name, field)
+
+            annotation = FieldInfoType.ANNOTATION
+            cls.__annotations__[name] = annotation
+
+    def to_df(self, name_value='value'):
+        """
+
+        DataFrame representation with Fields as rows.
+
+        """
+
+        objs = []
+        for name in self.model_fields.keys():
+            val = getattr(self, name)
+            objs.append(val)
+
+        df = to_df(*objs, name_value=name_value)
+        df['id'] = list(self.model_fields.keys())
+        df = df.set_index('id', drop=True)
+        return df
+
+
+class Root(RootModel, MixinFromJson):
+    """
+
+    Root (list) model
+
+    """
+
+    def to_df(self):
+        """
+
+        DataFrame representation with items as rows.
+
+        """
+
+        return to_df(*self.items)

{fmtr_tools-1.3.62 → fmtr_tools-1.3.64}/fmtr/tools/datatype_tools.py

@@ -1,4 +1,5 @@
-from typing import Any
+from types import UnionType, NoneType
+from typing import Any, get_origin, get_args
 
 from fmtr.tools.tools import Raise
 
@@ -84,3 +85,15 @@ def none_else(value: Any, default: Any) -> Any:
     if is_none(value):
         return default
     return value
+
+
+def is_optional(annotation) -> bool:
+    """
+
+    Is type/annotation optional? todo should be in typing_tools?
+
+    """
+    origin = get_origin(annotation)
+    args = get_args(annotation)
+    is_opt = origin is UnionType and NoneType in args
+    return is_opt

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

@@ -1,8 +1,8 @@
 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]:
@@ -73,3 +73,12 @@ def dedupe(items):
 
     """
     return list(dict.fromkeys(items))
+
+
+def get_class_lookup(*classes, name_function=identity):
+    """
+
+    Dictionary of class names to classes
+
+    """
+    return {name_function(cls.__name__): cls for cls in classes}

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

@@ -1,8 +1,7 @@
-from collections import namedtuple
-from string import Formatter
-
 import re
+from collections import namedtuple
 from dataclasses import dataclass
+from string import Formatter
 from textwrap import dedent
 from typing import List
 
@@ -151,14 +150,14 @@ def truncate_mid(text, length=None, sep=ELLIPSIS, return_type=str):
         )
 
 
-def flatten(raw):
+def flatten(raw, sep=' '):
     """
 
     Flatten a multiline string to a single line
 
     """
     lines = raw.splitlines()
-    text = ' '.join(lines)
+    text = sep.join(lines)
     text = text.strip()
     return text
 
@@ -175,6 +174,23 @@ def join(strings, sep=' '):
     return text
 
 
+def join_natural(items, sep=', ', conj='and'):
+    """
+
+    Natural language list
+
+    """
+
+    items = list(items)
+    if not items:
+        return ""
+    if len(items) == 1:
+        return items[0]
+    firsts, last = items[:-1], items[-1]
+    firsts_str = join(firsts, sep=sep)
+    text = f"{firsts_str} {conj} {last}"
+    return text
+
 class Mask:
     """
 

{fmtr_tools-1.3.62 → fmtr_tools-1.3.64}/fmtr/tools/tools.py

@@ -27,7 +27,15 @@ def identity(x: Any) -> Any:
     return x
 
 
-class Empty:
+class Special:
+    """
+
+    Classes to differentiate special arguments from primitive arguments.
+
+    """
+
+
+class Empty(Special):
     """
 
     Class to denote an unspecified object (e.g. argument) when `None` cannot be used.
@@ -35,7 +43,7 @@ class Empty:
     """
 
 
-class Raise:
+class Raise(Special):
     """
 
     Class to denote when a function should raise instead of e.g. returning a default.
@@ -43,4 +51,21 @@ class Raise:
     """
 
 
+class Auto(Special):
+    """
+
+    Class to denote when an argument should be inferred.
+
+    """
+
+
+class Required(Special):
+    """
+
+    Class to denote when an argument is required.
+
+    """
+
+
+
 EMPTY = Empty()

fmtr_tools-1.3.64/fmtr/tools/version

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.3.62
+Version: 1.3.64
 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
@@ -8,6 +8,20 @@ Author-email: innovative.fowler@mask.pro.fmtr.dev
 License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Provides-Extra: dev
+Requires-Dist: logfire; extra == "dev"
+Requires-Dist: semver; extra == "dev"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "dev"
+Requires-Dist: pydantic-settings; extra == "dev"
+Requires-Dist: pydantic; extra == "dev"
+Requires-Dist: pydantic-extra-types; extra == "dev"
+Requires-Dist: pycountry; extra == "dev"
+Requires-Dist: yamlscript; extra == "dev"
+Requires-Dist: pyyaml; extra == "dev"
+Requires-Dist: yamlscript; extra == "dev"
+Requires-Dist: pyyaml; extra == "dev"
+Requires-Dist: beanie[odm]; extra == "dev"
+Requires-Dist: motor; extra == "dev"
 Provides-Extra: test
 Requires-Dist: pytest-cov; extra == "test"
 Provides-Extra: yaml
@@ -154,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: setuptools; extra == "all"
-Requires-Dist: google-auth; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: cachetools; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: pydantic; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: json_repair; extra == "all"
-Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: tabulate; extra == "all"
-Requires-Dist: sre_yield; 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: regex; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: flet-video; extra == "all"
-Requires-Dist: pandas; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
-Requires-Dist: semver; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
 Requires-Dist: dask[bag]; extra == "all"
-Requires-Dist: peft; extra == "all"
-Requires-Dist: html2text; extra == "all"
-Requires-Dist: transformers[sentencepiece]; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: flet[all]; extra == "all"
-Requires-Dist: appdirs; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: huggingface_hub; 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: pytest-cov; extra == "all"
 Requires-Dist: beanie[odm]; extra == "all"
-Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: deepdiff; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: pycountry; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: faker; extra == "all"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
-Requires-Dist: odfpy; extra == "all"
-Requires-Dist: pydantic-settings; 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: motor; extra == "all"
-Requires-Dist: torchvision; extra == "all"
-Requires-Dist: filetype; 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: pymupdf4llm; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
 Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: fastapi; 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: Unidecode; extra == "all"
-Requires-Dist: distributed; 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: httpx_retries; 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: tokenizers; 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: torchvision; extra == "all"
+Requires-Dist: yamlscript; 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: cachetools; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
+Requires-Dist: motor; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

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

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

{fmtr_tools-1.3.62 → fmtr_tools-1.3.64}/setup.py

@@ -1,6 +1,8 @@
 from fmtr.tools import Setup
 
 DEPENDENCIES = {
+    'dev': ['logging', 'version.dev', 'debug', 'sets', 'yaml', 'db.document'],
+
     'install': [],
     'test': ['pytest-cov'],
     'yaml': ['yamlscript', 'pyyaml'],
@@ -43,7 +45,8 @@ DEPENDENCIES = {
     'webhook': ['http'],
     'browsers': ['playwright'],
     'db': [],
-    'db.document': ['beanie[odm]', 'motor']
+    'db.document': ['beanie[odm]', 'motor'],
+
 }
 
 setup = Setup(

fmtr_tools-1.3.62/fmtr/tools/data_modelling_tools.py

@@ -1,93 +0,0 @@
-from pydantic import BaseModel, RootModel, ConfigDict
-
-
-def to_df(*objs, name_value='value'):
-    """
-
-    DataFrame representation of Data Models as rows.
-
-    """
-    from fmtr.tools import tabular
-
-    rows = []
-    for obj in objs:
-        if isinstance(obj, BaseModel):
-            row = obj.model_dump()
-        else:
-            row = {name_value: obj}
-        rows.append(row)
-
-    df = tabular.DataFrame(rows)
-    if 'id' in df.columns:
-        df.set_index('id', inplace=True, drop=True)
-    return df
-
-
-class MixinArbitraryTypes:
-    """
-
-    Convenience for when non-serializable types are needed
-    """
-
-    model_config = ConfigDict(arbitrary_types_allowed=True)
-
-class MixinFromJson:
-
-    @classmethod
-    def from_json(cls, json_str):
-        """
-
-        Error-tolerant deserialization
-
-        """
-        from fmtr.tools import json_fix
-        data = json_fix.from_json(json_str, default={})
-
-        if type(data) is dict:
-            self = cls(**data)
-        else:
-            self = cls(data)
-
-        return self
-
-
-class Base(BaseModel, MixinFromJson):
-    """
-
-    Base model
-
-    """
-
-    def to_df(self, name_value='value'):
-        """
-
-        DataFrame representation with Fields as rows.
-
-        """
-
-        objs = []
-        for name in self.model_fields.keys():
-            val = getattr(self, name)
-            objs.append(val)
-
-        df = to_df(*objs, name_value=name_value)
-        df['id'] = list(self.model_fields.keys())
-        df = df.set_index('id', drop=True)
-        return df
-
-
-class Root(RootModel, MixinFromJson):
-    """
-
-    Root (list) model
-
-    """
-
-    def to_df(self):
-        """
-
-        DataFrame representation with items as rows.
-
-        """
-
-        return to_df(*self.items)

fmtr_tools-1.3.62/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.62