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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-simpleconf
-Version: 0.7.0
+Version: 0.7.1
 Summary: Simple configuration management with python.
 License: MIT
 Author: pwwang
@@ -18,9 +18,9 @@ Provides-Extra: env
 Provides-Extra: ini
 Provides-Extra: toml
 Provides-Extra: yaml
-Requires-Dist: diot (>=0.3.1,<0.4.0)
+Requires-Dist: diot (>=0.3.2,<0.4.0)
 Requires-Dist: iniconfig (>=2.0,<3.0) ; extra == "ini" or extra == "all"
-Requires-Dist: python-dotenv (>=1.0,<2.0) ; extra == "env" or extra == "all"
+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")

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

@@ -1,10 +1,10 @@
 [build-system]
-requires = [ "poetry>=0.12",]
+requires = [ "poetry>=2",]
 build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "python-simpleconf"
-version = "0.7.0"
+version = "0.7.1"
 description = "Simple configuration management with python."
 authors = [ "pwwang <pwwang@pwwang.com>",]
 license = "MIT"
@@ -17,8 +17,8 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.9"
-diot = "^0.3.1"
-python-dotenv = { version="^1.0", optional = true}
+diot = "^0.3.2"
+python-dotenv = { version="^1.1", optional = true}
 pyyaml = { version="^6", optional = true}
 # Use rtoml only when the wheel is available (linux)
 rtoml = {version = "^0.12", optional = true, platform = "linux"}
@@ -32,7 +32,7 @@ yaml = [ "pyyaml"]
 toml = [ "rtoml", "tomli"]
 all = [ "iniconfig", "python-dotenv", "pyyaml", "rtoml", "tomli"]
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 pytest = "^8"
 pytest-cov = "^6"
 

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

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

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

@@ -87,6 +87,8 @@ class ProfileConfig:
         *configs: Any,
         loader: LoaderType | Sequence[LoaderType] = None,
         ignore_nonexist: bool = False,
+        base: str = "default",
+        allow_missing_base: bool = False,
     ) -> Diot:
         """Load the configuration from the files, or other configurations
 
@@ -98,6 +100,10 @@ class ProfileConfig:
                 same length as configs.
             ignore_nonexist: Whether to ignore non-existent files
                 Otherwise, will raise errors
+            base: The default profile to use after loading
+            allow_missing_base: Whether to allow missing base profile
+                If False, will raise errors when the base profile is not found
+                in the loaded profiles.
         """
         if not isinstance(loader, Sequence) or isinstance(loader, str):
             loader = [loader] * len(configs)
@@ -132,7 +138,12 @@ class ProfileConfig:
                 pool.setdefault(profile, Diot())
                 pool[profile].update_recursively(value)
 
-        ProfileConfig.use_profile(out, "default")
+        if base and base not in pool and not allow_missing_base:
+            raise ValueError(f"Base profile '{base}' not found")
+
+        if base and base in pool:
+            ProfileConfig.use_profile(out, base, base=base)
+
         return out
 
     @staticmethod
@@ -140,6 +151,8 @@ class ProfileConfig:
         conf: Any,
         loader: str | Loader | None = None,
         ignore_nonexist: bool = False,
+        base: str = "default",
+        allow_missing_base: bool = False,
     ) -> Diot:
         """Load the configuration from the file
 
@@ -148,6 +161,7 @@ class ProfileConfig:
             loader: The loader to use. Will detect from conf by default
             ignore_nonexist: Whether to ignore non-existent files
                 Otherwise, will raise errors
+            base: The default profile to use after loading
 
         Returns:
             A Diot object with the loaded configuration
@@ -175,7 +189,12 @@ class ProfileConfig:
             pool.setdefault(profile, Diot())
             pool[profile].update_recursively(value)
 
-        ProfileConfig.use_profile(out, "default")
+        if base and base not in pool and not allow_missing_base:
+            raise ValueError(f"Base profile '{base}' not found")
+
+        if base and base in pool:
+            ProfileConfig.use_profile(out, base, base=base)
+
         return out
 
     @staticmethod
@@ -184,24 +203,35 @@ class ProfileConfig:
         profile: str,
         base: str = "default",
         copy: bool = False,
+        allow_missing_base: bool = False,
     ) -> Diot:
         """Switch the configuration to the given profile, based on the
-        default profile.
+        base profile.
 
         Args:
             conf: The configuration object by the `load` function
             profile: The profile to use
-            default: The default profile
+            base: The base profile.
+                If it does not exist, no base profile will be used.
+            copy: Whether to return a new configuration object
+                If False, the given configuration object will be updated
+                in-place.
+            allow_missing_base: Whether to allow missing base profile
+                If False, will raise errors when the base profile is not found
+                in the loaded profiles.
 
         Returns:
             The configuration object with the switched profile if copy is True
             Otherwise None (updated in-place)
         """
         pool = conf[POOL_KEY]
+        if base and base not in pool and not allow_missing_base:
+            raise ValueError(f"Base profile '{base}' not found")
+
         if copy:
             out = Diot({POOL_KEY: pool, META_KEY: conf[META_KEY].copy()})
-            if base is not None:
-                out.update_recursively(pool[base])
+            if base is not None and base != profile:
+                out.update_recursively(pool.get(base, {}))
             out[META_KEY]["current_profile"] = profile
             out[META_KEY]["base_profile"] = base
             out.update_recursively(pool[profile])
@@ -213,8 +243,8 @@ class ProfileConfig:
                 continue
             del conf[key]
 
-        if base is not None:
-            conf.update_recursively(pool[base])
+        if base is not None and base != profile:
+            conf.update_recursively(pool.get(base, {}))
         conf.update_recursively(pool[profile])
         conf[META_KEY]["current_profile"] = profile
         conf[META_KEY]["base_profile"] = base