fmtr.tools 1.0.40__tar.gz → 1.0.42__tar.gz

{fmtr.tools-1.0.40 → fmtr.tools-1.0.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.40
+Version: 1.0.42
 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

fmtr.tools-1.0.42/fmtr/tools/data_modelling_tools.py

@@ -0,0 +1,74 @@
+from pydantic import BaseModel, RootModel
+
+
+def to_df(*objs):
+    """
+
+    DataFrame representation of Data Models as rows.
+
+    """
+    from fmtr.tools import tabular
+    rows = [obj.model_dump() for obj in objs]
+    df = tabular.DataFrame(rows)
+    return df
+
+
+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):
+        """
+
+        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)
+        df['id'] = list(self.model_fields.keys())
+        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.0.40 → fmtr.tools-1.0.42}/fmtr/tools/string_tools.py

@@ -148,10 +148,10 @@ class Mask:
             return self
 
 
-def to_mask(text):
+def trim(text: str) -> str:
     """
 
-    Fix multi-string indents.
+    Trim strings both horizontally and vertically. Useful when multiline strings are defined in an indented context.
 
     """
     return dedent(text).strip()

{fmtr.tools-1.0.40 → fmtr.tools-1.0.42}/fmtr/tools/tabular_tools.py

@@ -1,3 +1,4 @@
 import pandas as pd
 
 DataFrame = pd.DataFrame
+Series = pd.Series

fmtr.tools-1.0.42/fmtr/tools/version

@@ -0,0 +1 @@
+1.0.42

{fmtr.tools-1.0.40 → fmtr.tools-1.0.42}/fmtr.tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.40
+Version: 1.0.42
 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

fmtr.tools-1.0.40/fmtr/tools/data_modelling_tools.py

@@ -1,39 +0,0 @@
-from pydantic import BaseModel, RootModel
-
-
-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
-
-    """
-    ...
-
-
-class Root(RootModel, MixinFromJson):
-    """
-
-    Root (list) model
-
-    """
-    ...

fmtr.tools-1.0.40/fmtr/tools/version

@@ -1 +0,0 @@
-1.0.40