fmtr.tools 1.0.55__tar.gz → 1.1.0__tar.gz

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.0.55
+Version: 1.1.0
 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,49 +9,50 @@ License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: test
-Requires-Dist: distributed; extra == "test"
-Requires-Dist: ollama; extra == "test"
+Requires-Dist: flet-webview; extra == "test"
+Requires-Dist: uvicorn; extra == "test"
+Requires-Dist: pymupdf4llm; extra == "test"
+Requires-Dist: pyyaml; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: logfire; extra == "test"
 Requires-Dist: google-auth-httplib2; extra == "test"
-Requires-Dist: semver; extra == "test"
-Requires-Dist: pyyaml; extra == "test"
 Requires-Dist: tinynetrc; extra == "test"
-Requires-Dist: dask[bag]; extra == "test"
-Requires-Dist: peft; extra == "test"
-Requires-Dist: openpyxl; extra == "test"
-Requires-Dist: google-auth-oauthlib; extra == "test"
-Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: sre_yield; extra == "test"
 Requires-Dist: bokeh; extra == "test"
-Requires-Dist: Unidecode; extra == "test"
+Requires-Dist: html2text; extra == "test"
+Requires-Dist: sentence_transformers; extra == "test"
 Requires-Dist: docker; extra == "test"
-Requires-Dist: deepmerge; extra == "test"
-Requires-Dist: json_repair; extra == "test"
+Requires-Dist: peft; extra == "test"
+Requires-Dist: google-auth; extra == "test"
 Requires-Dist: fastapi; extra == "test"
-Requires-Dist: transformers[sentencepiece]; extra == "test"
-Requires-Dist: pydevd-pycharm; extra == "test"
-Requires-Dist: tokenizers; extra == "test"
-Requires-Dist: diskcache; extra == "test"
-Requires-Dist: logfire; extra == "test"
-Requires-Dist: contexttimer; extra == "test"
-Requires-Dist: flet-video; extra == "test"
+Requires-Dist: pydantic; extra == "test"
+Requires-Dist: pydantic-settings; extra == "test"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
 Requires-Dist: torchvision; extra == "test"
 Requires-Dist: google-api-python-client; extra == "test"
-Requires-Dist: google-auth; extra == "test"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
-Requires-Dist: flet[all]; extra == "test"
-Requires-Dist: uvicorn; extra == "test"
-Requires-Dist: pydantic; extra == "test"
+Requires-Dist: distributed; extra == "test"
+Requires-Dist: openpyxl; extra == "test"
+Requires-Dist: contexttimer; extra == "test"
+Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: dask[bag]; extra == "test"
 Requires-Dist: tabulate; extra == "test"
-Requires-Dist: pymupdf4llm; extra == "test"
-Requires-Dist: openai; extra == "test"
+Requires-Dist: tokenizers; extra == "test"
+Requires-Dist: ollama; extra == "test"
 Requires-Dist: pandas; extra == "test"
+Requires-Dist: flet-video; extra == "test"
+Requires-Dist: flet[all]; extra == "test"
+Requires-Dist: transformers[sentencepiece]; extra == "test"
+Requires-Dist: semver; extra == "test"
+Requires-Dist: openai; extra == "test"
+Requires-Dist: google-auth-oauthlib; extra == "test"
+Requires-Dist: pydevd-pycharm; extra == "test"
 Requires-Dist: faker; extra == "test"
 Requires-Dist: pymupdf; extra == "test"
-Requires-Dist: sre_yield; extra == "test"
-Requires-Dist: flet-webview; extra == "test"
-Requires-Dist: sentence_transformers; extra == "test"
+Requires-Dist: deepmerge; extra == "test"
+Requires-Dist: diskcache; extra == "test"
+Requires-Dist: json_repair; extra == "test"
+Requires-Dist: Unidecode; extra == "test"
 Requires-Dist: torchaudio; extra == "test"
-Requires-Dist: html2text; extra == "test"
 Provides-Extra: yaml
 Requires-Dist: pyyaml; extra == "yaml"
 Provides-Extra: logging
@@ -143,6 +144,9 @@ Requires-Dist: pydantic; extra == "pdf"
 Requires-Dist: pymupdf4llm; extra == "pdf"
 Provides-Extra: debug
 Requires-Dist: pydevd-pycharm; extra == "debug"
+Provides-Extra: sets
+Requires-Dist: pydantic-settings; extra == "sets"
+Requires-Dist: pydantic; extra == "sets"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
@@ -239,6 +243,10 @@ The included modules, plus any extra requirements, are as follows:
   - Extras: `ai`
 - `tools.config`: Base config class with overridable field processors.
     - Extras: None
