fmtr.tools 1.1.23__py3-none-any.whl → 1.1.25__py3-none-any.whl

fmtr/tools/__init__.py

@@ -31,7 +31,7 @@ from fmtr.tools.path_tools import Path, PackagePaths, AppPaths
 from fmtr.tools import ai_tools as ai
 
 import fmtr.tools.setup_tools as setup
-from fmtr.tools.setup_tools import Setup, SetupPaths, Dependencies
+from fmtr.tools.setup_tools import Setup, SetupPaths, Dependencies, Tools
 
 try:
     from fmtr.tools import augmentation_tools as augmentation

fmtr/tools/setup_tools/__init__.py

@@ -1,6 +1,6 @@
 from fmtr.tools.import_tools import MissingExtraMockModule
 
-from fmtr.tools.setup_tools.setup_tools import Setup, SetupPaths, Dependencies
+from fmtr.tools.setup_tools.setup_tools import Setup, SetupPaths, Dependencies, Tools
 
 try:
     from setuptools import find_namespace_packages, find_packages, setup as setup_setuptools

fmtr/tools/setup_tools/setup_tools.py

@@ -1,6 +1,5 @@
 import sys
 from datetime import datetime
-from fnmatch import fnmatch
 from functools import cached_property
 from itertools import chain
 from typing import List, Dict
@@ -17,9 +16,7 @@ class SetupPaths(FromCallerMixin):
 
     """
 
-    SKIP_DIRS = {'data', 'build', 'dist', '.*', '*egg-info*'}
-
-    def __init__(self, path=None):
+    def __init__(self, path=None, org=Constants.ORG_NAME):
 
         """
 
@@ -29,15 +26,9 @@ class SetupPaths(FromCallerMixin):
         if not path:
             path = self.from_caller()
 
+        self.org_name = org
         self.repo = Path(path)
 
-    @property
-    def path(self):
-        if self.is_namespace:
-            return self.repo / self.org / self.name
-        else:
-            return self.repo / self.name
-
     @property
     def readme(self):
         return self.repo / 'README.md'
@@ -47,41 +38,40 @@ class SetupPaths(FromCallerMixin):
         return self.path / Constants.FILENAME_VERSION
 
     @cached_property
-    def layout(self):
+    def path(self):
+
+        from fmtr.tools import setup
+
+        if self.org:
+            base = self.org
+        else:
+            base = self.repo
 
-        directories = [
-            dir for dir in self.repo.iterdir()
-            if dir.is_dir()
-               and not any(fnmatch(dir.name, pattern) for pattern in self.SKIP_DIRS)
-        ]
+        directories = [base / dir for dir in setup.find_packages(base)]
 
         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}')
 
-        target = next(iter(directories))
-
-        contents = list(target.iterdir())
-        if len(contents) == 1 and (item := next(iter(contents))).is_dir():
-            return True, target.name, item.name
-
-        else:
-            return False, None, target.name
+        package = next(iter(directories))
+        return package
 
     @property
-    def is_namespace(self) -> str:
-        is_namespace, org, name = self.layout
-        return is_namespace
+    def org(self):
+        if not self.org_name:
+            return False
+        org = self.repo / self.org_name
+        if not org.is_dir():
+            return False
+        return org
 
     @property
-    def org(self) -> str:
-        is_namespace, org, name = self.layout
-        return org
+    def is_namespace(self) -> bool:
+        return bool(self.org)
 
     @property
     def name(self) -> str:
-        is_namespace, org, name = self.layout
-        return name
+        return self.path.stem
 
 
 class Setup(FromCallerMixin):
@@ -89,9 +79,9 @@ class Setup(FromCallerMixin):
     AUTHOR_EMAIL = 'innovative.fowler@mask.pro.fmtr.dev'
 
     REQUIREMENTS_ARG = 'requirements'
+    SKIP_DIRS = {'data', 'build', 'dist', '.*', '*egg-info*'}
 
-
-    def __init__(self, dependencies, paths=None, console_scripts=None, client=None, do_setup=True, **kwargs):
+    def __init__(self, dependencies, paths=None, org=Constants.ORG_NAME, console_scripts=None, client=None, do_setup=True, **kwargs):
 
         self.kwargs = kwargs
 
@@ -105,8 +95,10 @@ class Setup(FromCallerMixin):
             self.print_requirements()
             return
 
+        self.org = org
+
         if not paths:
-            paths = SetupPaths(path=self.from_caller())
+            paths = SetupPaths(path=self.from_caller(), org=self.org)
         self.paths = paths
 
         self.client = client
@@ -189,7 +181,7 @@ class Setup(FromCallerMixin):
     @property
     def packages(self):
 
