dataconf 3.6.0__tar.gz → 3.7.1__tar.gz

{dataconf-3.6.0 → dataconf-3.7.1}/PKG-INFO

@@ -1,24 +1,26 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dataconf
-Version: 3.6.0
+Version: 3.7.1
 Summary: Simple dataclasses configuration management for Python with hocon/json/yaml/properties/env-vars/dict support.
-Home-page: https://github.com/zifeo/dataconf
 License: MPL-2.0
+License-File: LICENSE
 Keywords: configuration,dataclasses,yaml,hocon,json,properties,cli,environment variables
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: License :: OSI Approved
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: PyYAML (>=6.0.2,<7.0.0)
 Requires-Dist: isodate (>=0.7.2,<0.8.0)
 Requires-Dist: pyhocon (>=0.3.61,<0.4.0)
 Requires-Dist: pyparsing (>=3.2.3,<4.0.0)
-Requires-Dist: python-dateutil (>=2.9.0.post0,<3.0.0)
+Requires-Dist: python-dateutil (>=3.0.0,<4.0.0)
 Project-URL: Repository, https://github.com/zifeo/dataconf
 Description-Content-Type: text/markdown
 
@@ -32,7 +34,7 @@ hocon/json/yaml/properties/env-vars/dict/cli support.
 
 ## Getting started
 
-Requires at least Python 3.9.
+Requires at least Python 3.10.
 
 ```bash
 # pypi

{dataconf-3.6.0 → dataconf-3.7.1}/README.md

@@ -8,7 +8,7 @@ hocon/json/yaml/properties/env-vars/dict/cli support.
 
 ## Getting started
 
-Requires at least Python 3.9.
+Requires at least Python 3.10.
 
 ```bash
 # pypi

{dataconf-3.6.0 → dataconf-3.7.1}/dataconf/exceptions.py

@@ -1,46 +1,30 @@
 class TypeConfigException(Exception):
     """Type mismatch exception."""
 
-    pass
-
 
 class MissingTypeException(Exception):
     """Missing type exception (e.g. List instead of List[int]."""
 
-    pass
-
 
 class AmbiguousSubclassException(Exception):
     """Multiple subclasses match the the given parameters. Use '_type' field to disambiguate"""
 
-    pass
-
 
 class MalformedConfigException(Exception):
     """Missing values exception."""
 
-    pass
-
 
 class UnexpectedKeysException(Exception):
     """Unexpected keys exception."""
 
-    pass
-
 
 class EnvListOrderException(Exception):
     """Ordering exception."""
 
-    pass
-
 
 class EnvListFormatException(Exception):
     """Format exception."""
 
-    pass
-
 
 class ParseException(Exception):
     """Parsing exception."""
-
-    pass

{dataconf-3.6.0 → dataconf-3.7.1}/dataconf/main.py

@@ -1,20 +1,18 @@
 import contextlib
 import os
-from typing import Any, Optional
-from typing import Dict
-from typing import List
-from typing import Type
+from typing import Any
 from urllib.parse import urlparse
 from urllib.request import urlopen
 
-from dataconf import utils
-from dataconf.exceptions import MalformedConfigException
+import pyparsing
 from pyhocon import ConfigFactory
 from pyhocon import HOCONConverter
 from pyhocon.config_parser import ConfigTree
-import pyparsing
 from yaml import safe_load
 
+from dataconf import utils
+from dataconf.exceptions import MalformedConfigException
+
 HOCON = 1
 YAML = 2
 
@@ -39,19 +37,20 @@ def cli_parse(*args, **kwargs):
 
 
 class Multi:
-    def __init__(self, confs: List[ConfigTree], strict: bool = True, **kwargs) -> None:
+    def __init__(self, confs: list[ConfigTree], strict: bool = True, **kwargs) -> None:
         self.confs = confs
         self.strict = strict
         self.kwargs = kwargs
 
     def env(self, prefix: str, **kwargs) -> "Multi":
