fmtr.tools 1.1.26__py3-none-any.whl → 1.1.28__py3-none-any.whl

fmtr/tools/constants.py

@@ -35,3 +35,7 @@ class Constants:
     DIR_NAME_SOURCE = 'source'
     FILENAME_VERSION = 'version'
     DIR_NAME_HF = 'hf'
+
+    ENTRYPOINTS_DIR = 'entrypoints'
+    PACKAGE_EXCLUDE_DIRS = {'data', 'build', 'dist', '.*', '*egg-info*'}
+    INIT_FILENAME = '__init__.py'

fmtr/tools/setup_tools/setup_tools.py

@@ -1,5 +1,6 @@
 import sys
 from datetime import datetime
+from fnmatch import fnmatch
 from functools import cached_property
 from itertools import chain
 from typing import List, Dict
@@ -40,20 +41,22 @@ class SetupPaths(FromCallerMixin):
     @cached_property
     def path(self):
 
-        from fmtr.tools import setup
-
-        if self.org:
+        if self.is_namespace:
             base = self.org
         else:
             base = self.repo
 
-        directories = [base / dir for dir in setup.find_packages(base)]
+        packages = [
+            dir for dir in base.iterdir()
+            if (dir / Constants.INIT_FILENAME).is_file()
+               and not any(fnmatch(dir.name, pattern) for pattern in Constants.PACKAGE_EXCLUDE_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}')
+        if len(packages) != 1:
+            dirs_str = ', '.join([str(dir) for dir in packages])
+            raise ValueError(f'Expected exactly one package in {self.repo}, found {dirs_str}')
 
-        package = next(iter(directories))
+        package = next(iter(packages))
         return package
 
     @property
@@ -65,6 +68,10 @@ class SetupPaths(FromCallerMixin):
             return False
         return org
 
+    @property
+    def entrypoints(self):
+        return self.path / Constants.ENTRYPOINTS_DIR
+
     @property
     def is_namespace(self) -> bool:
         return bool(self.org)
@@ -79,9 +86,13 @@ 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, org=Constants.ORG_NAME, console_scripts=None, client=None, do_setup=True, **kwargs):
+    ENTRYPOINT_COMMAND_SEP = '-'
+    ENTRYPOINT_FUNCTION_SEP = '_'
+    ENTRYPOINT_FUNC_NAME = 'main'
+
+    def __init__(self, dependencies, paths=None, org=Constants.ORG_NAME, client=None, do_setup=True, **kwargs):
+
 
         self.kwargs = kwargs
 
@@ -102,7 +113,7 @@ class Setup(FromCallerMixin):
         self.paths = paths
 
         self.client = client
-        self.console_scripts = console_scripts
+
 
         if do_setup:
             self.setup()
@@ -124,27 +135,26 @@ class Setup(FromCallerMixin):
         reqs = '\n'.join(reqs)
         print(reqs)
 
+    @property
+    def console_scripts(self):
 
+        if not self.paths.entrypoints.exists():
+            return {}
 
-    def get_entrypoint_path(self, key, value):
-        if value:
-            return f'{self.name}.{value}:{key}'
-        else:
-            return f'{self.name}:{key}'
+        names_mods = [path.stem for path in self.paths.entrypoints.iterdir() if path.is_file() and not path.stem.startswith('_')]
+        command_prefix = self.name.replace('.', self.ENTRYPOINT_COMMAND_SEP)
+        command_suffixes = [name_mod.replace(self.ENTRYPOINT_FUNCTION_SEP, self.ENTRYPOINT_COMMAND_SEP) for name_mod in names_mods]
+        commands = [f'{command_prefix}-{command_suffix}' for command_suffix in command_suffixes]
+        paths = [f'{self.name}.{Constants.ENTRYPOINTS_DIR}.{name_mod}:{self.ENTRYPOINT_FUNC_NAME}' for name_mod in names_mods]
 
-    @property
-    def entrypoints(self):
-        if self.console_scripts:
-            return dict(
-                console_scripts=[f'{key} = {self.get_entrypoint_path(key, value)}' for key, value in self.console_scripts.items()],
-            )
-        else:
-            return dict()
+        console_scripts = [f'{command} = {path}' for command, path in zip(commands, paths)]
+
+        return console_scripts
 
     @property
     def name(self):
         if self.paths.is_namespace:
-            return f'{self.paths.org}.{self.paths.name}'
+            return f'{self.paths.org_name}.{self.paths.name}'
         return self.paths.name
 
     @property
@@ -180,9 +190,7 @@ class Setup(FromCallerMixin):
 
     @property
     def packages(self):
-
-        excludes = list(self.SKIP_DIRS) + [f'{name}.*' for name in self.SKIP_DIRS if '*' not in name]
-
+        excludes = list(Constants.PACKAGE_EXCLUDE_DIRS) + [f'{name}.*' for name in Constants.PACKAGE_EXCLUDE_DIRS if '*' not in name]
         packages = self.find(where=str(self.paths.repo), exclude=excludes)
         return packages
 
