fmtr.tools 1.1.11__py3-none-any.whl → 1.1.13__py3-none-any.whl

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/version

@@ -1 +1 @@
-1.1.11
+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.dist-info → fmtr_tools-1.1.13.dist-info}/METADATA

@@ -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.dist-info → fmtr_tools-1.1.13.dist-info}/RECORD

@@ -36,16 +36,16 @@ fmtr/tools/process_tools.py,sha256=Ysh5Dk2QFBhXQerArjKdt7xZd3JrN5Ho02AaOjH0Nnw,1
 fmtr/tools/profiling_tools.py,sha256=jpXVjaNKPydTasEQVNXvxzGtMhXPit08AnJddkU8uIc,46
 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=wqLqZ64j3l2WA-yL5Xyl55XKblp1SbxQbB44Z7kF5QU,1952
+fmtr/tools/settings_tools.py,sha256=o11W3T60UZSvCTkh_eEQq1Mx74GycQ6JxUr0plBDbsk,2356
 fmtr/tools/spaces_tools.py,sha256=D_he3mve6DruB3OPS6QyzqD05ChHnRTb4buViKPe7To,1099
 fmtr/tools/string_tools.py,sha256=Q2vv7kuGVMaQlNSUxJYhex6WUQHDus40ht0PGImPjNQ,3879
 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=ru3slBiEnrsfqniKVioHigGLwx3RDu7XA86xIx6JHzg,6
+fmtr/tools/version,sha256=0MMPfOeY9Ul9U6Fl8ydzCGHg0ZKasYZSxI22Y6RNCU4,6
 fmtr/tools/version_tools.py,sha256=yNs_CGqWpqE4jbK9wsPIi14peJVXYbhIcMqHAFOw3yE,1480
-fmtr/tools/yaml_tools.py,sha256=RVm-PuTv5XNneMea9iZ-x-oI3UdpbLi2-KA0rSf2ybk,1537
+fmtr/tools/yaml_tools.py,sha256=9kuYChqJelWQIjGlSnK4iDdOWWH06P0gp9jIcRrC3UI,1903
 fmtr/tools/ai_tools/__init__.py,sha256=JZrLuOFNV1A3wvJgonxOgz_4WS-7MfCuowGWA5uYCjs,372
 fmtr/tools/ai_tools/agentic_tools.py,sha256=YebH7R9ovVo3GzfWAZxY49e2fNt13APDMe290xx7zks,3720
 fmtr/tools/ai_tools/inference_tools.py,sha256=yF8Oxph0L8W2CnK_o-MVztBhWVwBpgOEkx9_m3uqQww,11840
@@ -60,9 +60,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.11.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.1.11.dist-info/METADATA,sha256=-HlRFfrUTtI4k10csfs6idMFnFYMkF8ikUM_nD3BQJk,14855
-fmtr_tools-1.1.11.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-fmtr_tools-1.1.11.dist-info/entry_points.txt,sha256=e-eOW1Ml13tbxHC6Er1MnVOEDePeWw7DKwlE-l-gCY0,205
-fmtr_tools-1.1.11.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.1.11.dist-info/RECORD,,
+fmtr_tools-1.1.13.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.1.13.dist-info/METADATA,sha256=gJz-5eKN163pQUqSNZIu--IH8WiOrNPRr7ZZrlEzC3s,14855
+fmtr_tools-1.1.13.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+fmtr_tools-1.1.13.dist-info/entry_points.txt,sha256=e-eOW1Ml13tbxHC6Er1MnVOEDePeWw7DKwlE-l-gCY0,205
+fmtr_tools-1.1.13.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.1.13.dist-info/RECORD,,