fmtr.tools 1.1.22__tar.gz → 1.1.24__tar.gz

{fmtr_tools-1.1.22 → fmtr_tools-1.1.24}/PKG-INFO

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

{fmtr_tools-1.1.22 → fmtr_tools-1.1.24}/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.24/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.22/fmtr/tools → fmtr_tools-1.1.24/fmtr/tools/setup_tools}/setup_tools.py

@@ -1,12 +1,9 @@
 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
@@ -19,26 +16,21 @@ class SetupPaths(FromCallerMixin):
 
     """
 
-    SKIP_DIRS = {'data', 'build', 'dist', '.*', '*egg-info*'}
-
-    def __init__(self, path=None):
+    def __init__(self, path=None, org=Constants.ORG_NAME):
 
         """
 
         Use calling module path as default path, if not otherwise specified.
+        :param org:
 
         """
         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):
@@ -49,41 +41,43 @@ class SetupPaths(FromCallerMixin):
         return self.path / Constants.FILENAME_VERSION
 
     @cached_property
-    def layout(self):
+    def path(self):
+
+        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 self.find(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
+
+    @property
+    def find(self):
+        from fmtr.tools import setup
+        return setup.find_packages
 
 
 class Setup(FromCallerMixin):
@@ -91,9 +85,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
 
@@ -107,8 +101,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
@@ -179,14 +175,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(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
 
     @property
     def package_dir(self):
@@ -224,7 +228,9 @@ class Setup(FromCallerMixin):
 
     def setup(self):
 
-        return setup(**self.data)
+        from fmtr.tools import setup
+
+        return setup.setup_setuptools(**self.data)
 
 
 

fmtr_tools-1.1.24/fmtr/tools/version

@@ -0,0 +1 @@
+1.1.24

{fmtr_tools-1.1.22 → fmtr_tools-1.1.24}/fmtr.tools.egg-info/PKG-INFO

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

{fmtr_tools-1.1.22 → fmtr_tools-1.1.24}/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.22/fmtr/tools/version

@@ -1 +0,0 @@
-1.1.22

{fmtr_tools-1.1.22 → fmtr_tools-1.1.24}/fmtr.tools.egg-info/requires.txt

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