Merge branch 'release/4.15.0' into master

Author: rmk135

README.rst

@@ -59,8 +59,8 @@ Key features of the ``Dependency Injector``:
 - **Overriding**. Can override any provider by another provider on the fly. This helps in testing
   and configuring dev / stage environment to replace API clients with stubs etc. See
   `Provider overriding <https://python-dependency-injector.ets-labs.org/providers/overriding.html>`_.
-- **Configuration**. Reads configuration from ``yaml`` & ``ini`` files, environment variables
-  and dictionaries.
+- **Configuration**. Reads configuration from ``yaml`` & ``ini`` files, ``pydantic`` settings,
+  environment variables, and dictionaries.
   See `Configuration provider <https://python-dependency-injector.ets-labs.org/providers/configuration.html>`_.
 - **Containers**. Provides declarative and dynamic containers.
   See `Containers <https://python-dependency-injector.ets-labs.org/containers/index.html>`_.

docs/index.rst

@@ -70,8 +70,8 @@ Key features of the ``Dependency Injector``:
 - **Overriding**. Can override any provider by another provider on the fly. This helps in testing
   and configuring dev / stage environment to replace API clients with stubs etc. See
   :ref:`provider-overriding`.
-- **Configuration**. Reads configuration from ``yaml`` & ``ini`` files, environment variables
-  and dictionaries. See :ref:`configuration-provider`.
+- **Configuration**. Reads configuration from ``yaml`` & ``ini`` files, ``pydantic`` settings,
+  environment variables, and dictionaries. See :ref:`configuration-provider`.
 - **Resources**. Helps with initialization and configuring of logging, event loop, thread
   or process pool, etc. Can be used for per-function execution scope in tandem with wiring.
   See :ref:`resource-provider`.

docs/introduction/key_features.rst

@@ -16,8 +16,8 @@ Key features of the ``Dependency Injector``:
 - **Overriding**. Can override any provider by another provider on the fly. This helps in testing
   and configuring dev / stage environment to replace API clients with stubs etc. See
   :ref:`provider-overriding`.
-- **Configuration**. Reads configuration from ``yaml`` & ``ini`` files, environment variables
-  and dictionaries. See :ref:`configuration-provider`.
+- **Configuration**. Reads configuration from ``yaml`` & ``ini`` files, ``pydantic`` settings,
+  environment variables, and dictionaries. See :ref:`configuration-provider`.
 - **Resources**. Helps with initialization and configuring of logging, event loop, thread
   or process pool, etc. Can be used for per-function execution scope in tandem with wiring.
   See :ref:`resource-provider`.

docs/main/changelog.rst

@@ -7,6 +7,10 @@ that were made in every particular version.
 From version 0.7.6 *Dependency Injector* framework strictly 
 follows `Semantic versioning`_
 
+4.15.0
+------
+- Add ``Configuration.from_pydantic()`` method to load configuration from a ``pydantic`` settings.
+
 4.14.0
 ------
 - Add container providers traversal.

docs/providers/configuration.rst

@@ -5,10 +5,11 @@ Configuration provider
 
 .. meta::
    :keywords: Python,DI,Dependency injection,IoC,Inversion of Control,Configuration,Injection,
-              Option,Ini,Json,Yaml,Dict,Environment Variable,Load,Read,Get
+              Option,Ini,Json,Yaml,Pydantic,Dict,Environment Variable,Load,Read,Get
    :description: Configuration provides configuration options to the other providers. This page
                  demonstrates how to use Configuration provider to inject the dependencies, load
-                 a configuration from an ini or yaml file, dictionary or an environment variable.
+                 a configuration from an ini or yaml file, a dictionary, an environment variable,
+                 or a pydantic settings object.
 
 .. currentmodule:: dependency_injector.providers
 
@@ -89,6 +90,38 @@ You can also specify a YAML loader as an argument:
 
    *Don't forget to mirror the changes in the requirements file.*
 
+Loading from a Pydantic settings
+--------------------------------
+
+``Configuration`` provider can load configuration from a ``pydantic`` settings object using the
+:py:meth:`Configuration.from_pydantic` method:
+
+.. literalinclude:: ../../examples/providers/configuration/configuration_pydantic.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 31
+
+To get the data from pydantic settings ``Configuration`` provider calls ``Settings.dict()`` method.
+If you need to pass an argument to this call, use ``.from_pydantic()`` keyword arguments.
+
+.. code-block:: python
+
+   container.config.from_pydantic(Settings(), exclude={'optional'})
+
+.. note::
+
+   ``Dependency Injector`` doesn't install ``pydantic`` by default.
+
+   You can install the ``Dependency Injector`` with an extra dependency::
+
+      pip install dependency-injector[pydantic]
+
+   or install ``pydantic`` directly::
+
+      pip install pydantic
+
+   *Don't forget to mirror the changes in the requirements file.*
+
 Loading from a dictionary
 -------------------------
 
@@ -211,7 +244,7 @@ Methods ``.from_*()`` in strict mode raise an exception if configuration file do
 configuration data is undefined:
 
 .. code-block:: python
-   :emphasize-lines: 10,15,20,25
+   :emphasize-lines: 10,15,20,25,30
 
    class Container(containers.DeclarativeContainer):
 
@@ -231,6 +264,11 @@ configuration data is undefined:
        except FileNotFoundError:
            ...
 
+       try:
+           container.config.from_pydantic(EmptySettings())  # raise exception
+       except ValueError:
+           ...
+
        try:
            container.config.from_env('UNDEFINED_ENV_VAR')  # raise exception
        except ValueError:

examples/providers/configuration/configuration_pydantic.py

@@ -0,0 +1,37 @@
+"""`Configuration` provider values loading example."""
+
+import os
+
+from dependency_injector import containers, providers
+from pydantic import BaseSettings, Field
+
+# Emulate environment variables
+os.environ['AWS_ACCESS_KEY_ID'] = 'KEY'
+os.environ['AWS_SECRET_ACCESS_KEY'] = 'SECRET'
+
+
+class AwsSettings(BaseSettings):
+
+    access_key_id: str = Field(env='aws_access_key_id')
+    secret_access_key: str = Field(env='aws_secret_access_key')
+
+
+class Settings(BaseSettings):
+
+    aws: AwsSettings = AwsSettings()
+    optional: str = Field(default='default_value')
+
+
+class Container(containers.DeclarativeContainer):
+
+    config = providers.Configuration()
+
+
+if __name__ == '__main__':
+    container = Container()
+
+    container.config.from_pydantic(Settings())
+
+    assert container.config.aws.access_key_id() == 'KEY'
+    assert container.config.aws.secret_access_key() == 'SECRET'
+    assert container.config.optional() == 'default_value'

requirements-dev.txt

@@ -10,5 +10,6 @@ mypy
 pyyaml
 httpx
 fastapi
+pydantic
 
 -r requirements-ext.txt

setup.py

@@ -64,6 +64,9 @@
           'yaml': [
               'pyyaml',
           ],
+          'pydantic': [
+              'pydantic',
+          ],
           'flask': [
               'flask',
           ],

src/dependency_injector/__init__.py

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