feat(*): Support multiple casting for variables and allows "None" as …

…None for default values

README.md

@@ -31,6 +31,8 @@ pip install aiodi
 name = "%env(str:APP_NAME, 'sample')%"
 version = "%env(int:APP_VERSION, '1')%"
 log_level = "%env(APP_LEVEL, 'INFO')%"
+debug = "%env(bool:int:APP_DEBUG, '0')%"
+text = "Hello World"
 
 [tool.aiodi.services."_defaults"]
 project_dir = "../../.."

aiodi/__init__.py

@@ -3,7 +3,7 @@
 from .builder import ContainerBuilder
 from .container import Container, ContainerKey
 
-__version__ = '1.1.1'
+__version__ = '1.1.2'
 
 __all__ = (
     # di

aiodi/resolver/variable.py

@@ -4,8 +4,9 @@
 from ..helpers import raise_, re_finditer
 from . import Resolver, ValueNotFound, ValueResolutionPostponed
 
-REGEX = r"%(static|env|var)\((str:|int:|float:|bool:)?([\w]+)(,\s{1}'.*?')?\)%"
+REGEX = r"%(static|env|var)\(([str:int:float:bool:]*?)([\w]+)(,\s{1}'.*?')?\)%"
 STATIC_TEMPLATE: str = "%static({0}:{1}, '{2}')%"
+_VAR_DEFAULTS = ...
 
 
 class VariableMetadata(NamedTuple):
@@ -15,18 +16,24 @@ class VariableMetadata(NamedTuple):
 
     class MatchMetadata(NamedTuple):  # type: ignore
         source_kind: str
-        type: Type[Any]
+        types: List[Type[Any]]
         source_name: str
         default: Any
         match: Match
 
         @classmethod
         def from_match(cls, match: Match) -> 'VariableMetadata.MatchMetadata':
+            raw_types = (
+                ['str']
+                if match.groups()[1] is None or len(str(match.groups()[1])) == 0
+                else [s for s in str(match.groups()[1]).split(':') if s.strip() != '']
+            )
+            raw_default = _VAR_DEFAULTS if match.groups()[3] is None else str(match.groups()[3])[3:-1]
             return cls(
                 source_kind=str(match.groups()[0]),
-                type=str if match.groups()[1] is None else globals()['__builtins__'][str(match.groups()[1])[:-1]],
+                types=[globals()['__builtins__'][raw_type] for raw_type in raw_types],
                 source_name=str(match.groups()[2]),
-                default=None if match.groups()[3] is None else str(match.groups()[3])[3:-1],
+                default=None if isinstance(raw_default, str) and raw_default == 'None' else raw_default,
                 match=match,
             )
 
@@ -36,6 +43,11 @@ def __init__(self, name: str) -> None:
         super().__init__(kind='Variable', name=name)
 
 
+class EnvironmentVariableNotFound(ValueNotFound):
+    def __init__(self, name: str) -> None:
+        super().__init__(kind='EnvironmentVariable', name=name)
+
+
 class VariableResolutionPostponed(ValueResolutionPostponed[VariableMetadata]):
     pass
 
@@ -77,7 +89,12 @@ def parse_value(
             if metadata_.source_kind == 'static':
                 typ_val = metadata_.default
             elif metadata_.source_kind == 'env':
-                typ_val = getenv(key=metadata_.source_name, default=metadata_.default or '')
+                typ_val = getenv(key=metadata_.source_name, default=metadata_.default)
+                if typ_val is None:
+                    # can only concatenate str to str
+                    return typ_val
+                if metadata_.default is _VAR_DEFAULTS and typ_val == metadata_.default:
+                    raise EnvironmentVariableNotFound(name=metadata_.source_name)
             elif metadata_.source_kind == 'var':
                 if metadata_.source_name not in _variables:
                     if retries != -1:
@@ -94,7 +111,9 @@ def parse_value(
                 values += metadata.value[metadata_.match.end() :]
         value: Any = ''.join(values)
         if len(metadata.matches) == 1:
-            value = metadata.matches[0].type(value)
+            # multiple casting
+            for type_ in reversed(metadata.matches[0].types):
+                value = type_(value)
         return value
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [metadata]
 name = "aiodi"
-version = "1.1.1"
+version = "1.1.2"
 description = "Container for the Dependency Injection in Python."
 license = "MIT"
 authors = ["ticdenis <denisnavarroalcaide@outlook.es>"]

requirements-dev.txt

@@ -3,11 +3,11 @@ autoflake==1.4
 # fixed due to Python 3.6 support
 bandit==1.7.1
 black==22.1.0
-commitizen==2.20.5
+commitizen==2.21.0
 isort==5.10.1
 liccheck==0.6.5
 mkdocs==1.2.3
-mkdocs-material==8.1.10
+mkdocs-material==8.2.1
 mypy==0.931
 pre-commit==2.17.0
 psutil==5.9.0
@@ -23,5 +23,5 @@ setuptools==59.6.0
 # fixed due to Python 3.6 support
 shellcheck-py==0.8.0.3
 twine==3.8.0
-types-toml==0.10.3
+types-toml==0.10.4
 wheel==0.37.1

sample/pyproject.toml

@@ -2,6 +2,8 @@
 name = "%env(str:APP_NAME, 'sample')%"
 version = "%env(int:APP_VERSION, '1')%"
 log_level = "%env(APP_LEVEL, 'INFO')%"
+debug = "%env(bool:int:APP_DEBUG, '0')%"
+text = "Hello World"
 
 [tool.aiodi.services."_defaults"]
 project_dir = "../../.."

tests/integration/aiodi/test_builder.py

@@ -20,6 +20,8 @@ def test_container() -> None:
     assert 'env.log_level' in di and di.get('env.log_level', typ=str) == 'INFO'
     assert 'env.name' in di and di.get('env.name', typ=str) == 'sample'
     assert 'env.version' in di and di.get('env.version', typ=int) == 1
+    assert 'env.debug' in di and di.get('env.debug', typ=bool) is False
+    assert 'env.text' in di and di.get('env.text', typ=str) == 'Hello World'
 
     assert 'UserLogger' in di and di.get('UserLogger', typ=InMemoryUserLogger)
     assert 'logging.Logger' in di and di.get(Logger)