+-
+`tools.settings`: A base configuration system built on Pydantic Settings that provides a flexible way to manage application settings from multiple sources, based on a standard
+`path.PackagePaths` project layout.
+  - Extras: `sets`
 - `tools.dataclass`: Utilities for extracting and filtering fields and metadata from dataclasses, with support for applying filters and retrieving enabled fields based on metadata attributes.
     - Extras: None
 - `tools.datatype`
@@ -269,8 +277,12 @@ The included modules, plus any extra requirements, are as follows:
   - Extras: None
 - `tools.openai`: Utilities for interacting with the OpenAI API, simple text-to-text output, etc.
   - Extras: `openai.api`
-- `tools.Path`: Enhanced `pathlib.Path` object with additional functionality for Windows-to-Unix path conversion, reading/writing JSON and YAML files, and convenient directory creation with parent directories. Includes methods for obtaining paths to modules and temporary directories.
+- `tools.Path`: Enhanced
+  `pathlib.Path` object with additional functionality for Windows-to-Unix path conversion in WSL environments, reading/writing JSON and YAML files with proper encoding.
     - Extras: None
+-
+`tools.PackagePaths` class for managing canonical package paths, like settings files, artifact directories, version files.
+  - Extras: None
 - `tools.platform`: Detecting if host is WSL, Docker etc.
     - Extras: None
 - `tools.ContextProcess`: Manages a function running in a separate process using a context manager. Provides methods to start, stop, and restart the process, with configurable restart delays. Useful for ensuring clean process management and automatic stopping when the context manager exits.

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/README.md

@@ -84,6 +84,10 @@ The included modules, plus any extra requirements, are as follows:
   - Extras: `ai`
 - `tools.config`: Base config class with overridable field processors.
     - Extras: None
+-
+`tools.settings`: A base configuration system built on Pydantic Settings that provides a flexible way to manage application settings from multiple sources, based on a standard
+`path.PackagePaths` project layout.
+  - Extras: `sets`
 - `tools.dataclass`: Utilities for extracting and filtering fields and metadata from dataclasses, with support for applying filters and retrieving enabled fields based on metadata attributes.
     - Extras: None
 - `tools.datatype`
@@ -114,8 +118,12 @@ The included modules, plus any extra requirements, are as follows:
   - Extras: None
 - `tools.openai`: Utilities for interacting with the OpenAI API, simple text-to-text output, etc.
   - Extras: `openai.api`
-- `tools.Path`: Enhanced `pathlib.Path` object with additional functionality for Windows-to-Unix path conversion, reading/writing JSON and YAML files, and convenient directory creation with parent directories. Includes methods for obtaining paths to modules and temporary directories.
+- `tools.Path`: Enhanced
+  `pathlib.Path` object with additional functionality for Windows-to-Unix path conversion in WSL environments, reading/writing JSON and YAML files with proper encoding.
     - Extras: None
+-
+`tools.PackagePaths` class for managing canonical package paths, like settings files, artifact directories, version files.
+  - Extras: None
 - `tools.platform`: Detecting if host is WSL, Docker etc.
     - Extras: None
 - `tools.ContextProcess`: Manages a function running in a separate process using a context manager. Provides methods to start, stop, and restart the process, with configurable restart delays. Useful for ensuring clean process management and automatic stopping when the context manager exits.

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr/tools/__init__.py

@@ -2,7 +2,7 @@ from fmtr.tools import version_tools as version
 
 __version__ = version.read()
 
-import fmtr.tools.config_tools as config
+
 import fmtr.tools.dataclass_tools as dataclass
 import fmtr.tools.datatype_tools as datatype
 import fmtr.tools.environment_tools as env
@@ -22,7 +22,8 @@ import fmtr.tools.async_tools as asyncio
 from fmtr.tools.logging_tools import logger
 
 from fmtr.tools.import_tools import MissingExtraMockModule
-from fmtr.tools.path_tools import Path
+from fmtr.tools.path_tools import Path, PackagePaths
+from fmtr.tools.constants import Constants
 
 try:
     from fmtr.tools import augmentation_tools as augmentation
@@ -158,9 +159,13 @@ try:
 except ImportError as exception:
     debug = MissingExtraMockModule('debug', exception)
 
