fmtr.tools 1.1.11__tar.gz → 1.1.13__tar.gz

{fmtr_tools-1.1.11 → fmtr_tools-1.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.1.11
+Version: 1.1.13
 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,52 +9,52 @@ License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: test
-Requires-Dist: flet-webview; extra == "test"
-Requires-Dist: fastapi; extra == "test"
-Requires-Dist: pymupdf4llm; extra == "test"
-Requires-Dist: Unidecode; extra == "test"
-Requires-Dist: semver; extra == "test"
-Requires-Dist: pydantic-settings; extra == "test"
-Requires-Dist: google-auth-httplib2; extra == "test"
-Requires-Dist: pandas; extra == "test"
+Requires-Dist: json_repair; extra == "test"
+Requires-Dist: openpyxl; extra == "test"
+Requires-Dist: google-api-python-client; extra == "test"
+Requires-Dist: yamlscript; extra == "test"
+Requires-Dist: pymupdf; extra == "test"
+Requires-Dist: tokenizers; extra == "test"
+Requires-Dist: torchaudio; extra == "test"
+Requires-Dist: faker; extra == "test"
+Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: google-auth; extra == "test"
 Requires-Dist: google-auth-oauthlib; extra == "test"
-Requires-Dist: openai; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pydantic-settings; extra == "test"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
+Requires-Dist: fastapi; extra == "test"
+Requires-Dist: contexttimer; extra == "test"
 Requires-Dist: transformers[sentencepiece]; extra == "test"
-Requires-Dist: logfire; extra == "test"
-Requires-Dist: pydantic; extra == "test"
-Requires-Dist: deepmerge; extra == "test"
-Requires-Dist: pymupdf; extra == "test"
-Requires-Dist: sentence_transformers; extra == "test"
-Requires-Dist: html2text; extra == "test"
+Requires-Dist: dask[bag]; extra == "test"
 Requires-Dist: sre_yield; extra == "test"
-Requires-Dist: flet[all]; extra == "test"
-Requires-Dist: peft; extra == "test"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
+Requires-Dist: pydevd-pycharm; extra == "test"
+Requires-Dist: flet-webview; extra == "test"
+Requires-Dist: deepmerge; extra == "test"
+Requires-Dist: pandas; extra == "test"
+Requires-Dist: pydantic; extra == "test"
+Requires-Dist: openai; extra == "test"
+Requires-Dist: pymupdf4llm; extra == "test"
 Requires-Dist: appdirs; extra == "test"
-Requires-Dist: google-api-python-client; extra == "test"
-Requires-Dist: json_repair; extra == "test"
-Requires-Dist: dask[bag]; extra == "test"
-Requires-Dist: torchaudio; extra == "test"
-Requires-Dist: google-auth; extra == "test"
-Requires-Dist: tabulate; extra == "test"
-Requires-Dist: tokenizers; extra == "test"
-Requires-Dist: ollama; extra == "test"
 Requires-Dist: torchvision; extra == "test"
-Requires-Dist: yamlscript; extra == "test"
-Requires-Dist: faker; extra == "test"
-Requires-Dist: bokeh; extra == "test"
-Requires-Dist: docker; extra == "test"
+Requires-Dist: logfire; extra == "test"
 Requires-Dist: tinynetrc; extra == "test"
-Requires-Dist: uvicorn[standard]; extra == "test"
-Requires-Dist: openpyxl; extra == "test"
+Requires-Dist: flet[all]; extra == "test"
+Requires-Dist: html2text; extra == "test"
+Requires-Dist: google-auth-httplib2; extra == "test"
+Requires-Dist: docker; extra == "test"
+Requires-Dist: Unidecode; extra == "test"
 Requires-Dist: diskcache; extra == "test"
-Requires-Dist: pydevd-pycharm; extra == "test"
+Requires-Dist: uvicorn[standard]; extra == "test"
+Requires-Dist: bokeh; extra == "test"
+Requires-Dist: sentence_transformers; extra == "test"
+Requires-Dist: tabulate; extra == "test"
+Requires-Dist: ollama; extra == "test"
 Requires-Dist: logfire[fastapi]; extra == "test"
-Requires-Dist: contexttimer; extra == "test"
-Requires-Dist: distributed; extra == "test"
+Requires-Dist: peft; extra == "test"
 Requires-Dist: flet-video; extra == "test"
-Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: semver; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: distributed; extra == "test"
 Provides-Extra: yaml
 Requires-Dist: yamlscript; extra == "yaml"
 Provides-Extra: logging

{fmtr_tools-1.1.11 → fmtr_tools-1.1.13}/fmtr/tools/settings_tools.py

@@ -1,7 +1,24 @@
 from pydantic_settings import BaseSettings, PydanticBaseSettingsSource, YamlConfigSettingsSource, EnvSettingsSource, CliSettingsSource
-from typing import ClassVar
+from typing import ClassVar, Any
 
-from fmtr.tools.path_tools import PackagePaths
+from fmtr.tools.path_tools import PackagePaths, Path
+
+
+class YamlScriptConfigSettingsSource(YamlConfigSettingsSource):
+    """
+
+    Customer source for reading YAML *Script* (as opposed to plain YAML) configuration files.
+
+    """
+
+    def _read_file(self, file_path: Path) -> dict[str, Any]:
+        """
+
+        Use our own Path class to read YAML Script.
+
+        """
+        data = Path(file_path).read_yaml() or {}
+        return data
 
 
 class Base(BaseSettings):
@@ -34,7 +51,7 @@ class Base(BaseSettings):
             init_settings,
             CliSettingsSource(settings_cls, cli_parse_args=True),
             EnvSettingsSource(settings_cls, env_prefix=cls.get_env_prefix()),
-            YamlConfigSettingsSource(settings_cls, yaml_file=cls.paths.settings),
+            YamlScriptConfigSettingsSource(settings_cls, yaml_file=cls.paths.settings),
         )
 
         return sources

