fmtr.tools 1.1.24__tar.gz → 1.1.25__tar.gz

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

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

{fmtr_tools-1.1.24 → fmtr_tools-1.1.25}/fmtr/tools/__init__.py

@@ -31,7 +31,7 @@ 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
+from fmtr.tools.setup_tools import Setup, SetupPaths, Dependencies, Tools
 
 try:
     from fmtr.tools import augmentation_tools as augmentation

{fmtr_tools-1.1.24 → fmtr_tools-1.1.25}/fmtr/tools/setup_tools/__init__.py

@@ -1,6 +1,6 @@
 from fmtr.tools.import_tools import MissingExtraMockModule
 
-from fmtr.tools.setup_tools.setup_tools import Setup, SetupPaths, Dependencies
+from fmtr.tools.setup_tools.setup_tools import Setup, SetupPaths, Dependencies, Tools
 
 try:
     from setuptools import find_namespace_packages, find_packages, setup as setup_setuptools

{fmtr_tools-1.1.24 → fmtr_tools-1.1.25}/fmtr/tools/setup_tools/setup_tools.py

@@ -21,7 +21,6 @@ class SetupPaths(FromCallerMixin):
         """
 
         Use calling module path as default path, if not otherwise specified.
-        :param org:
 
         """
         if not path:
@@ -30,8 +29,6 @@ class SetupPaths(FromCallerMixin):
         self.org_name = org
         self.repo = Path(path)
 
-
-
     @property
     def readme(self):
         return self.repo / 'README.md'
@@ -43,12 +40,14 @@ class SetupPaths(FromCallerMixin):
     @cached_property
     def path(self):
 
+        from fmtr.tools import setup
+
         if self.org:
             base = self.org
         else:
             base = self.repo
 
-        directories = [base / dir for dir in self.find(base)]
+        directories = [base / dir for dir in setup.find_packages(base)]
 
         if len(directories) != 1:
             dirs_str = ', '.join([str(dir) for dir in directories])
@@ -74,11 +73,6 @@ class SetupPaths(FromCallerMixin):
     def name(self) -> str:
         return self.path.stem
 
-    @property
-    def find(self):
-        from fmtr.tools import setup
-        return setup.find_packages
-
 
 class Setup(FromCallerMixin):
     AUTHOR = 'Frontmatter'
@@ -209,7 +203,7 @@ class Setup(FromCallerMixin):
 
     @property
     def data(self):
-        return dict(
+        data = dict(
             name=self.name,
             version=self.version,
             author=self.author,
@@ -225,6 +219,7 @@ class Setup(FromCallerMixin):
             install_requires=self.dependencies.install,
             extras_require=self.dependencies.extras,
         ) | self.kwargs
+        return data
 
     def setup(self):
 
@@ -233,6 +228,16 @@ class Setup(FromCallerMixin):
         return setup.setup_setuptools(**self.data)
 
 
+class Tools:
+    MASK = f'{Constants.LIBRARY_NAME}[{{extras}}]'
+
+    def __init__(self, *extras):
+        self.extras = extras
+
+    def __str__(self):
+        extras_str = ','.join(self.extras)
+        return self.MASK.format(extras=extras_str)
+
 
 
 class Dependencies:
@@ -254,7 +259,7 @@ class Dependencies:
         for value in values:
             if value == key or value not in self.dependencies:
                 # Add the value directly if it references itself or is not a dependency key.
-                values_resolved.append(value)
+                values_resolved.append(str(value))
             else:
                 # Recurse into nested dependencies.
                 values_resolved += self.resolve_values(value)

fmtr_tools-1.1.25/fmtr/tools/version

@@ -0,0 +1 @@
+1.1.25

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

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

fmtr_tools-1.1.24/fmtr/tools/version

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

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

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