fmtr.tools 1.1.21__tar.gz → 1.1.23__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.1.21
+Version: 1.1.23
 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: tinynetrc; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: yamlscript; extra == "test"
+Requires-Dist: pandas; 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: 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: pyyaml; extra == "test"
-Requires-Dist: logfire[fastapi]; extra == "test"
-Requires-Dist: google-auth-httplib2; extra == "test"
-Requires-Dist: openai; extra == "test"
+Requires-Dist: flet[all]; extra == "test"
+Requires-Dist: pydantic-settings; extra == "test"
+Requires-Dist: ollama; extra == "test"
 Requires-Dist: diskcache; extra == "test"
-Requires-Dist: bokeh; extra == "test"
-Requires-Dist: sentence_transformers; 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: torchaudio; extra == "test"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
+Requires-Dist: faker; extra == "test"
 Requires-Dist: pydantic; extra == "test"
+Requires-Dist: distributed; extra == "test"
 Requires-Dist: dask[bag]; extra == "test"
-Requires-Dist: Unidecode; extra == "test"
-Requires-Dist: docker; extra == "test"
-Requires-Dist: google-auth; extra == "test"
+Requires-Dist: sre_yield; extra == "test"
+Requires-Dist: tabulate; extra == "test"
+Requires-Dist: html2text; extra == "test"
+Requires-Dist: tinynetrc; extra == "test"
+Requires-Dist: setuptools; 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: peft; extra == "test"
+Requires-Dist: google-auth; extra == "test"
 Requires-Dist: semver; extra == "test"
-Requires-Dist: regex; 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: 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-auth-oauthlib; extra == "test"
+Requires-Dist: filetype; extra == "test"
+Requires-Dist: deepmerge; 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: bokeh; 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"
+Requires-Dist: google-auth-httplib2; extra == "test"
+Requires-Dist: appdirs; extra == "test"
+Requires-Dist: Unidecode; extra == "test"
+Requires-Dist: transformers[sentencepiece]; extra == "test"
 Provides-Extra: yaml
 Requires-Dist: yamlscript; extra == "yaml"
 Requires-Dist: pyyaml; extra == "yaml"

{fmtr_tools-1.1.21 → fmtr_tools-1.1.23}/fmtr/tools/__init__.py

@@ -23,9 +23,16 @@ import fmtr.tools.packaging_tools as packaging
 from fmtr.tools.logging_tools import logger
 
 from fmtr.tools.import_tools import MissingExtraMockModule
-from fmtr.tools.path_tools import Path, PackagePaths, AppPaths
+
 from fmtr.tools.constants import Constants
 
+# Submodules
+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
+
 try:
     from fmtr.tools import augmentation_tools as augmentation
 except ImportError as exception:
@@ -95,11 +102,6 @@ try:
 except ImportError as exception:
     api = MissingExtraMockModule('api', exception)
 
-try:
-    from fmtr.tools import ai_tools as ai
-except ImportError as exception:
-    ai = MissingExtraMockModule('ai', exception)
-
 try:
     from fmtr.tools import data_modelling_tools as dm
 except ImportError as exception:
@@ -174,9 +176,3 @@ try:
     from fmtr.tools import dns_tools as dns
 except ImportError as exception:
     dns = MissingExtraMockModule('dns', exception)
-
-try:
-    from fmtr.tools import setup_tools as setup
-    from fmtr.tools.setup_tools import Setup, SetupPaths, Dependencies
-except ImportError as exception:
-    setup = Setup = SetupPaths = Dependencies = MissingExtraMockModule('setup', exception)

fmtr_tools-1.1.23/fmtr/tools/setup_tools/__init__.py

@@ -0,0 +1,8 @@
+from fmtr.tools.import_tools import MissingExtraMockModule
+
+from fmtr.tools.setup_tools.setup_tools import Setup, SetupPaths, Dependencies
+
+try:
+    from setuptools import find_namespace_packages, find_packages, setup as setup_setuptools
+except ImportError as exception:
+    find_namespace_packages = find_packages = setup_setuptools = MissingExtraMockModule('setup', exception)

{fmtr_tools-1.1.21/fmtr/tools → fmtr_tools-1.1.23/fmtr/tools/setup_tools}/setup_tools.py

@@ -1,11 +1,10 @@
+import sys
 from datetime import datetime
 from fnmatch import fnmatch
 from functools import cached_property
 from itertools import chain
 from typing import List, Dict
 
-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 FromCallerMixin
@@ -14,7 +13,7 @@ from fmtr.tools.path_tools.path_tools import FromCallerMixin
 class SetupPaths(FromCallerMixin):
     """
 
-    Canonical paths for a package.
+    Canonical paths for a repo.
 
     """
 
@@ -89,6 +88,9 @@ class Setup(FromCallerMixin):
     AUTHOR = 'Frontmatter'
     AUTHOR_EMAIL = 'innovative.fowler@mask.pro.fmtr.dev'
 
+    REQUIREMENTS_ARG = 'requirements'
+
+
     def __init__(self, dependencies, paths=None, console_scripts=None, client=None, do_setup=True, **kwargs):
 
         self.kwargs = kwargs
@@ -97,6 +99,12 @@ class Setup(FromCallerMixin):
             dependencies = Dependencies(**dependencies)
         self.dependencies = dependencies
 
+        requirements_extras = self.get_requirements_extras()
+
+        if requirements_extras:
+            self.print_requirements()
+            return
+
         if not paths:
             paths = SetupPaths(path=self.from_caller())
         self.paths = paths
@@ -107,6 +115,25 @@ class Setup(FromCallerMixin):
         if do_setup:
             self.setup()
 