fmtr_tools-1.1.13/fmtr/tools/version

@@ -0,0 +1 @@
+1.1.13

{fmtr_tools-1.1.11 → fmtr_tools-1.1.13}/fmtr/tools/yaml_tools.py

@@ -5,6 +5,13 @@ from yaml import dump
 
 from fmtr.tools import environment_tools as env
 
+try:
+    import yamlscript
+except ImportError:
+    raise  # Raise if even the package isn't installed, to trigger the regular missing extra exception.
+except Exception as exception:
+    pass  # Allow missing binary, so we can install on-demand
+
 
 def install():
     """
@@ -67,3 +74,11 @@ def from_yaml(yaml_str: str) -> Any:
     """
     obj = get_interpreter().load(yaml_str)
     return obj
+
+
+if __name__ == '__main__':
+    from fmtr.tools import Path
+
+    py = Path('hw.yml')
+    data = py.read_yaml()
+    data

{fmtr_tools-1.1.11 → fmtr_tools-1.1.13}/fmtr.tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.1.11
+Version: 1.1.13
 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,52 +9,52 @@ License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: test
-Requires-Dist: flet-webview; extra == "test"
-Requires-Dist: fastapi; extra == "test"
-Requires-Dist: pymupdf4llm; extra == "test"
-Requires-Dist: Unidecode; extra == "test"
-Requires-Dist: semver; extra == "test"
-Requires-Dist: pydantic-settings; extra == "test"
-Requires-Dist: google-auth-httplib2; extra == "test"
-Requires-Dist: pandas; extra == "test"
+Requires-Dist: json_repair; extra == "test"
+Requires-Dist: openpyxl; extra == "test"
+Requires-Dist: google-api-python-client; extra == "test"
+Requires-Dist: yamlscript; extra == "test"
+Requires-Dist: pymupdf; extra == "test"
+Requires-Dist: tokenizers; extra == "test"
+Requires-Dist: torchaudio; extra == "test"
+Requires-Dist: faker; extra == "test"
+Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: google-auth; extra == "test"
 Requires-Dist: google-auth-oauthlib; extra == "test"
-Requires-Dist: openai; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pydantic-settings; extra == "test"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
+Requires-Dist: fastapi; extra == "test"
+Requires-Dist: contexttimer; extra == "test"
 Requires-Dist: transformers[sentencepiece]; extra == "test"
-Requires-Dist: logfire; extra == "test"
-Requires-Dist: pydantic; extra == "test"
-Requires-Dist: deepmerge; extra == "test"
-Requires-Dist: pymupdf; extra == "test"
-Requires-Dist: sentence_transformers; extra == "test"
-Requires-Dist: html2text; extra == "test"
+Requires-Dist: dask[bag]; extra == "test"
 Requires-Dist: sre_yield; extra == "test"
-Requires-Dist: flet[all]; extra == "test"
-Requires-Dist: peft; extra == "test"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
+Requires-Dist: pydevd-pycharm; extra == "test"
+Requires-Dist: flet-webview; extra == "test"
+Requires-Dist: deepmerge; extra == "test"
+Requires-Dist: pandas; extra == "test"
+Requires-Dist: pydantic; extra == "test"
+Requires-Dist: openai; extra == "test"
+Requires-Dist: pymupdf4llm; extra == "test"
 Requires-Dist: appdirs; extra == "test"
-Requires-Dist: google-api-python-client; extra == "test"
-Requires-Dist: json_repair; extra == "test"
-Requires-Dist: dask[bag]; extra == "test"
-Requires-Dist: torchaudio; extra == "test"
-Requires-Dist: google-auth; extra == "test"
-Requires-Dist: tabulate; extra == "test"
-Requires-Dist: tokenizers; extra == "test"
-Requires-Dist: ollama; extra == "test"
 Requires-Dist: torchvision; extra == "test"
-Requires-Dist: yamlscript; extra == "test"
-Requires-Dist: faker; extra == "test"
-Requires-Dist: bokeh; extra == "test"
-Requires-Dist: docker; extra == "test"
+Requires-Dist: logfire; extra == "test"
 Requires-Dist: tinynetrc; extra == "test"
-Requires-Dist: uvicorn[standard]; extra == "test"
-Requires-Dist: openpyxl; extra == "test"
+Requires-Dist: flet[all]; extra == "test"
+Requires-Dist: html2text; extra == "test"
+Requires-Dist: google-auth-httplib2; extra == "test"
+Requires-Dist: docker; extra == "test"
+Requires-Dist: Unidecode; extra == "test"
 Requires-Dist: diskcache; extra == "test"
-Requires-Dist: pydevd-pycharm; extra == "test"
+Requires-Dist: uvicorn[standard]; extra == "test"
+Requires-Dist: bokeh; extra == "test"
+Requires-Dist: sentence_transformers; extra == "test"
+Requires-Dist: tabulate; extra == "test"
+Requires-Dist: ollama; extra == "test"
 Requires-Dist: logfire[fastapi]; extra == "test"
-Requires-Dist: contexttimer; extra == "test"
-Requires-Dist: distributed; extra == "test"
+Requires-Dist: peft; extra == "test"
 Requires-Dist: flet-video; extra == "test"
-Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: semver; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: distributed; extra == "test"
 Provides-Extra: yaml
 Requires-Dist: yamlscript; extra == "yaml"
 Provides-Extra: logging

fmtr_tools-1.1.11/fmtr/tools/version

@@ -1 +0,0 @@
-1.1.11

{fmtr_tools-1.1.11 → fmtr_tools-1.1.13}/fmtr.tools.egg-info/requires.txt

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