python-simpleconf 0.7.1__tar.gz → 0.7.2__tar.gz

{python_simpleconf-0.7.1 → python_simpleconf-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-simpleconf
-Version: 0.7.1
+Version: 0.7.2
 Summary: Simple configuration management with python.
 License: MIT
 Author: pwwang
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: all
+Provides-Extra: cloud
 Provides-Extra: env
 Provides-Extra: ini
 Provides-Extra: toml
@@ -24,6 +25,7 @@ Requires-Dist: python-dotenv (>=1.1,<2.0) ; extra == "env" or extra == "all"
 Requires-Dist: pyyaml (>=6,<7) ; extra == "yaml" or extra == "all"
 Requires-Dist: rtoml (>=0.12,<0.13) ; (sys_platform == "linux") and (extra == "toml" or extra == "all")
 Requires-Dist: tomli (>=2.0,<3.0) ; (sys_platform != "linux") and (extra == "toml" or extra == "all")
+Requires-Dist: yunpath (>=0.0.4,<0.0.5) ; extra == "cloud"
 Project-URL: Homepage, https://github.com/pwwang/simpleconf
 Project-URL: Repository, https://github.com/pwwang/simpleconf
 Description-Content-Type: text/markdown

{python_simpleconf-0.7.1 → python_simpleconf-0.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "python-simpleconf"
-version = "0.7.1"
+version = "0.7.2"
 description = "Simple configuration management with python."
 authors = [ "pwwang <pwwang@pwwang.com>",]
 license = "MIT"
@@ -24,6 +24,7 @@ pyyaml = { version="^6", optional = true}
 rtoml = {version = "^0.12", optional = true, platform = "linux"}
 tomli = {version = "^2.0", optional = true, markers = 'sys_platform != "linux"'}
 iniconfig = {version = "^2.0", optional = true}
+yunpath = {version = "^0.0.4", optional = true}
 
 [tool.poetry.extras]
 ini = [ "iniconfig" ]
@@ -31,6 +32,7 @@ env = [ "python-dotenv"]
 yaml = [ "pyyaml"]
 toml = [ "rtoml", "tomli"]
 all = [ "iniconfig", "python-dotenv", "pyyaml", "rtoml", "tomli"]
+cloud = [ "yunpath"]
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8"

{python_simpleconf-0.7.1 → python_simpleconf-0.7.2}/simpleconf/__init__.py

@@ -1,3 +1,3 @@
 from .config import Config, ProfileConfig
 
-__version__ = "0.7.1"
+__version__ = "0.7.2"

{python_simpleconf-0.7.1 → python_simpleconf-0.7.2}/simpleconf/config.py

@@ -142,7 +142,7 @@ class ProfileConfig:
             raise ValueError(f"Base profile '{base}' not found")
 
         if base and base in pool:
-            ProfileConfig.use_profile(out, base, base=base)
+            out = ProfileConfig.use_profile(out, base, base=base)
 
         return out
 
@@ -193,7 +193,7 @@ class ProfileConfig:
             raise ValueError(f"Base profile '{base}' not found")
 
         if base and base in pool:
-            ProfileConfig.use_profile(out, base, base=base)
+            out = ProfileConfig.use_profile(out, base, base=base)
 
         return out
 

{python_simpleconf-0.7.1 → python_simpleconf-0.7.2}/simpleconf/loaders/__init__.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from os import PathLike
-from pathlib import Path
 from typing import Any, Callable, List, Dict
+from pathlib import Path
 
 from diot import Diot
 from ..caster import cast
@@ -13,13 +12,25 @@ class Loader(ABC):
 
     CASTERS: List[Callable[[str, bool], Any]] | None = None
 
+    @staticmethod
+    def _convert_path(conf: str | Path) -> Path:
+        """Convert the conf to Path if it is a string"""
+        try:
+            from yunpath import AnyPath
+        except ImportError:
+            AnyPath = Path
+
+        if isinstance(conf, str):
+            return AnyPath(conf)
+        return conf
+
     @abstractmethod
     def loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:
         """Load the configuration from the path or configurations"""
 
-    def _exists(self, conf: PathLike, ignore_exist: bool) -> bool:
+    def _exists(self, conf: str | Path, ignore_exist: bool) -> bool:
         """Check if the configuration file exists"""
-        path = Path(conf)
+        path = self.__class__._convert_path(conf)
         if not ignore_exist and not path.exists():
             raise FileNotFoundError(f"{conf} does not exist")
         return path.exists()
@@ -34,10 +45,19 @@ class Loader(ABC):
         Returns:
             The Diot object
         """
-        loaded = self.loading(conf, ignore_nonexist)
+        path = self.__class__._convert_path(conf)
+        loaded = self.loading(path, ignore_nonexist)
         if self.__class__.CASTERS:
             loaded = cast(loaded, self.__class__.CASTERS)
 
         return Diot(loaded)
 
     load_with_profiles = load
+
+
+class NoConvertingPathMixin(ABC):
+    """String loader base class"""
+
+    @staticmethod
+    def _convert_path(conf: str) -> str:
+        return conf

{python_simpleconf-0.7.1 → python_simpleconf-0.7.2}/simpleconf/loaders/dict.py

@@ -1,17 +1,21 @@
 from typing import Any, Dict
 
-from . import Loader
+from . import Loader, NoConvertingPathMixin
 
 
 class DictLoader(Loader):
     """Dict loader"""
 
+    @staticmethod
+    def _convert_path(conf):
+        return conf
+
     def loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:
         """Load the configuration from a dict"""
         return conf
 
 
-class DictsLoader(DictLoader):
+class DictsLoader(NoConvertingPathMixin, DictLoader):
     """Dict string loader"""
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:

{python_simpleconf-0.7.1 → python_simpleconf-0.7.2}/simpleconf/loaders/env.py

@@ -16,7 +16,7 @@ from ..caster import (
     json_caster,
     toml_caster,
 )
-from . import Loader
+from . import Loader, NoConvertingPathMixin
 
 dotenv = require_package("dotenv")
 
@@ -67,7 +67,7 @@ class EnvLoader(Loader):
         return cast(out, self.__class__.CASTERS)
 
 
-class EnvsLoader(EnvLoader):
+class EnvsLoader(NoConvertingPathMixin, EnvLoader):
     """Env string loader"""
 
     def loading(self, conf: Any, ignore_nonexist: bool = False) -> Dict[str, Any]:

{python_simpleconf-0.7.1 → python_simpleconf-0.7.2}/simpleconf/loaders/ini.py

@@ -17,7 +17,7 @@ from ..caster import (
     json_caster,
     toml_caster,
 )
-from . import Loader
+from . import Loader, NoConvertingPathMixin
 
 iniconfig = require_package("iniconfig")
 
@@ -85,7 +85,7 @@ class IniLoader(Loader):
         return out
 
 
-class InisLoader(IniLoader):
+class InisLoader(NoConvertingPathMixin, IniLoader):
     """Ini-like string loader"""
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:

{python_simpleconf-0.7.1 → python_simpleconf-0.7.2}/simpleconf/loaders/json.py

@@ -1,7 +1,7 @@
 import json
 from typing import Any, Dict
 
-from . import Loader
+from . import Loader, NoConvertingPathMixin
 
 
 class JsonLoader(Loader):
@@ -20,7 +20,7 @@ class JsonLoader(Loader):
             return json.load(f)
 
 
-class JsonsLoader(JsonLoader):
+class JsonsLoader(NoConvertingPathMixin, JsonLoader):
     """Json string loader"""
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:

{python_simpleconf-0.7.1 → python_simpleconf-0.7.2}/simpleconf/loaders/osenv.py

@@ -4,7 +4,7 @@ import warnings
 
 from diot import Diot
 
-from . import Loader
+from . import Loader, NoConvertingPathMixin
 from ..caster import (
     cast,
     int_caster,
@@ -18,7 +18,7 @@ from ..caster import (
 )
 
 
-class OsenvLoader(Loader):
+class OsenvLoader(NoConvertingPathMixin, Loader):
     """Environment variable loader"""
 
     CASTERS = [

{python_simpleconf-0.7.1 → python_simpleconf-0.7.2}/simpleconf/loaders/toml.py

@@ -5,7 +5,7 @@ from ..caster import (
     none_caster,
     null_caster,
 )
-from . import Loader
+from . import Loader, NoConvertingPathMixin
 
 toml = require_package("rtoml", "tomllib", "tomli")
 
@@ -35,7 +35,7 @@ class TomlLoader(Loader):
             return toml.load(f)
 
 
-class TomlsLoader(TomlLoader):
+class TomlsLoader(NoConvertingPathMixin, TomlLoader):
     """Toml string loader"""
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]:

{python_simpleconf-0.7.1 → python_simpleconf-0.7.2}/simpleconf/loaders/yaml.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict
 
-from . import Loader
+from . import Loader, NoConvertingPathMixin
 from ..utils import require_package
 
 yaml = require_package("yaml")
@@ -22,7 +22,7 @@ class YamlLoader(Loader):
             return yaml.load(f, Loader=yaml.FullLoader)
 
 
-class YamlsLoader(YamlLoader):
+class YamlsLoader(NoConvertingPathMixin, YamlLoader):
     """Yaml string loader"""
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Dict[str, Any]: