fmtr.tools 1.0.43__tar.gz → 1.0.45__tar.gz

{fmtr.tools-1.0.43 → fmtr.tools-1.0.45}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.43
+Version: 1.0.45
 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
 Author-email: innovative.fowler@mask.pro.fmtr.dev
-License: Copyright © 2024 Frontmatter. All rights reserved.
+License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
 Provides-Extra: ai
 Provides-Extra: ai.client

{fmtr.tools-1.0.43 → fmtr.tools-1.0.45}/fmtr/tools/data_modelling_tools.py

@@ -1,14 +1,22 @@
 from pydantic import BaseModel, RootModel
 
 
-def to_df(*objs):
+def to_df(*objs, name_value='value'):
     """
 
     DataFrame representation of Data Models as rows.
 
     """
     from fmtr.tools import tabular
-    rows = [obj.model_dump() for obj in objs]
+
+    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)
     return df
 
@@ -40,7 +48,7 @@ class Base(BaseModel, MixinFromJson):
 
     """
 
-    def to_df(self):
+    def to_df(self, name_value='value'):
         """
 
         DataFrame representation with Fields as rows.
@@ -52,7 +60,7 @@ class Base(BaseModel, MixinFromJson):
             val = getattr(self, name)
             objs.append(val)
 
-        df = to_df(*objs)
+        df = to_df(*objs, name_value=name_value)
         df['id'] = list(self.model_fields.keys())
         return df
 

fmtr.tools-1.0.45/fmtr/tools/version

@@ -0,0 +1 @@
+1.0.45

{fmtr.tools-1.0.43 → fmtr.tools-1.0.45}/fmtr.tools.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.43
+Version: 1.0.45
 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
 Author-email: innovative.fowler@mask.pro.fmtr.dev
-License: Copyright © 2024 Frontmatter. All rights reserved.
+License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
 Provides-Extra: ai
 Provides-Extra: ai.client

fmtr.tools-1.0.45/setup.py

@@ -0,0 +1,50 @@
+from datetime import datetime
+from pathlib import Path
+from setuptools import find_namespace_packages, setup, find_packages
+
+import requirements
+
+ORG, PACKAGE = 'fmtr', 'tools'
+ORG_GITHUB = ORG
+AUTHOR = 'Frontmatter'
+AUTHOR_EMAIL = 'innovative.fowler@mask.pro.fmtr.dev'
+DESCRIPTION = 'Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML'
+
+PATH_BASE = Path(__file__).absolute().parent
+IS_SINGLETON = (PATH_BASE / PACKAGE).exists()
+VERSION = 'version'
+
+if IS_SINGLETON:
+    packages = find_packages()
+    package_dir = None
+    name = PACKAGE
+    path_ver = PATH_BASE / name / VERSION
+else:
+    packages = find_namespace_packages()
+    package_dir = {'': '.'}
+    name = f'{ORG}.{PACKAGE}'
+    path_ver = PATH_BASE / ORG / PACKAGE / VERSION
+
+__version__ = path_ver.read_text().strip()
+
+setup(
+    name=name,
+    version=__version__,
+    url=f'https://github.com/{ORG_GITHUB}/{name}',
+    author=AUTHOR,
+    license=f'Copyright © {datetime.now().year} {AUTHOR}. All rights reserved.',
+    author_email=AUTHOR_EMAIL,
+    description=DESCRIPTION,
+    long_description=(PATH_BASE / 'README.md').read_text(),
+    long_description_content_type='text/markdown',
+    packages=packages,
+    package_dir=package_dir,
+    package_data={
+        name: [VERSION],
+    },
+    entry_points={
+        'console_scripts': requirements.CONSOLE_SCRIPTS,
+    },
+    install_requires=requirements.INSTALL,
+    extras_require=requirements.EXTRAS,
+)

fmtr.tools-1.0.43/fmtr/tools/version

@@ -1 +0,0 @@
-1.0.43

fmtr.tools-1.0.43/setup.py

@@ -1,36 +0,0 @@
-from pathlib import Path
-from setuptools import find_namespace_packages, setup, find_packages
-
-import requirements
-
-name_ns, name_base = 'fmtr', 'tools'
-name = f'{name_ns}.{name_base}'
-path_segment = f'{name_ns}/{name_base}'
-path_base = Path(__file__).absolute().parent
-path_ver = path_base / path_segment / 'version'
-__version__ = path_ver.read_text().strip()
-
-packages = find_packages(where=path_segment)
-packages = [name] + [f'{name}.{nsp}' for nsp in packages]
-
-setup(
-    name=name,
-    version=__version__,
-    url=f'https://github.com/{name_ns}/{name}',
-    license='Copyright © 2024 Frontmatter. All rights reserved.',
-    author='Frontmatter',
-    author_email='innovative.fowler@mask.pro.fmtr.dev',
-    description='Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML',
-    long_description=(path_base / 'README.md').read_text(),
-    long_description_content_type='text/markdown',
-    packages=find_namespace_packages(),
-    package_dir={'': '.'},
-    package_data={
-        name: [f'version'],
-    },
-    entry_points={
-        'console_scripts': requirements.CONSOLE_SCRIPTS,
-    },
-    install_requires=requirements.INSTALL,
-    extras_require=requirements.EXTRAS,
-)