-        excludes = list(SetupPaths.SKIP_DIRS) + [f'{name}.*' for name in SetupPaths.SKIP_DIRS]
+        excludes = list(self.SKIP_DIRS) + [f'{name}.*' for name in self.SKIP_DIRS if '*' not in name]
 
         packages = self.find(where=str(self.paths.repo), exclude=excludes)
         return packages
@@ -211,7 +203,7 @@ class Setup(FromCallerMixin):
 
     @property
     def data(self):
-        return dict(
+        data = dict(
             name=self.name,
             version=self.version,
             author=self.author,
@@ -227,6 +219,7 @@ class Setup(FromCallerMixin):
             install_requires=self.dependencies.install,
             extras_require=self.dependencies.extras,
         ) | self.kwargs
+        return data
 
     def setup(self):
 
@@ -235,6 +228,16 @@ class Setup(FromCallerMixin):
         return setup.setup_setuptools(**self.data)
 
 
+class Tools:
+    MASK = f'{Constants.LIBRARY_NAME}[{{extras}}]'
+
+    def __init__(self, *extras):
+        self.extras = extras
+
+    def __str__(self):
+        extras_str = ','.join(self.extras)
+        return self.MASK.format(extras=extras_str)
+
 
 
 class Dependencies:
@@ -256,7 +259,7 @@ class Dependencies:
         for value in values:
             if value == key or value not in self.dependencies:
                 # Add the value directly if it references itself or is not a dependency key.
-                values_resolved.append(value)
+                values_resolved.append(str(value))
             else:
                 # Recurse into nested dependencies.
                 values_resolved += self.resolve_values(value)

fmtr/tools/version

@@ -1 +1 @@
-1.1.23
+1.1.25

{fmtr_tools-1.1.23.dist-info → fmtr_tools-1.1.25.dist-info}/METADATA

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

{fmtr_tools-1.1.23.dist-info → fmtr_tools-1.1.25.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fmtr/tools/__init__.py,sha256=PeQKmb9q7xTaiDGy7TUa_5V2lh8k0rV0BJgjwf37udI,5571
+fmtr/tools/__init__.py,sha256=SMYBulUmtwW27eKblcTq1GCZjSOQDPiZBUCd2mRcTGc,5578
 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
@@ -45,7 +45,7 @@ fmtr/tools/tabular_tools.py,sha256=tpIpZzYku1HcJrHZJL6BC39LmN3WUWVhFbK2N7nDVmE,1
 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=3LplPseqc2k-fqP6873j8m5kUAOUMVJ7Cpo-3h23Q3s,6
+fmtr/tools/version,sha256=MXtcMHPDkm9DBt901I2qwVZouqD5wzakzj7n9M5gDCI,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
@@ -55,8 +55,8 @@ fmtr/tools/path_tools/__init__.py,sha256=v5CpmzXq5Ii90FtcmxAJKiLxmguZMrPnQ_HdT87
 fmtr/tools/path_tools/app_path_tools.py,sha256=JrJvtTDd_gkCKcZtBCDTMktsM77PZwGV_hzQX0g5GU8,1722
 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/setup_tools/__init__.py,sha256=8HX-GvGxeCK3nIHH5PHkvhkH0MIt89AK8a5l6Vua2dQ,379
-fmtr/tools/setup_tools/setup_tools.py,sha256=1pbpQ70PeGfgkWpKQx1rQ8GoIYCArzw22uyuCT93Qas,7790
+fmtr/tools/setup_tools/__init__.py,sha256=fUCjzyE4JBPEOZhC4B--VPj_eOCkQb1QG5PIgiGj03U,386
+fmtr/tools/setup_tools/setup_tools.py,sha256=A70uc80HrfvTh41LOizC14jQEY6N-ol4O-PkxYIJNBQ,7803
 fmtr/tools/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/tests/conftest.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/tests/helpers.py,sha256=N5sf9YoZV93a7tf_UxpLeyQ9vp6Ec0teNIimFDvc054,1091
@@ -65,9 +65,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.23.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.1.23.dist-info/METADATA,sha256=ywC-2AZET6ohT0uWvxuHEAZ9IgcEiNjkUB7DDKHiCL4,15735
-fmtr_tools-1.1.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.1.23.dist-info/entry_points.txt,sha256=e-eOW1Ml13tbxHC6Er1MnVOEDePeWw7DKwlE-l-gCY0,205
-fmtr_tools-1.1.23.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.1.23.dist-info/RECORD,,
+fmtr_tools-1.1.25.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.1.25.dist-info/METADATA,sha256=4suZ_4qo32TLcy5mPDvTPyr-4ewe_ygsW92UYBbqzDs,15735
+fmtr_tools-1.1.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.1.25.dist-info/entry_points.txt,sha256=e-eOW1Ml13tbxHC6Er1MnVOEDePeWw7DKwlE-l-gCY0,205
+fmtr_tools-1.1.25.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.1.25.dist-info/RECORD,,