-        self.strict = False
         data = env_vars_parse(prefix, os.environ)
-        return self.dict(data, **kwargs)
+        strict = kwargs.pop("strict", False)
+        return self.dict(data, strict=strict, **kwargs)
 
-    def dict(self, obj: Dict[str, Any], **kwargs) -> "Multi":
+    def dict(self, obj: dict[str, Any], **kwargs) -> "Multi":
         conf = ConfigFactory.from_dict(obj)
-        return Multi(self.confs + [conf], self.strict, **kwargs)
+        strict = kwargs.pop("strict", self.strict)
+        return Multi(self.confs + [conf], strict, **kwargs)
 
     def string(self, s: str, loader: str = HOCON, **kwargs) -> "Multi":
         if loader == YAML:
@@ -63,7 +62,7 @@ class Multi:
 
     def url(self, uri: str, timeout: int = 10, **kwargs) -> "Multi":
         path = urlparse(uri).path
-        if path.endswith(".yaml") or path.endswith(".yml"):
+        if path.endswith((".yaml", ".yml")):
             with contextlib.closing(urlopen(uri, timeout=timeout)) as fd:
                 s = fd.read().decode("utf-8")
             return self.string(s, loader=YAML, **kwargs)
@@ -74,16 +73,14 @@ class Multi:
     def file(
         self,
         path: str,
-        loader: Optional[str] = None,
+        loader: str | None = None,
         allow_missing: bool = False,
         **kwargs,
     ) -> "Multi":
         if allow_missing and not os.path.exists(path):
             return self.dict({}, **kwargs)
 
-        if loader == YAML or (
-            loader is None and (path.endswith(".yaml") or path.endswith(".yml"))
-        ):
+        if loader == YAML or (loader is None and path.endswith((".yaml", ".yml"))):
             with open(path, "r") as f:
                 data = safe_load(f)
             return self.dict(data, **kwargs)
@@ -91,11 +88,11 @@ class Multi:
         conf = ConfigFactory.parse_file(path)
         return Multi(self.confs + [conf], self.strict, **kwargs)
 
-    def cli(self, argv: List[str], **kwargs) -> "Multi":
+    def cli(self, argv: list[str], **kwargs) -> "Multi":
         data = cli_parse(argv)
         return self.dict(data, **kwargs)
 
-    def on(self, clazz: Type):
+    def on(self, clazz: type):
         conf, *nxts = self.confs
         for nxt in nxts:
             conf = ConfigTree.merge_configs(conf, nxt)
@@ -105,35 +102,35 @@ class Multi:
 multi = Multi([])
 
 
-def env(prefix: str, clazz: Type, **kwargs):
+def env(prefix: str, clazz: type, **kwargs):
     return multi.env(prefix, **kwargs).on(clazz)
 
 
-def dict(obj: Dict[str, Any], clazz: Type, **kwargs):
+def dict(obj: dict[str, Any], clazz: type, **kwargs):
     return multi.dict(obj, **kwargs).on(clazz)
 
 
-def string(s: str, clazz: Type, **kwargs):
+def string(s: str, clazz: type, **kwargs):
     return multi.string(s, **kwargs).on(clazz)
 
 
-def url(uri: str, clazz: Type, **kwargs):
+def url(uri: str, clazz: type, **kwargs):
     return multi.url(uri, **kwargs).on(clazz)
 
 
-def file(path: str, clazz: Type, **kwargs):
+def file(path: str, clazz: type, **kwargs):
     return multi.file(path, **kwargs).on(clazz)
 
 
-def cli(argv: List[str], clazz: Type, **kwargs):
+def cli(argv: list[str], clazz: type, **kwargs):
     return multi.cli(argv, **kwargs).on(clazz)
 
 
-def load(path: str, clazz: Type, **kwargs):
+def load(path: str, clazz: type, **kwargs):
     return file(path, clazz, **kwargs)
 
 