+try:
+    from fmtr.tools import settings_tools as sets
+except ImportError as exception:
+    sets = MissingExtraMockModule('sets', exception)
+
 
 __all__ = [
-    'config',
     'dataclass',
     'datatype',
     'environment',

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr/tools/ai_tools/agentic_tools.py

@@ -6,7 +6,7 @@ from pydantic_ai.models.openai import OpenAIModel
 from pydantic_ai.providers.openai import OpenAIProvider
 
 from fmtr.tools import environment_tools as env
-from fmtr.tools.config import ToolsConfig
+from fmtr.tools.constants import Constants
 
 pydantic_ai.Agent.instrument_all()
 
@@ -17,9 +17,9 @@ class Task:
 
     """
 
-    PROVIDER = OpenAIProvider(api_key=env.get(ToolsConfig.FMTR_OPENAI_API_KEY_KEY))
+    PROVIDER = OpenAIProvider(api_key=env.get(Constants.FMTR_OPENAI_API_KEY_KEY))
 
-    API_HOST_FMTR = env.get(ToolsConfig.FMTR_AI_HOST_KEY, ToolsConfig.FMTR_AI_HOST_DEFAULT)
+    API_HOST_FMTR = env.get(Constants.FMTR_AI_HOST_KEY, Constants.FMTR_AI_HOST_DEFAULT)
     API_URL_FMTR = f'https://{API_HOST_FMTR}/v1'
     PROVIDER_FMTR = OpenAIProvider(base_url=API_URL_FMTR)
 

fmtr_tools-1.0.55/fmtr/tools/config.py → fmtr_tools-1.1.0/fmtr/tools/constants.py

@@ -1,9 +1,7 @@
 import datetime
 
-from fmtr.tools.config_tools import ConfigClass
 
-
-class ToolsConfig(ConfigClass):
+class Constants:
     ENCODING = 'UTF-8'
     ORG_NAME = 'fmtr'
     LIBRARY_NAME = f'{ORG_NAME}.tools'

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr/tools/debugging_tools.py

@@ -1,7 +1,7 @@
 import pydevd_pycharm
 
 from fmtr.tools import environment_tools as env
-from fmtr.tools.config import ToolsConfig
+from fmtr.tools.constants import Constants
 
 MASK = 'Starting debugger at tcp://{host}:{port}...'
 
@@ -12,16 +12,16 @@ def trace(is_debug=None, host=None, port=None, stdoutToServer=True, stderrToServ
 
     """
     if not is_debug:
-        is_debug = env.get_bool(ToolsConfig.FMTR_REMOTE_DEBUG_ENABLED_KEY, False)
+        is_debug = env.get_bool(Constants.FMTR_REMOTE_DEBUG_ENABLED_KEY, False)
 
     if not is_debug:
         return
 
     if is_debug is True and not host:
-        host = ToolsConfig.FMTR_REMOTE_DEBUG_HOST_DEFAULT
+        host = Constants.FMTR_REMOTE_DEBUG_HOST_DEFAULT
 
-    host = host or env.get(ToolsConfig.FMTR_REMOTE_DEBUG_HOST_KEY, ToolsConfig.FMTR_REMOTE_DEBUG_HOST_DEFAULT)
-    port = port or ToolsConfig.FMTR_REMOTE_DEBUG_PORT_DEFAULT
+    host = host or env.get(Constants.FMTR_REMOTE_DEBUG_HOST_KEY, Constants.FMTR_REMOTE_DEBUG_HOST_DEFAULT)
+    port = port or Constants.FMTR_REMOTE_DEBUG_PORT_DEFAULT
 
     from fmtr.tools import logger
 

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr/tools/environment_tools.py

@@ -8,7 +8,7 @@ from collections.abc import Callable
 from datetime import date, datetime
 from typing import Any, Dict
 
-from fmtr.tools.config import ToolsConfig
+from fmtr.tools.constants import Constants
 from fmtr.tools.datatype_tools import to_bool
 from fmtr.tools.path_tools import Path
 from fmtr.tools.tools import identity, EMPTY
@@ -76,4 +76,4 @@ get_date = get_getter(date.fromisoformat)
 get_datetime = get_getter(datetime.fromisoformat)
 get_path = get_getter(Path)
 
-IS_DEBUG = get(ToolsConfig.FMTR_LOG_LEVEL_KEY, None, converter=str.upper) == 'DEBUG'
+IS_DEBUG = get(Constants.FMTR_LOG_LEVEL_KEY, None, converter=str.upper) == 'DEBUG'

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr/tools/hash_tools.py

@@ -2,7 +2,7 @@ import base64
 import hashlib
 from zlib import crc32
 
-from fmtr.tools.config import ToolsConfig
+from fmtr.tools.constants import Constants
 
 SPECIALS = {'O': '9', '=': '9', 'I': '9'}
 
@@ -12,7 +12,7 @@ def hash_unit(value: str) -> float:
     Hash the input string to a value between 0.0 and 1.0 (not secure).
 
     """
-    value = str(value).encode(ToolsConfig.ENCODING)
+    value = str(value).encode(Constants.ENCODING)
     return float(crc32(value) & 0xffffffff) / 2 ** 32
 
 

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr/tools/json_tools.py

@@ -1,6 +1,6 @@
 import json
 
-from fmtr.tools.config import ToolsConfig
+from fmtr.tools.constants import Constants
 
 
 def to_json(obj):
@@ -9,7 +9,7 @@ def to_json(obj):
     Serialise to JSON
 
     """
-    json_str = json.dumps(obj, indent=ToolsConfig.SERIALIZATION_INDENT, ensure_ascii=False)
+    json_str = json.dumps(obj, indent=Constants.SERIALIZATION_INDENT, ensure_ascii=False)
     return json_str
 
 

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr/tools/logging_tools.py

@@ -2,7 +2,7 @@ import logging
 import os
 
 from fmtr.tools import environment_tools
-from fmtr.tools.config import ToolsConfig
+from fmtr.tools.constants import Constants
 
 DEVELOPMENT = "development"
 PRODUCTION = "production"
@@ -12,7 +12,7 @@ ENVIRONMENT_DEFAULT = DEVELOPMENT
 LEVEL_DEFAULT = logging.DEBUG if environment_tools.IS_DEBUG else logging.INFO
 
 
-def get_logger(name, version=None, host=ToolsConfig.FMTR_OBS_HOST, key=None, org=ToolsConfig.ORG_NAME,
+def get_logger(name, version=None, host=Constants.FMTR_OBS_HOST, key=None, org=Constants.ORG_NAME,
                stream=STREAM_DEFAULT,
                environment=ENVIRONMENT_DEFAULT, level=LEVEL_DEFAULT):
     """
@@ -31,7 +31,7 @@ def get_logger(name, version=None, host=ToolsConfig.FMTR_OBS_HOST, key=None, org
         return logger
 
     if key is None:
-        key = environment_tools.get(ToolsConfig.FMTR_OBS_API_KEY_KEY)
+        key = environment_tools.get(Constants.FMTR_OBS_API_KEY_KEY)
     url = f"https://{host}/api/{org}/v1/traces"
     headers = f"Authorization=Basic {key},stream-name={stream}"
 
@@ -57,7 +57,7 @@ def get_logger(name, version=None, host=ToolsConfig.FMTR_OBS_HOST, key=None, org
     return logger
 
 
-logger = get_logger(name=ToolsConfig.LIBRARY_NAME)
+logger = get_logger(name=Constants.LIBRARY_NAME)
 
 if __name__ == '__main__':
     logger.info('Hello World')

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr/tools/parallel_tools.py

@@ -6,13 +6,12 @@ from contextlib import nullcontext as NullContext
 from dask.diagnostics import ProgressBar
 from typing import List, Callable, Any, Union
 
-from fmtr.tools.config_tools import ConfigClass
 from fmtr.tools.iterator_tools import dict_records_to_lists
 from fmtr.tools.logging_tools import logger
 from fmtr.tools.path_tools import Path
 
 
-class ParallelConfig(ConfigClass):
+class ParallelConfig:
     """
 
     Configuration values.

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr/tools/path_tools.py

@@ -1,11 +1,10 @@
 import re
 import subprocess
-from inspect import stack
 from pathlib import Path
 from tempfile import gettempdir
 from typing import Union, Any
 
-from fmtr.tools.config import ToolsConfig
+from fmtr.tools.constants import Constants
 from fmtr.tools.platform_tools import is_wsl
 
 WIN_PATH_PATTERN = r'''([a-z]:(\\|$)|\\\\)'''
@@ -72,8 +71,8 @@ class Path(type(Path())):
         Get path to originating module (e.g. directory containing .py file).
 
         """
-        frame_called = stack()[1]
-        path = cls(frame_called.filename).absolute().parent
+        from fmtr.tools.inspection_tools import get_call_path
+        path = get_call_path(offset=2).absolute().parent
         return path
 
     @classmethod
@@ -83,8 +82,8 @@ class Path(type(Path())):
         Get path to originating module (i.e. .py file).
 
         """
-        frame_called = stack()[1]
-        path = cls(frame_called.filename).absolute()
+        from fmtr.tools.inspection_tools import get_call_path
+        path = get_call_path(offset=2).absolute()
         return path
 
     @classmethod
@@ -96,29 +95,6 @@ class Path(type(Path())):
         """
         return cls(gettempdir())
 
-    @classmethod
-    def data(cls, name='data') -> 'Path':
-        """
-
-        Fetch canonical "data"/"artifacts" path, whether calling package is regular or namespace package.
-
-        """
-        from fmtr.tools.inspection_tools import get_call_path
-        path = get_call_path()
-        path = path.absolute().parent.parent
-
-        path /= name
-
-        if path.exists():
-            return path
-
-        path = path.parent.parent / name
-
-        if path.exists():
-            return path
-
-        raise FileNotFoundError(f'No "{name}" directory found at "{path}"')
-
     def write_json(self, obj) -> int:
         """
 
@@ -127,7 +103,7 @@ class Path(type(Path())):
         """
         from fmtr.tools import json
         json_str = json.to_json(obj)
-        return self.write_text(json_str, encoding=ToolsConfig.ENCODING)
+        return self.write_text(json_str, encoding=Constants.ENCODING)
 
     def read_json(self) -> Any:
         """
@@ -136,7 +112,7 @@ class Path(type(Path())):
 
         """
         from fmtr.tools import json
-        json_str = self.read_text(encoding=ToolsConfig.ENCODING)
+        json_str = self.read_text(encoding=Constants.ENCODING)
         obj = json.from_json(json_str)
         return obj
 
@@ -148,7 +124,7 @@ class Path(type(Path())):
         """
         from fmtr.tools import yaml
         yaml_str = yaml.to_yaml(obj)
-        return self.write_text(yaml_str, encoding=ToolsConfig.ENCODING)
+        return self.write_text(yaml_str, encoding=Constants.ENCODING)
 
     def read_yaml(self) -> Any:
         """
@@ -157,7 +133,7 @@ class Path(type(Path())):
 
         """
         from fmtr.tools import yaml
-        yaml_str = self.read_text(encoding=ToolsConfig.ENCODING)
+        yaml_str = self.read_text(encoding=Constants.ENCODING)
         obj = yaml.from_yaml(yaml_str)
         return obj
 
@@ -170,3 +146,107 @@ class Path(type(Path())):
         return self.mkdir(parents=True, exist_ok=True)
 
 
+class PackagePaths:
+    """
+
+    Canonical paths for a package.
+
+    """
+
+    FILENAME_CONFIG = 'settings.yaml'
+    DIR_NAME_ARTIFACTS = 'artifacts'
+    FILENAME_VERSION = 'version'
+
+    def __init__(self, path=None, org_singleton=None, dir_name_artifacts=DIR_NAME_ARTIFACTS, filename_config=FILENAME_CONFIG, file_version=FILENAME_VERSION):
+
+        """
+
+        Use calling module path as default path, if not otherwise specified.
+
+        """
+        if not path:
+            from fmtr.tools.inspection_tools import get_call_path
+            path = get_call_path(offset=2).parent
+
+        self.path = Path(path)
+        self.org_singleton = org_singleton
+        self.dir_name_artifacts = dir_name_artifacts
+        self.filename_config = filename_config
+        self.filename_version = file_version
+
+    @property
+    def is_namespace(self) -> bool:
+        """
+
+        If organization is not hard-specified, then the package is a namespace.
+
+        """
+        return not bool(self.org_singleton)
+
+    @property
+    def name(self) -> str:
+        """
+
+        Name of package.
+
+        """
+        return self.path.stem
+
+    @property
+    def org(self) -> str:
+        """
+
+        Name of organization.
+
+        """
+        if not self.is_namespace:
+            return self.org_singleton
+        else:
+            return self.path.parent.stem
+
+    @property
+    def repo(self) -> Path:
+        """
+
+        Path of repo (i.e. parent of package base directory).
+
+        """
+        if self.is_namespace:
+            return self.path.parent.parent
+        else:
+            return self.path.parent
+
+    @property
+    def version(self) -> Path:
+        """
+
+        Path of version file.
+
+        """
+        return self.path / self.filename_version
+
+    @property
+    def artifacts(self) -> Path:
+        """
+
+        Path of artifacts directory.
+
+        """
+        return self.repo / self.dir_name_artifacts
+
+    @property
+    def settings(self) -> Path:
+        """
+
+        Path of settings file.
+
+        """
+        return self.artifacts / self.filename_config
+
+    def __repr__(self) -> str:
+        """
+
+        Show base path in repr.
+
+        """
+        return f'{self.__class__.__name__}("{self.path}")'

fmtr_tools-1.1.0/fmtr/tools/settings_tools.py

@@ -0,0 +1,65 @@
+from pydantic_settings import BaseSettings, PydanticBaseSettingsSource, YamlConfigSettingsSource, EnvSettingsSource, CliSettingsSource
+from typing import ClassVar
+
+from fmtr.tools.path_tools import PackagePaths
+
+
+class Base(BaseSettings):
+    """
+
+    Base class for settings configuration using Pydantic BaseSettings.
+    Provides functionality for setting up and customizing sources for retrieving configuration values.
+    Defines sources for configuration through environment variables, CLI arguments, YAML files.
+
+    """
+
+    paths: ClassVar = PackagePaths()
+
+    @classmethod
+    def settings_customise_sources(
+            cls,
+            settings_cls: type[BaseSettings],
+            init_settings: PydanticBaseSettingsSource,
+            env_settings: PydanticBaseSettingsSource,
+            dotenv_settings: PydanticBaseSettingsSource,
+            file_secret_settings: PydanticBaseSettingsSource,
+    ) -> tuple[PydanticBaseSettingsSource, ...]:
+        """
+
+        Define priority and additional sources. Note: the earlier items have higher priority.
+
+        """
+
+        sources = (
+            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),
+        )
+
+        return sources
+
+    @classmethod
+    def get_env_prefix(cls):
+        """
+
+        Get environment variable prefix, which depends on whether the package is a namespace/singleton.
+
+        """
+        if cls.paths.is_namespace:
+            stem = f'{cls.paths.org}_{cls.paths.name}'
+        else:
+            stem = f'{cls.paths.name}'
+
+        prefix = f'{stem}_'.upper()
+        return prefix
+
+    @property
+    def version(self):
+        """
+
+        Read in version file.
+
+        """
+        from fmtr.tools import version
+        return version.read_path(self.paths.version)

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr/tools/tokenization_tools.py

@@ -8,11 +8,10 @@ from tokenizers.trainers import BpeTrainer
 from tokenizers.trainers import WordLevelTrainer
 from typing import List
 
-from fmtr.tools.config_tools import ConfigClass
 from fmtr.tools.path_tools import Path
 
 
-class TokenConfig(ConfigClass):
+class TokenConfig:
     """
 
     Default config for special characters etc.

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr/tools/tools.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from fmtr.tools.config import ToolsConfig
+from fmtr.tools.constants import Constants
 
 
 class MissingExtraError(ImportError):
@@ -13,7 +13,7 @@ class MissingExtraError(ImportError):
     MASK = 'The current module is missing dependencies. To install them, run: `pip install {library}[{extra}] --upgrade`'
 
     def __init__(self, extra):
-        self.message = self.MASK.format(library=ToolsConfig.LIBRARY_NAME, extra=extra)
+        self.message = self.MASK.format(library=Constants.LIBRARY_NAME, extra=extra)
 
         super().__init__(self.message)
 

fmtr_tools-1.1.0/fmtr/tools/version

@@ -0,0 +1 @@
+1.1.0

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr/tools/version_tools.py

@@ -7,6 +7,8 @@ try:
     semver = semver
     parse = semver.VersionInfo.parse
 except ImportError as exception:
+    # Special case to allow module import.
+    # Should be slit out into separate version.dev subpackage
     parse = MissingExtraMockModule('version', exception)
     semver = MissingExtraMockModule('version', exception)
 
@@ -18,20 +20,27 @@ def read() -> str:
 
     """
 
-    from fmtr.tools.tools import ToolsConfig
-
     path = get_call_path(offset=2).parent / 'version'
-    text = path.read_text(encoding=ToolsConfig.ENCODING).strip()
+    return read_path(path)
 
-    text = get(text)
 
+def read_path(path) -> str:
+    """
+
+    Read in version from specified path
+
+    """
+    from fmtr.tools.tools import Constants
+    text = path.read_text(encoding=Constants.ENCODING).strip()
+
+    text = get(text)
     return text
 
 
 def get(text) -> str:
     """
 
-    Optionally add dev build info.
+    Optionally add dev build info to raw version string.
 
     """
     import os
@@ -41,9 +50,9 @@ def get(text) -> str:
 
     if is_dev:
         import datetime
-        from fmtr.tools.tools import ToolsConfig
+        from fmtr.tools.tools import Constants
 
-        timestamp = datetime.datetime.now(datetime.timezone.utc).strftime(ToolsConfig.DATETIME_SEMVER_BUILD_FORMAT)
+        timestamp = datetime.datetime.now(datetime.timezone.utc).strftime(Constants.DATETIME_SEMVER_BUILD_FORMAT)
 
         version = parse(text)
         version = version.bump_patch()

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr.tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.0.55
+Version: 1.1.0
 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,49 +9,50 @@ License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: test
-Requires-Dist: distributed; extra == "test"
-Requires-Dist: ollama; extra == "test"
+Requires-Dist: flet-webview; extra == "test"
+Requires-Dist: uvicorn; extra == "test"
+Requires-Dist: pymupdf4llm; extra == "test"
+Requires-Dist: pyyaml; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: logfire; extra == "test"
 Requires-Dist: google-auth-httplib2; extra == "test"
-Requires-Dist: semver; extra == "test"
-Requires-Dist: pyyaml; extra == "test"
 Requires-Dist: tinynetrc; extra == "test"
-Requires-Dist: dask[bag]; extra == "test"
-Requires-Dist: peft; extra == "test"
-Requires-Dist: openpyxl; extra == "test"
-Requires-Dist: google-auth-oauthlib; extra == "test"
-Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: sre_yield; extra == "test"
 Requires-Dist: bokeh; extra == "test"
-Requires-Dist: Unidecode; extra == "test"
+Requires-Dist: html2text; extra == "test"
+Requires-Dist: sentence_transformers; extra == "test"
 Requires-Dist: docker; extra == "test"
-Requires-Dist: deepmerge; extra == "test"
-Requires-Dist: json_repair; extra == "test"
+Requires-Dist: peft; extra == "test"
+Requires-Dist: google-auth; extra == "test"
 Requires-Dist: fastapi; extra == "test"
-Requires-Dist: transformers[sentencepiece]; extra == "test"
-Requires-Dist: pydevd-pycharm; extra == "test"
-Requires-Dist: tokenizers; extra == "test"
-Requires-Dist: diskcache; extra == "test"
-Requires-Dist: logfire; extra == "test"
-Requires-Dist: contexttimer; extra == "test"
-Requires-Dist: flet-video; extra == "test"
+Requires-Dist: pydantic; extra == "test"
+Requires-Dist: pydantic-settings; extra == "test"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
 Requires-Dist: torchvision; extra == "test"
 Requires-Dist: google-api-python-client; extra == "test"
-Requires-Dist: google-auth; extra == "test"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
-Requires-Dist: flet[all]; extra == "test"
-Requires-Dist: uvicorn; extra == "test"
-Requires-Dist: pydantic; extra == "test"
+Requires-Dist: distributed; extra == "test"
+Requires-Dist: openpyxl; extra == "test"
+Requires-Dist: contexttimer; extra == "test"
+Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: dask[bag]; extra == "test"
 Requires-Dist: tabulate; extra == "test"
-Requires-Dist: pymupdf4llm; extra == "test"
-Requires-Dist: openai; extra == "test"
+Requires-Dist: tokenizers; extra == "test"
+Requires-Dist: ollama; extra == "test"
 Requires-Dist: pandas; extra == "test"
+Requires-Dist: flet-video; extra == "test"
+Requires-Dist: flet[all]; extra == "test"
+Requires-Dist: transformers[sentencepiece]; extra == "test"
+Requires-Dist: semver; extra == "test"
+Requires-Dist: openai; extra == "test"
+Requires-Dist: google-auth-oauthlib; extra == "test"
+Requires-Dist: pydevd-pycharm; extra == "test"
 Requires-Dist: faker; extra == "test"
 Requires-Dist: pymupdf; extra == "test"
-Requires-Dist: sre_yield; extra == "test"
-Requires-Dist: flet-webview; extra == "test"
-Requires-Dist: sentence_transformers; extra == "test"
+Requires-Dist: deepmerge; extra == "test"
+Requires-Dist: diskcache; extra == "test"
+Requires-Dist: json_repair; extra == "test"
+Requires-Dist: Unidecode; extra == "test"
 Requires-Dist: torchaudio; extra == "test"
-Requires-Dist: html2text; extra == "test"
 Provides-Extra: yaml
 Requires-Dist: pyyaml; extra == "yaml"
 Provides-Extra: logging
@@ -143,6 +144,9 @@ Requires-Dist: pydantic; extra == "pdf"
 Requires-Dist: pymupdf4llm; extra == "pdf"
 Provides-Extra: debug
 Requires-Dist: pydevd-pycharm; extra == "debug"
+Provides-Extra: sets
+Requires-Dist: pydantic-settings; extra == "sets"
+Requires-Dist: pydantic; extra == "sets"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
@@ -239,6 +243,10 @@ The included modules, plus any extra requirements, are as follows:
   - Extras: `ai`
 - `tools.config`: Base config class with overridable field processors.
     - Extras: None
+-
+`tools.settings`: A base configuration system built on Pydantic Settings that provides a flexible way to manage application settings from multiple sources, based on a standard
+`path.PackagePaths` project layout.
+  - Extras: `sets`
 - `tools.dataclass`: Utilities for extracting and filtering fields and metadata from dataclasses, with support for applying filters and retrieving enabled fields based on metadata attributes.
     - Extras: None
 - `tools.datatype`
@@ -269,8 +277,12 @@ The included modules, plus any extra requirements, are as follows:
   - Extras: None
 - `tools.openai`: Utilities for interacting with the OpenAI API, simple text-to-text output, etc.
   - Extras: `openai.api`
-- `tools.Path`: Enhanced `pathlib.Path` object with additional functionality for Windows-to-Unix path conversion, reading/writing JSON and YAML files, and convenient directory creation with parent directories. Includes methods for obtaining paths to modules and temporary directories.
+- `tools.Path`: Enhanced
+  `pathlib.Path` object with additional functionality for Windows-to-Unix path conversion in WSL environments, reading/writing JSON and YAML files with proper encoding.
     - Extras: None
+-
+`tools.PackagePaths` class for managing canonical package paths, like settings files, artifact directories, version files.
+  - Extras: None
 - `tools.platform`: Detecting if host is WSL, Docker etc.
     - Extras: None
 - `tools.ContextProcess`: Manages a function running in a separate process using a context manager. Provides methods to start, stop, and restart the process, with configurable restart delays. Useful for ensuring clean process management and automatic stopping when the context manager exits.

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr.tools.egg-info/SOURCES.txt

@@ -6,9 +6,8 @@ setup.py
 ./fmtr/tools/async_tools.py
 ./fmtr/tools/augmentation_tools.py
 ./fmtr/tools/caching_tools.py
-./fmtr/tools/config.py
-./fmtr/tools/config_tools.py
 ./fmtr/tools/console_script_tools.py
+./fmtr/tools/constants.py
 ./fmtr/tools/data_modelling_tools.py
 ./fmtr/tools/dataclass_tools.py
 ./fmtr/tools/datatype_tools.py
@@ -40,6 +39,7 @@ setup.py
 ./fmtr/tools/profiling_tools.py
 ./fmtr/tools/random_tools.py
 ./fmtr/tools/semantic_tools.py
+./fmtr/tools/settings_tools.py
 ./fmtr/tools/spaces_tools.py
 ./fmtr/tools/string_tools.py
 ./fmtr/tools/tabular_tools.py

{fmtr_tools-1.0.55 → fmtr_tools-1.1.0}/fmtr.tools.egg-info/requires.txt

@@ -99,6 +99,10 @@ pandas
 tabulate
 openpyxl
 
+[sets]
+pydantic-settings
+pydantic
+
 [spaces]
 tinynetrc
 
@@ -108,49 +112,50 @@ tabulate
 openpyxl
 
 [test]
-distributed
-ollama
+flet-webview
+uvicorn
+pymupdf4llm
+pyyaml
 pytest-cov
+logfire
 google-auth-httplib2
-semver
-pyyaml
 tinynetrc
-dask[bag]
-peft
-openpyxl
-google-auth-oauthlib
-huggingface_hub
+sre_yield
 bokeh
-Unidecode
+html2text
+sentence_transformers
 docker
-deepmerge
-json_repair
+peft
+google-auth
 fastapi
-transformers[sentencepiece]
-pydevd-pycharm
-tokenizers
-diskcache
-logfire
-contexttimer
-flet-video
+pydantic
+pydantic-settings
+pydantic-ai[logfire,openai]
 torchvision
 google-api-python-client
-google-auth
-pydantic-ai[logfire,openai]
-flet[all]
-uvicorn
-pydantic
+distributed
+openpyxl
+contexttimer
+huggingface_hub
+dask[bag]
 tabulate
-pymupdf4llm
-openai
+tokenizers
+ollama
 pandas
+flet-video
+flet[all]
+transformers[sentencepiece]
+semver
+openai
+google-auth-oauthlib
+pydevd-pycharm
 faker
 pymupdf
-sre_yield
-flet-webview
-sentence_transformers
+deepmerge
+diskcache
+json_repair
+Unidecode
 torchaudio
-html2text
 
 [tokenization]
 tokenizers

fmtr_tools-1.0.55/fmtr/tools/config_tools.py

@@ -1,54 +0,0 @@
-"""
-
-Config tools for downstream projects
-
-"""
-from dataclasses import dataclass, fields, Field as DataclassField
-
-from typing import List, Type
-
-
-class ConfigClass:
-    """
-
-    Base class for all config classes.
-
-    """
-
-    @classmethod
-    def process_field(cls, field):
-        """
-
-        Post-process field
-
-        """
-
-    @classmethod
-    def process_fields(cls):
-        """
-
-        Post-process fields
-
-        """
-        for field in cls.get_fields():
-            cls.process_field(field)
-
-    @classmethod
-    def get_fields(cls) -> List[DataclassField]:
-        """
-
-        Return fields
-
-        """
-        return fields(cls)
-
-    def __init_subclass__(cls, **kwargs):
-        """
-
-        Decorate subclasses as dataclasses
-
-        """
-        return dataclass(cls)
-
-
-Field = Type

fmtr_tools-1.0.55/fmtr/tools/version

@@ -1 +0,0 @@
-1.0.55