python-simpleconf 0.6.1__tar.gz → 0.6.2__tar.gz

{python_simpleconf-0.6.1 → python_simpleconf-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-simpleconf
-Version: 0.6.1
+Version: 0.6.2
 Summary: Simple configuration management with python.
 License: MIT
 Author: pwwang

{python_simpleconf-0.6.1 → python_simpleconf-0.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "python-simpleconf"
-version = "0.6.1"
+version = "0.6.2"
 description = "Simple configuration management with python."
 authors = [ "pwwang <pwwang@pwwang.com>",]
 license = "MIT"

{python_simpleconf-0.6.1 → python_simpleconf-0.6.2}/simpleconf/__init__.py

@@ -1,3 +1,3 @@
 from .config import Config, ProfileConfig
 
-__version__ = "0.6.1"
+__version__ = "0.6.2"

{python_simpleconf-0.6.1 → python_simpleconf-0.6.2}/simpleconf/config.py

@@ -1,38 +1,51 @@
 from __future__ import annotations
 
 from contextlib import contextmanager
-from typing import TYPE_CHECKING, Any, List, Generator
+from typing import Any, List, Generator, Union, Sequence
 
 from diot import Diot
 
 from .utils import config_to_ext, get_loader, POOL_KEY, META_KEY
+from .loaders import Loader
 
-if TYPE_CHECKING:
-    from .loaders import Loader
+LoaderType = Union[str, Loader, None]
 
 
 class Config:
     """The configuration class"""
 
     @staticmethod
-    def load(*configs, ignore_nonexist: bool = False) -> Diot:
+    def load(
+        *configs: Any,
+        loader: LoaderType | Sequence[LoaderType] = None,
+        ignore_nonexist: bool = False,
+    ) -> Diot:
         """Load the configuration from the files, or other configurations
 
         Args:
             *configs: The configuration files or other configurations to load
                 Latter ones will override the former ones for items with the
                 same keys recursively.
+            loader: The loader to use. If a list is given, it must have the
+                same length as configs.
             ignore_nonexist: Whether to ignore non-existent files
                 Otherwise, will raise errors
 
         Returns:
             A Diot object with the loaded configurations
         """
+        if not isinstance(loader, Sequence) or isinstance(loader, str):
+            loader = [loader] * len(configs)
+
+        if len(loader) != len(configs):
+            raise ValueError(
+                f"Length of loader ({len(loader)}) does not match "
+                f"length of configs ({len(configs)})"
+            )
+
         out = Diot()
-        for conf in configs:
-            ext = config_to_ext(conf)
-            loader = get_loader(ext)
-            loaded = loader.load(conf, ignore_nonexist)
+        for i, conf in enumerate(configs):
+            loaded = Config.load_one(conf, loader[i], ignore_nonexist)
             out.update_recursively(loaded)
 
         return out
@@ -55,6 +68,9 @@ class Config:
             A Diot object with the loaded configuration
         """
         if loader is None:
+            if hasattr(config, "read"):
+                raise ValueError("'loader' must be specified for stream")
+
             ext = config_to_ext(config)
             loader = get_loader(ext)
         else:
@@ -67,26 +83,50 @@ class ProfileConfig:
     """The configuration class with profile support"""
 
     @staticmethod
-    def load(*configs: Any, ignore_nonexist: bool = False) -> Diot:
+    def load(
+        *configs: Any,
+        loader: LoaderType | Sequence[LoaderType] = None,
+        ignore_nonexist: bool = False,
+    ) -> Diot:
         """Load the configuration from the files, or other configurations
 
         Args:
             *configs: The configuration files or other configurations to load
                 Latter ones will override the former ones for items with the
                 same profile and keys recursively.
+            loader: The loader to use. If a list is given, it must have the
+                same length as configs.
             ignore_nonexist: Whether to ignore non-existent files
                 Otherwise, will raise errors
         """
+        if not isinstance(loader, Sequence) or isinstance(loader, str):
+            loader = [loader] * len(configs)
+
+        if len(loader) != len(configs):
+            raise ValueError(
+                f"Length of loader ({len(loader)}) does not match "
+                f"length of configs ({len(configs)})"
+            )
+
         out = Diot({POOL_KEY: Diot()})
         pool = out[POOL_KEY]
         out[META_KEY] = {
             "current_profile": None,
             "base_profile": None,
         }
-        for conf in configs:
-            ext = config_to_ext(conf)
-            loader = get_loader(ext)
-            loaded = loader.load_with_profiles(conf, ignore_nonexist)
+        for i, conf in enumerate(configs):
+            lder = loader[i]
+
+            if lder is None and hasattr(conf, "read"):
+                raise ValueError("'loader' must be specified for stream")
+
+            if lder is None:
+                ext = config_to_ext(conf)
+                lder = get_loader(ext)
+            else:
+                lder = get_loader(lder)
+
+            loaded = lder.load_with_profiles(conf, ignore_nonexist)
             for profile, value in loaded.items():
                 profile = profile.lower()
                 pool.setdefault(profile, Diot())
@@ -121,6 +161,9 @@ class ProfileConfig:
         }
 
         if loader is None:
+            if hasattr(conf, "read"):
+                raise ValueError("'loader' must be specified for stream")
+
             ext = config_to_ext(conf)
             loader = get_loader(ext)
         else:

{python_simpleconf-0.6.1 → python_simpleconf-0.6.2}/simpleconf/loaders/env.py

@@ -1,4 +1,5 @@
 import warnings
+import io
 from pathlib import Path
 from typing import Any
 from simpleconf.utils import require_package
@@ -36,8 +37,13 @@ class EnvLoader(Loader):
 
     def loading(self, conf: Any, ignore_nonexist: bool = False) -> Diot:
         """Load the configuration from a .env file"""
+        if hasattr(conf, "read"):
+            content = conf.read()
+            return Diot(dotenv.dotenv_values(stream=io.StringIO(content)))
+
         if not self._exists(conf, ignore_nonexist):
             return Diot()
+
         return Diot(dotenv.main.DotEnv(conf).dict())
 
     def load_with_profiles(  # type: ignore[override]

{python_simpleconf-0.6.1 → python_simpleconf-0.6.2}/simpleconf/loaders/ini.py

@@ -38,24 +38,36 @@ class IniLoader(Loader):
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Diot:
         """Load the configuration from an ini-like file"""
+        if hasattr(conf, "read"):
+            content = conf.read()
+            return iniconfig.IniConfig("<config>", content).sections
+
         if not self._exists(conf, ignore_nonexist):
             return Diot(default={})
+
         return iniconfig.IniConfig(conf).sections
 
     def load(self, conf: Any, ignore_nonexist: bool = False) -> Diot:
         """Load and cast the configuration from an ini-like file"""
         sections = self.loading(conf, ignore_nonexist)
         keys = list(sections)
+
+        if hasattr(conf, "read"):
+            pathname = "<config>"
+        else:
+            pathname = Path(conf).name
+
         # only load the default section
         if len(keys) > 1:
             warnings.warn(
-                f"{Path(conf).name}: More than one section found, "
-                "only the default section will be loaded."
+                f"{pathname}: More than one section found, "
+                "only the default section will be loaded. "
+                "Use ProfileConfig.load() if you want to sections as profiles."
             )
 
         if len(keys) == 0 or keys[0].lower() != "default":
             raise ValueError(
-                f"{Path(conf).name}: Only the default section can be loaded."
+                f"{pathname}: Only the default section can be loaded."
             )
 
         return cast(Diot(sections[keys[0]]), self.__class__.CASTERS)

{python_simpleconf-0.6.1 → python_simpleconf-0.6.2}/simpleconf/loaders/json.py

@@ -11,6 +11,10 @@ class JsonLoader(Loader):
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Diot:
         """Load the configuration from a json file"""
+        if hasattr(conf, "read"):
+            content = conf.read()
+            return Diot(json.loads(content))
+
         if not self._exists(conf, ignore_nonexist):
             return Diot()
         with open(conf) as f:

{python_simpleconf-0.6.1 → python_simpleconf-0.6.2}/simpleconf/loaders/toml.py

@@ -21,6 +21,10 @@ class TomlLoader(Loader):
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Diot:
         """Load the configuration from a toml file"""
+        if hasattr(conf, "read"):
+            content = conf.read()
+            return Diot(toml.loads(content))
+
         if not self._exists(conf, ignore_nonexist):
             return Diot()
 

{python_simpleconf-0.6.1 → python_simpleconf-0.6.2}/simpleconf/loaders/yaml.py

@@ -12,6 +12,10 @@ class YamlLoader(Loader):
 
     def loading(self, conf: Any, ignore_nonexist: bool) -> Diot:
         """Load the configuration from a yaml file"""
+        if hasattr(conf, "read"):
+            content = conf.read()
+            return Diot(yaml.load(content, Loader=yaml.FullLoader))
+
         if not self._exists(conf, ignore_nonexist):
             return Diot()