fmtr.tools 1.1.20__tar.gz → 1.1.21__tar.gz

{fmtr_tools-1.1.20 → fmtr_tools-1.1.21}/PKG-INFO

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

@@ -0,0 +1 @@
+1.1.21

{fmtr_tools-1.1.20 → fmtr_tools-1.1.21}/fmtr.tools.egg-info/PKG-INFO

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

@@ -1 +0,0 @@
-1.1.20

{fmtr_tools-1.1.20 → fmtr_tools-1.1.21}/fmtr.tools.egg-info/requires.txt

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