fmtr.tools 1.1.26__tar.gz → 1.1.28__tar.gz

{fmtr_tools-1.1.26 → fmtr_tools-1.1.28}/PKG-INFO

@@ -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 → fmtr_tools-1.1.28}/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-1.1.26 → fmtr_tools-1.1.28}/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-1.1.28/fmtr/tools/version

@@ -0,0 +1 @@
+1.1.28

{fmtr_tools-1.1.26 → fmtr_tools-1.1.28}/fmtr.tools.egg-info/PKG-INFO

@@ -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/fmtr/tools/version

@@ -1 +0,0 @@
-1.1.26

{fmtr_tools-1.1.26 → fmtr_tools-1.1.28}/fmtr.tools.egg-info/requires.txt

@@ -135,60 +135,60 @@ tabulate
 openpyxl
 
 [test]
+setuptools
+httpx_retries
+flet-webview
+filetype
+httpx
+bokeh
+fastapi
+tabulate
+flet-video
+uvicorn[standard]
+logfire[httpx]
+logfire
 torchaudio
+google-api-python-client
+yamlscript
+pydantic-ai[logfire,openai]
 semver
-docker
-logfire
+html2text
+dnspython[doh]
+pydantic
+tokenizers
+deepmerge
 ollama
-openpyxl
-flet[all]
 diskcache
+google-auth-httplib2
 pymupdf
-pydevd-pycharm
-filetype
-sentence_transformers
-peft
-flet-video
-appdirs
-huggingface_hub
-flet-webview
-httpx
-deepmerge
+tinynetrc
 pytest-cov
-dnspython[doh]
 regex
-openai
-html2text
-yamlscript
-pydantic-settings
-dask[bag]
-tinynetrc
-pandas
-bokeh
-uvicorn[standard]
-torchvision
-logfire[fastapi]
-Unidecode
-tabulate
-distributed
-tokenizers
 faker
-contexttimer
-google-auth-oauthlib
-fastapi
-google-api-python-client
-logfire[httpx]
-json_repair
-pymupdf4llm
+pydevd-pycharm
 sre_yield
-setuptools
+Unidecode
+pyyaml
+peft
+pymupdf4llm
+distributed
 transformers[sentencepiece]
-pydantic-ai[logfire,openai]
-pydantic
+json_repair
+torchvision
+sentence_transformers
 google-auth
-pyyaml
-google-auth-httplib2
-httpx_retries
+google-auth-oauthlib
+pydantic-settings
+docker
+flet[all]
+contexttimer
+huggingface_hub
+pandas
+openai
+appdirs
+dask[bag]
+openpyxl
+logfire[fastapi]
 
 [tokenization]
 tokenizers