@@ -199,7 +207,7 @@ class Setup(FromCallerMixin):
 
     @property
     def url(self):
-        return f'https://github.com/{self.paths.org}/{self.paths.name}'
+        return f'https://github.com/{self.org}/{self.paths.name}'
 
     @property
     def data(self):
@@ -215,7 +223,9 @@ class Setup(FromCallerMixin):
             packages=self.packages,
             package_dir=self.package_dir,
             package_data=self.package_data,
-            entry_points=self.entrypoints,
+            entry_points=dict(
+                console_scripts=self.console_scripts,
+            ),
             install_requires=self.dependencies.install,
             extras_require=self.dependencies.extras,
         ) | self.kwargs
@@ -280,7 +290,10 @@ class Dependencies:
 
     @cached_property
     def install(self):
-        return self.resolve_values(self.INSTALL)
+        if self.INSTALL in self.dependencies:
+            return self.resolve_values(self.INSTALL)
+        else:
+            return []
 
 
 if __name__ == '__main__':

fmtr/tools/version

@@ -1 +1 @@
-1.1.26
+1.1.28

{fmtr_tools-1.1.26.dist-info → fmtr_tools-1.1.28.dist-info}/METADATA

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

{fmtr_tools-1.1.26.dist-info → fmtr_tools-1.1.28.dist-info}/RECORD

@@ -4,7 +4,7 @@ fmtr/tools/async_tools.py,sha256=ewz757WcveQJd-G5SVr2JDOQVbdLGecCgl-tsBGVZz4,284
 fmtr/tools/augmentation_tools.py,sha256=-6ESbO4CDlKqVOV1J1V6qBeoBMzbFIinkDHRHnCBej0,55
 fmtr/tools/caching_tools.py,sha256=UOCYUNvLQ-NofR_dhqBmZF96-HRPf4At5MmxVk3gAIk,2943
 fmtr/tools/console_script_tools.py,sha256=7KVO0WI3Z7d7EZcmvTVS-O4OMxYYMZuA_7s0eubv76E,328
-fmtr/tools/constants.py,sha256=6RvZLlj0jrej0X7yz-03uu-ELSYWFGknjmb-iOcozm0,1208
+fmtr/tools/constants.py,sha256=FOHvjovW_pHIvym9OXKZnztPvPVvudyG5S01i7XtXKE,1352
 fmtr/tools/data_modelling_tools.py,sha256=0BFm-F_cYzVTxftWQwORkPd0FM2BTLVh9-s0-rTTFoo,1744
 fmtr/tools/dataclass_tools.py,sha256=0Gt6KeLhtPgubo_2tYkIVqB8oQ91Qzag8OAGZDdjvMU,1209
 fmtr/tools/datatype_tools.py,sha256=3P4AWIFGkJ-UqvXlj0Jc9IvkIIgTOE9jRrOk3NVbpH8,1508
@@ -46,7 +46,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=qdONjQrKG26HBKWvtcv7oRITgNwT9_551G27tbp2pgI,6
+fmtr/tools/version,sha256=KZLQYWcj6yTAXH4Eaz7K860XWssMDypvIyHOQjYOv80,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
@@ -57,7 +57,7 @@ fmtr/tools/path_tools/app_path_tools.py,sha256=JrJvtTDd_gkCKcZtBCDTMktsM77PZwGV_
 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=fUCjzyE4JBPEOZhC4B--VPj_eOCkQb1QG5PIgiGj03U,386
-fmtr/tools/setup_tools/setup_tools.py,sha256=A70uc80HrfvTh41LOizC14jQEY6N-ol4O-PkxYIJNBQ,7803
+fmtr/tools/setup_tools/setup_tools.py,sha256=-BqbfiexUPhs71WBynpupGc_FD5MFLfD7FzT4XwlR9c,8540
 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
@@ -66,9 +66,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.26.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.1.26.dist-info/METADATA,sha256=FtJBsmBvoK7KrRHHybQWVULi5JeFwzjcz0H5QxlqF8Q,15735
-fmtr_tools-1.1.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.1.26.dist-info/entry_points.txt,sha256=e-eOW1Ml13tbxHC6Er1MnVOEDePeWw7DKwlE-l-gCY0,205
-fmtr_tools-1.1.26.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.1.26.dist-info/RECORD,,
+fmtr_tools-1.1.28.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.1.28.dist-info/METADATA,sha256=VZ1GCYGE62S_ek4EqQv_4TtDS-cSfCA4xxCcfWP5lwU,15735
+fmtr_tools-1.1.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.1.28.dist-info/entry_points.txt,sha256=e-eOW1Ml13tbxHC6Er1MnVOEDePeWw7DKwlE-l-gCY0,205
+fmtr_tools-1.1.28.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.1.28.dist-info/RECORD,,