fmtr.tools 1.1.17__tar.gz → 1.1.18__tar.gz

{fmtr_tools-1.1.17 → fmtr_tools-1.1.18}/PKG-INFO

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

@@ -0,0 +1 @@
+1.1.18

{fmtr_tools-1.1.17 → fmtr_tools-1.1.18}/fmtr.tools.egg-info/PKG-INFO

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

@@ -1 +0,0 @@
-1.1.17

{fmtr_tools-1.1.17 → fmtr_tools-1.1.18}/fmtr.tools.egg-info/requires.txt

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