fmtr.tools 1.1.20__py3-none-any.whl → 1.1.21__py3-none-any.whl

fmtr/tools/__init__.py

@@ -177,5 +177,6 @@ except ImportError as exception:
 
 try:
     from fmtr.tools import setup_tools as setup
+    from fmtr.tools.setup_tools import Setup, SetupPaths, Dependencies
 except ImportError as exception:
-    setup = MissingExtraMockModule('setup', exception)
+    setup = Setup = SetupPaths = Dependencies = MissingExtraMockModule('setup', exception)

fmtr/tools/path_tools/path_tools.py

@@ -177,8 +177,14 @@ class Path(type(Path())):
         kind = path.guess(str(self.absolute()))
         return kind
 
+    @property
+    def children(self):
+        if not self.is_dir():
+            return None
+        return sorted(self.iterdir(), key=lambda x: x.is_dir(), reverse=True)
+
 
-class PathsBase:
+class FromCallerMixin:
     """
 
 
@@ -190,7 +196,7 @@ class PathsBase:
         return path
 
 
-class PackagePaths(PathsBase):
+class PackagePaths(FromCallerMixin):
     """
 
     Canonical paths for a package.

fmtr/tools/setup_tools.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from fnmatch import fnmatch
 from functools import cached_property
 from itertools import chain
 from typing import List, Dict
@@ -7,17 +8,17 @@ from setuptools import find_namespace_packages, find_packages, setup
 
 from fmtr.tools.constants import Constants
 from fmtr.tools.path_tools import Path
-from fmtr.tools.path_tools.path_tools import PathsBase
+from fmtr.tools.path_tools.path_tools import FromCallerMixin
 
 
-class SetupPaths(PathsBase):
+class SetupPaths(FromCallerMixin):
     """
 
     Canonical paths for a package.
 
     """
 
-    SKIP_DIRS = {'data'}
+    SKIP_DIRS = {'data', 'build', 'dist', '.*', '*egg-info*'}
 
     def __init__(self, path=None):
 
@@ -51,18 +52,13 @@ class SetupPaths(PathsBase):
 
         directories = [
             dir for dir in self.repo.iterdir()
-            if
-            (
-                    dir.is_dir()
-                    and not dir.name.startswith('.')
-                    and dir.name not in self.SKIP_DIRS
-                    and 'egg-info' not in dir.name
-            )
+            if dir.is_dir()
+               and not any(fnmatch(dir.name, pattern) for pattern in self.SKIP_DIRS)
         ]
 
         if len(directories) != 1:
             dirs_str = ', '.join([str(dir) for dir in directories])
-            raise ValueError(f'Expected exactly one directory in "{self.repo}", found {dirs_str}')
+            raise ValueError(f'Expected exactly one directory in {self.repo}, found {dirs_str}')
 
         target = next(iter(directories))
 
@@ -89,19 +85,28 @@ class SetupPaths(PathsBase):
         return name
 
 
-class Setup:
+class Setup(FromCallerMixin):
     AUTHOR = 'Frontmatter'
     AUTHOR_EMAIL = 'innovative.fowler@mask.pro.fmtr.dev'
 
-    def __init__(self, paths, dependencies, console_scripts=None, client=None, **kwargs):
+    def __init__(self, dependencies, paths=None, console_scripts=None, client=None, do_setup=True, **kwargs):
 
         self.kwargs = kwargs
+
+        if type(dependencies) is not Dependencies:
+            dependencies = Dependencies(**dependencies)
         self.dependencies = dependencies
+
+        if not paths:
+            paths = SetupPaths(path=self.from_caller())
         self.paths = paths
 
         self.client = client
         self.console_scripts = console_scripts
 
+        if do_setup:
+            self.setup()
+
     def get_entrypoint_path(self, key, value):
         if value:
             return f'{self.name}.{value}:{key}'
@@ -169,7 +174,8 @@ class Setup:
     def url(self):
         return f'https://github.com/{self.paths.org}/{self.paths.name}'
 
-    def get_data_setup(self):
+    @property
+    def data(self):
         return dict(
             name=self.name,
             version=self.version,
@@ -188,27 +194,10 @@ class Setup:
         ) | self.kwargs
 
     def setup(self):