-def loads(s: str, clazz: Type, **kwargs):
+def loads(s: str, clazz: type, **kwargs):
     return string(s, clazz, **kwargs)
 
 

{dataconf-3.6.0 → dataconf-3.7.1}/dataconf/utils.py

@@ -1,4 +1,4 @@
-from dataclasses import _MISSING_TYPE
+from dataclasses import MISSING
 from dataclasses import asdict
 from dataclasses import fields
 from dataclasses import is_dataclass
@@ -8,42 +8,50 @@ from enum import Enum
 from enum import IntEnum
 from inspect import isclass
 from pathlib import Path
-
-from typing import Any, Literal
-from typing import Dict
+from types import UnionType
+from typing import Any
+from typing import Literal
+from typing import Union
 from typing import get_args
 from typing import get_origin
-from typing import List
-from typing import Type
-from typing import Union
 
-from dataconf.exceptions import AmbiguousSubclassException, EnvListFormatException
-from dataconf.exceptions import EnvListOrderException
-from dataconf.exceptions import MalformedConfigException
-from dataconf.exceptions import MissingTypeException
-from dataconf.exceptions import ParseException
-from dataconf.exceptions import TypeConfigException
-from dataconf.exceptions import UnexpectedKeysException
+import pyparsing
 from dateutil.parser import isoparse
 from dateutil.relativedelta import relativedelta
+from isodate import Duration
+from isodate import parse_duration
 from pyhocon import ConfigFactory
 from pyhocon.config_tree import ConfigList
 from pyhocon.config_tree import ConfigTree
-from isodate import parse_duration
-from isodate import Duration
-import pyparsing
 
-from dataconf.version import PY310up
+from dataconf.exceptions import AmbiguousSubclassException
+from dataconf.exceptions import EnvListFormatException
+from dataconf.exceptions import EnvListOrderException
+from dataconf.exceptions import MalformedConfigException
+from dataconf.exceptions import MissingTypeException
+from dataconf.exceptions import ParseException
+from dataconf.exceptions import TypeConfigException
+from dataconf.exceptions import UnexpectedKeysException
 
+NoneType = type(None)
 
-if PY310up:
-    from types import UnionType
+_BOOL_TRUE = {"true", "1", "yes", "on", "t", "y"}
+_BOOL_FALSE = {"false", "0", "no", "off", "f", "n"}
 
 
-NoneType = type(None)
+def __parse_bool(value: Any):
+    if isinstance(value, bool):
+        return value
+    if isinstance(value, str):
+        normalised = value.strip().lower()
+        if normalised in _BOOL_TRUE:
+            return True
+        if normalised in _BOOL_FALSE:
+            return False
+    return None
 
 
-def __parse_type(value: Any, clazz: Type, path: str, check: bool):
+def __parse_type(value: Any, clazz: type, path: str, check: bool):
     try:
         if check:
             return value
@@ -56,15 +64,15 @@ def __parse_type(value: Any, clazz: Type, path: str, check: bool):
 
 
 def is_union(origin):
-    return origin is Union or (PY310up and origin is UnionType)
+    return origin is Union or origin is UnionType
 
 
-def is_optional(type: Type | Any | str):
+def is_optional(type: type | Any | str):
     # Optional = Union[T, NoneType]
     return is_union(get_origin(type)) and NoneType in get_args(type)
 
 
-def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected: bool):
+def __parse(value: any, clazz: type, path: str, strict: bool, ignore_unexpected: bool):
     if is_dataclass(clazz):
         if not isinstance(value, ConfigTree):
             raise TypeConfigException(
@@ -89,7 +97,7 @@ def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected:
                     # if val is a dataclass, convert to ConfigTree
                     val = ConfigFactory.from_dict(asdict(val))
 
-            if not isinstance(val, _MISSING_TYPE):
+            if val is not MISSING:
                 fs[f.name] = __parse(
                     val, f.type, f"{path}.{f.name}", strict, ignore_unexpected
                 )
@@ -100,8 +108,8 @@ def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected:
 
             elif is_dataclass(f.type):
                 if all(
-                    not isinstance(field.default, _MISSING_TYPE)
-                    or not isinstance(field.default_factory, _MISSING_TYPE)
+                    field.default is not MISSING
+                    or field.default_factory is not MISSING
                     or is_optional(field.type)
                     for field in fields(f.type)
                 ):
@@ -122,7 +130,7 @@ def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected:
                     f'expected type {clazz} at {path_to_str(path)}, no field "{f.name}" found'
                 )
 
