Merge branch 'release/4.23.0' into master

docs/main/changelog.rst

@@ -7,6 +7,12 @@ that were made in every particular version.
 From version 0.7.6 *Dependency Injector* framework strictly 
 follows `Semantic versioning`_
 
+4.23.0
+------
+- Add support of aliases for ``Configuration`` provider.
+  See issue: `#394 <https://github.com/ets-labs/python-dependency-injector/issues/394>`_.
+  Thanks to `@gtors <https://github.com/gtors>`_ for suggesting the feature.
+
 4.22.1
 ------
 - Pin ``sphinx`` version to hotfix docs build.

docs/providers/configuration.rst

@@ -306,6 +306,25 @@ configuration provider to strict mode.
 
    Modifier ``.required()`` should be specified before type modifier ``.as_*()``.
 
+Aliases
+-------
+
+You can use ``Configuration`` provider with a context manager to create aliases.
+
+.. literalinclude:: ../../examples/providers/configuration/configuration_alias.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 14,22
+
+.. note::
+
+   Library ``environs`` is a 3rd party library. You need to install it
+   separately::
+
+      pip install environs
+
+   Documentation is available on GitHub: https://github.com/sloria/environs
+
 Injecting invariants
 --------------------
 

examples/providers/configuration/configuration_alias.py

@@ -0,0 +1,36 @@
+"""`Configuration` provider alias example."""
+
+from dependency_injector import containers, providers
+from environs import Env
+
+
+class Container(containers.DeclarativeContainer):
+
+    config = providers.Configuration()
+
+
+if __name__ == '__main__':
+    env = Env()
+    container = Container()
+
+    with container.config.some_plugin_name as plugin:
+        plugin.some_interval_ms.override(
+            env.int(
+                'SOME_INTERVAL_MS',
+                default=30000,
+            ),
+        )
+
+        with plugin.kafka as kafka:
+            kafka.bootstrap_servers.override(
+                env.list(
+                    'KAFKA_BOOTSTRAP_SERVERS',
+                    default=['kafka1', 'kafka2'],
+                ),
+            )
+            kafka.security_protocol.override(
+                env.str(
+                    'KAFKA_SECURITY_PROTOCOL',
+                    default='SASL_SSL',
+                ),
+            )

src/dependency_injector/__init__.py

@@ -1,6 +1,6 @@
 """Top-level package."""
 
-__version__ = '4.22.1'
+__version__ = '4.23.0'
 """Version number.
 
 :type: str

src/dependency_injector/providers.pyi

@@ -176,6 +176,8 @@ class CoroutineDelegate(Delegate):
 class ConfigurationOption(Provider[Any]):
     UNDEFINED: object
     def __init__(self, name: Tuple[str], root: Configuration) -> None: ...
+    def __enter__(self) -> ConfigurationOption: ...
+    def __exit__(self, *exc_info: Any) -> None: ...
     def __getattr__(self, item: str) -> ConfigurationOption: ...
     def __getitem__(self, item: Union[str, Provider]) -> ConfigurationOption: ...
     @property
@@ -203,6 +205,8 @@ class TypedConfigurationOption(Callable[T]):
 class Configuration(Object[Any]):
     DEFAULT_NAME: str = 'config'
     def __init__(self, name: str = DEFAULT_NAME, default: Optional[Any] = None, *, strict: bool = False) -> None: ...
+    def __enter__(self) -> Configuration : ...
+    def __exit__(self, *exc_info: Any) -> None: ...
     def __getattr__(self, item: str) -> ConfigurationOption: ...
     def __getitem__(self, item: Union[str, Provider]) -> ConfigurationOption: ...
     def get_name(self) -> str: ...

src/dependency_injector/providers.pyx

@@ -1415,6 +1415,12 @@ cdef class ConfigurationOption(Provider):
 
         return copied
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *exc_info):
+        pass
+
     def __str__(self):
         return represent_provider(provider=self, provides=self.get_name())
 
@@ -1740,6 +1746,12 @@ cdef class Configuration(Object):
 
         return copied
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *exc_info):
+        pass
+
     def __str__(self):
         return represent_provider(provider=self, provides=self.__name)
 

tests/unit/providers/test_configuration_py2_py3.py

@@ -243,6 +243,33 @@ class ConfigTests(unittest.TestCase):
         with self.assertRaises(AttributeError):
             a.__name__
 
+    def test_context_manager_alias(self):
+        class Container(containers.DeclarativeContainer):
+            config = providers.Configuration()
+
+        container = Container()
+
+        with container.config as cfg:
+            cfg.override({'foo': 'foo', 'bar': 'bar'})
+
+        self.assertEqual(container.config(), {'foo': 'foo', 'bar': 'bar'})
+        self.assertEqual(cfg(), {'foo': 'foo', 'bar': 'bar'})
+        self.assertIs(container.config, cfg)
+
+    def test_option_context_manager_alias(self):
+        class Container(containers.DeclarativeContainer):
+            config = providers.Configuration()
+
+        container = Container()
+
+        with container.config.option as opt:
+            opt.override({'foo': 'foo', 'bar': 'bar'})
+
+        self.assertEqual(container.config(), {'option': {'foo': 'foo', 'bar': 'bar'}})
+        self.assertEqual(container.config.option(), {'foo': 'foo', 'bar': 'bar'})
+        self.assertEqual(opt(), {'foo': 'foo', 'bar': 'bar'})
+        self.assertIs(container.config.option, opt)
+
     def test_missing_key(self):
         # See: https://github.com/ets-labs/python-dependency-injector/issues/358
         self.config.override(None)