fmtr.tools 1.1.17__py3-none-any.whl → 1.1.18__py3-none-any.whl

fmtr/tools/setup_tools.py

@@ -1,13 +1,13 @@
-from itertools import chain
-
 from datetime import datetime
 from functools import cached_property
-from setuptools import find_namespace_packages, find_packages
+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 PathsBase, path
+from fmtr.tools.path_tools.path_tools import PathsBase
 
 
 class SetupPaths(PathsBase):
@@ -55,7 +55,8 @@ class SetupPaths(PathsBase):
         ]
 
         if len(directories) != 1:
-            raise ValueError(f'Expected exactly one directory in "{path}", found {','.join(directories)}')
+            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))
 
@@ -86,15 +87,14 @@ class Setup:
     AUTHOR = 'Frontmatter'
     AUTHOR_EMAIL = 'innovative.fowler@mask.pro.fmtr.dev'
 
-    paths = SetupPaths(path=Path(__file__).absolute().parent.parent.parent)
+    def __init__(self, paths, dependencies, console_scripts=None, client=None, **kwargs):
 
-    def __init__(self, dependencies, console_scripts=None, client=None, **kwargs):
 
-        self.client = client
         self.kwargs = kwargs
         self.dependencies = dependencies
-        self.paths
+        self.paths = paths
 
+        self.client = client
         self.console_scripts = console_scripts
 
     def get_entrypoint_path(self, key, value):
@@ -141,10 +141,13 @@ class Setup:
 
     @property
     def packages(self):
+
+        excludes = list(SetupPaths.SKIP_DIRS) + [f'{name}.*' for name in SetupPaths.SKIP_DIRS]
+
         if self.paths.is_namespace:
-            return find_namespace_packages(where=str(self.paths.repo))
+            return find_namespace_packages(where=str(self.paths.repo), exclude=excludes)
         else:
-            return find_packages(where=str(self.paths.repo))
+            return find_packages(where=str(self.paths.repo), exclude=excludes)
 
     @property
     def package_dir(self):
@@ -179,6 +182,8 @@ class Setup:
             extras_require=self.dependencies.extras,
         ) | self.kwargs
 
+    def setup(self):
+        return setup(**self.get_data_setup())
 
 class Entrypoints:
     ALL = 'all'

fmtr/tools/version

@@ -1 +1 @@
-1.1.17
+1.1.18

{fmtr_tools-1.1.17.dist-info → fmtr_tools-1.1.18.dist-info}/METADATA

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

{fmtr_tools-1.1.17.dist-info → fmtr_tools-1.1.18.dist-info}/RECORD

@@ -39,14 +39,14 @@ fmtr/tools/profiling_tools.py,sha256=jpXVjaNKPydTasEQVNXvxzGtMhXPit08AnJddkU8uIc
 fmtr/tools/random_tools.py,sha256=4VlQdk5THbR8ka4pZaLbk_ZO_4yy6PF_lHZes_rgenY,2223
 fmtr/tools/semantic_tools.py,sha256=cxY9NSAHWj4nEc6Oj4qA1omR3dWbl2OuH7_PkINc6_E,1386
 fmtr/tools/settings_tools.py,sha256=o11W3T60UZSvCTkh_eEQq1Mx74GycQ6JxUr0plBDbsk,2356
-fmtr/tools/setup_tools.py,sha256=JymAPBPgHlF2gw9d4TrLT2LvPS9B2riGyJ2suD2gw6U,6944
+fmtr/tools/setup_tools.py,sha256=wSTczlk8nq3f6A4zAn86R7iZ1qOhk_HXJG2HpYpNSVQ,7144
 fmtr/tools/spaces_tools.py,sha256=D_he3mve6DruB3OPS6QyzqD05ChHnRTb4buViKPe7To,1099
 fmtr/tools/string_tools.py,sha256=mjO7NSqhtYMtnX7fKb8eXZ7MO2lXWGMl0kXxnZznupM,3764
 fmtr/tools/tabular_tools.py,sha256=tpIpZzYku1HcJrHZJL6BC39LmN3WUWVhFbK2N7nDVmE,120
 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=GkdkUXF_QoQgGaivlyso9zz8QA1rg2DseoZxAQwvOEc,6
+fmtr/tools/version,sha256=-WxO0odronhLxbLZ9VITjNyo4V2gt73K5JKN61yV-6Q,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
@@ -64,9 +64,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.17.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.1.17.dist-info/METADATA,sha256=RrfqTgYjKQLca5VUuvhO3oGRxwLY3vXmsSG4NUaci5I,15735
-fmtr_tools-1.1.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.1.17.dist-info/entry_points.txt,sha256=e-eOW1Ml13tbxHC6Er1MnVOEDePeWw7DKwlE-l-gCY0,205
-fmtr_tools-1.1.17.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.1.17.dist-info/RECORD,,
+fmtr_tools-1.1.18.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.1.18.dist-info/METADATA,sha256=Dd4BEXUZJT36o1D1n_uaJGXiPMAxZOg6bRgoZU9ilZA,15735
+fmtr_tools-1.1.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.1.18.dist-info/entry_points.txt,sha256=e-eOW1Ml13tbxHC6Er1MnVOEDePeWw7DKwlE-l-gCY0,205
+fmtr_tools-1.1.18.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.1.18.dist-info/RECORD,,