-        unexpected_keys = value.keys() - {renamings.get(k, k) for k in fs.keys()}
+        unexpected_keys = value.keys() - {renamings.get(k, k) for k in fs}
         if len(unexpected_keys) > 0 and not ignore_unexpected:
             raise UnexpectedKeysException(
                 f'unexpected key(s) "{", ".join(unexpected_keys)}" detected for type {clazz} at {path_to_str(path)}'
@@ -133,30 +141,30 @@ def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected:
     origin = get_origin(clazz)
     args = get_args(clazz)
 
-    if origin is list:
+    if clazz is list or origin is list:
+        if len(args) != 1:
+            raise MissingTypeException("expected list with type information: List[?]")
+
         if value is None:
             raise MalformedConfigException(
                 f"expected list at {path_to_str(path)} but received None"
             )
 
-        if len(args) != 1:
-            raise MissingTypeException("expected list with type information: List[?]")
-
         parse_candidate = args[0]
         return [
             __parse(v, parse_candidate, f"{path}[]", strict, ignore_unexpected)
             for v in value
         ]
 
-    if origin is tuple:
+    if clazz is tuple or origin is tuple:
+        if len(args) < 1:
+            raise MissingTypeException("expected tuple with type information: Tuple[?]")
+
         if value is None:
             raise MalformedConfigException(
                 f"expected tuple at {path_to_str(path)} but received None"
             )
 
-        if len(args) < 1:
-            raise MissingTypeException("expected tuple with type information: Tuple[?]")
-
         has_ellipsis = args[-1] == Ellipsis
         if has_ellipsis and len(args) != 2:
             raise MissingTypeException(
@@ -172,7 +180,7 @@ def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected:
             for v, arg in zip(value, _args)
         )
 
-    if origin is dict:
+    if clazz is dict or origin is dict:
         if len(args) != 2:
             raise MissingTypeException(
                 "expected dict with type information: Dict[?, ?]"
@@ -208,14 +216,14 @@ def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected:
         )
 
     if clazz is bool:
-        if not strict and value is not None:
-            try:
-                value = bool(value)
-            except ValueError:
-                pass
-        return __parse_type(value, clazz, path, isinstance(value, bool))
+        parsed = __parse_bool(value)
+        if parsed is not None:
+            return parsed
+        return __parse_type(value, clazz, path, False)
 
     if clazz is int:
+        if isinstance(value, bool):
+            return __parse_type(value, clazz, path, False)
         if not strict and value is not None:
             try:
                 value = int(value)
@@ -224,14 +232,14 @@ def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected:
         return __parse_type(value, clazz, path, isinstance(value, int))
 
     if clazz is float:
+        if isinstance(value, bool):
+            return __parse_type(value, clazz, path, False)
         if not strict and value is not None:
             try:
                 value = float(value)
             except ValueError:
                 pass
-        return __parse_type(
-            value, clazz, path, isinstance(value, float) or isinstance(value, int)
-        )
+        return __parse_type(value, clazz, path, isinstance(value, (float, int)))
 
     if clazz is str:
         return __parse_type(value, clazz, path, isinstance(value, str))
@@ -243,7 +251,7 @@ def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected:
         return value
 
     if isclass(clazz) and (issubclass(clazz, Enum) or issubclass(clazz, IntEnum)):
-        if isinstance(value, int):
+        if isinstance(value, int) and not isinstance(value, bool):
             return clazz.__call__(value)
         elif issubclass(clazz, str):
             return clazz(value)
@@ -315,7 +323,7 @@ def __parse(value: any, clazz: Type, path: str, strict: bool, ignore_unexpected:
     if len(child_successes) == 1:
         return child_successes[0][1]
     elif len(child_successes) > 1:
-        matching_classes = "\n- ".join(map(lambda x: x[0].__name__, child_successes))
+        matching_classes = "\n- ".join(x[0].__name__ for x in child_successes)
         raise AmbiguousSubclassException(
             f"""multiple subtypes of {clazz} matched at {path_to_str(path)}, use '_type' to disambiguate:\n- {matching_classes}"""
         )
@@ -352,7 +360,7 @@ def __generate(value: object, path: str):
     return value
 
 
-def __env_vars_parse(prefix: str, obj: Dict[str, Any]):
+def __env_vars_parse(prefix: str, obj: dict[str, Any]):
     ret = {}
 
     def set_lens(p, focus, v):
@@ -430,11 +438,11 @@ def path_to_str(path: str) -> str:
     return path if len(path) > 0 else "root"
 
 
-def __cli_parse(argv: List[str]):
+def __cli_parse(argv: list[str]):
     kvs = {}
     i = 0
 
-    if not argv[0].startswith("--"):
+    if argv and not argv[0].startswith("--"):
         i += 1
 
     while i < len(argv):

dataconf-3.7.1/dataconf/version.py

@@ -0,0 +1,5 @@
+import sys
+
+__version__ = "3.7.1"
+
+PY311up = sys.version_info >= (3, 11)

{dataconf-3.6.0 → dataconf-3.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dataconf"
-version = "3.6.0"
+version = "3.7.1"
 description = "Simple dataclasses configuration management for Python with hocon/json/yaml/properties/env-vars/dict support."
 authors = []
 license = "MPL-2.0"
@@ -12,10 +12,12 @@ include = [
 classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12"
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
 ]
 keywords = [
     "configuration",
@@ -32,8 +34,8 @@ keywords = [
 dataconf = 'dataconf.cli:run'
 
 [tool.poetry.dependencies]
-python = "^3.9"
-python-dateutil = "^2.9.0.post0"
+python = "^3.10"
+python-dateutil = "^3.0.0"
 PyYAML = "^6.0.2"
 isodate = "^0.7.2"
 pyhocon = "^0.3.61"
@@ -48,7 +50,7 @@ ruff = ">=0.12.7"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "3.6.0"
+version = "3.7.1"
 tag_format = "v$major.$minor.$patch$prerelease"
 version_files = [
     "pyproject.toml:version",

dataconf-3.6.0/dataconf/version.py

@@ -1,6 +0,0 @@
-import sys
-
-__version__ = "3.6.0"
-
-PY310up = sys.version_info >= (3, 10)
-PY311up = sys.version_info >= (3, 11)

{dataconf-3.6.0 → dataconf-3.7.1}/dataconf/__init__.py

@@ -1,33 +1,33 @@
+from dataconf.main import HOCON
+from dataconf.main import YAML
 from dataconf.main import cli
 from dataconf.main import dict
 from dataconf.main import dump
 from dataconf.main import dumps
 from dataconf.main import env
 from dataconf.main import file
-from dataconf.main import HOCON
 from dataconf.main import load
 from dataconf.main import loads
 from dataconf.main import multi
 from dataconf.main import parse
 from dataconf.main import string
 from dataconf.main import url
-from dataconf.main import YAML
 from dataconf.version import __version__
 
 __all__ = [
-    "load",
-    "loads",
+    "HOCON",
+    "YAML",
+    "__version__",
+    "cli",
+    "dict",
     "dump",
     "dumps",
     "env",
-    "url",
-    "dict",
     "file",
-    "string",
-    "cli",
+    "load",
+    "loads",
     "multi",
     "parse",
-    "YAML",
-    "HOCON",
-    "__version__",
+    "string",
+    "url",
 ]