+    def get_requirements_extras(self):
+        if self.REQUIREMENTS_ARG not in sys.argv:
+            return None
+
+        extras_str = sys.argv[-1]
+        extras = extras_str.split(',')
+        return extras
+
+    def print_requirements(self):
+        reqs = []
+        reqs += self.dependencies.install
+
+        for extra in sys.argv[-1].split(','):
+            reqs += self.dependencies.extras[extra]
+        reqs = '\n'.join(reqs)
+        print(reqs)
+
+
+
     def get_entrypoint_path(self, key, value):
         if value:
             return f'{self.name}.{value}:{key}'
@@ -150,14 +177,22 @@ class Setup(FromCallerMixin):
         return self.paths.version.read_text().strip()
 
     @property
-    def packages(self):
+    def find(self):
 
-        excludes = list(SetupPaths.SKIP_DIRS) + [f'{name}.*' for name in SetupPaths.SKIP_DIRS]
+        from fmtr.tools import setup
 
         if self.paths.is_namespace:
-            return find_namespace_packages(where=str(self.paths.repo), exclude=excludes)
+            return setup.find_namespace_packages
         else:
-            return find_packages(where=str(self.paths.repo), exclude=excludes)
+            return setup.find_packages
+
+    @property
+    def packages(self):
+
+        excludes = list(SetupPaths.SKIP_DIRS) + [f'{name}.*' for name in SetupPaths.SKIP_DIRS]
+
+        packages = self.find(where=str(self.paths.repo), exclude=excludes)
+        return packages
 
     @property
     def package_dir(self):
@@ -195,7 +230,9 @@ class Setup(FromCallerMixin):
 
     def setup(self):
 
-        return setup(**self.data)
+        from fmtr.tools import setup
+
+        return setup.setup_setuptools(**self.data)
 
 
 
@@ -226,7 +263,7 @@ class Dependencies:
 
         return values_resolved
 
-    @property
+    @cached_property
     def extras(self) -> Dict[str, List[str]]:
         """
 
@@ -238,7 +275,7 @@ class Dependencies:
         resolved[self.ALL] = list(set(chain.from_iterable(resolved.values())))
         return resolved
 
-    @property
+    @cached_property
     def install(self):
         return self.resolve_values(self.INSTALL)
 

fmtr_tools-1.1.23/fmtr/tools/version

@@ -0,0 +1 @@
+1.1.23

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.1.21
+Version: 1.1.23
 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: tinynetrc; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: yamlscript; extra == "test"
+Requires-Dist: pandas; 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: 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: pyyaml; extra == "test"
-Requires-Dist: logfire[fastapi]; extra == "test"
-Requires-Dist: google-auth-httplib2; extra == "test"
-Requires-Dist: openai; extra == "test"
+Requires-Dist: flet[all]; extra == "test"
+Requires-Dist: pydantic-settings; extra == "test"
+Requires-Dist: ollama; extra == "test"
 Requires-Dist: diskcache; extra == "test"
-Requires-Dist: bokeh; extra == "test"
-Requires-Dist: sentence_transformers; 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: torchaudio; extra == "test"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
+Requires-Dist: faker; extra == "test"
 Requires-Dist: pydantic; extra == "test"
+Requires-Dist: distributed; extra == "test"
 Requires-Dist: dask[bag]; extra == "test"
-Requires-Dist: Unidecode; extra == "test"
-Requires-Dist: docker; extra == "test"
-Requires-Dist: google-auth; extra == "test"
+Requires-Dist: sre_yield; extra == "test"
+Requires-Dist: tabulate; extra == "test"
+Requires-Dist: html2text; extra == "test"
+Requires-Dist: tinynetrc; extra == "test"
+Requires-Dist: setuptools; 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: peft; extra == "test"
+Requires-Dist: google-auth; extra == "test"
 Requires-Dist: semver; extra == "test"
-Requires-Dist: regex; 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: 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-auth-oauthlib; extra == "test"
+Requires-Dist: filetype; extra == "test"
+Requires-Dist: deepmerge; 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: bokeh; 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"
+Requires-Dist: google-auth-httplib2; extra == "test"
+Requires-Dist: appdirs; extra == "test"
+Requires-Dist: Unidecode; extra == "test"
+Requires-Dist: transformers[sentencepiece]; extra == "test"
 Provides-Extra: yaml
 Requires-Dist: yamlscript; extra == "yaml"
 Requires-Dist: pyyaml; extra == "yaml"

{fmtr_tools-1.1.21 → fmtr_tools-1.1.23}/fmtr.tools.egg-info/SOURCES.txt

@@ -42,7 +42,6 @@ setup.py
 ./fmtr/tools/random_tools.py
 ./fmtr/tools/semantic_tools.py
 ./fmtr/tools/settings_tools.py
-./fmtr/tools/setup_tools.py
 ./fmtr/tools/spaces_tools.py
 ./fmtr/tools/string_tools.py
 ./fmtr/tools/tabular_tools.py
@@ -59,6 +58,8 @@ setup.py
 ./fmtr/tools/path_tools/app_path_tools.py
 ./fmtr/tools/path_tools/path_tools.py
 ./fmtr/tools/path_tools/type_path_tools.py
+./fmtr/tools/setup_tools/__init__.py
+./fmtr/tools/setup_tools/setup_tools.py
 ./fmtr/tools/tests/__init__.py
 ./fmtr/tools/tests/conftest.py
 ./fmtr/tools/tests/helpers.py

fmtr_tools-1.1.21/fmtr/tools/version

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

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

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