-        data = self.get_data_setup()
-        return setup(**data)
-
-
-class Entrypoints:
-    ALL = 'all'
-    INSTALL = 'install'
 
-    def __init__(self, console_scripts=None, **kwargs):
-        self.kwargs = kwargs
-        self._console_scripts = console_scripts
+        return setup(**self.data)
 
-    @property
-    def console_scripts(self):
-        return [f'{key} = {value}:{key}' for key, value in self._console_scripts.items()]
 
-    @property
-    def data(self):
-        return dict(
-            console_scripts=self.console_scripts,
-        ) | self.kwargs
 
 
 class Dependencies:

fmtr/tools/version

@@ -1 +1 @@
-1.1.20
+1.1.21

{fmtr_tools-1.1.20.dist-info → fmtr_tools-1.1.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.1.20
+Version: 1.1.21
 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
@@ -9,60 +9,60 @@ License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: test
-Requires-Dist: yamlscript; extra == "test"
-Requires-Dist: semver; extra == "test"
-Requires-Dist: setuptools; extra == "test"
-Requires-Dist: deepmerge; extra == "test"
-Requires-Dist: google-auth-oauthlib; extra == "test"
-Requires-Dist: html2text; extra == "test"
-Requires-Dist: pydantic; extra == "test"
-Requires-Dist: logfire[httpx]; extra == "test"
-Requires-Dist: json_repair; extra == "test"
-Requires-Dist: sre_yield; extra == "test"
-Requires-Dist: pydantic-settings; extra == "test"
-Requires-Dist: google-auth-httplib2; extra == "test"
 Requires-Dist: tinynetrc; extra == "test"
-Requires-Dist: openai; extra == "test"
+Requires-Dist: fastapi; extra == "test"
+Requires-Dist: httpx_retries; extra == "test"
+Requires-Dist: setuptools; extra == "test"
+Requires-Dist: filetype; extra == "test"
+Requires-Dist: faker; extra == "test"
 Requires-Dist: pydevd-pycharm; extra == "test"
-Requires-Dist: contexttimer; extra == "test"
-Requires-Dist: pymupdf; extra == "test"
-Requires-Dist: ollama; extra == "test"
-Requires-Dist: dnspython[doh]; extra == "test"
 Requires-Dist: pyyaml; extra == "test"
-Requires-Dist: huggingface_hub; extra == "test"
 Requires-Dist: logfire[fastapi]; extra == "test"
-Requires-Dist: transformers[sentencepiece]; extra == "test"
-Requires-Dist: google-api-python-client; extra == "test"
-Requires-Dist: flet[all]; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: torchaudio; extra == "test"
-Requires-Dist: flet-video; extra == "test"
-Requires-Dist: httpx_retries; extra == "test"
-Requires-Dist: faker; extra == "test"
-Requires-Dist: pymupdf4llm; extra == "test"
-Requires-Dist: filetype; extra == "test"
-Requires-Dist: uvicorn[standard]; extra == "test"
-Requires-Dist: peft; extra == "test"
-Requires-Dist: logfire; extra == "test"
+Requires-Dist: google-auth-httplib2; extra == "test"
+Requires-Dist: openai; extra == "test"
+Requires-Dist: diskcache; extra == "test"
 Requires-Dist: bokeh; extra == "test"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
-Requires-Dist: regex; extra == "test"
-Requires-Dist: tabulate; extra == "test"
 Requires-Dist: sentence_transformers; extra == "test"
-Requires-Dist: openpyxl; extra == "test"
+Requires-Dist: pymupdf4llm; extra == "test"
 Requires-Dist: distributed; extra == "test"
+Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: deepmerge; extra == "test"
+Requires-Dist: transformers[sentencepiece]; extra == "test"
+Requires-Dist: google-auth-oauthlib; extra == "test"
+Requires-Dist: logfire[httpx]; extra == "test"
+Requires-Dist: pydantic; extra == "test"
 Requires-Dist: dask[bag]; extra == "test"
-Requires-Dist: appdirs; extra == "test"
 Requires-Dist: Unidecode; extra == "test"
 Requires-Dist: docker; extra == "test"
-Requires-Dist: httpx; extra == "test"
-Requires-Dist: diskcache; extra == "test"
-Requires-Dist: pandas; extra == "test"
 Requires-Dist: google-auth; extra == "test"
-Requires-Dist: tokenizers; extra == "test"
-Requires-Dist: fastapi; extra == "test"
+Requires-Dist: contexttimer; extra == "test"
+Requires-Dist: peft; extra == "test"
+Requires-Dist: semver; extra == "test"
+Requires-Dist: regex; extra == "test"
+Requires-Dist: logfire; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: yamlscript; extra == "test"
+Requires-Dist: pandas; extra == "test"
+Requires-Dist: ollama; extra == "test"
+Requires-Dist: openpyxl; extra == "test"
+Requires-Dist: appdirs; extra == "test"
+Requires-Dist: html2text; extra == "test"
+Requires-Dist: flet-video; extra == "test"
+Requires-Dist: flet[all]; extra == "test"
+Requires-Dist: google-api-python-client; extra == "test"
+Requires-Dist: dnspython[doh]; extra == "test"
+Requires-Dist: pymupdf; extra == "test"
+Requires-Dist: sre_yield; extra == "test"
+Requires-Dist: pydantic-settings; extra == "test"
+Requires-Dist: tabulate; extra == "test"
 Requires-Dist: flet-webview; extra == "test"
+Requires-Dist: httpx; extra == "test"
+Requires-Dist: tokenizers; extra == "test"
 Requires-Dist: torchvision; extra == "test"
+Requires-Dist: json_repair; extra == "test"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
+Requires-Dist: torchaudio; extra == "test"
+Requires-Dist: uvicorn[standard]; extra == "test"
 Provides-Extra: yaml
 Requires-Dist: yamlscript; extra == "yaml"
 Requires-Dist: pyyaml; extra == "yaml"

{fmtr_tools-1.1.20.dist-info → fmtr_tools-1.1.21.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fmtr/tools/__init__.py,sha256=KFSvu0OIyX5QsE4_rkFrFhhSxyvYFTaGsLemJqvNAys,5683
+fmtr/tools/__init__.py,sha256=v4XtEHm35sT7Z7-kKdFdBPXw_yFtxF0GOCx4q4y5Qg4,5790
 fmtr/tools/api_tools.py,sha256=w8Zrp_EwN5KlUghwLoTCXo4z1irg5tAsReCqDLjASfE,2133
 fmtr/tools/async_tools.py,sha256=ewz757WcveQJd-G5SVr2JDOQVbdLGecCgl-tsBGVZz4,284
 fmtr/tools/augmentation_tools.py,sha256=-6ESbO4CDlKqVOV1J1V6qBeoBMzbFIinkDHRHnCBej0,55
@@ -39,14 +39,14 @@ fmtr/tools/profiling_tools.py,sha256=jpXVjaNKPydTasEQVNXvxzGtMhXPit08AnJddkU8uIc
 fmtr/tools/random_tools.py,sha256=4VlQdk5THbR8ka4pZaLbk_ZO_4yy6PF_lHZes_rgenY,2223
 fmtr/tools/semantic_tools.py,sha256=cxY9NSAHWj4nEc6Oj4qA1omR3dWbl2OuH7_PkINc6_E,1386
 fmtr/tools/settings_tools.py,sha256=o11W3T60UZSvCTkh_eEQq1Mx74GycQ6JxUr0plBDbsk,2356
-fmtr/tools/setup_tools.py,sha256=J-48XFnBuf1DF3Twt3M1scSbuEEf-yNaBkYXwYLlNVg,7303
+fmtr/tools/setup_tools.py,sha256=uaT8Ejc2yBLATTHR_51vGIoU8yDOBgXLmFnxY5c23V4,7041
 fmtr/tools/spaces_tools.py,sha256=D_he3mve6DruB3OPS6QyzqD05ChHnRTb4buViKPe7To,1099
 fmtr/tools/string_tools.py,sha256=mjO7NSqhtYMtnX7fKb8eXZ7MO2lXWGMl0kXxnZznupM,3764
 fmtr/tools/tabular_tools.py,sha256=tpIpZzYku1HcJrHZJL6BC39LmN3WUWVhFbK2N7nDVmE,120
 fmtr/tools/tokenization_tools.py,sha256=me-IBzSLyNYejLybwjO9CNB6Mj2NYfKPaOVThXyaGNg,4268
 fmtr/tools/tools.py,sha256=CAsApa1YwVdNE6H66Vjivs_mXYvOas3rh7fPELAnTpk,795
 fmtr/tools/unicode_tools.py,sha256=yS_9wpu8ogNoiIL7s1G_8bETFFO_YQlo4LNPv1NLDeY,52
-fmtr/tools/version,sha256=dLWYVtGE882f5xI3OPEgua_42l7bfjVlF-pj0odcsdo,6
+fmtr/tools/version,sha256=Q9bVQ4J5J33dityoULiym-dEvZSY9uBJ10Hd83OP8yY,6
 fmtr/tools/version_tools.py,sha256=yNs_CGqWpqE4jbK9wsPIi14peJVXYbhIcMqHAFOw3yE,1480
 fmtr/tools/yaml_tools.py,sha256=9kuYChqJelWQIjGlSnK4iDdOWWH06P0gp9jIcRrC3UI,1903
 fmtr/tools/ai_tools/__init__.py,sha256=JZrLuOFNV1A3wvJgonxOgz_4WS-7MfCuowGWA5uYCjs,372
@@ -54,7 +54,7 @@ fmtr/tools/ai_tools/agentic_tools.py,sha256=YebH7R9ovVo3GzfWAZxY49e2fNt13APDMe29
 fmtr/tools/ai_tools/inference_tools.py,sha256=2UP2gXEyOJUjyyV6zmFIYmIxUsh1rXkRH0IbFvr2bRs,11908
 fmtr/tools/path_tools/__init__.py,sha256=v5CpmzXq5Ii90FtcmxAJKiLxmguZMrPnQ_HdT872Np0,443
 fmtr/tools/path_tools/app_path_tools.py,sha256=JrJvtTDd_gkCKcZtBCDTMktsM77PZwGV_hzQX0g5GU8,1722
-fmtr/tools/path_tools/path_tools.py,sha256=Lw7ebHUAOrs-OXLNeM-yVrwV7bn5AO8iWNkcz7ASH5k,7695
+fmtr/tools/path_tools/path_tools.py,sha256=8WBzNctpds5tVT1-FcizAORrBCGlkUbPcfOel-Js7ps,7878
 fmtr/tools/path_tools/type_path_tools.py,sha256=Zgs-ek-GXRKDIlVDGdg3muB0PIxTg2ba0NeHw6y8FWQ,40
 fmtr/tools/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/tests/conftest.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -64,9 +64,9 @@ fmtr/tools/tests/test_environment.py,sha256=iHaiMQfECYZPkPKwfuIZV9uHuWe3aE-p_dN_
 fmtr/tools/tests/test_json.py,sha256=IeSP4ziPvRcmS8kq7k9tHonC9rN5YYq9GSNT2ul6Msk,287
 fmtr/tools/tests/test_path.py,sha256=AkZQa6_8BQ-VaCyL_J-iKmdf2ZaM-xFYR37Kun3k4_g,2188
 fmtr/tools/tests/test_yaml.py,sha256=jc0TwwKu9eC0LvFGNMERdgBue591xwLxYXFbtsRwXVM,287
-fmtr_tools-1.1.20.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.1.20.dist-info/METADATA,sha256=D8EESo6eAElR4gnwMVShc3k__fZHNjQrp-rY226DrT4,15735
-fmtr_tools-1.1.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.1.20.dist-info/entry_points.txt,sha256=e-eOW1Ml13tbxHC6Er1MnVOEDePeWw7DKwlE-l-gCY0,205
-fmtr_tools-1.1.20.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.1.20.dist-info/RECORD,,
+fmtr_tools-1.1.21.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.1.21.dist-info/METADATA,sha256=-dnzZwvyXt4n6SBqztBZt1MAO_qWBXrbBvU6EMxUZ3s,15735
+fmtr_tools-1.1.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.1.21.dist-info/entry_points.txt,sha256=e-eOW1Ml13tbxHC6Er1MnVOEDePeWw7DKwlE-l-gCY0,205
+fmtr_tools-1.1.21.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.1.21.dist-info/RECORD,,