Merge branch 'release/4.48.1'

* Remove KWPair
* Avoid type checks around _is_injectable

.coveragerc

@@ -1,7 +0,0 @@
-[run]
-source = src/dependency_injector
-omit = tests/unit
-plugins = Cython.Coverage
-
-[html]
-directory=reports/unittests/

.cursor/rules/coding-guide.mdc

@@ -0,0 +1,29 @@
+---
+description: Code in Python and Cython
+globs:
+alwaysApply: false
+---
+- Follow PEP 8 rules
+- When you write imports, split system, 3rd-party, and local imports with a new line
+- Have two empty lines between the import block and the rest of the code
+- Have an empty line (\n) at the end of every file
+- If a file is supposed to be run, always add ``if __name__ == 'main'``
+- Always follow a consistent pattern of using double or single quotes
+- When there is a class without a docblock, leave one blank line before its members, e.g.:
+```python
+class Container(containers.DeclarativeContainer):
+
+    service = providers.Factory(Service)
+```
+
+- Avoid shortcuts in names unless absolutely necessary, exceptions:
+```
+arg
+args
+kwarg
+kwargs
+obj
+cls
+```
+
+- Avoid inline comments unless absolutely necessary

.cursor/rules/makefile-commands.mdc

@@ -0,0 +1,7 @@
+---
+description: Build and run tests
+globs:
+alwaysApply: false
+---
+- Use Makefile commands to build, test, lint and other similar operations when they are available.
+- Activate virtualenv before running any commands by ``. venv/bin/actvate``

.cursor/rules/run-examples.mdc

@@ -0,0 +1,8 @@
+---
+description: Run examples
+globs:
+alwaysApply: false
+---
+- When you run an example from the ``examples/`` folder, switch to the example folder and run it from there.
+- If there are instructions on running the examples or its tests in readme, follow them
+- Activate virtualenv before running any commands by ``. venv/bin/actvate``

.deepsource.toml

@@ -0,0 +1,12 @@
+version = 1
+
+test_patterns = ["tests/**/test_*.py"]
+
+exclude_patterns = ["docs/**"]
+
+[[analyzers]]
+name = "python"
+enabled = true
+
+  [analyzers.meta]
+  runtime_version = "3.x.x"

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{py,pyi,pxd,pyx}]
+ij_visual_guides = 80,88

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: rmk135

.github/workflows/publishing.yml

@@ -0,0 +1,131 @@
+name: Publishing
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - '*'
+
+jobs:
+
+  tests:
+    name: Run tests
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.13
+      - run: pip install tox
+      - run: tox
+        env:
+          TOXENV: 3.13
+
+  linters:
+    name: Run linters
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        toxenv: [flake8, pydocstyle, mypy, pylint]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.13
+      - run: pip install tox
+      - run: tox
+        env:
+          TOXENV: ${{ matrix.toxenv }}
+
+  build-sdist:
+    name: Build source tarball
+    needs: [tests, linters]
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.13
+      - run: |
+          python -m pip install --upgrade build
+          python -m build --sdist
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-sdist
+          path: ./dist/*
+
+  build-wheels:
+    name: Build wheels
+    needs: [tests, linters]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, macos-14]
+    env:
+      CIBW_ENABLE: pypy
+      CIBW_ENVIRONMENT: >-
+        PIP_CONFIG_SETTINGS="build_ext=-j4"
+        DEPENDENCY_INJECTOR_LIMITED_API="1"
+        CFLAGS="-g0"
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v3.0.0
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
+
+  test-publish:
+    name: Upload release to TestPyPI
+    needs: [build-sdist, build-wheels]
+    runs-on: ubuntu-latest
+    environment: test-pypi
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/
+
+  publish:
+    name: Upload release to PyPI
+    needs: [build-sdist, build-wheels, test-publish]
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
+      - uses: pypa/gh-action-pypi-publish@release/v1
+
+  publish-docs:
+    name: Publish docs
+    needs: [publish]
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.13
+      - run: pip install awscli
+      - run: pip install -r requirements-doc.txt
+      - run: pip install -e .
+      - run: (cd docs && make clean html)
+      - run: |
+          aws s3 sync docs/_build/html s3://python-dependency-injector-docs --delete
+          aws cloudfront create-invalidation --distribution-id ${{ secrets.AWS_CLOUDFRONT_DISTRIBUTION_ID }} --path "/*" > /dev/null
+          echo "Cache invalidation triggered"
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}

.github/workflows/tests-and-linters.yml

@@ -0,0 +1,67 @@
+name: Tests and linters
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+
+  test-on-different-versions:
+    name: Run tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - run: pip install tox
+      - run: tox
+        env:
+          DEPENDENCY_INJECTOR_LIMITED_API: 1
+          TOXENV: ${{ matrix.python-version }}
+
+  test-different-pydantic-versions:
+    name: Run tests with different pydantic versions
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.12"
+      - run: pip install tox
+      - run: tox -e pydantic-v1,pydantic-v2
+
+  test-coverage:
+    name: Run tests with coverage
+    runs-on: ubuntu-latest
+    env:
+      DEPENDENCY_INJECTOR_DEBUG_MODE: 1
+      PIP_VERBOSE: 1
+      COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.12
+      - run: pip install tox
+      - run: tox -vv
+        env:
+          TOXENV: coveralls
+
+  linters:
+    name: Run linters
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        toxenv: [flake8, pydocstyle, mypy, pylint]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.13
+      - run: pip install tox
+      - run: tox
+        env:
+          TOXENV: ${{ matrix.toxenv }}

.gitignore

@@ -15,6 +15,7 @@ lib64/
 parts/
 sdist/
 var/
+wheelhouse/
 *.egg-info/
 .installed.cfg
 *.egg
@@ -36,6 +37,7 @@ reports/
 .cache
 nosetests.xml
 coverage.xml
+.hypothesis/
 
 # Translations
 *.mo
@@ -54,7 +56,7 @@ target/
 .idea/
 
 # Virtualenv
-venv/
+venv*/
 
 # SQLite
 *.db
@@ -62,10 +64,13 @@ venv/
 # Vim Rope
 .ropeproject/
 
-# C extensions
-src/dependency_injector/*.h
-src/dependency_injector/*.so
-src/dependency_injector/containers/*.h
-src/dependency_injector/containers/*.so
-src/dependency_injector/providers/*.h
-src/dependency_injector/providers/*.so
+# Cython artifacts
+src/**/*.c
+src/**/*.h
+src/**/*.so
+src/**/*.html
+
+# Workspace for samples
+.workspace/
+
+.vscode/

.pylintrc

@@ -1,49 +0,0 @@
-[MASTER]
-
-# Add <file or directory> to the black list. It should be a base name, not a
-# path. You may set this option multiple times.
-ignore=utils,tests
-
-[MESSAGES CONTROL]
-
-# Disable the message(s) with the given id(s).
-# disable-msg=
-
-[SIMILARITIES]
-
-# Minimum lines number of a similarity.
-min-similarity-lines=5
-
-[TYPECHECK]
-ignore-mixin-members=yes
-# ignored-classes=
-zope=no
-# generated-members=providedBy,implementedBy,rawDataReceived
-
-[DESIGN]
-# Maximum number of arguments for function / method
-max-args=10
-
-# Maximum number of locals for function / method body
-max-locals=20
-
-# Maximum number of return / yield for function / method body
-max-returns=10
-
-# Maximum number of branch for function / method body
-max-branchs=10
-
-# Maximum number of statements in function / method body
-max-statements=60
-
-# Maximum number of parents for a class (see R0901).
-max-parents=10
-
-# Maximum number of attributes for a class (see R0902).
-max-attributes=30
-
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=0
-
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=30

.travis.yml

@@ -1,101 +0,0 @@
-os: linux
-dist: xenial
-language: python
-jobs:
-  include:
-  - python: 3.8
-    env: TOXENV=coveralls DEPENDENCY_INJECTOR_DEBUG_MODE=1
-    install:
-      - pip install tox
-      - pip install cython
-      - make cythonize
-    script: tox
-  - python: 3.6
-    env: TOXENV=pylint
-    install: pip install tox
-    script: tox
-  - python: 3.6
-    env: TOXENV=flake8
-    install: pip install tox
-    script: tox
-  - python: 3.6
-    env: TOXENV=pydocstyle
-    install: pip install tox
-    script: tox
-  - python: 3.6
-    env: TOXENV=mypy
-    install: pip install tox
-    script: tox
-  - python: 2.7
-    env: TOXENV=py27
-    install: pip install tox
-    script: tox
-  - python: 3.4
-    env: TOXENV=py34
-    install: pip install tox
-    script: tox
-  - python: 3.5
-    env: TOXENV=py35
-    install: pip install tox
-    script: tox
-  - python: 3.6
-    env: TOXENV=py36
-    install: pip install tox
-    script: tox
-  - python: 3.7
-    env: TOXENV=py37
-    install: pip install tox
-    script: tox
-  - python: 3.8
-    env: TOXENV=py38
-    install: pip install tox
-    script: tox
-  - python: pypy
-    env: TOXENV=pypy
-    install: pip install tox
-    script: tox
-  - python: pypy3
-    env: TOXENV=pypy3
-    install: pip install tox
-    script: tox
-  - python: 3.8
-    if: tag IS present
-    env: TWINE_USERNAME=__token__
-    install: pip install pip --upgrade
-    script: python setup.py sdist
-    after_success:
-      - python3 -m pip install twine
-      - python3 -m twine upload dist/*
-  - services: docker
-    if: tag IS present
-    env: TWINE_USERNAME=__token__
-    install: python3 -m pip install cibuildwheel==1.5.1
-    script: python3 -m cibuildwheel --output-dir wheelhouse
-    after_success:
-      - python3 -m pip install twine
-      - python3 -m twine upload wheelhouse/*.whl
-  - os: osx
-    if: tag IS present
-    language: shell
-    env: TWINE_USERNAME=__token__
-    install: python3 -m pip install cibuildwheel==1.5.1
-    script: python3 -m cibuildwheel --output-dir wheelhouse
-    after_success:
-      - python3 -m pip install twine
-      - python3 -m twine upload wheelhouse/*.whl
-  - os: windows
-    if: tag IS present
-    language: shell
-    env: TWINE_USERNAME=__token__
-    before_install:
-      - choco install python --version 3.8.0
-      - export PATH="/c/Python38:/c/Python38/Scripts:$PATH"
-    install: python -m pip install cibuildwheel==1.5.1
-    script: python -m cibuildwheel --output-dir wheelhouse
-    after_success:
-      - python -m pip install twine
-      - python -m twine upload wheelhouse/*.whl
-notifications:
-  slack:
-    rooms:
-      secure: CdWDgKnfYW7vvvoH3nS3yg3TcNZiYLRUyEp6ukQ4rQiiuR4+ltuvyGyFJWgP8r7VVJ9yHkB0jebCKWLUMsAEt1my33B6eMDEVefovpkdh2eJjGswmm80brt0EJULpgwPOtB1U47Mwca8L5jDW4KSv9RypUFRgn8eHDoWw6LKf5g=

CONTRIBUTORS.rst

@@ -13,3 +13,12 @@ Dependency Injector Contributors
 + Bruno P. Kinoshita (kinow)
 + RobinsonMa (RobinsonMa)
 + Rüdiger Busche (JarnoRFB)
++ Dmitry Rassoshenko (rda-dev)
++ Fotis Koutoupas (kootoopas)
++ Shubhendra Singh Chauhan (withshubh)
++ sonthonaxrk (sonthonaxrk)
++ Ngo Thanh Loi (Leonn) (loingo95)
++ Thiago Hiromi (thiromi)
++ Felipe Rubio (krouw)
++ Anton Petrov (anton-petrov)
++ ZipFile (ZipFile)

LICENSE.rst

@@ -1,4 +1,4 @@
-Copyright (c) 2017, ETS Labs
+Copyright (c) 2024, Roman Mogylatov
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

MANIFEST.in

@@ -1,9 +1,7 @@
-recursive-include src/dependency_injector *.py* *.c
+recursive-include src/dependency_injector *.py* *.c py.typed
 recursive-include tests *.py
 include README.rst
 include CONTRIBUTORS.rst
 include LICENSE.rst
-include requirements.txt
 include setup.py
 include tox.ini
-include py.typed

Makefile

@@ -1,14 +1,6 @@
 VERSION := $(shell python setup.py --version)
 
-CYTHON_SRC := $(shell find src/dependency_injector -name '*.pyx')
-
-CYTHON_DIRECTIVES = -Xlanguage_level=2
-
-ifdef DEPENDENCY_INJECTOR_DEBUG_MODE
-	CYTHON_DIRECTIVES += -Xprofile=True
-	CYTHON_DIRECTIVES += -Xlinetrace=True
-endif
-
+export COVERAGE_RCFILE := pyproject.toml
 
 clean:
 	# Clean sources
@@ -25,39 +17,28 @@ clean:
 	find examples -name '*.py[co]' -delete
 	find examples -name '__pycache__' -delete
 
-cythonize:
-	# Compile Cython to C
-	cython -a $(CYTHON_DIRECTIVES) $(CYTHON_SRC)
+build: clean
+	# Compile C extensions
+	python setup.py build_ext --inplace
 	# Move all Cython html reports
 	mkdir -p reports/cython/
 	find src -name '*.html' -exec mv {}  reports/cython/  \;
 
-build: clean cythonize
-	# Compile C extensions
-	python setup.py build_ext --inplace
-
 docs-live:
 	sphinx-autobuild docs docs/_build/html
 
-install: uninstall clean cythonize
+install: uninstall clean build
 	pip install -ve .
 
 uninstall:
 	- pip uninstall -y -q dependency-injector 2> /dev/null
 
-test-py2: build
+test:
 	# Unit tests with coverage report
 	coverage erase
-	coverage run --rcfile=./.coveragerc -m unittest2 discover -s tests/unit/ -p test_*_py2_py3.py
-	coverage report --rcfile=./.coveragerc
-	coverage html --rcfile=./.coveragerc
-
-test-py3: build
-	# Unit tests with coverage report
-	coverage erase
-	coverage run --rcfile=./.coveragerc -m unittest2 discover -s tests/unit/ -p test_*py3*.py
-	coverage report --rcfile=./.coveragerc
-	coverage html --rcfile=./.coveragerc
+	coverage run -m pytest
+	coverage report
+	coverage html
 
 check:
 	flake8 src/dependency_injector/
@@ -68,9 +49,9 @@ check:
 
 	mypy tests/typing
 
-test-publish: cythonize
+test-publish: build
 	# Create distributions
-	python setup.py sdist
+	python -m build --sdist
 	# Upload distributions to PyPI
 	twine upload --repository testpypi dist/dependency-injector-$(VERSION)*
 

README.rst

@@ -35,14 +35,10 @@
    :target: https://pypi.org/project/dependency-injector/
    :alt: Wheel
 
-.. image:: https://travis-ci.org/ets-labs/python-dependency-injector.svg?branch=master
-   :target: https://travis-ci.org/ets-labs/python-dependency-injector
+.. image:: https://img.shields.io/github/actions/workflow/status/ets-labs/python-dependency-injector/tests-and-linters.yml?branch=master
+   :target: https://github.com/ets-labs/python-dependency-injector/actions
    :alt: Build Status
 
-.. image:: http://readthedocs.org/projects/python-dependency-injector/badge/?version=latest
-   :target: http://python-dependency-injector.ets-labs.org/
-   :alt: Docs Status
-   
 .. image:: https://coveralls.io/repos/github/ets-labs/python-dependency-injector/badge.svg?branch=master
    :target: https://coveralls.io/github/ets-labs/python-dependency-injector?branch=master
    :alt: Coverage Status
@@ -52,97 +48,39 @@ What is ``Dependency Injector``?
 
 ``Dependency Injector`` is a dependency injection framework for Python.
 
-It helps you in implementing the dependency injection principle.
+It helps implement the dependency injection principle.
 
-What is dependency injection?
------------------------------
+Key features of the ``Dependency Injector``:
 
-Dependency injection is a principle that helps to decrease coupling and increase cohesion. Your
-code becomes more flexible, clear and it is easier to test it.
-
-How to implement dependency injection?
---------------------------------------
-
-Objects do not create each other anymore. They provide a way to inject the needed dependencies
-instead.
-
-Before:
-
-.. code-block:: python
-
-   import os
-
-
-   class ApiClient:
-
-       def __init__(self):
-           self.api_key = os.getenv('API_KEY')
-           self.timeout = os.getenv('TIMEOUT')
-
-
-   class Service:
-
-       def __init__(self):
-           self.api_client = ApiClient()
-
-
-   if __name__ == '__main__':
-       service = Service()
-
-
-After:
-
-.. code-block:: python
-
-   import os
-
-
-   class ApiClient:
-
-       def __init__(self, api_key: str, timeout: int):
-           self.api_key = api_key
-           self.timeout = timeout
-
-
-   class Service:
-
-       def __init__(self, api_client: ApiClient):
-           self.api_client = api_client
-
-
-   if __name__ == '__main__':
-       service = Service(ApiClient(os.getenv('API_KEY'), os.getenv('TIMEOUT')))
-
-
-Flexibility comes with a price: now you need to assemble your objects like this
-``Service(ApiClient(os.getenv('API_KEY'), os.getenv('TIMEOUT')))``. The assembly code might get
-duplicated and it'll become harder to change the application structure.
-
-What does Dependency Injector do?
----------------------------------
-
-``Dependency Injector`` helps you assemble the objects.
-
-It provides you the container and the providers that help you describe objects assembly. When you
-need an object you get it from the container. The rest of the assembly work is done by the
-framework:
+- **Providers**. Provides ``Factory``, ``Singleton``, ``Callable``, ``Coroutine``, ``Object``,
+  ``List``, ``Dict``, ``Configuration``, ``Resource``, ``Dependency``, and ``Selector`` providers
+  that help assemble your objects.
+  See `Providers <https://python-dependency-injector.ets-labs.org/providers/index.html>`_.
+- **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``, and ``json`` files, ``pydantic`` settings,
+  environment variables, and dictionaries.
+  See `Configuration provider <https://python-dependency-injector.ets-labs.org/providers/configuration.html>`_.
+- **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 `Resource provider <https://python-dependency-injector.ets-labs.org/providers/resource.html>`_.
+- **Containers**. Provides declarative and dynamic containers.
+  See `Containers <https://python-dependency-injector.ets-labs.org/containers/index.html>`_.
+- **Wiring**. Injects dependencies into functions and methods. Helps integrate with
+  other frameworks: Django, Flask, Aiohttp, Sanic, FastAPI, etc.
+  See `Wiring <https://python-dependency-injector.ets-labs.org/wiring.html>`_.
+- **Asynchronous**. Supports asynchronous injections.
+  See `Asynchronous injections <https://python-dependency-injector.ets-labs.org/providers/async.html>`_.
+- **Typing**. Provides typing stubs, ``mypy``-friendly.
+  See `Typing and mypy <https://python-dependency-injector.ets-labs.org/providers/typing_mypy.html>`_.
+- **Performance**. Fast. Written in ``Cython``.
+- **Maturity**. Mature and production-ready. Well-tested, documented, and supported.
 
 .. code-block:: python
 
    from dependency_injector import containers, providers
-
-
-   class ApiClient:
-
-       def __init__(self, api_key: str, timeout: int):
-           self.api_key = api_key
-           self.timeout = timeout
-
-
-   class Service:
-
-       def __init__(self, api_client: ApiClient):
-           self.api_client = api_client
+   from dependency_injector.wiring import Provide, inject
 
 
    class Container(containers.DeclarativeContainer):
@@ -152,7 +90,7 @@ framework:
        api_client = providers.Singleton(
            ApiClient,
            api_key=config.api_key,
-           timeout=config.timeout.as_int(),
+           timeout=config.timeout,
        )
 
        service = providers.Factory(
@@ -161,31 +99,40 @@ framework:
        )
 
 
-   if __name__ == '__main__':
+   @inject
+   def main(service: Service = Provide[Container.service]) -> None:
+       ...
+
+
+   if __name__ == "__main__":
        container = Container()
-       container.config.api_key.from_env('API_KEY')
-       container.config.timeout.from_env('TIMEOUT')
-
-       service = container.service()
-
-Retrieving of the ``Service`` instance now is done like this ``container.service()``.
-
-Also ``Dependency Injector`` provides a bonus in overriding any of the providers with the
-``.override()`` method:
-
-.. code-block:: python
-
-   from unittest import mock
+       container.config.api_key.from_env("API_KEY", required=True)
+       container.config.timeout.from_env("TIMEOUT", as_=int, default=5)
+       container.wire(modules=[__name__])
 
+       main()  # <-- dependency is injected automatically
 
        with container.api_client.override(mock.Mock()):
-       service = container.service()
-       assert isinstance(service.api_client, mock.Mock)
+           main()  # <-- overridden dependency is injected automatically
 
-It helps in a testing. Also you can use it for configuring project for the different environments:
-replace an API client with a stub on the dev or stage.
+When you call the ``main()`` function the ``Service`` dependency is assembled and injected automatically.
 
-`More examples <https://github.com/ets-labs/python-dependency-injector/tree/master/examples>`_
+When you do testing, you call the ``container.api_client.override()`` method to replace the real API
+client with a mock. When you call ``main()``, the mock is injected.
+
+You can override any provider with another provider.
+
+It also helps you in a re-configuring project for different environments: replace an API client
+with a stub on the dev or stage.
+
+With the ``Dependency Injector``, object assembling is consolidated in a container. Dependency injections are defined explicitly.
+This makes it easier to understand and change how an application works.
+
+.. figure:: https://raw.githubusercontent.com/wiki/ets-labs/python-dependency-injector/img/di-readme.svg
+   :target: https://github.com/ets-labs/python-dependency-injector
+
+Visit the docs to know more about the
+`Dependency injection and inversion of control in Python <https://python-dependency-injector.ets-labs.org/introduction/di_in_python.html>`_.
 
 Installation
 ------------
@@ -197,74 +144,67 @@ The package is available on the `PyPi`_::
 Documentation
 -------------
 
-The documentation is available on the `Read The Docs <http://python-dependency-injector.ets-labs.org/>`_
+The documentation is available `here <https://python-dependency-injector.ets-labs.org/>`_.
+
+Examples
+--------
+
+Choose one of the following:
+
+- `Application example (single container) <https://python-dependency-injector.ets-labs.org/examples/application-single-container.html>`_
+- `Application example (multiple containers) <https://python-dependency-injector.ets-labs.org/examples/application-multiple-containers.html>`_
+- `Decoupled packages example (multiple containers) <https://python-dependency-injector.ets-labs.org/examples/decoupled-packages.html>`_
+- `Boto3 example <https://python-dependency-injector.ets-labs.org/examples/boto3.html>`_
+- `Django example <https://python-dependency-injector.ets-labs.org/examples/django.html>`_
+- `Flask example <https://python-dependency-injector.ets-labs.org/examples/flask.html>`_
+- `Aiohttp example <https://python-dependency-injector.ets-labs.org/examples/aiohttp.html>`_
+- `Sanic example <https://python-dependency-injector.ets-labs.org/examples/sanic.html>`_
+- `FastAPI example <https://python-dependency-injector.ets-labs.org/examples/fastapi.html>`_
+- `FastAPI + Redis example <https://python-dependency-injector.ets-labs.org/examples/fastapi-redis.html>`_
+- `FastAPI + SQLAlchemy example <https://python-dependency-injector.ets-labs.org/examples/fastapi-sqlalchemy.html>`_
 
 Tutorials
 ---------
 
 Choose one of the following:
 
-- `Flask web application tutorial <http://python-dependency-injector.ets-labs.org/tutorials/flask.html>`_
-- `Aiohttp REST API tutorial <http://python-dependency-injector.ets-labs.org/tutorials/aiohttp.html>`_
-- `Asyncio monitoring daemon tutorial <http://python-dependency-injector.ets-labs.org/tutorials/asyncio-daemon.html>`_
-- `CLI application tutorial <http://python-dependency-injector.ets-labs.org/tutorials/cli.html>`_
+- `Flask web application tutorial <https://python-dependency-injector.ets-labs.org/tutorials/flask.html>`_
+- `Aiohttp REST API tutorial <https://python-dependency-injector.ets-labs.org/tutorials/aiohttp.html>`_
+- `Asyncio monitoring daemon tutorial <https://python-dependency-injector.ets-labs.org/tutorials/asyncio-daemon.html>`_
+- `CLI application tutorial <https://python-dependency-injector.ets-labs.org/tutorials/cli.html>`_
 
 Concept
 -------
 
-``Dependency Injector`` stands on two principles:
+The framework stands on the `PEP20 (The Zen of Python) <https://www.python.org/dev/peps/pep-0020/>`_ principle:
 
-- Explicit is better than implicit (PEP20).
-- Do no magic to your code.
+.. code-block:: bash
 
-How does it different from the other frameworks?
+   Explicit is better than implicit
 
-- **No autowiring.** The framework does NOT do any autowiring / autoresolving of the dependencies. You need to specify everything explicitly. Because *"Explicit is better than implicit" (PEP20)*.
-- **Does not pollute your code.** Your application does NOT know and does NOT depend on the framework. No ``@inject`` decorators, annotations, patching or any other magic tricks.
+You need to specify how to assemble and where to inject the dependencies explicitly.
 
-``Dependency Injector`` makes a simple contract with you:
-
-- You tell the framework how to assemble your objects
-- The framework does it for you
-
-The power of the ``Dependency Injector`` is in its simplicity and straightforwardness. It is a simple tool for the powerful concept.
+The power of the framework is in its simplicity.
+``Dependency Injector`` is a simple tool for the powerful concept.
 
 Frequently asked questions
 --------------------------
 
-What is the dependency injection?
+What is dependency injection?
  - dependency injection is a principle that decreases coupling and increases cohesion
 
 Why should I do the dependency injection?
- - your code becomes more flexible, testable and clear
- - you have no problems when you need to understand how it works or change it 😎 
+ - your code becomes more flexible, testable, and clear 😎
 
-How do I start doing the dependency injection?
+How do I start applying the dependency injection?
  - you start writing the code following the dependency injection principle
  - you register all of your application components and their dependencies in the container
- - when you need a component, you get it from the container
-
-Why do I need a framework for this?
- - you need the framework for this to not create it by your own
- - this framework gives you the container and the providers
- - the container is like a dictionary with the batteries 🔋 
- - the providers manage the lifetime of your components, you will need factories, singletons, smart config object etc
+ - when you need a component, you specify where to inject it or get it from the container
 
 What price do I pay and what do I get?
- - you need to explicitly specify the dependencies in the container
+ - you need to explicitly specify the dependencies
  - it will be extra work in the beginning
- - it will payoff when project grows or in two weeks 😊 (when you forget what project was about)
-
-What features does the framework have?
- - building objects graph
- - smart configuration object
- - providers: factory, singleton, thread locals registers, etc
- - positional and keyword context injections
- - overriding of the objects in any part of the graph
-
-What features the framework does NOT have?
- - autowiring / autoresolving of the dependencies
- - the annotations and ``@inject``-like decorators
+ - it will payoff as project grows
 
 Have a question?
  - Open a `Github Issue <https://github.com/ets-labs/python-dependency-injector/issues>`_

docs/_static/custom.css

@@ -0,0 +1,9 @@
+.no-border {
+    border: 0 !important;
+    box-shadow: none !important;
+    -webkit-box-shadow: none !important;
+}
+.no-border td {
+    border: 0px !important;
+    padding: 0px 10px 0px 0px !important;
+}

docs/_static/disqus.js

@@ -1,11 +0,0 @@
-var disqus_shortname;
-var disqus_identifier;
-
-$(function() {
-    var disqus_thread = $("#disqus_thread");
-    disqus_shortname = disqus_thread.data('disqus-shortname');
-    disqus_identifier = disqus_thread.data('disqus-identifier');
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-});

docs/_static/sphinx_rtd_theme-hotfix.css

@@ -1,3 +0,0 @@
-.rst-content .highlight>pre, .rst-content .linenodiv>pre {
-    line-height: normal;
-}

docs/_static/sponsor.html

@@ -0,0 +1 @@
+<iframe src="https://github.com/sponsors/rmk135/button" title="Sponsor Dependency Injector" height="32" width="114" style="border: 0; border-radius: 6px;"></iframe>

docs/api/aiohttpext.rst

@@ -1,9 +0,0 @@
-dependency_injector.ext.aiohttp
-===============================
-
-.. automodule:: dependency_injector.ext.aiohttp
-   :members:
-   :special-members:
-
-
-.. disqus::

docs/api/asgi-lifespan.rst

@@ -0,0 +1,9 @@
+dependency_injector.ext.starlette
+=================================
+
+.. automodule:: dependency_injector.ext.starlette
+   :members:
+   :inherited-members:
+   :show-inheritance:
+
+.. disqus::

docs/api/containers.rst

@@ -3,7 +3,7 @@ dependency_injector.containers
 
 .. automodule:: dependency_injector.containers
    :members:
-   :special-members:
-
+   :inherited-members:
+   :show-inheritance:
 
 .. disqus::

docs/api/flaskext.rst

@@ -1,9 +0,0 @@
-dependency_injector.ext.flask
-=============================
-
-.. automodule:: dependency_injector.ext.flask
-   :members:
-   :special-members:
-
-
-.. disqus::

docs/api/index.rst

@@ -4,9 +4,9 @@ API Documentation
 ..  toctree::
    :maxdepth: 2
 
-    top_level
+   top-level
    providers
    containers
+   wiring
    errors
-    aiohttpext
-    flaskext
+   asgi-lifespan

docs/api/wiring.rst

@@ -0,0 +1,7 @@
+dependency_injector.wiring
+=============================
+
+.. automodule:: dependency_injector.wiring
+   :members:
+
+.. disqus::

docs/conf.py

@@ -20,49 +20,49 @@ import alabaster
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath(".."))
 
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+#needs_sphinx = "1.0"
 
 # Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# extensions coming with Sphinx (named "sphinx.ext.*") or your custom
 # ones.
 extensions = [
-    'alabaster',
-    'sphinx.ext.autodoc',
-    'sphinxcontrib.disqus',
+    "alabaster",
+    "sphinx.ext.autodoc",
+    "sphinx_disqus.disqus",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+# source_suffix = [".rst", ".md"]
+source_suffix = ".rst"
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+#source_encoding = "utf-8-sig"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'Dependency Injector'
-copyright = u'2017, ETS Labs'
-author = u'ETS Labs'
+project = "Dependency Injector"
+copyright = "2024, Roman Mogylatov"
+author = "Roman Mogylatov"
 
-# The version info for the project you're documenting, acts as replacement for
+# The version info for the project you"re documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
 # Getting version:
-with open('../src/dependency_injector/__init__.py') as init_file:
-    version = re.search('__version__ = \'(.*?)\'', init_file.read()).group(1)
+with open("../src/dependency_injector/__init__.py") as init_file:
+    version = re.search("__version__ = \"(.*?)\"", init_file.read()).group(1)
 
 # The full version, including alpha/beta/rc tags.
 release = version
@@ -72,23 +72,23 @@ release = version
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+#today = ""
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+#today_fmt = "%B %d, %Y"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ["_build"]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
 #default_role = None
 
-# If true, '()' will be appended to :func: etc. cross-reference text.
+# If true, "()" will be appended to :func: etc. cross-reference text.
 #add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
@@ -100,7 +100,7 @@ exclude_patterns = ['_build']
 #show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
@@ -116,8 +116,8 @@ todo_include_todos = False
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-# html_theme = 'sphinx_rtd_theme'
-html_theme = 'alabaster'
+# html_theme = "sphinx_rtd_theme"
+html_theme = "alabaster"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -141,21 +141,24 @@ html_theme_path = [alabaster.get_path()]
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+html_favicon = "favicon.ico"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
+html_css_files = [
+    "custom.css",
+]
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
 #html_extra_path = []
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# If not "", a "Last updated on:" timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+#html_last_updated_fmt = "%b %d, %Y"
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
@@ -189,50 +192,50 @@ html_static_path = ['_static']
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+#html_use_opensearch = ""
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
 #html_file_suffix = None
 
 # Language to be used for generating the HTML full-text search index.
 # Sphinx supports the following languages:
-#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
-#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
-#html_search_language = 'en'
+#   "da", "de", "en", "es", "fi", "fr", "hu", "it", "ja"
+#   "nl", "no", "pt", "ro", "ru", "sv", "tr"
+#html_search_language = "en"
 
 # A dictionary with options for the search language support, empty by default.
-# Now only 'ja' uses this config value
-#html_search_options = {'type': 'default'}
+# Now only "ja" uses this config value
+#html_search_options = {"type": "default"}
 
 # The name of a javascript file (relative to the configuration directory) that
 # implements a search results scorer. If empty, the default will be used.
-#html_search_scorer = 'scorer.js'
+#html_search_scorer = "scorer.js"
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'dependency_injectordoc'
+htmlhelp_basename = "dependency_injectordoc"
 
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+# The paper size ("letterpaper" or "a4paper").
+#"papersize": "letterpaper",
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+# The font size ("10pt", "11pt" or "12pt").
+#"pointsize": "10pt",
 
 # Additional stuff for the LaTeX preamble.
-#'preamble': '',
+#"preamble": "",
 
 # Latex figure (float) alignment
-#'figure_align': 'htbp',
+#"figure_align": "htbp",
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  (master_doc, 'dependency_injector.tex', u'Dependency Injector Documentation',
-   u'ETS Labs', 'manual'),
+  (master_doc, "dependency_injector.tex", u"Dependency Injector Documentation",
+   u"Roman Mogylatov", "manual"),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -261,7 +264,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'Dependency Injector', u'Dependency Injector Documentation',
+    (master_doc, "Dependency Injector", u"Dependency Injector Documentation",
      [author], 1)
 ]
 
@@ -275,9 +278,9 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  (master_doc, 'Dependency Injector', u'Dependency Injector Documentation',
-   author, 'Dependency Injector', 'Dependency injection microframework for Python',
-   'Miscellaneous'),
+  (master_doc, "Dependency Injector", u"Dependency Injector Documentation",
+   author, "Dependency Injector", "Dependency injection microframework for Python",
+   "Miscellaneous"),
 ]
 
 # Documents to append as an appendix to all manuals.
@@ -286,23 +289,25 @@ texinfo_documents = [
 # If false, no module index is generated.
 #texinfo_domain_indices = True
 
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
+# How to display URL addresses: "footnote", "no", or "inline".
+#texinfo_show_urls = "footnote"
 
-# If true, do not generate a @detailmenu in the "Top" node's menu.
+# If true, do not generate a @detailmenu in the "Top" node"s menu.
 #texinfo_no_detailmenu = False
 
-autodoc_member_order = 'bysource'
+autodoc_member_order = "bysource"
 
-disqus_shortname = 'python-dependency-injector'
+disqus_shortname = "python-dependency-injector"
 
 html_theme_options = {
-    'github_user': 'ets-labs',
-    'github_repo': 'python-dependency-injector',
-    'github_type': 'star',
-    'github_button': True,
-    'github_banner': True,
-    'logo': 'logo.svg',
-    'description': 'Dependency injection framework for Python',
-    'code_font_size': '10pt',
+    "github_user": "ets-labs",
+    "github_repo": "python-dependency-injector",
+    "github_type": "star",
+    "github_button": True,
+    "github_banner": True,
+    "logo": "logo.svg",
+    "description": "Dependency injection framework for Python by Roman Mogylatov",
+    "code_font_size": "10pt",
+    "analytics_id": "UA-67012059-1",
+    "donate_url": "https://github.com/sponsors/rmk135",
 }

docs/containers/check_dependencies.rst

@@ -0,0 +1,18 @@
+.. _check-container-dependencies:
+
+Check container dependencies
+----------------------------
+
+To check container dependencies use method ``.check_dependencies()``.
+
+.. literalinclude:: ../../examples/containers/check_dependencies.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 12
+
+Method ``.check_dependencies()`` raises an error if container has any undefined dependencies.
+If all dependencies are provided or have defaults, no error is raised.
+
+See also: :ref:`dependency-provider`.
+
+.. disqus::

docs/containers/copying.rst

@@ -0,0 +1,23 @@
+Container copying
+-----------------
+
+You can create declarative container copies using ``@containers.copy()`` decorator.
+
+.. literalinclude:: ../../examples/containers/declarative_copy_decorator1.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 18-22
+
+Decorator ``@containers.copy()`` copies providers from source container to destination container.
+Destination container provider will replace source provider, if names match.
+
+Decorator ``@containers.copy()`` helps you when you create derived declarative containers
+from the base one. Base container often keeps default dependencies while derived containers define
+overriding providers. Without ``@containers.copy()`` decorator, overridden providers are available
+in the derived container, but base class dependencies continue to be bound to the base class providers.
+
+.. literalinclude:: ../../examples/containers/declarative_copy_decorator2.py
+   :language: python
+   :lines: 11-
+
+.. disqus::

docs/containers/declarative.rst

@@ -34,10 +34,39 @@ Injections in the declarative container are done the usual way:
    :language: python
    :lines: 3-
 
-You can override the container providers when you create the container instance:
+You can override container providers while creating a container instance:
 
 .. literalinclude:: ../../examples/containers/declarative_override_providers.py
    :language: python
    :lines: 3-
+   :emphasize-lines: 13
+
+Alternatively, you can call ``container.override_providers()`` method when the container instance
+already exists:
+
+.. code-block:: python
+   :emphasize-lines: 3
+
+   container = Container()
+
+   container.override_providers(foo=mock.Mock(Foo), bar=mock.Mock(Bar))
+
+   assert isinstance(container.foo(), mock.Mock)
+   assert isinstance(container.bar(), mock.Mock)
+
+You can also use ``container.override_providers()`` with a context manager to reset
+provided overriding after the context is closed:
+
+.. code-block:: python
+   :emphasize-lines: 3
+
+   container = Container()
+
+   with container.override_providers(foo=mock.Mock(Foo), bar=mock.Mock(Bar)):
+       assert isinstance(container.foo(), mock.Mock)
+       assert isinstance(container.bar(), mock.Mock)
+
+   assert isinstance(container.foo(), Foo)
+   assert isinstance(container.bar(), Bar)
 
 .. disqus::

docs/containers/index.rst

@@ -1,3 +1,5 @@
+.. _containers:
+
 Containers
 ==========
 
@@ -21,3 +23,7 @@ Containers module API docs - :py:mod:`dependency_injector.containers`.
     dynamic
     specialization
     overriding
+    copying
+    reset_singletons
+    check_dependencies
+    traversal

docs/containers/overriding.rst

@@ -1,5 +1,5 @@
-Overriding of the container
----------------------------
+Container overriding
+--------------------
 
 .. currentmodule:: dependency_injector.containers
 
@@ -21,4 +21,20 @@ The container also has:
 
 :py:class:`DynamicContainer` has the same functionality.
 
+Another possible way to override container providers on declarative level is
+``@containers.override()`` decorator:
+
+.. literalinclude:: ../../examples/containers/declarative_override_decorator.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 12-16
+
+Decorator ``@containers.override()`` takes a container for overriding as an argument.
+This container providers will be overridden by the providers with the same names from
+the decorated container.
+
+It helps to change the behaviour of application by importing extension modules but not a code change.
+Imported module can override providers in main container. While the code uses main container as
+before, the overridden providers provide components defined in the extension module.
+
 .. disqus::

docs/containers/reset_singletons.rst

@@ -0,0 +1,31 @@
+.. _reset-container-singletons:
+
+Reset container singletons
+--------------------------
+
+To reset all container singletons use method ``.reset_singletons()``.
+
+.. literalinclude:: ../../examples/containers/reset_singletons.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 16
+
+Method ``.reset_singletons()`` also resets singletons in sub-containers: ``providers.Container`` and
+``providers.DependenciesContainer.``
+
+.. literalinclude:: ../../examples/containers/reset_singletons_subcontainers.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 21
+
+You can use ``.reset_singletons()`` method with a context manager. Singletons will be reset on
+both entering and exiting a context.
+
+.. literalinclude:: ../../examples/containers/reset_singletons_with.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 14-15
+
+See also: :ref:`singleton-provider`.
+
+.. disqus::

docs/containers/traversal.rst

@@ -0,0 +1,33 @@
+Container providers traversal
+-----------------------------
+
+To traverse container providers use method ``.traverse()``.
+
+.. literalinclude:: ../../examples/containers/traverse.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 38
+
+Method ``.traverse()`` returns a generator. Traversal generator visits all container providers.
+This includes nested providers even if they are not present on the root level of the container.
+
+Traversal generator guarantees that each container provider will be visited only once.
+It can traverse cyclic provider graphs.
+
+Traversal generator does not guarantee traversal order.
+
+You can use ``types=[...]`` argument to filter providers. Traversal generator will only return
+providers matching specified types.
+
+.. code-block:: python
+   :emphasize-lines: 3
+
+   container = Container()
+
+   for provider in container.traverse(types=[providers.Resource]):
+       print(provider)
+
+    # <dependency_injector.providers.Resource(<function init_database at 0x10bd2cb80>) at 0x10d346b40>
+    # <dependency_injector.providers.Resource(<function init_cache at 0x10be373a0>) at 0x10d346bc0>
+
+.. disqus::

docs/examples-other/chained-factories.rst

@@ -0,0 +1,68 @@
+Chained Factories pattern
+=========================
+
+This example demonstrates "Chained Factories" pattern.
+
+The idea of the pattern is in wrapping ``Factory`` into another ``Factory`` that adds
+additional arguments.
+
+.. code-block:: python
+
+   base_factory = providers.Factory(
+       SomeClass,
+       base_argument=1,
+   )
+
+   concrete_factory = providers.Factory(
+       base_factory,
+       extra_argument=2,
+   )
+
+
+   if __name__ == "__main__":
+       instance = concrete_factory()
+       # Same as: # instance = SomeClass(base_argument=1, extra_argument=2)
+
+Sample code
+-----------
+
+Listing of the pattern example:
+
+.. literalinclude:: ../../examples/miniapps/factory-patterns/chained_factories.py
+   :language: python
+
+Arguments priority
+------------------
+
+Passing of the arguments works the same way like for any other :ref:`factory-provider`.
+
+.. code-block:: python
+
+   # 1. Keyword arguments of upper level factory are added to lower level factory
+   chained_dict_factory = providers.Factory(
+       providers.Factory(dict, arg1=1),
+       arg2=2,
+   )
+   print(chained_dict_factory())  # prints: {"arg1": 1, "arg2": 2}
+
+   # 2. Keyword arguments of upper level factory have priority
+   chained_dict_factory = providers.Factory(
+       providers.Factory(dict, arg1=1),
+       arg1=2,
+   )
+   print(chained_dict_factory())  # prints: {"arg1": 2}
+
+   # 3. Keyword arguments provided from context have the most priority
+   chained_dict_factory = providers.Factory(
+       providers.Factory(dict, arg1=1),
+       arg1=2,
+   )
+   print(chained_dict_factory(arg1=3))  # prints: {"arg1": 3}
+
+
+Credits
+-------
+
+The "Chained Factories" pattern was suggested by the ``Dependency Injector`` users.
+
+.. disqus::

docs/examples-other/factory-of-factories.rst

@@ -0,0 +1,74 @@
+Factory of Factories pattern
+============================
+
+This example demonstrates "Factory of Factories" pattern.
+
+The idea of the pattern is in creating a ``Factory`` that creates another ``Factory`` and adds
+additional arguments.
+
+.. code-block:: python
+
+   base_factory = providers.Factory(
+       providers.Factory
+       SomeClass,
+       base_argument=1,
+   )
+
+   concrete_factory = providers.Factory(
+       OtherClass,
+       instance=base_factory(extra_argument=1),
+   )
+
+
+   if __name__ == "__main__":
+       instance = concrete_factory()
+       # Same as: # instance = SomeClass(base_argument=1, extra_argument=2)
+
+Sample code
+-----------
+
+Listing of the pattern example:
+
+.. literalinclude:: ../../examples/miniapps/factory-patterns/factory_of_factories.py
+   :language: python
+
+Arguments priority
+------------------
+
+Passing of the arguments works the same way like for any other :ref:`factory-provider`.
+
+.. code-block:: python
+
+   # 1. Keyword arguments of upper level factory are added to lower level factory
+   factory_of_dict_factories = providers.Factory(
+       providers.Factory,
+       dict,
+       arg1=1,
+   )
+   dict_factory = factory_of_dict_factories(arg2=2)
+   print(dict_factory())  # prints: {"arg1": 1, "arg2": 2}
+
+   # 2. Keyword arguments of upper level factory have priority
+   factory_of_dict_factories = providers.Factory(
+       providers.Factory,
+       dict,
+       arg1=1,
+   )
+   dict_factory = factory_of_dict_factories(arg1=2)
+   print(dict_factory())  # prints: {"arg1": 2}
+
+   # 3. Keyword arguments provided from context have the most priority
+   factory_of_dict_factories = providers.Factory(
+       providers.Factory,
+       dict,
+       arg1=1,
+   )
+   dict_factory = factory_of_dict_factories(arg1=2)
+   print(dict_factory(arg1=3))  # prints: {"arg1": 3}
+
+Credits
+-------
+
+The "Factory of Factories" pattern was suggested by the ``Dependency Injector`` users.
+
+.. disqus::

docs/examples-other/index.rst

@@ -0,0 +1,17 @@
+Other examples
+==============
+
+.. meta::
+   :keywords: Python,Dependency Injection,Inversion of Control,Container,Example,Application,
+              Framework
+   :description: This sections contains assorted Dependency Injector examples.
+
+This sections contains assorted ``Dependency Injector`` examples.
+
+..  toctree::
+    :maxdepth: 2
+
+    use-cases
+    password-hashing
+    chained-factories
+    factory-of-factories

docs/examples-other/password-hashing.rst

@@ -0,0 +1,30 @@
+Password hashing example
+========================
+
+.. meta::
+   :keywords: Python,Dependency Injection,Inversion of Control,Container,Example,Application,
+              Framework,Callable
+   :description: This example demonstrates a usage of the Callable provider.
+
+This example demonstrates an injection of the ``Callable`` provider.
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/password-hashing>`_.
+
+Sample code
+-----------
+
+Listing of the pattern example:
+
+.. literalinclude:: ../../examples/miniapps/password-hashing/example.py
+   :language: python
+
+Run the example
+---------------
+
+Instructions for running:
+
+.. code-block:: bash
+
+    python example.py
+
+.. disqus::

docs/examples-other/use-cases.rst

@@ -0,0 +1,74 @@
+Use cases example
+=================
+
+.. meta::
+   :keywords: Python,Dependency Injection,Inversion of Control,Container,Example,Application,
+              Framework,DependenciesContainer
+   :description: This example demonstrates a usage of the DependenciesContainer provider.
+
+This example demonstrates a usage of the ``DependenciesContainer`` provider.
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/decoupled-packages>`_.
+
+Application structure
+---------------------
+
+Example application has next structure:
+
+.. code-block:: bash
+
+
+   ./
+   └── example/
+       ├── __init__.py
+       ├── __main__.py
+       ├── adapters.py
+       ├── containers.py
+       └── usecases.py
+
+Containers
+----------
+
+Listing of the ``example/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/use-cases/example/containers.py
+   :language: python
+
+Main module
+-----------
+
+Listing of the ``example/__main__.py``:
+
+.. literalinclude:: ../../examples/miniapps/use-cases/example/__main__.py
+   :language: python
+
+
+Run the application
+-------------------
+
+Instructions for running in the "test" mode:
+
+.. code-block:: bash
+
+    python run.py test example@example.com
+
+Instructions for running in the "prod" mode:
+
+.. code-block:: bash
+
+    python run.py prod example@example.com
+
+Adapters and use cases
+----------------------
+
+Listing of the ``example/adapters.py``:
+
+.. literalinclude:: ../../examples/miniapps/use-cases/example/adapters.py
+   :language: python
+
+Listing of the ``example/usecases.py``:
+
+.. literalinclude:: ../../examples/miniapps/use-cases/example/usecases.py
+   :language: python
+
+.. disqus::

docs/examples/aiohttp.rst

@@ -0,0 +1,83 @@
+.. _aiohttp-example:
+
+Aiohttp example
+===============
+
+.. meta::
+   :keywords: Python,Dependency Injection,Aiohttp,Example
+   :description: This example demonstrates a usage of the Aiohttp and Dependency Injector.
+
+
+This example shows how to use ``Dependency Injector`` with `Aiohttp <https://docs.aiohttp.org/>`_.
+
+The example application is a REST API that searches for funny GIFs on the `Giphy <https://giphy.com/>`_.
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/aiohttp>`_.
+
+:ref:`aiohttp-tutorial` demonstrates how to build this application step-by-step.
+
+Application structure
+---------------------
+
+Application has next structure:
+
+.. code-block:: bash
+
+   ./
+   ├── giphynavigator/
+   │   ├── __init__.py
+   │   ├── application.py
+   │   ├── containers.py
+   │   ├── giphy.py
+   │   ├── handlers.py
+   │   ├── services.py
+   │   └── tests.py
+   ├── config.yml
+   └── requirements.txt
+
+Container
+---------
+
+Declarative container is defined in ``giphynavigator/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/aiohttp/giphynavigator/containers.py
+   :language: python
+
+Handlers
+--------
+
+Handler has dependencies on search service and some config options. The dependencies are injected
+using :ref:`wiring` feature.
+
+Listing of ``giphynavigator/handlers.py``:
+
+.. literalinclude:: ../../examples/miniapps/aiohttp/giphynavigator/handlers.py
+   :language: python
+
+Application factory
+-------------------
+Application factory creates container, wires it with the ``handlers`` module, creates
+``Aiohttp`` app and setup routes.
+
+Listing of ``giphynavigator/application.py``:
+
+.. literalinclude:: ../../examples/miniapps/aiohttp/giphynavigator/application.py
+   :language: python
+
+Tests
+-----
+
+Tests use :ref:`provider-overriding` feature to replace giphy client with a mock ``giphynavigator/tests.py``:
+
+.. literalinclude:: ../../examples/miniapps/aiohttp/giphynavigator/tests.py
+   :language: python
+   :emphasize-lines: 32,59,73
+
+Sources
+-------
+
+Explore the sources on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/aiohttp>`_.
+
+.. include:: ../sponsor.rst
+
+.. disqus::

docs/examples/application-multiple-containers.rst

@@ -0,0 +1,89 @@
+.. _application-multiple-containers:
+
+Application example (multiple containers)
+=========================================
+
+.. meta::
+   :keywords: Python,Dependency Injection,Inversion of Control,Container,Example,Application,
+              Framework,AWS,boto3,client
+   :description: This example shows how you can create an application using multiple declarative
+                 containers. We build an example Python micro application following the dependency
+                 injection principle. It consists from several services with a domain logic that
+                 have dependencies on database & AWS S3.
+
+This example shows how you can create an application using multiple declarative containers. Using
+multiple declarative containers is a good choice for a large application. For
+building a moderate or a small size application refer to :ref:`application-single-container`.
+
+We build an example micro application following the dependency injection principle. It consists
+of several services with a domain logic. The services have dependencies on database & AWS S3.
+
+.. image:: images/application.png
+    :width: 100%
+    :align: center
+
+Start from the scratch or jump to the section:
+
+.. contents::
+   :local:
+   :backlinks: none
+
+You can find the source code and instructions for running on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/application-multiple-containers>`_.
+
+Application structure
+---------------------
+
+Application consists of an ``example`` package, a configuration file and a ``requirements.txt``
+file.
+
+.. code-block:: bash
+
+   ./
+   ├── example/
+   │   ├── __init__.py
+   │   ├── __main__.py
+   │   ├── containers.py
+   │   └── services.py
+   ├── config.yml
+   └── requirements.txt
+
+Containers
+----------
+
+Listing of the ``example/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/application-multiple-containers/example/containers.py
+   :language: python
+
+Main module
+-----------
+
+Listing of the ``example/__main__.py``:
+
+.. literalinclude:: ../../examples/miniapps/application-multiple-containers/example/__main__.py
+   :language: python
+
+Services
+--------
+
+Listing of the ``example/services.py``:
+
+.. literalinclude:: ../../examples/miniapps/application-multiple-containers/example/services.py
+   :language: python
+
+Configuration
+-------------
+
+Listing of the ``config.yml``:
+
+.. literalinclude:: ../../examples/miniapps/application-multiple-containers/config.yml
+   :language: yaml
+
+Run the application
+-------------------
+
+You can find the source code and instructions for running on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/application-multiple-containers>`_.
+
+.. include:: ../sponsor.rst
+
+.. disqus::

docs/examples/application-single-container.rst

@@ -0,0 +1,95 @@
+.. _application-single-container:
+
+Application example (single container)
+======================================
+
+.. meta::
+   :keywords: Python,Dependency Injection,Inversion of Control,Container,Example,Application,
+              Framework,AWS,boto3,client
+   :description: This example shows how you can create an application using a single declarative
+                 container. We build an example Python micro application following the dependency
+                 injection principle. It consists from several services with a domain logic that
+                 have dependencies on database & AWS S3.
+
+This example shows how you can create an application using a single declarative container. Using
+a single declarative container is a good choice for small or moderate size application. For
+building a large application refer to :ref:`application-multiple-containers`.
+
+We build an example micro application following the dependency injection principle. It consists
+of several services with a domain logic. The services have dependencies on database & AWS S3.
+
+.. image:: images/application.png
+    :width: 100%
+    :align: center
+
+Start from the scratch or jump to the section:
+
+.. contents::
+   :local:
+   :backlinks: none
+
+You can find the source code and instructions for running on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/application-single-container>`_.
+
+Application structure
+---------------------
+
+Application consists of an ``example`` package, several configuration files and a
+``requirements.txt`` file.
+
+.. code-block:: bash
+
+   ./
+   ├── example/
+   │   ├── __init__.py
+   │   ├── __main__.py
+   │   ├── containers.py
+   │   └── services.py
+   ├── config.ini
+   ├── logging.ini
+   └── requirements.txt
+
+Container
+---------
+
+Listing of the ``example/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/application-single-container/example/containers.py
+   :language: python
+
+Main module
+-----------
+
+Listing of the ``example/__main__.py``:
+
+.. literalinclude:: ../../examples/miniapps/application-single-container/example/__main__.py
+   :language: python
+
+Services
+--------
+
+Listing of the ``example/services.py``:
+
+.. literalinclude:: ../../examples/miniapps/application-single-container/example/services.py
+   :language: python
+
+Configuration
+-------------
+
+Listing of the ``config.ini``:
+
+.. literalinclude:: ../../examples/miniapps/application-single-container/config.ini
+   :language: ini
+
+Listing of the ``logging.ini``:
+
+.. literalinclude:: ../../examples/miniapps/application-single-container/logging.ini
+   :language: ini
+
+Run the application
+-------------------
+
+You can find the source code and instructions for running on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/application-single-container>`_.
+
+.. include:: ../sponsor.rst
+
+.. disqus::

docs/examples/boto3.rst

@@ -0,0 +1,22 @@
+.. _boto3-example:
+
+Boto3 example
+=============
+
+.. meta::
+   :keywords: Python,Dependency Injection,Boto3,AWS,Amazon Web Services,S3,SQS,Rout53,EC2,Lambda,Example
+   :description: This example demonstrates a usage of Boto3 AWS client and Dependency Injector.
+
+
+This example shows how to use ``Dependency Injector`` with `Boto3 <https://github.com/boto/boto3>`_.
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/boto3-session>`_.
+
+Listing of ``boto3_session_example.py``:
+
+.. literalinclude:: ../../examples/miniapps/boto3-session/boto3_session_example.py
+   :language: python
+
+.. include:: ../sponsor.rst
+
+.. disqus::

docs/examples/bundles_miniapp.rst

@@ -1,74 +0,0 @@
-Bundles mini application example
---------------------------------
-
-.. currentmodule:: dependency_injector.containers
-
-"Bundles" is an example mini application that is intended to demonstrate the
-power of dependency injection for creation of re-usable application components
-("bundles") with 100% transparency of their dependencies.
-
-Example application
-~~~~~~~~~~~~~~~~~~~
-
-"Bundles" mini application has next structure:
-
-.. code-block:: bash
-
-    bundles/
-        bundles/               <-- Bundles package
-            photos/            <-- Photos bundle
-                __init__.py    <-- Photos bundle dependency injection container
-                entities.py
-                repositories.py
-            users/             <-- Users bundle
-                __init__.py    <-- Users bundle dependency injection container
-                entities.py
-                repositories.py
-        run.py                 <-- Entrypoint
-
-
-IoC containers
-~~~~~~~~~~~~~~
-
-Next two listings show :py:class:`DeclarativeContainer`'s for "users" and 
-"photos" bundles.
-
-Listing of ``bundles/users/__init__.py``:
-
-.. literalinclude:: ../../examples/miniapps/bundles/bundles/users/__init__.py
-   :language: python
-
-.. note::
-
-    - ``Users`` container has dependency on database.
-
-Listing of ``bundles/photos/__init__.py``:
-
-.. literalinclude:: ../../examples/miniapps/bundles/bundles/photos/__init__.py
-   :language: python
-
-.. note::
-
-    - ``Photos`` container has dependencies on database and file storage.
-
-Run application
-~~~~~~~~~~~~~~~
-
-Finally, both "bundles" are initialized by providing needed dependencies.
-Initialization of dependencies happens right in the runtime, not earlier.
-Generally, it means, that any part of any bundle could be overridden on the
-fly.
-
-Listing of ``run.py``:
-
-.. literalinclude:: ../../examples/miniapps/bundles/run.py
-   :language: python
-
-Links
-~~~~~
-
-+ `Dependency Injector <https://github.com/ets-labs/python-dependency-injector/>`_
-+ `Full example sources <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/bundles>`_
-
-
-.. disqus::

docs/examples/chained_factories.rst

@@ -1,21 +0,0 @@
-Chained Factories pattern
-=========================
-
-This example demonstrate implementation of "Chained Factories" pattern.
-Main idea of this pattern is about wrapping :py:class:`Factory` into
-another :py:class:`Factory` that mix additional arguments or keyword
-arguments to a wrapped one.
-
-Listing of ``data.py``, demonstrates sample classes structure:
-
-.. literalinclude:: ../../examples/miniapps/factory_patterns/data.py
-   :language: python
-
-Listing of ``chained_factories.py``, demonstrates "Chained Factories"
-pattern and provide some explanation:
-
-.. literalinclude:: ../../examples/miniapps/factory_patterns/chained_factories.py
-   :language: python
-
-
-.. disqus::

docs/examples/decoupled-packages.rst

@@ -0,0 +1,134 @@
+.. _decoupled-packages:
+
+Decoupled packages example (multiple containers)
+================================================
+
+.. meta::
+   :keywords: Python,Dependency Injection,Inversion of Control,Container,Example,Application,
+              Framework,AWS,boto3,client
+   :description: This example shows how to use Dependency Injector to create Python decoupled packages.
+                 To achieve a decoupling each package has a container with the components. When
+                 a component needs a dependency from the outside of the package scope we use the
+                 Dependency provider. The package container has no knowledge on where the
+                 dependencies come from. It states a need that the dependencies must be provided.
+                 This helps to decouple a package from the 3rd party dependencies and other
+                 packages.
+
+This example shows how to use ``Dependency Injector`` to create decoupled packages.
+
+To achieve a decoupling each package has a container with the components. When a component needs a
+dependency from the outside of the package scope we use the ``Dependency`` provider. The package
+container has no knowledge on where the dependencies come from. It states a need that the
+dependencies must be provided. This helps to decouple a package from the 3rd party dependencies
+and other packages.
+
+To wire the packages we use an application container. Application container has all 3rd party
+dependencies and package containers. It wires the packages and dependencies to create a
+complete application.
+
+We build an example micro application that consists of 3 packages:
+
+- ``user`` - a package with user domain logic, depends on a database
+- ``photo`` - a package with photo domain logic, depends on a database and AWS S3
+- ``analytics`` - a package with analytics domain logic, depends on the  ``user`` and ``photo``
+  package components
+
+.. image:: images/decoupled-packages.png
+    :width: 100%
+    :align: center
+
+Start from the scratch or jump to the section:
+
+.. contents::
+   :local:
+   :backlinks: none
+
+You can find the source code and instructions for running on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/decoupled-packages>`_.
+
+Application structure
+---------------------
+
+Application consists of an ``example`` package, a configuration file and a ``requirements.txt``
+file.
+
+.. code-block:: bash
+
+   ./
+   ├── example/
+   │   ├── analytics/
+   │   │   ├── __init__.py
+   │   │   ├── containers.py
+   │   │   └── services.py
+   │   ├── photo/
+   │   │   ├── __init__.py
+   │   │   ├── containers.py
+   │   │   ├── entities.py
+   │   │   └── repositories.py
+   │   ├── user/
+   │   │   ├── __init__.py
+   │   │   ├── containers.py
+   │   │   ├── entities.py
+   │   │   └── repositories.py
+   │   ├── __init__.py
+   │   ├── __main__.py
+   │   └── containers.py
+   ├── config.ini
+   └── requirements.txt
+
+Package containers
+------------------
+
+Listing of the ``example/user/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/decoupled-packages/example/user/containers.py
+   :language: python
+
+Listing of the ``example/photo/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/decoupled-packages/example/photo/containers.py
+   :language: python
+
+Listing of the ``example/analytics/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/decoupled-packages/example/analytics/containers.py
+   :language: python
+
+Application container
+---------------------
+
+Application container consists of all packages and 3rd party dependencies. Its role is to wire
+everything together in a complete application.
+
+Listing of the ``example/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/decoupled-packages/example/containers.py
+   :language: python
+
+.. note::
+   Package ``analytics`` has dependencies on the repositories from the ``user`` and
+   ``photo`` packages. This is an example of how you can pass the dependencies from one package
+   to another.
+
+Main module
+-----------
+Listing of the ``example/__main__.py``:
+
+.. literalinclude:: ../../examples/miniapps/decoupled-packages/example/__main__.py
+   :language: python
+
+Configuration
+-------------
+
+Listing of the ``config.ini``:
+
+.. literalinclude:: ../../examples/miniapps/decoupled-packages/config.ini
+   :language: ini
+
+Run the application
+-------------------
+
+You can find the source code and instructions for running on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/decoupled-packages>`_.
+
+.. include:: ../sponsor.rst
+
+.. disqus::

docs/examples/django.rst

@@ -0,0 +1,99 @@
+.. _django-example:
+
+Django example
+==============
+
+.. meta::
+   :keywords: Python,Dependency Injection,Django,Example
+   :description: This example demonstrates a usage of the Django and Dependency Injector.
+
+
+This example shows how to use ``Dependency Injector`` with `Django <https://www.djangoproject.com/>`_.
+
+The example application helps to search for repositories on the Github.
+
+.. image:: images/django.png
+    :width: 100%
+    :align: center
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/django>`_.
+
+Application structure
+---------------------
+
+Application has standard Django project structure. It consists of ``githubnavigator`` project package and
+``web`` application package:
+
+.. code-block:: bash
+
+   ./
+   ├── githubnavigator/
+   │   ├── __init__.py
+   │   ├── asgi.py
+   │   ├── containers.py
+   │   ├── services.py
+   │   ├── settings.py
+   │   ├── urls.py
+   │   └── wsgi.py
+   ├── web/
+   │   ├── templates/
+   │   │   ├── base.html
+   │   │   └── index.html
+   │   ├── __init__.py
+   │   ├── apps.py
+   │   ├── tests.py
+   │   ├── urls.py
+   │   └── views.py
+   ├── manage.py
+   └── requirements.txt
+
+Container
+---------
+
+Declarative container is defined in ``githubnavigator/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/django/githubnavigator/containers.py
+   :language: python
+
+Container instance is created in ``githubnavigator/__init__.py``:
+
+.. literalinclude:: ../../examples/miniapps/django/githubnavigator/__init__.py
+   :language: python
+
+Views
+-----
+
+View has dependencies on search service and some config options. The dependencies are injected
+using :ref:`wiring` feature.
+
+Listing of ``web/views.py``:
+
+.. literalinclude:: ../../examples/miniapps/django/web/views.py
+   :language: python
+
+App config
+----------
+
+Container is wired to the ``views`` module in the app config ``web/apps.py``:
+
+.. literalinclude:: ../../examples/miniapps/django/web/apps.py
+   :language: python
+   :emphasize-lines: 12
+
+Tests
+-----
+
+Tests use :ref:`provider-overriding` feature to replace github client with a mock ``web/tests.py``:
+
+.. literalinclude:: ../../examples/miniapps/django/web/tests.py
+   :language: python
+   :emphasize-lines: 39,60
+
+Sources
+-------
+
+Explore the sources on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/django>`_.
+
+.. include:: ../sponsor.rst
+
+.. disqus::

docs/examples/factory_of_factories.rst

@@ -1,20 +0,0 @@
-Factory of Factories pattern
-============================
-
-This example demonstrate implementation of "Factory of Factories" pattern.
-Main idea of this pattern is about creation of a :py:class:`Factory` that
-creates another :py:class:`Factory` and mix additional arguments to it.
-
-Listing of ``data.py``, demonstrates sample classes structure:
-
-.. literalinclude:: ../../examples/miniapps/factory_patterns/data.py
-   :language: python
-
-Listing of ``factory_of_factories.py``, demonstrates "Chained Factories"
-pattern and provide some explanation:
-
-.. literalinclude:: ../../examples/miniapps/factory_patterns/factory_of_factories.py
-   :language: python
-
-
-.. disqus::

docs/examples/fastapi-redis.rst

@@ -0,0 +1,100 @@
+.. _fastapi-redis-example:
+
+FastAPI + Redis example
+=======================
+
+.. meta::
+   :keywords: Python,Dependency Injection,FastAPI,Redis,Example
+   :description: This example demonstrates a usage of the FastAPI, Redis, and Dependency Injector.
+
+This example shows how to use ``Dependency Injector`` with `FastAPI <https://fastapi.tiangolo.com/>`_ and
+`Redis <https://redis.io/>`_.
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/fastapi-redis>`_.
+
+See also:
+
+- Provider :ref:`async-injections`
+- Resource provider :ref:`resource-async-initializers`
+- Wiring :ref:`async-injections-wiring`
+
+Application structure
+---------------------
+
+Application has next structure:
+
+.. code-block:: bash
+
+   ./
+   ├── fastapiredis/
+   │   ├── __init__.py
+   │   ├── application.py
+   │   ├── containers.py
+   │   ├── redis.py
+   │   ├── services.py
+   │   └── tests.py
+   ├── docker-compose.yml
+   ├── Dockerfile
+   └── requirements.txt
+
+Redis
+-----
+
+Module ``redis`` defines Redis connection pool initialization and shutdown. See ``fastapiredis/redis.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-redis/fastapiredis/redis.py
+   :language: python
+
+Service
+-------
+
+Module ``services`` contains example service. Service has a dependency on Redis connection pool.
+It uses it for getting and setting a key asynchronously. Real life service will do something more meaningful.
+See ``fastapiredis/services.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-redis/fastapiredis/services.py
+   :language: python
+
+Container
+---------
+
+Declarative container wires example service with Redis connection pool. See ``fastapiredis/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-redis/fastapiredis/containers.py
+   :language: python
+
+Application
+-----------
+
+Module ``application`` creates ``FastAPI`` app, setup endpoint, and init container.
+
+Endpoint ``index`` has a dependency on example service. The dependency is injected using :ref:`wiring` feature.
+
+Listing of ``fastapiredis/application.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-redis/fastapiredis/application.py
+   :language: python
+
+Tests
+-----
+
+Tests use :ref:`provider-overriding` feature to replace example service with a mock. See ``fastapiredis/tests.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-redis/fastapiredis/tests.py
+   :language: python
+   :emphasize-lines: 24
+
+Sources
+-------
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/fastapi-redis>`_.
+
+See also:
+
+- Provider :ref:`async-injections`
+- Resource provider :ref:`resource-async-initializers`
+- Wiring :ref:`async-injections-wiring`
+
+.. include:: ../sponsor.rst
+
+.. disqus::

docs/examples/fastapi-sqlalchemy.rst

@@ -0,0 +1,121 @@
+.. _fastapi-sqlalchemy-example:
+
+FastAPI + SQLAlchemy example
+============================
+
+.. meta::
+   :keywords: Python,Dependency Injection,FastAPI,SQLAlchemy,Example
+   :description: This example demonstrates a usage of the FastAPI, SQLAlchemy, and Dependency Injector.
+
+This example shows how to use ``Dependency Injector`` with `FastAPI <https://fastapi.tiangolo.com/>`_ and
+`SQLAlchemy <https://www.sqlalchemy.org/>`_.
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/fastapi-sqlalchemy>`_.
+
+Thanks to `@ShvetsovYura <https://github.com/ShvetsovYura>`_ for providing initial example:
+`FastAPI_DI_SqlAlchemy <https://github.com/ShvetsovYura/FastAPI_DI_SqlAlchemy>`_.
+
+Application structure
+---------------------
+
+Application has next structure:
+
+.. code-block:: bash
+
+   ./
+   ├── webapp/
+   │   ├── __init__.py
+   │   ├── application.py
+   │   ├── containers.py
+   │   ├── database.py
+   │   ├── endpoints.py
+   │   ├── models.py
+   │   ├── repositories.py
+   │   ├── services.py
+   │   └── tests.py
+   ├── config.yml
+   ├── docker-compose.yml
+   ├── Dockerfile
+   └── requirements.txt
+
+Application factory
+-------------------
+
+Application factory creates container, wires it with the ``endpoints`` module, creates
+``FastAPI`` app, and setup routes.
+
+Application factory also creates database if it does not exist.
+
+Listing of ``webapp/application.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-sqlalchemy/webapp/application.py
+   :language: python
+
+Endpoints
+---------
+
+Module ``endpoints`` contains example endpoints. Endpoints have a dependency on user service.
+User service is injected using :ref:`wiring` feature. See ``webapp/endpoints.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-sqlalchemy/webapp/endpoints.py
+   :language: python
+
+Container
+---------
+
+Declarative container wires example user service, user repository, and utility database class.
+See ``webapp/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-sqlalchemy/webapp/containers.py
+   :language: python
+
+Services
+--------
+
+Module ``services`` contains example user service. See ``webapp/services.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-sqlalchemy/webapp/services.py
+   :language: python
+
+Repositories
+------------
+
+Module ``repositories`` contains example user repository. See ``webapp/repositories.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-sqlalchemy/webapp/repositories.py
+   :language: python
+
+Models
+------
+
+Module ``models`` contains example SQLAlchemy user model. See ``webapp/models.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-sqlalchemy/webapp/models.py
+   :language: python
+
+Database
+--------
+
+Module ``database`` defines declarative base and utility class with engine and session factory.
+See ``webapp/database.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-sqlalchemy/webapp/database.py
+   :language: python
+
+Tests
+-----
+
+Tests use :ref:`provider-overriding` feature to replace repository with a mock. See ``webapp/tests.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi-sqlalchemy/webapp/tests.py
+   :language: python
+   :emphasize-lines: 25, 45, 58, 74, 86, 97
+
+Sources
+-------
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/fastapi-sqlalchemy>`_.
+
+.. include:: ../sponsor.rst
+
+.. disqus::

docs/examples/fastapi.rst

@@ -0,0 +1,81 @@
+.. _fastapi-example:
+
+FastAPI example
+===============
+
+.. meta::
+   :keywords: Python,Dependency Injection,FastAPI,Example
+   :description: This example demonstrates a usage of the FastAPI and Dependency Injector.
+
+
+This example shows how to use ``Dependency Injector`` with `FastAPI <https://fastapi.tiangolo.com/>`_.
+
+The example application is a REST API that searches for funny GIFs on the `Giphy <https://giphy.com/>`_.
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/fastapi>`_.
+
+Application structure
+---------------------
+
+Application has next structure:
+
+.. code-block:: bash
+
+   ./
+   ├── giphynavigator/
+   │   ├── __init__.py
+   │   ├── application.py
+   │   ├── containers.py
+   │   ├── endpoints.py
+   │   ├── giphy.py
+   │   ├── services.py
+   │   └── tests.py
+   ├── config.yml
+   └── requirements.txt
+
+Container
+---------
+
+Declarative container is defined in ``giphynavigator/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi/giphynavigator/containers.py
+   :language: python
+
+Endpoints
+---------
+
+Endpoint has a dependency on search service. There are also some config options that are used as default values.
+The dependencies are injected using :ref:`wiring` feature.
+
+Listing of ``giphynavigator/endpoints.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi/giphynavigator/endpoints.py
+   :language: python
+
+Application factory
+-------------------
+Application factory creates container, wires it with the ``endpoints`` module, creates
+``FastAPI`` app, and setup routes.
+
+Listing of ``giphynavigator/application.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi/giphynavigator/application.py
+   :language: python
+
+Tests
+-----
+
+Tests use :ref:`provider-overriding` feature to replace giphy client with a mock ``giphynavigator/tests.py``:
+
+.. literalinclude:: ../../examples/miniapps/fastapi/giphynavigator/tests.py
+   :language: python
+   :emphasize-lines: 29,57,72
+
+Sources
+-------
+
+Explore the sources on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/fastapi>`_.
+
+.. include:: ../sponsor.rst
+
+.. disqus::

docs/examples/fastdepends.rst

@@ -0,0 +1,48 @@
+.. _fastdepends-example:
+
+FastDepends example
+===================
+
+.. meta::
+   :keywords: Python,Dependency Injection,FastDepends,Example
+   :description: This example demonstrates a usage of the FastDepends and Dependency Injector.
+
+
+This example demonstrates how to use ``Dependency Injector`` with `FastDepends <https://github.com/Lancetnik/FastDepends>`_, a lightweight dependency injection framework inspired by FastAPI's dependency system, but without the web framework components.
+
+Basic Usage
+-----------
+
+The integration between FastDepends and Dependency Injector is straightforward. Simply use Dependency Injector's ``Provide`` marker within FastDepends' ``Depends`` function:
+
+.. code-block:: python
+
+    import sys
+
+    from dependency_injector import containers, providers
+    from dependency_injector.wiring import inject, Provide
+    from fast_depends import Depends
+
+
+    class CoefficientService:
+        @staticmethod
+        def get_coefficient() -> float:
+            return 1.2
+
+
+    class Container(containers.DeclarativeContainer):
+        service = providers.Factory(CoefficientService)
+
+
+    @inject
+    def apply_coefficient(
+        a: int,
+        coefficient_provider: CoefficientService = Depends(Provide[Container.service]),
+    ) -> float:
+        return a * coefficient_provider.get_coefficient()
+
+
+    container = Container()
+    container.wire(modules=[sys.modules[__name__]])
+
+    apply_coefficient(100) == 120.0

docs/examples/flask-blueprints.rst

@@ -0,0 +1,91 @@
+.. _flask-blueprints-example:
+
+Flask blueprints example
+========================
+
+.. meta::
+   :keywords: Python,Dependency Injection,Flask,Blueprints,Example
+   :description: This example demonstrates a usage of the Flask Blueprints and Dependency Injector.
+
+
+This example shows how to use ``Dependency Injector`` with `Flask <https://flask.palletsprojects.com/en/1.1.x/>`_
+blueprints.
+
+The example application helps to search for repositories on the Github.
+
+.. image:: images/flask.png
+    :width: 100%
+    :align: center
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/flask-blueprints>`_.
+
+Application structure
+---------------------
+
+Application has next structure:
+
+.. code-block:: bash
+
+   ./
+   ├── githubnavigator/
+   │   ├── blueprints
+   │   │   ├── __init__.py
+   │   │   └── example.py
+   │   ├── templates
+   │   │   ├── base.html
+   │   │   └── index.py
+   │   ├── __init__.py
+   │   ├── application.py
+   │   ├── containers.py
+   │   ├── services.py
+   │   └── tests.py
+   ├── config.yml
+   └── requirements.txt
+
+Container
+---------
+
+Declarative container is defined in ``githubnavigator/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/flask-blueprints/githubnavigator/containers.py
+   :language: python
+
+Blueprints
+----------
+
+Blueprint's view has dependencies on search service and some config options. The dependencies are injected
+using :ref:`wiring` feature.
+
+Listing of ``githubnavigator/blueprints/example.py``:
+
+.. literalinclude:: ../../examples/miniapps/flask-blueprints/githubnavigator/blueprints/example.py
+   :language: python
+
+Application factory
+-------------------
+
+Application factory creates container, wires it with the blueprints, creates
+``Flask`` app, and setup routes.
+
+Listing of ``githubnavigator/application.py``:
+
+.. literalinclude:: ../../examples/miniapps/flask-blueprints/githubnavigator/application.py
+   :language: python
+
+Tests
+-----
+
+Tests use :ref:`provider-overriding` feature to replace github client with a mock ``githubnavigator/tests.py``:
+
+.. literalinclude:: ../../examples/miniapps/flask-blueprints/githubnavigator/tests.py
+   :language: python
+   :emphasize-lines: 44,67
+
+Sources
+-------
+
+Explore the sources on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/flask-blueprints>`_.
+
+.. include:: ../sponsor.rst
+
+.. disqus::

docs/examples/flask.rst

@@ -0,0 +1,89 @@
+.. _flask-example:
+
+Flask example
+=============
+
+.. meta::
+   :keywords: Python,Dependency Injection,Flask,Example
+   :description: This example demonstrates a usage of the Flask and Dependency Injector.
+
+
+This example shows how to use ``Dependency Injector`` with `Flask <https://flask.palletsprojects.com/en/1.1.x/>`_.
+
+The example application helps to search for repositories on the Github.
+
+.. image:: images/flask.png
+    :width: 100%
+    :align: center
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/flask>`_.
+
+:ref:`flask-tutorial` demonstrates how to build this application step-by-step.
+
+Application structure
+---------------------
+
+Application has next structure:
+
+.. code-block:: bash
+
+   ./
+   ├── githubnavigator/
+   │   ├── templates
+   │   │   ├── base.html
+   │   │   └── index.py
+   │   ├── __init__.py
+   │   ├── application.py
+   │   ├── containers.py
+   │   ├── services.py
+   │   ├── tests.py
+   │   └── views.py
+   ├── config.yml
+   └── requirements.txt
+
+Container
+---------
+
+Declarative container is defined in ``githubnavigator/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/flask/githubnavigator/containers.py
+   :language: python
+
+Views
+-----
+
+View has dependencies on search service and some config options. The dependencies are injected
+using :ref:`wiring` feature.
+
+Listing of ``githubnavigator/views.py``:
+
+.. literalinclude:: ../../examples/miniapps/flask/githubnavigator/views.py
+   :language: python
+
+Application factory
+-------------------
+Application factory creates container, wires it with the ``views`` module, creates
+``Flask`` app and setup routes.
+
+Listing of ``githubnavigator/application.py``:
+
+.. literalinclude:: ../../examples/miniapps/flask/githubnavigator/application.py
+   :language: python
+
+Tests
+-----
+
+Tests use :ref:`provider-overriding` feature to replace github client with a mock ``githubnavigator/tests.py``:
+
+.. literalinclude:: ../../examples/miniapps/flask/githubnavigator/tests.py
+   :language: python
+   :emphasize-lines: 44,67
+
+Sources
+-------
+
+Explore the sources on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/flask>`_.
+
+.. include:: ../sponsor.rst
+
+.. disqus::

docs/examples/index.rst

@@ -2,23 +2,26 @@ Examples
 ========
 
 .. meta::
-   :keywords: Python,DI,Dependency injection,IoC,Inversion of Control
-   :description: Current section of documentation is designed to provide 
-                 several example mini applications that are built on the top 
-                 of inversion of control principle and powered by 
-                 "Dependency Injector" framework.
+   :keywords: Python,DI,Dependency injection,IoC,Inversion of Control,Example
+   :description: Python dependency injection examples.
 
-Current section of documentation is designed to provide several example mini 
-applications that are built according to the inversion of control principle 
-and powered by *Dependency Injector* framework.
+Explore the examples to see the ``Dependency Injector`` in action.
 
 ..  toctree::
     :maxdepth: 2
 
-    services_miniapp_v1
-    services_miniapp_v2
-    bundles_miniapp
-    use_cases_miniapp
-    password_hashing_miniapp
-    chained_factories
-    factory_of_factories
+    application-single-container
+    application-multiple-containers
+    decoupled-packages
+    boto3
+    django
+    flask
+    flask-blueprints
+    aiohttp
+    sanic
+    fastapi
+    fastapi-redis
+    fastapi-sqlalchemy
+    fastdepends
+
+.. disqus::

docs/examples/password_hashing_miniapp.rst

@@ -1,18 +0,0 @@
-Dependency injection and password hashing in Python
-===================================================
-
-Small example that demonstrates using of dependency injection for user
-password hashing.
-
-Instructions for running:
-
-.. code-block:: bash
-
-    python example.py
-
-Listing of ``example.py``:
-
-.. literalinclude:: ../../examples/miniapps/password_hashing/example.py
-   :language: python
-
-.. disqus::

docs/examples/sanic.rst

@@ -0,0 +1,82 @@
+.. _sanic-example:
+
+Sanic example
+==============
+
+.. meta::
+   :keywords: Python,Dependency Injection,Sanic,Example
+   :description: This example demonstrates a usage of the Sanic and Dependency Injector.
+
+
+This example shows how to use ``Dependency Injector`` with `Sanic <https://sanic.readthedocs.io/en/latest/>`_.
+
+The example application is a REST API that searches for funny GIFs on the `Giphy <https://giphy.com/>`_.
+
+The source code is available on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/sanic>`_.
+
+Application structure
+---------------------
+
+Application has next structure:
+
+.. code-block:: bash
+
+   ./
+   ├── giphynavigator/
+   │   ├── __init__.py
+   │   ├── __main__.py
+   │   ├── application.py
+   │   ├── containers.py
+   │   ├── giphy.py
+   │   ├── handlers.py
+   │   ├── services.py
+   │   └── tests.py
+   ├── config.yml
+   └── requirements.txt
+
+Container
+---------
+
+Declarative container is defined in ``giphynavigator/containers.py``:
+
+.. literalinclude:: ../../examples/miniapps/sanic/giphynavigator/containers.py
+   :language: python
+
+Handlers
+--------
+
+Handler has dependencies on search service and some config options. The dependencies are injected
+using :ref:`wiring` feature.
+
+Listing of ``giphynavigator/handlers.py``:
+
+.. literalinclude:: ../../examples/miniapps/sanic/giphynavigator/handlers.py
+   :language: python
+
+Application factory
+-------------------
+Application factory creates container, wires it with the ``handlers`` module, creates
+``Sanic`` app and setup routes.
+
+Listing of ``giphynavigator/application.py``:
+
+.. literalinclude:: ../../examples/miniapps/sanic/giphynavigator/application.py
+   :language: python
+
+Tests
+-----
+
+Tests use :ref:`provider-overriding` feature to replace giphy client with a mock ``giphynavigator/tests.py``:
+
+.. literalinclude:: ../../examples/miniapps/sanic/giphynavigator/tests.py
+   :language: python
+   :emphasize-lines: 34,61,75
+
+Sources
+-------
+
+Explore the sources on the `Github <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/sanic>`_.
+
+.. include:: ../sponsor.rst
+
+.. disqus::

docs/examples/services_miniapp_v1.rst

@@ -1,73 +0,0 @@
-Services mini application example (v1 - multiple containers)
-------------------------------------------------------------
-
-.. meta::
-   :description: "Services miniapp" is an example mini application that 
-                 consists from several services that have dependencies on 
-                 some standard and 3rd-party libraries for logging, 
-                 interaction with database and remote service via API. 
-                 "Services miniapp" example demonstrates usage of 
-                 Dependency Injector for creating several inversion of control /
-                 dependency injection containers.
-
-"Services miniapp" is an example mini application that consists from several 
-services that have dependencies on some standard and 3rd-party libraries for 
-logging, interaction with database and remote service calls via API.
-
-"Services miniapp" example demonstrates usage of 
-:doc:`Dependency Injector <../index>` for creating several IoC containers.
-
-Instructions for running:
-
-.. code-block:: bash
-
-    python run.py 1 secret photo.jpg
-
-Example application
-~~~~~~~~~~~~~~~~~~~
-
-Classes diagram:
-
-.. image:: /images/miniapps/services/classes.png
-    :width: 100%
-    :align: center
-
-
-Example application structure:
-
-.. code-block:: bash
-
-    /example
-        /__init__.py
-        /main.py
-        /services.py
-
-
-Listing of ``example/services.py``:
-
-.. literalinclude:: ../../examples/miniapps/services_v1/example/services.py
-   :language: python
-
-Listing of ``example/main.py``:
-
-.. literalinclude:: ../../examples/miniapps/services_v1/example/main.py
-   :language: python
-
-IoC containers
-~~~~~~~~~~~~~~
-
-Listing of ``containers.py``:
-
-.. literalinclude:: ../../examples/miniapps/services_v1/containers.py
-   :language: python
-
-Run application
-~~~~~~~~~~~~~~~
-
-Listing of ``run.py``:
-
-.. literalinclude:: ../../examples/miniapps/services_v1/run.py
-   :language: python
-
-
-.. disqus::

docs/examples/services_miniapp_v2.rst

@@ -1,73 +0,0 @@
-Services mini application example (v2 - single container)
----------------------------------------------------------
-
-.. meta::
-   :description: "Services miniapp" is an example mini application that 
-                 consists from several services that have dependencies on 
-                 some standard and 3rd-party libraries for logging, 
-                 interaction with database and remote service via API. 
-                 "Services miniapp" example demonstrates usage of 
-                 Dependency Injector for creating inversion of control /
-                 dependency injection container.
-
-"Services miniapp" is an example mini application that consists from several 
-services that have dependencies on some standard and 3rd-party libraries for 
-logging, interaction with database and remote service calls via API.
-
-"Services miniapp" example demonstrates usage of 
-:doc:`Dependency Injector <../index>` for creating IoC container.
-
-Instructions for running:
-
-.. code-block:: bash
-
-    python run.py 1 secret photo.jpg
-
-Example application
-~~~~~~~~~~~~~~~~~~~
-
-Classes diagram:
-
-.. image:: /images/miniapps/services/classes.png
-    :width: 100%
-    :align: center
-
-
-Example application structure:
-
-.. code-block:: bash
-
-    /example
-        /__init__.py
-        /main.py
-        /services.py
-
-
-Listing of ``example/services.py``:
-
-.. literalinclude:: ../../examples/miniapps/services_v2/example/services.py
-   :language: python
-
-Listing of ``example/main.py``:
-
-.. literalinclude:: ../../examples/miniapps/services_v2/example/main.py
-   :language: python
-
-IoC container
-~~~~~~~~~~~~~
-
-Listing of ``container.py``:
-
-.. literalinclude:: ../../examples/miniapps/services_v2/container.py
-   :language: python
-
-Run application
-~~~~~~~~~~~~~~~
-
-Listing of ``run.py``:
-
-.. literalinclude:: ../../examples/miniapps/services_v2/run.py
-   :language: python
-
-
-.. disqus::

docs/examples/use_cases_miniapp.rst

@@ -1,55 +0,0 @@
-Use cases mini application example
-----------------------------------
-
-.. currentmodule:: dependency_injector.providers
-
-"Use cases" miniapp demonstrate usage of :py:class:`DependenciesContainer` 
-provider.
-
-Example application
-~~~~~~~~~~~~~~~~~~~
-
-"Use cases" mini application has next structure:
-
-.. code-block:: bash
-
-    use_cases/
-        example/               <-- Example package
-            __init__.py
-            adapters.py
-            use_cases.py
-        containers.py          <-- Dependency injection containers
-        run.py                 <-- Entrypoint
-
-
-IoC containers
-~~~~~~~~~~~~~~
-
-Listing of ``use_cases/containers.py``:
-
-.. literalinclude:: ../../examples/miniapps/use_cases/containers.py
-   :language: python
-
-Run application
-~~~~~~~~~~~~~~~
-
-Listing of ``run.py``:
-
-.. literalinclude:: ../../examples/miniapps/use_cases/run.py
-   :language: python
-
-Instructions for running:
-
-.. code-block:: bash
-
-    python run.py prod example@example.com  # Running in "production" environment
-    python run.py test example@example.com  # Running in "testing" environment
-
-Links
-~~~~~
-
-+ `Dependency Injector <https://github.com/ets-labs/python-dependency-injector/>`_
-+ `Full example sources <https://github.com/ets-labs/python-dependency-injector/tree/master/examples/miniapps/use_cases>`_
-
-
-.. disqus::

docs/index.rst

@@ -34,15 +34,15 @@ Dependency Injector --- Dependency injection framework for Python
    :target: https://pypi.org/project/dependency-injector/
    :alt: Supported Python implementations
 
-.. image:: https://pepy.tech/badge/dependency-injector
+.. image:: https://static.pepy.tech/badge/dependency-injector
    :target: https://pepy.tech/project/dependency-injector
    :alt: Downloads
 
-.. image:: https://pepy.tech/badge/dependency-injector/month
+.. image:: https://static.pepy.tech/badge/dependency-injector/month
    :target: https://pepy.tech/project/dependency-injector
    :alt: Downloads
 
-.. image:: https://pepy.tech/badge/dependency-injector/week
+.. image:: https://static.pepy.tech/badge/dependency-injector/week
    :target: https://pepy.tech/project/dependency-injector
    :alt: Downloads
 
@@ -50,47 +50,84 @@ Dependency Injector --- Dependency injection framework for Python
    :target: https://pypi.org/project/dependency-injector/
    :alt: Wheel
 
-.. image:: https://travis-ci.org/ets-labs/python-dependency-injector.svg?branch=master
-   :target: https://travis-ci.org/ets-labs/python-dependency-injector
+.. image:: https://img.shields.io/github/actions/workflow/status/ets-labs/python-dependency-injector/tests-and-linters.yml?branch=master
+   :target: https://github.com/ets-labs/python-dependency-injector/actions
    :alt: Build Status
 
-.. image:: http://readthedocs.org/projects/python-dependency-injector/badge/?version=latest
-   :target: http://python-dependency-injector.ets-labs.org/
-   :alt: Docs Status
-
 .. image:: https://coveralls.io/repos/github/ets-labs/python-dependency-injector/badge.svg?branch=master
    :target: https://coveralls.io/github/ets-labs/python-dependency-injector?branch=master
    :alt: Coverage Status
 
 ``Dependency Injector`` is a dependency injection framework for Python.
 
-It stands on two principles:
+It helps implementing the dependency injection principle.
 
-- Explicit is better than implicit (PEP20).
-- Do no magic to your code.
+Key features of the ``Dependency Injector``:
 
-How does it different from the other frameworks?
+- **Providers**. Provides ``Factory``, ``Singleton``, ``Callable``, ``Coroutine``, ``Object``,
+  ``List``, ``Dict``, ``Configuration``, ``Resource``, ``Dependency``, and ``Selector`` providers
+  that help assemble your objects. See :ref:`providers`.
+- **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``, and ``json`` 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`.
+- **Containers**. Provides declarative and dynamic containers. See :ref:`containers`.
+- **Wiring**. Injects dependencies into functions and methods. Helps integrate with
+  other frameworks: Django, Flask, Aiohttp, Sanic, FastAPI, etc. See :ref:`wiring`.
+- **Asynchronous**. Supports asynchronous injections. See :ref:`async-injections`.
+- **Typing**. Provides typing stubs, ``mypy``-friendly. See :ref:`provider-typing`.
+- **Performance**. Fast. Written in ``Cython``.
+- **Maturity**. Mature and production-ready. Well-tested, documented, and supported.
 
-- **No autowiring.** The framework does NOT do any autowiring / autoresolving of the dependencies. You need to specify everything explicitly. Because *"Explicit is better than implicit" (PEP20)*.
-- **Does not pollute your code.** Your application does NOT know and does NOT depend on the framework. No ``@inject`` decorators, annotations, patching or any other magic tricks.
+.. code-block:: python
 
-``Dependency Injector`` makes a simple contract with you:
+   from dependency_injector import containers, providers
+   from dependency_injector.wiring import Provide, inject
 
-- You tell the framework how to assemble your objects
-- The framework does it for you
 
-The power of the ``Dependency Injector`` is in its simplicity and straightforwardness. It is a simple tool for the powerful concept.
+   class Container(containers.DeclarativeContainer):
 
-With the ``Dependency Injector`` you keep **application structure in one place**.
-This place is called **the container**. You use the container to manage all the components of the
-application. All the component dependencies are defined explicitly. This provides the control on
-the application structure. It is **easy to understand and change** it.
+       config = providers.Configuration()
 
-.. figure:: https://raw.githubusercontent.com/wiki/ets-labs/python-dependency-injector/img/di-map.svg
+       api_client = providers.Singleton(
+           ApiClient,
+           api_key=config.api_key,
+           timeout=config.timeout,
+       )
+
+       service = providers.Factory(
+           Service,
+           api_client=api_client,
+       )
+
+
+   @inject
+   def main(service: Service = Provide[Container.service]) -> None:
+       ...
+
+
+   if __name__ == "__main__":
+       container = Container()
+       container.config.api_key.from_env("API_KEY", required=True)
+       container.config.timeout.from_env("TIMEOUT", as_=int, default=5)
+       container.wire(modules=[__name__])
+
+       main()  # <-- dependency is injected automatically
+
+       with container.api_client.override(mock.Mock()):
+           main()  # <-- overridden dependency is injected automatically
+
+With the ``Dependency Injector``, object assembling is consolidated in the container.
+Dependency injections are defined explicitly.
+This makes it easier to understand and change how the application works.
+
+.. figure:: https://raw.githubusercontent.com/wiki/ets-labs/python-dependency-injector/img/di-readme.svg
    :target: https://github.com/ets-labs/python-dependency-injector
 
-*The container is like a map of your application. You always know what depends on what.*
-
 Explore the documentation to know more about the ``Dependency Injector``.
 
 .. _contents:
@@ -102,11 +139,12 @@ Contents
    :maxdepth: 2
 
    introduction/index
-    main/installation
+   examples/index
    tutorials/index
    providers/index
    containers/index
-    examples/index
+   wiring
+   examples-other/index
    api/index
    main/feedback
    main/changelog

docs/introduction/di_in_python.rst

@@ -1,153 +1,315 @@
 Dependency injection and inversion of control in Python
--------------------------------------------------------
+=======================================================
 
 .. meta::
-   :keywords: Python,DI,Dependency injection,IoC,Inversion of Control
-   :description: This article describes benefits of dependency injection and 
-                 inversion of control for Python applications. Also it 
-                 contains some Python examples that show how dependency 
-                 injection and inversion could be implemented. In addition, it 
-                 demonstrates usage of dependency injection framework, 
-                 IoC container and such popular design pattern as Factory.
+   :keywords: Python,DI,Dependency injection,IoC,Inversion of Control,Example
+   :description: This page describes a usage of the dependency injection and inversion of control
+                 in Python. It contains Python examples that show how to implement dependency
+                 injection. It demonstrates a usage of the dependency injection framework
+                 Dependency Injector, its container, Factory, Singleton and Configuration
+                 providers. The example show how to use Dependency Injector providers overriding
+                 feature for testing or configuring project in different environments and explains
+                 why it's better than monkey-patching.
 
-History
-~~~~~~~
+Originally dependency injection pattern got popular in languages with static typing like Java.
+Dependency injection is a principle that helps to achieve an inversion of control. A
+dependency injection framework can significantly improve the flexibility of a language
+with static typing. Implementation of a dependency injection framework for a language
+with static typing is not something that one can do quickly. It will be a quite complex thing
+to be done well. And will take time.
 
-Originally, dependency injection pattern got popular in languages with static 
-typing, like Java. Dependency injection framework can 
-significantly improve flexibility of the language with static typing. Also,
-implementation of dependency injection framework for language with static 
-typing is not something that one can do shortly, it could be quite complex 
-thing to be done well.
+Python is an interpreted language with dynamic typing. There is an opinion that dependency
+injection doesn't work for it as well as it does for Java. A lot of the flexibility is already
+built-in. Also, there is an opinion that a dependency injection framework is something that
+Python developer rarely needs. Python developers say that dependency injection can be implemented
+easily using language fundamentals.
 
-While Python is very flexible interpreted language with dynamic typing, there 
-is a meaning that dependency injection doesn't work for it as well, as it does 
-for Java. Also there is a meaning that dependency injection framework is 
-something that Python developer would not ever need, cause dependency injection
-could be implemented easily using language fundamentals.
+This page describes the advantages of applying dependency injection in Python. It
+contains Python examples that show how to implement dependency injection. It demonstrates the usage
+of the ``Dependency Injector`` framework, its container, ``Factory``, ``Singleton``,
+and ``Configuration`` providers. The example shows how to use providers' overriding feature
+of ``Dependency Injector`` for testing or re-configuring a project in different environments and
+explains why it's better than monkey-patching.
 
-Discussion
-~~~~~~~~~~
+What is dependency injection?
+-----------------------------
 
-It is true. 
+Let's see what the dependency injection is.
 
-Partly.
+Dependency injection is a principle that helps to decrease coupling and increase cohesion.
 
-Dependency injection, as a software design pattern, has number of 
-advantages that are common for each language (including Python):
+.. image:: images/coupling-cohesion.png
 
-+ Dependency Injection decreases coupling between a class and its dependency.
-+ Because dependency injection doesn't require any change in code behavior it 
-  can be applied to legacy code as a refactoring. The result is clients that 
-  are more independent and that are easier to unit test in isolation using 
-  stubs or mock objects that simulate other objects not under test. This ease 
-  of testing is often the first benefit noticed when using dependency 
-  injection.
-+ Dependency injection can be used to externalize a system's configuration 
-  details into configuration files allowing the system to be reconfigured 
-  without recompilation (rebuilding). Separate configurations can be written 
-  for different situations that require different implementations of 
-  components. This includes, but is not limited to, testing.
-+ Reduction of boilerplate code in the application objects since all work to 
-  initialize or set up dependencies is handled by a provider component.
-+ Dependency injection allows a client to remove all knowledge of a concrete 
-  implementation that it needs to use. This helps isolate the client from the 
-  impact of design changes and defects. It promotes reusability, testability 
-  and maintainability.
-+ Dependency injection allows a client the flexibility of being configurable. 
-  Only the client's behavior is fixed. The client may act on anything that 
-  supports the intrinsic interface the client expects.
+What is coupling and cohesion?
 
-.. note::
+Coupling and cohesion are about how tough the components are tied.
 
-    While improved testability is one the first benefits of using dependency 
-    injection, it could be easily overwhelmed by monkey-patching technique, 
-    that works absolutely great in Python (you can monkey-patch anything, 
-    anytime).  At the same time, monkey-patching has nothing similar with 
-    other advantages defined above. Also monkey-patching technique is 
-    something that could be considered like too dirty to be used in production.
+- **High coupling**. If the coupling is high it's like using superglue or welding. No easy way
+  to disassemble.
+- **High cohesion**. High cohesion is like using screws. Quite easy to disassemble and
+  re-assemble in a different way. It is an opposite to high coupling.
 
-The complexity of dependency injection pattern implementation in Python is 
-definitely quite lower than in other languages (even with dynamic typing). 
+Cohesion often correlates with coupling. Higher cohesion usually leads to lower coupling and vice versa.
 
-.. note:: 
+Low coupling brings flexibility. Your code becomes easier to change and test.
 
-    Low complexity of dependency injection pattern implementation in Python 
-    still means that some code should be written, reviewed, tested and 
-    supported.
+How to implement the dependency injection?
 
-Talking about inversion of control, it is a software design principle that 
-also works for each programming language, not depending on its typing type.
+Objects do not create each other anymore. They provide a way to inject the dependencies instead.
 
-Inversion of control is used to increase modularity of the program and make 
-it extensible.
+Before:
 
-Main design purposes of using inversion of control are:
+.. code-block:: python
 
-+ To decouple the execution of a task from implementation.
-+ To focus a module on the task it is designed for.
-+ To free modules from assumptions about how other systems do what they do and 
-  instead rely on contracts.
-+ To prevent side effects when replacing a module.
+   import os
 
-Example
-~~~~~~~
 
-Let's go through next example:
+   class ApiClient:
 
-.. image:: /images/miniapps/engines_cars/diagram.png
-    :width: 100%
-    :align: center
+       def __init__(self) -> None:
+           self.api_key = os.getenv("API_KEY")  # <-- dependency
+           self.timeout = int(os.getenv("TIMEOUT"))  # <-- dependency
 
-Listing of ``example.engines`` module:
 
-.. literalinclude:: ../../examples/miniapps/engines_cars/example/engines.py
-   :language: python
+   class Service:
 
-Listing of ``example.cars`` module:
+       def __init__(self) -> None:
+           self.api_client = ApiClient()  # <-- dependency
 
-.. literalinclude:: ../../examples/miniapps/engines_cars/example/cars.py
-   :language: python
 
-Next example demonstrates creation of several cars with different engines:
+   def main() -> None:
+       service = Service()  # <-- dependency
+       ...
 
-.. literalinclude:: ../../examples/miniapps/engines_cars/example_di.py
-   :language: python
 
-While previous example demonstrates advantages of dependency injection, there
-is a disadvantage demonstration as well - creation of car requires additional 
-code for specification of dependencies. Nevertheless, this disadvantage could 
-be easily avoided by using a dependency injection framework for creation of 
-inversion of control container (IoC container).
+   if __name__ == "__main__":
+       main()
 
-Example of creation of several inversion of control containers (IoC containers)
-using :doc:`Dependency Injector <../index>`:
+After:
 
-.. literalinclude:: ../../examples/miniapps/engines_cars/example_ioc_containers.py
-   :language: python
+.. code-block:: python
+
+   import os
+
+
+   class ApiClient:
+
+       def __init__(self, api_key: str, timeout: int) -> None:
+           self.api_key = api_key  # <-- dependency is injected
+           self.timeout = timeout  # <-- dependency is injected
+
+
+   class Service:
+
+       def __init__(self, api_client: ApiClient) -> None:
+           self.api_client = api_client  # <-- dependency is injected
+
+
+   def main(service: Service) -> None:  # <-- dependency is injected
+       ...
+
+
+   if __name__ == "__main__":
+       main(
+           service=Service(
+               api_client=ApiClient(
+                   api_key=os.getenv("API_KEY"),
+                   timeout=int(os.getenv("TIMEOUT")),
+               ),
+           ),
+       )
+
+``ApiClient`` is decoupled from knowing where the options come from. You can read a key and a
+timeout from a configuration file or even get them from a database.
+
+``Service`` is decoupled from the ``ApiClient``. It does not create it anymore. You can provide a
+stub or other compatible object.
+
+Function ``main()`` is decoupled from ``Service``. It receives it as an argument.
+
+Flexibility comes with a price.
+
+Now you need to assemble and inject the objects like this:
+
+.. code-block:: python
+
+   main(
+       service=Service(
+           api_client=ApiClient(
+               api_key=os.getenv("API_KEY"),
+               timeout=int(os.getenv("TIMEOUT")),
+           ),
+       ),
+   )
+
+The assembly code might get duplicated and it'll become harder to change the application structure.
+
+Here comes the ``Dependency Injector``.
+
+What does the Dependency Injector do?
+-------------------------------------
+
+With the dependency injection pattern, objects lose the responsibility of assembling
+the dependencies. The ``Dependency Injector`` absorbs that responsibility.
+
+``Dependency Injector`` helps to assemble and inject the dependencies.
+
+It provides a container and providers that help you with the objects assembly.
+When you need an object you place a ``Provide`` marker as a default value of a
+function argument. When you call this function, framework assembles and injects
+the dependency.
+
+.. code-block:: python
+
+   from dependency_injector import containers, providers
+   from dependency_injector.wiring import Provide, inject
+
+
+   class Container(containers.DeclarativeContainer):
+
+       config = providers.Configuration()
+
+       api_client = providers.Singleton(
+           ApiClient,
+           api_key=config.api_key,
+           timeout=config.timeout,
+       )
+
+       service = providers.Factory(
+           Service,
+           api_client=api_client,
+       )
+
+
+   @inject
+   def main(service: Service = Provide[Container.service]) -> None:
+       ...
+
+
+   if __name__ == "__main__":
+       container = Container()
+       container.config.api_key.from_env("API_KEY", required=True)
+       container.config.timeout.from_env("TIMEOUT", as_=int, default=5)
+       container.wire(modules=[__name__])
+
+       main()  # <-- dependency is injected automatically
+
+       with container.api_client.override(mock.Mock()):
+           main()  # <-- overridden dependency is injected automatically
+
+When you call the ``main()`` function the ``Service`` dependency is assembled and injected automatically.
+
+When you do testing, you call the ``container.api_client.override()`` method to replace the real API
+client with a mock. When you call ``main()``, the mock is injected.
+
+You can override any provider with another provider.
+
+It also helps you in a re-configuring project for different environments: replace an API client
+with a stub on the dev or stage.
+
+Objects assembling is consolidated in a container. Dependency injections are defined explicitly.
+This makes it easier to understand and change how an application works.
+
+Testing, Monkey-patching and dependency injection
+-------------------------------------------------
+
+The testability benefit is opposed to monkey-patching.
+
+In Python, you can monkey-patch anything, anytime. The problem with monkey-patching is
+that it's too fragile. The cause of it is that when you monkey-patch you do something that
+wasn't intended to be done. You monkey-patch the implementation details. When implementation
+changes the monkey-patching is broken.
+
+With dependency injection, you patch the interface, not an implementation. This is a way more
+stable approach.
+
+Also, monkey-patching is way too dirty to be used outside of the testing code for
+re-configuring the project for the different environments.
+
+Conclusion
+----------
+
+Dependency injection provides you with three advantages:
+
+- **Flexibility**. The components are loosely coupled. You can easily extend or change the
+  functionality of a system by combining the components in a different way. You even can do it on
+  the fly.
+- **Testability**. Testing is easier because you can easily inject mocks instead of real objects
+  that use API or database, etc.
+- **Clearness and maintainability**. Dependency injection helps you reveal the dependencies.
+  Implicit becomes explicit. And "Explicit is better than implicit" (PEP 20 - The Zen of Python).
+  You have all the components and dependencies defined explicitly in a container. This
+  provides an overview and control of the application structure. It is easier to understand and
+  change it.
+
+Is it worth applying dependency injection in Python?
+
+It depends on what you build. The advantages above are not too important if you use Python as a
+scripting language. The picture is different when you use Python to create an application. The
+larger the application the more significant the benefits.
+
+Is it worth using a framework for applying dependency injection?
+
+The complexity of the dependency injection pattern implementation in Python is
+lower than in other languages but it's still in place. It doesn't mean you have to use a
+framework but using a framework is beneficial because the framework is:
+
+- Already implemented
+- Tested on all platforms and versions of Python
+- Documented
+- Supported
+- Other engineers are familiar with it
+
+An advice at last:
+
+- **Give it a try**. Dependency injection is counter-intuitive. Our nature is that
+  when we need something the first thought that comes to our mind is to go and get it. Dependency
+  injection is just like "Wait, I need to state a need instead of getting something right away".
+  It's like a little investment that will pay-off later. The advice is to just give it a try for
+  two weeks. This time will be enough for getting your own impression. If you don't like it you
+  won't lose too much.
+- **Common sense first**. Use common sense when applying dependency injection. It is a good
+  principle, but not a silver bullet. If you do it too much you will reveal too many of the
+  implementation details. Experience comes with practice and time.
 
 What's next?
-~~~~~~~~~~~~
+------------
 
 Choose one of the following as a next step:
 
-+ Pass one of the dependency injection tutorials:
-    + :ref:`flask-tutorial`
-    + :ref:`aiohttp-tutorial`
-    + :ref:`asyncio-daemon-tutorial`
-    + :ref:`cli-tutorial`
-+ Know more about the :ref:`providers`
-+ Go to the :ref:`contents`
+- Look at the application examples:
+    - :ref:`application-single-container`
+    - :ref:`application-multiple-containers`
+    - :ref:`decoupled-packages`
+    - :ref:`boto3-example`
+    - :ref:`django-example`
+    - :ref:`flask-example`
+    - :ref:`flask-blueprints-example`
+    - :ref:`aiohttp-example`
+    - :ref:`sanic-example`
+    - :ref:`fastapi-example`
+    - :ref:`fastapi-redis-example`
+    - :ref:`fastapi-sqlalchemy-example`
+- Pass the tutorials:
+    - :ref:`flask-tutorial`
+    - :ref:`aiohttp-tutorial`
+    - :ref:`asyncio-daemon-tutorial`
+    - :ref:`cli-tutorial`
+- Know more about the ``Dependency Injector`` :ref:`key-features`
+- Know more about the :ref:`providers`
+- Know more about the :ref:`wiring`
+- Go to the :ref:`contents`
 
 Useful links
-~~~~~~~~~~~~
+------------
 
-There are some useful links related to dependency injection design pattern 
-that could be used for further reading:
+A few useful links related to a dependency injection design pattern for further reading:
 
 + https://en.wikipedia.org/wiki/Dependency_injection
 + https://martinfowler.com/articles/injection.html
 + https://github.com/ets-labs/python-dependency-injector
 + https://pypi.org/project/dependency-injector/
 
+.. include:: ../sponsor.rst
+
 .. disqus::

docs/introduction/index.rst

@@ -3,18 +3,16 @@ Introduction
 
 .. meta::
    :keywords: Python,DI,Dependency injection,IoC,Inversion of Control
-   :description: Current section of documentation is designed to give some 
-                 overview about dependency injection pattern, inversion of 
-                 control principle and "Dependency Injector" framework.
+   :description: Current section of the documentation is provides an
+                 overview of the dependency injection, inversion of
+                 control and Dependency Injector framework.
 
-Current section of documentation is designed to give some overview about 
-dependency injection pattern, inversion of control principle and 
-*Dependency Injector* framework.
+The current section of the documentation provides an overview of the
+dependency injection, inversion of control, and the ``Dependency Injector`` framework.
 
 ..  toctree::
     :maxdepth: 2
 
-    what_is_di
     di_in_python
     key_features
-    structure
+    installation

docs/introduction/installation.rst

@@ -0,0 +1,42 @@
+Installation
+============
+
+``Dependency Injector`` is available on `PyPI <https://pypi.org/project/dependency-injector/>`_.
+To install the latest version you can use ``pip``:
+
+.. code-block:: bash
+
+    pip install dependency-injector
+
+Some modules of the ``Dependency Injector`` are implemented as C extensions.
+``Dependency Injector`` is distributed as a pre-compiled wheels. Wheels are
+available for all supported Python versions on Linux, Windows, and MacOS.
+Linux distribution uses `manylinux <https://github.com/pypa/manylinux>`_.
+
+If there is no appropriate wheel for your environment (Python version and OS)
+installer will compile the package from sources on your machine. You'll need
+a C compiler and Python header files.
+
+To verify the installed version:
+
+.. code-block:: bash
+
+    >>> import dependency_injector
+    >>> dependency_injector.__version__
+    '4.39.0'
+
+.. note::
+   When adding ``Dependency Injector`` to ``pyproject.toml`` or ``requirements.txt``
+   don't forget to pin the version to the current major:
+
+   .. code-block:: bash
+
+       dependency-injector>=4.0,<5.0
+
+   *The next major version can be incompatible.*
+
+All releases are available on the `PyPI release history page <https://pypi.org/project/dependency-injector/#history>`_.
+Each release has an appropriate tag. The tags are available on the
+`GitHub releases page <https://github.com/ets-labs/python-dependency-injector/releases>`_.
+
+.. disqus::

docs/introduction/key_features.rst

@@ -1,68 +1,43 @@
+.. _key-features:
+
 Key features
 ------------
 
 .. meta::
    :keywords: Python,DI,Dependency injection,IoC,Inversion of Control
-   :description: This article describes key features of "Dependency Injector" 
-                 framework. It also provides some cases and recommendations 
-                 about usage of "Dependency Injector" framework.
+   :description: This article describes key features of the Dependency Injector
+                 framework.
 
+Key features of the ``Dependency Injector``:
 
-``Dependency Injector`` is a dependency injection framework for Python.
-It was designed to be a unified and developer-friendly tool that helps
-implement a dependency injection design pattern in a formal, pretty, and
-Pythonic way.
+- **Providers**. Provides ``Factory``, ``Singleton``, ``Callable``, ``Coroutine``, ``Object``,
+  ``List``, ``Dict``, ``Configuration``, ``Resource``, ``Dependency``, and ``Selector`` providers
+  that help assemble your objects. See :ref:`providers`.
+- **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``, and ``json`` 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`.
+- **Containers**. Provides declarative and dynamic containers. See :ref:`containers`.
+- **Wiring**. Injects dependencies into functions and methods. Helps integrate with
+  other frameworks: Django, Flask, Aiohttp, Sanic, FastAPI, etc. See :ref:`wiring`.
+- **Asynchronous**. Supports asynchronous injections. See :ref:`async-injections`.
+- **Typing**. Provides typing stubs, ``mypy``-friendly. See :ref:`provider-typing`.
+- **Performance**. Fast. Written in ``Cython``.
+- **Maturity**. Mature and production-ready. Well-tested, documented, and supported.
 
-It stands on two principles:
+The framework stands on the `PEP20 (The Zen of Python) <https://www.python.org/dev/peps/pep-0020/>`_ principle:
 
-- Explicit is better than implicit (PEP20).
-- Do no magic to your code.
+.. code-block:: text
 
-How does it different from the other frameworks?
+   Explicit is better than implicit
 
-- **No autowiring.** The framework does NOT do any autowiring / autoresolving of the dependencies. You need to specify everything explicitly. Because *"Explicit is better than implicit" (PEP20)*.
-- **Does not pollute your code.** Your application does NOT know and does NOT depend on the framework. No ``@inject`` decorators, annotations, patching or any other magic tricks.
+You need to specify how to assemble and where to inject the dependencies explicitly.
 
-``Dependency Injector`` makes a simple contract with you:
-
-- You tell the framework how to build you code
-- The framework does it for you
-
-The power of the ``Dependency Injector`` is in its simplicity and straightforwardness. It is a simple tool for the powerful concept.
-
-The key features of the ``Dependency Injector`` framework are:
-
-+ Easy, smart, and Pythonic style.
-+ Does NOT pollute client code.
-+ Obvious and clear structure.
-+ Extensibility and flexibility.
-+ High performance.
-+ Memory efficiency.
-+ Thread safety.
-+ Documented.
-+ Semantically versioned.
-+ Distributed as pre-compiled wheels.
-
-``Dependency Injector`` containers and providers are implemented as C extension
-types using ``Cython``.
-
-``Dependency Injector`` framework can be used in the different application types:
-
-+ Web applications based on the ``Flask``, ``Django`` or any other web framework.
-+ Asynchronous applications ``asyncio``, ``aiohttp``, ``Tornado``, or ``Twisted``.
-+ Standalone frameworks and libraries.
-+ GUI applications.
-
-``Dependency Injector`` framework can be integrated on the different project
-stages:
-
-+ It can be used in the beginning of the development of a new application.
-+ It can be integrated into application that is on its active development stage.
-+ It can be used for refactoring of legacy application.
-
-Components of ``Dependency Injector`` framework could be used:
-
-+ In composition with each other.
-+ Independently from each other.
+The power of the framework is in its simplicity.
+``Dependency Injector`` is a simple tool for the powerful concept.
 
 .. disqus::

docs/introduction/structure.rst

@@ -1,50 +0,0 @@
-Structure of Dependency Injector
---------------------------------
-
-.. meta::
-   :keywords: Python,DI,Dependency injection,IoC,Inversion of Control
-   :description: This article describes "Dependency Injector" framework 
-                 components and their interaction between each other. 
-                 Providers and containers are the former components of 
-                 the framework.
-
-Current section describes *Dependency Injector* main entities and their 
-interaction between each other.
-
-.. image:: /images/internals.png
-    :width: 100%
-    :align: center
-
-There are 2 main entities: providers & containers.
-
-Providers
-~~~~~~~~~
-
-Providers are strategies of accessing objects. For example, 
-:py:class:`dependency_injector.providers.Factory` creates new instance 
-of provided class every time it is called. 
-:py:class:`dependency_injector.providers.Singleton` creates provided 
-instance once and returns it on every next call. Base class is - 
-:py:class:`dependency_injector.providers.Provider`.
-
-Providers could be:
-
-+ Injected into each other.
-+ Overridden by each other.
-+ Extended.
-
-Containers 
-~~~~~~~~~~
-
-Containers are collections of providers. They are used for grouping 
-of providers by some principles. Base class is - 
-:py:class:`dependency_injector.containers.DeclarativeContainer`.
-
-Containers could be:
-
-+ Overridden by each other.
-+ Copied from each other.
-+ Extended.
-
-
-.. disqus::

docs/introduction/what_is_di.rst

@@ -1,126 +0,0 @@
-What is dependency injection and inversion of control?
-------------------------------------------------------
-
-.. meta::
-   :keywords: Python,DI,Dependency injection,IoC,Inversion of Control
-   :description: This article provides definition of dependency injection, 
-                 inversion of control and dependency inversion. It contains 
-                 example code in Python that is refactored to be following 
-                 inversion of control principle.
-
-Definition
-~~~~~~~~~~
-
-Wikipedia provides quite good definitions of dependency injection pattern
-and related principles:
-
-.. glossary::
-
-    `Dependency injection`_
-        In software engineering, dependency injection is a software design 
-        pattern that implements inversion of control for resolving 
-        dependencies. A dependency is an object that can be used (a service). 
-        An injection is the passing of a dependency to a dependent object (a 
-        client) that would use it. The service is made part of the client's 
-        state. Passing the service to the client, rather than allowing a 
-        client to build or find the service, is the fundamental requirement of 
-        the pattern.
-
-        Dependency injection allows a program design to follow the dependency 
-        inversion principle. The client delegates to external code (the 
-        injector) the responsibility of providing its dependencies. The client 
-        is not allowed to call the injector code. It is the injecting code 
-        that constructs the services and calls the client to inject them. This 
-        means the client code does not need to know about the injecting code. 
-        The client does not need to know how to construct the services. The 
-        client does not need to know which actual services it is using. The 
-        client only needs to know about the intrinsic interfaces of the 
-        services because these define how the client may use the services. 
-        This separates the responsibilities of use and construction.
-
-    `Inversion of control`_
-        In software engineering, inversion of control (IoC) describes a design 
-        in which custom-written portions of a computer program receive the 
-        flow of control from a generic, reusable library. A software 
-        architecture with this design inverts control as compared to 
-        traditional procedural programming: in traditional programming, the 
-        custom code that expresses the purpose of the program calls into 
-        reusable libraries to take care of generic tasks, but with inversion 
-        of control, it is the reusable code that calls into the custom, or 
-        task-specific, code.
-
-        Inversion of control is used to increase modularity of the program and 
-        make it extensible, and has applications in object-oriented 
-        programming and other programming paradigms. The term was popularized 
-        by Robert C. Martin and Martin Fowler.
-
-        The term is related to, but different from, the dependency inversion 
-        principle, which concerns itself with decoupling dependencies between 
-        high-level and low-level layers through shared abstractions.
-
-    `Dependency inversion`_
-        In object-oriented programming, the dependency inversion principle 
-        refers to a specific form of decoupling software modules. When 
-        following this principle, the conventional dependency relationships 
-        established from high-level, policy-setting modules to low-level, 
-        dependency modules are reversed, thus rendering high-level modules 
-        independent of the low-level module implementation details. The 
-        principle states:
-
-            + High-level modules should not depend on low-level modules. 
-              Both should depend on abstractions.
-            + Abstractions should not depend on details. 
-              Details should depend on abstractions.
-
-        The principle inverts the way some people may think about 
-        object-oriented design, dictating that both high- and low-level 
-        objects must depend on the same abstraction. 
-
-Example
-~~~~~~~
-
-Let's go through the code of ``example.py``:
-
-.. literalinclude:: ../../examples/di_demo/example.py
-   :language: python
-
-At some point, things defined above mean, that the code from ``example.py``,
-could look different, like in ``example_di.py``:
-
-.. literalinclude:: ../../examples/di_demo/example_di.py
-   :language: python
-
-Best explanation, ever
-~~~~~~~~~~~~~~~~~~~~~~
-
-Some times ago `user198313`_ posted awesome `question`_ about dependency 
-injection on `StackOverflow`_:
-
-.. note:: 
-
-    How to explain dependency injection to a 5-year-old?
-
-And `John Munsch`_ provided absolutely Great answer:
-
-.. note:: 
-
-    When you go and get things out of the refrigerator for yourself, you can 
-    cause problems. You might leave the door open, you might get something 
-    Mommy or Daddy doesn't want you to have. You might even be looking for 
-    something we don't even have or which has expired.
-
-    What you should be doing is stating a need, "I need something to drink 
-    with lunch," and then we will make sure you have something when you sit 
-    down to eat.
-
-
-.. disqus::
-
-
-.. _Dependency injection: http://en.wikipedia.org/wiki/Dependency_injection
-.. _Inversion of control: https://en.wikipedia.org/wiki/Inversion_of_control
-.. _Dependency inversion: https://en.wikipedia.org/wiki/Dependency_inversion_principle
-.. _StackOverflow: http://stackoverflow.com/
-.. _question: http://stackoverflow.com/questions/1638919/how-to-explain-dependency-injection-to-a-5-year-old/1639186
-.. _user198313: http://stackoverflow.com/users/198313/user198313
-.. _John Munsch: http://stackoverflow.com/users/31899/john-munsch

docs/main/changelog.rst

@@ -7,6 +7,988 @@ that were made in every particular version.
 From version 0.7.6 *Dependency Injector* framework strictly
 follows `Semantic versioning`_
 
+4.48.1
+------
+
+* Improve performance of ``dependency_injector._cwiring.DependencyResolver``
+* Add ``typing-extensions`` as a dependency for older Python versions (<3.11)
+* Produce warning on ``@inject``s without ``Provide[...]`` marks
+* Add support for `resource_type` in ``Lifespan``s
+
+4.48.0
+------
+
+- Improve performance of wiring (`#897 <https://github.com/ets-labs/python-dependency-injector/pull/897>`_)
+- Add Context Manager support to Resource provider (`#899 <https://github.com/ets-labs/python-dependency-injector/pull/899>`_)
+- Add support for async generator injections (`#900 <https://github.com/ets-labs/python-dependency-injector/pull/900>`_)
+- Fix unintended dependency on ``typing_extensions`` (`#902 <https://github.com/ets-labs/python-dependency-injector/pull/902>`_)
+- Add support for Fast Depends (`#898 <https://github.com/ets-labs/python-dependency-injector/pull/898>`_)
+- Add ``resource_type`` parameter to init and shutdown resources using specialized providers (`#858 <https://github.com/ets-labs/python-dependency-injector/pull/858>`_)
+
+4.47.1
+------
+
+- Fix typing for wiring marker (`#892 <https://github.com/ets-labs/python-dependency-injector/pull/896>`_)
+- Strip debug symbols in wheels
+
+4.47.0
+------
+
+- Add support for ``Annotated`` type for module and class attribute injection in wiring,
+  with updated documentation and examples.
+  See discussion:
+  https://github.com/ets-labs/python-dependency-injector/pull/721#issuecomment-2025263718
+- Fix ``root`` property shadowing in ``ConfigurationOption`` (`#875 <https://github.com/ets-labs/python-dependency-injector/pull/875>`_)
+- Fix incorrect monkeypatching during ``wire()`` that could violate MRO in some classes (`#886 <https://github.com/ets-labs/python-dependency-injector/pull/886>`_)
+- ABI3 wheels are now published for CPython.
+- Drop support of Python 3.7.
+
+4.46.0
+------
+
+- Add option to disable env var interpolation in configs (`#861 <https://github.com/ets-labs/python-dependency-injector/pull/861>`_)
+- Fix ``Closing`` dependency resolution (`#852 <https://github.com/ets-labs/python-dependency-injector/pull/852>`_)
+- Add support for ``inspect.iscoroutinefunction()`` in ``Coroutine`` provider (`#830 <https://github.com/ets-labs/python-dependency-injector/pull/830>`_)
+- Fix broken wiring of sync inject-decorated methods (`#673 <https://github.com/ets-labs/python-dependency-injector/pull/673>`_)
+- Add support for ``typing.Annotated`` (`#721 <https://github.com/ets-labs/python-dependency-injector/pull/721>`_, `#853 <https://github.com/ets-labs/python-dependency-injector/pull/853>`_)
+- Documentation updates for movie-lister example (`#747 <https://github.com/ets-labs/python-dependency-injector/pull/747>`_)
+- Fix type propagation in ``Provider.provider`` (`#744 <https://github.com/ets-labs/python-dependency-injector/pull/744>`_)
+
+Many thanks for the contributions to:
+- `ZipFile <https://github.com/ZipFile>`_
+- `Yegor Statkevich <https://github.com/jazzthief>`_
+- `Federico Tomasi <https://github.com/federinik>`_
+- `Martin Lafrance <https://github.com/martlaf>`_
+- `Philip Bjorge <https://github.com/philipbjorge>`_
+- `Ilya Kazakov <https://github.com/mrKazzila>`_
+
+4.45.0
+--------
+- Add Starlette lifespan handler implementation (`#683 <https://github.com/ets-labs/python-dependency-injector/pull/683>`_).
+- Raise exception in ``ThreadLocalSingleton`` instead of hiding it in finally (`#845 <https://github.com/ets-labs/python-dependency-injector/pull/845>`_).
+- Improve debuggability of ``deepcopy`` errors (`#839 <https://github.com/ets-labs/python-dependency-injector/pull/839>`_).
+- Update examples (`#838 <https://github.com/ets-labs/python-dependency-injector/pull/838>`_).
+- Upgrade testing dependencies (`#837 <https://github.com/ets-labs/python-dependency-injector/pull/837>`_).
+- Add minor fixes to the documentation (`#709 <https://github.com/ets-labs/python-dependency-injector/pull/709>`_).
+- Remove ``six`` from the dependencies (`3ba4704 <https://github.com/ets-labs/python-dependency-injector/commit/3ba4704bc1cb00310749fd2eda0c8221167c313c>`_).
+
+Many thanks for the contributions to:
+-  `ZipFile <https://github.com/ZipFile>`_
+- `František Trebuňa <https://github.com/gortibaldik>`_
+- `JC (Jonathan Chen) <https://github.com/dijonkitchen>`_
+
+4.44.0
+--------
+- Implement support for Pydantic 2. PR: `#832 <https://github.com/ets-labs/python-dependency-injector/pull/832>`_.
+- Implement `PEP-517 <https://peps.python.org/pep-0517/>`_, `PEP-518 <https://peps.python.org/pep-0518/>`_, and
+  `PEP-621 <https://peps.python.org/pep-0621/>`_. PR: `#829 <https://github.com/ets-labs/python-dependency-injector/pull/829>`_.
+
+Many thanks to `ZipFile <https://github.com/ZipFile>`_ for both contributions.
+
+4.43.0
+--------
+- Add support for Python 3.13.
+- Migrate to Cython 3 (version 3.0.11). Many thanks to `ZipFile <https://github.com/ZipFile>`_ for
+  this contribution `#813 <https://github.com/ets-labs/python-dependency-injector/pull/813>`_.
+
+4.42.0
+--------
+- Promote release ``4.42.0b1`` to a production release.
+- Fix the Disqus comment widget.
+
+4.42.0b1
+--------
+
+- Add support of Python 3.12.
+- Drop support of Python 2.7, 3.5, and 3.6.
+- Regenerate C sources using Cython 0.29.37.
+- Update ``cibuildwheel`` to version ``2.20.0``.
+
+4.41.0
+------
+- Add support of Python 3.11.
+- Allow Closing to detect dependent resources `#633 <https://github.com/ets-labs/python-dependency-injector/issues/633>`_,
+  `#636 <https://github.com/ets-labs/python-dependency-injector/pull/636>`_. Thanks `Jamie Stumme @StummeJ <https://github.com/StummeJ>`_
+  for the contribution.
+- Update CI/CD to use Ubuntu 22.04.
+- Update CI/CD to ``actions/checkout@v3``, ``actions/setup-python@v4``, ``actions/upload-artifact@v3``, ``pypa/cibuildwheel@v2.11.3``,
+  and ``actions/download-artifact@v3``.
+- Fix install crash on non-utf8 systems `#644 <https://github.com/ets-labs/python-dependency-injector/pull/644>`_.
+- Fix a bug in Windows build with default charset `#635 <https://github.com/ets-labs/python-dependency-injector/pull/635>`_.
+- Update FastAPI Redis example to use ``aioredis`` version 2 `#613 <https://github.com/ets-labs/python-dependency-injector/pull/613>`_.
+- Update documentation on creating custom providers `#598 <https://github.com/ets-labs/python-dependency-injector/pull/598>`_.
+- Regenerate C sources using Cython 0.29.32.
+- Fix builds badge.
+
+4.40.0
+------
+- Add ``Configuration.from_json()`` method to load configuration from a json file.
+- Fix bug with wiring not working properly with functions double wrapped by ``@functools.wraps`` decorator.
+  See issue: `#454 <https://github.com/ets-labs/python-dependency-injector/issues/454>`_.
+  Many thanks to: `@platipo <https://github.com/platipo>`_, `@MatthieuMoreau0 <https://github.com/MatthieuMoreau0>`_,
+  `@fabiocerqueira <https://github.com/fabiocerqueira>`_, `@Jitesh-Khuttan <https://github.com/Jitesh-Khuttan>`_.
+- Refactor wiring module to store all patched callable data in the ``PatchedRegistry``.
+- Improve wording on the "Dependency injection and inversion of control in Python" docs page.
+- Add documentation on the ``@inject`` decorator.
+- Update typing in the main example and cohesion/coupling correlation definition in
+  "Dependency injection and inversion of control in Python".
+  Thanks to `@illia-v (Illia Volochii) <https://github.com/illia-v>`_ for the
+  PR (`#580 <https://github.com/ets-labs/python-dependency-injector/pull/580>`_).
+- Update copyright year.
+- Enable skipped test ``test_schema_with_boto3_session()``.
+- Update pytest configuration.
+- Regenerate C sources using Cython 0.29.30.
+
+4.39.1
+------
+- Fix bug `#574 <https://github.com/ets-labs/python-dependency-injector/issues/574>`_:
+  "``@inject`` breaks ``inspect.iscoroutinefunction``". Thanks to
+  `@burritoatspoton (Rafał Burczyński) <https://github.com/burritoatspoton>`_ for reporting the issue.
+
+4.39.0
+------
+- Optimize injections and wiring from x1.5 to x7 times depending on the use case.
+- Fix bug `#569 <https://github.com/ets-labs/python-dependency-injector/issues/569>`_:
+  "numpy.typing.NDArray breaks wiring". Thanks to
+  `@VKFisher (Vlad Fisher) <https://github.com/VKFisher>`_ for reporting the issue and providing a fix.
+
+4.38.0
+------
+- Add new provider ``Aggregate``. It is a generalized version of ``FactoryAggregate`` that
+  can contain providers of any type, not only ``Factory``. See issue
+  `#530 <https://github.com/ets-labs/python-dependency-injector/issues/530>`_. Thanks to
+  `@zerlok (Danil Troshnev) <https://github.com/zerlok>`_ for suggesting the feature.
+- Add argument ``as_`` to the ``config.from_env()`` method for the explicit type casting
+  of an environment variable value, e.g.: ``config.timeout.from_env("TIMEOUT", as_=int)``.
+  See issue `#533 <https://github.com/ets-labs/python-dependency-injector/issues/533>`_. Thanks to
+  `@gtors (Andrey Torsunov) <https://github.com/gtors>`_ for suggesting the feature.
+- Add ``.providers`` attribute to the ``FactoryAggregate`` provider. It is an alias for
+  ``FactoryAggregate.factories`` attribute.
+- Add ``.set_providers()`` method to the ``FactoryAggregate`` provider. It is an alias for
+  ``FactoryAggregate.set_factories()`` method.
+- Add string imports for ``Factory``, ``Singleton``, ``Callable``, ``Resource``, and ``Coroutine``
+  providers, e.g. ``Factory("module.Class")``.
+  See issue `#531 <https://github.com/ets-labs/python-dependency-injector/issues/531>`_.
+  Thanks to `@al-stefanitsky-mozdor <https://github.com/al-stefanitsky-mozdor>`_ for suggesting the feature.
+- Fix ``Dependency`` provider to don't raise "Dependency is not defined" error when the ``default``
+  is a falsy value of proper type.
+  See issue `#550 <https://github.com/ets-labs/python-dependency-injector/issues/550>`_. Thanks to
+  `@approxit <https://github.com/approxit>`_ for reporting the issue.
+- Refactor ``FactoryAggregate`` provider internals.
+- Update logo on Github and in docs to support dark themes and remove some imperfections.
+
+4.37.0
+------
+- Add support of Python 3.10.
+- Improve wiring with adding importing modules and packages from a string
+  ``container.wire(modules=["yourapp.module1"])``.
+- Add container wiring configuration ``wiring_config = containers.WiringConfiguration()``.
+- Add support of ``with`` statement for ``container.override_providers()`` method.
+- Add ``Configuration(yaml_files=[...])`` argument.
+- Add ``Configuration(ini_files=[...])`` argument.
+- Add ``Configuration(pydantic_settings=[...])`` argument.
+- Drop support of Python 3.4. There are no immediate breaking changes, but Dependency Injector
+  will no longer be tested on Python 3.4 and any bugs will not be fixed.
+- Announce the date of dropping Python 3.5 support (Jan 1st 2022).
+- Fix ``Dependency.is_defined`` attribute to always return boolean value.
+- Fix ``envs_required=False`` behavior in ``Configuration.from_*()`` methods
+  to give a priority to the explicitly provided value.
+- Update documentation and fix typos.
+- Regenerate C sources using Cython 0.29.24.
+- Migrate tests to ``pytest``.
+
+4.36.2
+------
+- Update docs.
+
+4.36.1
+------
+- Fix a wiring bug with improper resolving of ``Provide[some_provider.provider]``.
+- Fix a typo in ``Factory`` provider docs ``service.add_attributes(clent=client)``
+  `#499 <https://github.com/ets-labs/python-dependency-injector/issues/499>`_.
+  Thanks to `@rajanjha786 <https://github.com/rajanjha786>`_ for the contribution.
+- Fix a typo in ``boto3`` example
+  `#511 <https://github.com/ets-labs/python-dependency-injector/issues/511>`_.
+  Thanks to `@whysage <https://github.com/whysage>`_ for the contribution.
+
+4.36.0
+------
+- Add support of non-string keys for ``FactoryAggregate`` provider.
+- Improve ``FactoryAggregate`` typing stub.
+- Improve resource subclasses typing and make shutdown definition optional
+  `PR #492 <https://github.com/ets-labs/python-dependency-injector/pull/492>`_.
+  Thanks to `@EdwardBlair <https://github.com/EdwardBlair>`_  for suggesting the improvement.
+- Fix type annotations for ``.provides``.
+  Thanks to `Thiago Hiromi @thiromi <https://github.com/thiromi>`_ for the fix
+  `PR #491 <https://github.com/ets-labs/python-dependency-injector/pull/491>`_.
+- Fix environment variables interpolation examples in configuration provider docs ``{$ENV} -> ${ENV}``.
+  Thanks to `Felipe Rubio @krouw <https://github.com/krouw>`_ for reporting the issue and
+  fixing yaml example `PR #494 <https://github.com/ets-labs/python-dependency-injector/pull/494>`_.
+- Fix ``@containers.copy()`` decorator to respect dependencies on parent providers.
+  See issue `#477 <https://github.com/ets-labs/python-dependency-injector/issues/477>`_.
+  Thanks to `Andrey Torsunov @gtors <https://github.com/gtors>`_  for reporting the issue.
+- Fix typing stub for ``container.override_providers()`` to accept other types besides ``Provider``.
+- Fix runtime issue with generic typing in resource initializer classes ``resources.Resource``
+  and ``resources.AsyncResource``.
+  See issue `#488 <https://github.com/ets-labs/python-dependency-injector/issues/488>`_.
+  Thanks to `@EdwardBlair <https://github.com/EdwardBlair>`_  for reporting the issue.
+
+4.35.3
+------
+- *This release was removed from PyPI. It was inconsistently published because project has
+  reached a PyPI size limit. Changes from this release are published on PyPI in next version.*
+
+4.35.2
+------
+- Update wiring to support modules provided as packages.
+  See issue `#481 <https://github.com/ets-labs/python-dependency-injector/issues/481>`_.
+  Thanks to `@Sadbot <https://github.com/Sadbot>`_  for demonstrating the issue.
+
+4.35.1
+------
+- Fix a container issue with supporting custom string types.
+  See issue `#479 <https://github.com/ets-labs/python-dependency-injector/issues/479>`_.
+  Thanks to `@ilsurih <https://github.com/ilsurih>`_  for reporting the issue.
+
+4.35.0
+------
+- Add support of six 1.16.0.
+
+4.34.2
+------
+- Fix a bug with reverse shutdown order in ``container.shutdown_resources()``.
+  See issue `#432 <https://github.com/ets-labs/python-dependency-injector/issues/432>`_.
+  Thanks to `Saulius Beinorius <https://github.com/saulbein>`_  for bringing up the issue.
+
+4.34.1
+------
+- Update ``container.shutdown_resources()`` to respect dependencies order while shutdown.
+  See issue `#432 <https://github.com/ets-labs/python-dependency-injector/issues/432>`_.
+  Thanks to `Saulius Beinorius <https://github.com/saulbein>`_  for bringing up the issue.
+
+4.34.0
+------
+- Add option ``envs_required`` for configuration provider ``.from_yaml()`` and ``.from_ini()``
+  methods. With ``envs_required=True`` methods ``.from_yaml()`` and ``.from_ini()`` raise
+  an exception when encounter an undefined environment variable in the configuration file.
+  By default this option is set to false for preserving previous behavior ``envs_required=False``.
+- Add raising of an exception in configuration provider strict mode when provider encounters
+  an undefined environment variable in the configuration file.
+- Update configuration provider environment variables interpolation to replace
+  undefined environment variables with an empty value.
+- Update configuration provider to perform environment variables interpolation before passing
+  configuration file content to the parser.
+
+4.33.0
+------
+- Add support of default value for environment variable in INI and YAML
+  configuration files with ``${ENV_NAME:default}`` format.
+  See issue `#459 <https://github.com/ets-labs/python-dependency-injector/issues/459>`_.
+  Thanks to `Maksym Shemet @hbmshemet <https://github.com/hbmshemet>`_ for suggesting the feature.
+- Add method ``Configuration.from_value()``.
+  See issue `#462 <https://github.com/ets-labs/python-dependency-injector/issues/462>`_.
+  Thanks to Mr. `Slack Clone <https://disqus.com/by/slackclone/>`_  for bringing it up
+  in the comments for configuration provider docs.
+
+4.32.3
+------
+- This fix a typo in ``di_in_python.rst`` doc.
+  Thanks to `@loingo95 <https://github.com/loingo95>`_ for the fix.
+
+4.32.2
+------
+- Improve wiring fault tolerance.
+  See issue `#441 <https://github.com/ets-labs/python-dependency-injector/issues/441>`_.
+  Thanks to `@ssheng <https://github.com/ssheng>`_ for reporting the issue.
+
+4.32.1
+------
+- Fix a bug with ``List`` provider not working in async mode.
+  See issue: `#450 <https://github.com/ets-labs/python-dependency-injector/issues/450>`_.
+  Thanks to `@mxab <https://github.com/mxab>`_ for reporting the issue.
+- Add async mode tests for ``List`` and ``Dict`` provider.
+
+4.32.0
+------
+- Add ``ContextLocalSingleton`` provider.
+  See PR: `#443 <https://github.com/ets-labs/python-dependency-injector/pull/442>`_.
+  Thanks to `@sonthonaxrk <https://github.com/sonthonaxrk>`_ for the contribution.
+- Regenerate C sources using Cython 0.29.22.
+
+4.31.2
+------
+- Fix an issue with ``Dict`` provider non-string keys.
+  See issue: `#435 <https://github.com/ets-labs/python-dependency-injector/issues/435>`_.
+  Thanks to `@daniel55411 <https://github.com/daniel55411>`_ for reporting the issue.
+- Fix Flask scoped contexts example.
+  See issue: `#440 <https://github.com/ets-labs/python-dependency-injector/pull/440>`_.
+  Thanks to `@sonthonaxrk <https://github.com/sonthonaxrk>`_ for the contribution.
+
+4.31.1
+------
+- Fix ``ThreadSafeSingleton`` synchronization issue.
+  See issue: `#433 <https://github.com/ets-labs/python-dependency-injector/issues/433>`_.
+  Thanks to `@garlandhu <https://github.com/garlandhu>`_ for reporting the issue.
+
+4.31.0
+------
+- Implement providers' lazy initialization.
+- Improve providers' copying.
+- Improve typing in wiring module.
+- Fix wiring module loader uninstallation issue.
+- Fix provided instance providers error handing in asynchronous mode.
+- Fix overridden configuration option cache resetting.
+  See issue: `#428 <https://github.com/ets-labs/python-dependency-injector/issues/428>`_.
+  Thanks to `@dcendents <https://github.com/dcendents>`_ for reporting the issue.
+
+4.30.0
+------
+- Remove restriction to wire a dynamic container.
+
+4.29.2
+------
+- Fix wiring to not crash on missing signatures.
+  See issue: `#420 <https://github.com/ets-labs/python-dependency-injector/issues/420>`_.
+  Thanks to `@Balthus1989 <https://github.com/Balthus1989>`_ for reporting the issue.
+
+4.29.1
+------
+- Fix recursive copying issue in ``Delegate`` provider.
+  See issue: `#245 <https://github.com/ets-labs/python-dependency-injector/issues/245>`_.
+  Thanks to `@GitterRemote <https://github.com/GitterRemote>`_ for reporting the issue.
+- Add docs and example for ``Factory.add_attributes()`` method.
+- Remove legacy css file.
+- Remove ``unittest2`` test dependency.
+
+4.29.0
+------
+- Implement context manager interface for resetting a singleton provider.
+  See issue: `#413 <https://github.com/ets-labs/python-dependency-injector/issues/413>`_.
+  Thanks to `@Arrowana <https://github.com/Arrowana>`_ for suggesting the improvement.
+- Implement overriding interface to container provider.
+  See issue: `#415 <https://github.com/ets-labs/python-dependency-injector/issues/415>`_.
+  Thanks to `@wackazong <https://github.com/wackazong>`_ for bringing up the use case.
+
+4.28.1
+------
+- Fix async mode mode exception handling issue in ``Dependency`` provider.
+  See issue: `#409 <https://github.com/ets-labs/python-dependency-injector/issues/409>`_.
+  Thanks to `@wackazong <https://github.com/wackazong>`_ for reporting the issue.
+- Fix links to ``boto3`` example.
+
+4.28.0
+------
+- Add wiring injections into modules and class attributes.
+  See issue: `#411 <https://github.com/ets-labs/python-dependency-injector/issues/411>`_.
+  Many thanks to `@brunopereira27 <https://github.com/brunopereira27>`_ for submitting
+  the use case.
+
+4.27.0
+------
+- Introduce wiring inspect filter to filter out ``flask.request`` and other local proxy objects
+  from the inspection.
+  See issue: `#408 <https://github.com/ets-labs/python-dependency-injector/issues/408>`_.
+  Many thanks to `@bvanfleet <https://github.com/bvanfleet>`_ for reporting the issue and
+  help in finding the root cause.
+- Add ``boto3`` example.
+- Add tests for ``.as_float()`` modifier usage with wiring.
+- Make refactoring of wiring module and tests.
+  See PR # `#406 <https://github.com/ets-labs/python-dependency-injector/issues/406>`_.
+  Thanks to `@withshubh <https://github.com/withshubh>`_ for the contribution:
+  - Remove unused imports in tests.
+  - Use literal syntax to create data structure in tests.
+- Add integration with a static analysis tool `DeepSource <https://deepsource.io/>`_.
+
+4.26.0
+------
+- Add wiring by string id.
+- Improve error message for ``Dependency`` provider missing attribute.
+
+4.25.1
+------
+- Amend docs and add another example for ``@containers.copy()`` decorator.
+
+4.25.0
+------
+- Add ``application-multiple-containers-runtime-overriding`` example. This example demonstrates
+  how to build application from multiple containers and override one container config from
+  another one in the runtime.
+  See issue: `#207 <https://github.com/ets-labs/python-dependency-injector/issues/207>`_.
+- Add attributes forwarding for the ``Dependency`` provider.
+
+4.24.0
+------
+- Add docs on ``@containers.copy()`` decorator.
+- Refactor ``@containers.copy()`` decorator.
+- Refactor async mode support in containers module.
+
+4.23.5
+------
+- Fix docs publishing.
+
+4.23.4
+------
+- Fix a typo.
+
+4.23.3
+------
+- Fix mistakenly processed awaitable objects in async mode. This bug has corrupted
+  ``fastapi-redis`` example causing pool exhaustion.
+  Thanks to `@iliamir <https://github.com/iliamir>`_ and Valery Komarov for finding and
+  reporting the issue.
+- Refactor async mode.
+
+4.23.2
+------
+- Improve async mode exceptions handling.
+- Fix double printing of exception when async resource initialization causes an error.
+
+4.23.1
+------
+- Hotfix a bug with importing FastAPI ``Request``.
+  See issue: `#398 <https://github.com/ets-labs/python-dependency-injector/issues/398>`_.
+  Thanks to `@tapm <https://github.com/tapm>`_ for reporting the bug.
+
+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.
+- Fix a typo in docs.
+
+4.22.0
+------
+- Add method ``container.check_dependencies()`` to check if all container dependencies
+  are defined.
+  See issue: `#383 <https://github.com/ets-labs/python-dependency-injector/issues/383>`_.
+  Thanks to `@shaunc <https://github.com/shaunc>`_ for suggesting the feature.
+- Add container name to the representation of the ``Dependency`` provider.
+- Add docs cross-links between ``Singleton`` provider and "Reset container singletons"
+  pages.
+
+4.21.0
+------
+- Improve ``Dependency`` provider error message: when dependency is undefined,
+  error message contains its name.
+
+4.20.2
+------
+- Move docs on container "self" injections to "Providers" section.
+
+4.20.1
+------
+- Refactor containers module.
+
+4.20.0
+------
+- Add container "self" injections.
+  See issue: `#364 <https://github.com/ets-labs/python-dependency-injector/issues/364>`_.
+  Thanks to `@shaunc <https://github.com/shaunc>`_ for suggesting the feature.
+
+4.19.0
+------
+- Add ``singleton.full_reset()`` method to reset all underlying singleton providers.
+- Fix ``container.reset_singleton()`` to reset all provider types, not only ``Singleton``.
+- Improve ``container.traverse(types=[...])`` and ``provider.traverse(types=[...])`` typing stubs
+  to return ``types`` -typed iterator.
+- Update docs on creating custom providers with a requirement to specify ``.related`` property.
+
+4.18.0
+------
+- Add ``container.reset_singleton()`` method to reset container singletons.
+- Refactor ``container.apply_container_providers_overridings()`` to use ``container.traverse()``.
+  This enables deep lazy initialization of ``Container`` providers.
+- Add tests for ``Selector`` provider.
+- Add tests for ``ProvidedInstance`` and ``MethodCaller`` providers.
+- Update Makefile to make Python 3 tests to be a default test command: ``make test``.
+
+4.17.0
+------
+- Add ``FastAPI`` + ``SQLAlchemy`` example.
+  Thanks to `@ShvetsovYura <https://github.com/ShvetsovYura>`_ for providing initial example:
+  `FastAPI_DI_SqlAlchemy <https://github.com/ShvetsovYura/FastAPI_DI_SqlAlchemy>`_.
+
+4.16.0
+------
+- Add container base class ``containers.Container``. ``DynamicContainer``
+  and ``DeclarativeContainer`` become subclasses of the ``Container``.
+  See issue: `#386 <https://github.com/ets-labs/python-dependency-injector/issues/386>`_.
+  Thanks to `@ventaquil <https://github.com/ventaquil>`_ for reporting the issue.
+
+4.15.0
+------
+- Add ``Configuration.from_pydantic()`` method to load configuration from a ``pydantic`` settings.
+
+4.14.0
+------
+- Add container providers traversal.
+- Fix an issue with ``container.init_resource()`` and ``container.shutdown_resource()`` ignoring
+  nested resources that are not present on the root level.
+  See issue: `#380 <https://github.com/ets-labs/python-dependency-injector/issues/380>`_.
+  Thanks to `@approxit <https://github.com/approxit>`_ for finding and reporting the issue.
+- Add ``.provides`` attribute to ``Singleton`` and its subclasses.
+  It's a consistency change to make ``Singleton`` match ``Callable``
+  and ``Factory`` interfaces.
+- Add ``.initializer`` attribute to ``Resource`` provider.
+- Update string representation of ``Resource`` provider.
+
+4.13.2
+------
+- Fix PyCharm typing warning "Expected type 'Optional[Iterable[ModuleType]]',
+  got 'List[module.py]' instead" in ``container.wire()`` method.
+
+4.13.1
+------
+- Fix declarative container metaclass bug: parent container providers replaced child container providers.
+  See issue: `#367 <https://github.com/ets-labs/python-dependency-injector/issues/367>`_.
+  Many thanks to `Shaun Cutts <https://github.com/shaunc>`_ for finding and report the issue.
+
+4.13.0
+------
+- Add ``default`` argument to the dependency provider: ``Dependency(..., default=...)``.
+  See issue: `#336 <https://github.com/ets-labs/python-dependency-injector/issues/336>`_.
+  Many thanks to `Shaun Cutts <https://github.com/shaunc>`_ for providing the use case.
+
+4.12.0
+------
+- Add wiring import hook that auto-wires dynamically imported modules.
+  See issue: `#365 <https://github.com/ets-labs/python-dependency-injector/issues/365>`_.
+  Thanks to `@Balthus1989 <https://github.com/Balthus1989>`_ for providing a use case.
+
+4.11.3
+------
+- Replace weakrefs with normal refs in ``ConfigurationOption`` to support
+  ``Container().provider()`` use case. Test that it does not introduce a memory leak.
+  See issue: `#358#issuecomment-764482059 <https://github.com/ets-labs/python-dependency-injector/issues/358#issuecomment-764482059>`_.
+  Many thanks to `@Minitour <https://github.com/Minitour>`_ for reporting the issue.
+
+4.11.2
+------
+- Fix a bug in ``providers.Container`` when it's declared not at class root level.
+  See issue `#379 <https://github.com/ets-labs/python-dependency-injector/issues/379>`_.
+  Many thanks to `@approxit <https://github.com/approxit>`_ for reporting the issue.
+
+4.11.1
+------
+- Fix a bug in ``@containers.copy`` to improve replacing of subcontainer providers.
+  See issue `#378 <https://github.com/ets-labs/python-dependency-injector/issues/378>`_.
+  Many thanks to `Shaun Cutts <https://github.com/shaunc>`_ for reporting the issue.
+
+4.11.0
+------
+- Add ``loader`` argument to the configuration provider ``Configuration.from_yaml(..., loader=...)``
+  to override the default YAML loader.
+  Many thanks to `Stefano Frazzetto <https://github.com/StefanoFrazzetto>`_ for suggesting an improvement.
+- Make security improvement: change default YAML loader to the custom ``yaml.SafeLoader`` with a support
+  of environment variables interpolation.
+  Many thanks to `Stefano Frazzetto <https://github.com/StefanoFrazzetto>`_ for suggesting an improvement.
+- Update configuration provider ``.from_*()`` methods to raise an exception in strict mode if
+  configuration file does not exist or configuration data is undefined.
+  Many thanks to `Stefano Frazzetto <https://github.com/StefanoFrazzetto>`_ for suggesting an improvement.
+- Add ``required`` argument to the configuration provider ``.from_*()`` methods to specify
+  mandatory configuration sources.
+  Many thanks to `Stefano Frazzetto <https://github.com/StefanoFrazzetto>`_ for suggesting an improvement.
+- Fix a bug with asynchronous injections: async providers do not work with async dependencies.
+  See issue: `#368 <https://github.com/ets-labs/python-dependency-injector/issues/368>`_.
+  Thanks `@kolypto <https://github.com/kolypto>`_ for the bug report.
+- Refactor asynchronous injections.
+- Add extra tests for asynchronous injections.
+- Migrate CI to Github Actions.
+
+4.10.3
+------
+- Fix a bug in the ``Configuration`` provider: strict mode didn't work when provider
+  is overridden by ``None``.
+  See issue: `#358#issuecomment-761607432 <https://github.com/ets-labs/python-dependency-injector/issues/358#issuecomment-761607432>`_.
+  Many thanks to `Stefano Frazzetto <https://github.com/StefanoFrazzetto>`_ for reporting the issue.
+
+4.10.2
+------
+- Fix a bug in ``Resource`` that cause failure when async resource depends on
+  another async resource.
+  See issue `#361 <https://github.com/ets-labs/python-dependency-injector/issues/361>`_.
+  Thanks `@kolypto <https://github.com/kolypto>`_ for the bug report.
+
+4.10.1
+------
+- Fix a Python 3.9 specific bug in ``wiring`` module: introspection doesn't work for
+  builtin ``types.GenericAlias``. This resulted in wiring failure for modules
+  importing ``queue.Queue``.
+  See issue `#362 <https://github.com/ets-labs/python-dependency-injector/issues/362>`_.
+  Thanks `@ventaquil <https://github.com/ventaquil>`_ for the bug report.
+- Switch Coveralls reporting Travis Job to run on Python 3.9.
+
+4.10.0
+------
+- Add ``strict`` mode and ``required`` modifier for ``Configuration`` provider.
+  See issue `#341 <https://github.com/ets-labs/python-dependency-injector/issues/341>`_.
+  Thanks `ms-lolo <https://github.com/ms-lolo>`_ for the feature request.
+
+4.9.1
+-----
+- Fix a bug in the ``Configuration`` provider to correctly handle undefined values.
+  See issue `#358 <https://github.com/ets-labs/python-dependency-injector/issues/358>`_.
+  Many thanks to `Stefano Frazzetto <https://github.com/StefanoFrazzetto>`_ for reporting the issue.
+
+4.9.0
+-----
+- Add ``.dependencies`` attribute to the ``DeclarativeContainer`` and ``DynamicContainer``.
+  It returns dictionary of container ``Dependency`` and ``DependenciesContainer`` providers.
+  See issue `#357 <https://github.com/ets-labs/python-dependency-injector/issues/357>`_.
+  Many thanks to `Shaun Cutts <https://github.com/shaunc>`_ for suggesting the feature.
+
+4.8.3
+-----
+- Fix a bug in the ``Configuration`` provider to correctly handle overriding by ``None``.
+  See issue `#358 <https://github.com/ets-labs/python-dependency-injector/issues/358>`_.
+  Many thanks to `Stefano Frazzetto <https://github.com/StefanoFrazzetto>`_ for reporting the issue.
+
+4.8.2
+-----
+- Fix ``Container`` provider to apply context overridings on root container initialization.
+  See issue `#354 <https://github.com/ets-labs/python-dependency-injector/issues/354>`_.
+  Many thanks to `Shaun Cutts <https://github.com/shaunc>`_ for submitting the issue.
+- Hotfix for version ``4.8.0``: fix side effect in ``Container`` provider overriding.
+
+4.8.1
+-----
+- Fix declarative container multi-level inheritance issue.
+  See issue `#350 <https://github.com/ets-labs/python-dependency-injector/issues/350>`_.
+  Many thanks to `Shaun Cutts <https://github.com/shaunc>`_ for submitting the issue.
+
+4.8.0
+-----
+- Add support of overriding ``Container`` provider.
+  See issue `#354 <https://github.com/ets-labs/python-dependency-injector/issues/354>`_.
+  Many thanks to `Shaun Cutts <https://github.com/shaunc>`_ for submitting the issue.
+
+4.7.0
+-----
+- Add container injection support for wiring.
+
+4.6.1
+-----
+- Add Disqus comments widget to the provider's async injections docs page.
+
+4.6.0
+-----
+- Add support of async injections for providers.
+- Add support of async injections for wiring.
+- Add support of async initializers for ``Resource`` provider.
+- Add ``FastAPI`` + ``Redis`` example.
+- Add ARM wheel builds.
+  See issue `#342 <https://github.com/ets-labs/python-dependency-injector/issues/342>`_ for details.
+- Fix a typo in `ext.flask` deprecation warning.
+  See PR `#345 <https://github.com/ets-labs/python-dependency-injector/pull/345>`_ for details.
+  Thanks to `Fotis Koutoupas <https://github.com/kootoopas>`_ for the fix.
+- Update copyright year.
+
+4.5.4
+-----
+- Fix manylinux wheels uploading issue.
+  See issue `#333 <https://github.com/ets-labs/python-dependency-injector/issues/333>`_ for details.
+  Thanks to `Richard Jones <https://github.com/RichardDRJ>`_ for reporting the issue.
+
+4.5.3
+-----
+- Fix ``4.5.2`` degradation bug in wiring ``@inject`` with not working ``FastAPI.Depends`` directive.
+  See issue `#331 <https://github.com/ets-labs/python-dependency-injector/issues/331>`_ for details.
+  Thanks to `Juan Esteban Marín <https://github.com/juanmarin96>`_ for reporting the issue.
+- Add ``FastAPI`` tests.
+
+4.5.2
+-----
+- Fix a bug in wiring ``@inject`` with not properly working ``FastAPI.Depends`` directive.
+  See issue `#330 <https://github.com/ets-labs/python-dependency-injector/issues/330>`_ for details.
+  Thanks to `Lojka-oops <https://github.com/Lojka-oops>`_ for reporting the issue.
+
+4.5.1
+-----
+- Fix flake8 issue in ``Commands  and Handlers`` example.
+
+4.5.0
+-----
+- Add support of non-string keys for ``Dict`` provider.
+- Add simple ``FastAPI`` example.
+- Add ``Commands  and Handlers`` example from
+  issue `#327 <https://github.com/ets-labs/python-dependency-injector/issues/327>`_.
+- Add extra typing test for provided instance of ``DependenciesContainer`` provider.
+
+4.4.1
+-----
+- Improve ``FastAPI`` integration: handle ``Depends(Provide[...])``.
+- Update ``FastAPI`` example.
+- Remove a typo from the ``Flask`` tutorial.
+
+4.4.0
+-----
+- Add ``@inject`` decorator. It helps to fix a number of wiring bugs and make wiring be more resilient.
+- Refactor ``wiring`` module.
+- Update documentation and examples to use ``@inject`` decorator.
+- Add ``Flask`` blueprints example.
+- Fix wiring bug when wiring doesn't work with the class-based decorators.
+- Fix wiring bug when wiring doesn't work with the decorators that doesn't use ``functools.wraps(...)``.
+- Fix wiring bug with ``@app.route(...)`` -style decorators (Flask, Sanic, FastAPI, etc.).
+- Fix wiring bug when wiring doesn't work with Flask blueprints.
+
+4.3.9
+-----
+- Add ``FastAPI`` example.
+
+4.3.8
+-----
+- Add a hotfix to support wiring for ``FastAPI`` endpoints.
+
+4.3.7
+-----
+- Fix race in ``ThreadSafeSingleton``. Many thanks to
+  `Dmitry Rassoshenko aka rda-dev <https://github.com/rda-dev>`_ for the pull request
+  (See PR `#322 <https://github.com/ets-labs/python-dependency-injector/pull/322>`_).
+
+4.3.6
+-----
+- Fix changelog typo.
+
+4.3.5
+-----
+- Fix a bug in ``wiring`` module that caused multiple imports of the modules
+  when ``.wire(packages=[...])`` is used
+  (See issue `#320 <https://github.com/ets-labs/python-dependency-injector/issues/320>`_). Thanks
+  to `Federico iskorini <https://github.com/iskorini>`_ for reporting the issue.
+
+4.3.4
+-----
+- Fix a bug in ``Configuration`` provider that resulted in not working ``.reset_override()``
+  (See issue `#319 <https://github.com/ets-labs/python-dependency-injector/issues/319>`_). Thanks
+  to `Jun lust4life <https://github.com/lust4life>`_ for reporting the issue and suggesting a fix.
+
+4.3.3
+-----
+- Fix a bug in ``wiring`` with improper patching of ``@classmethod`` and ``@staticmethod`` decorated methods
+  (See issue `#318 <https://github.com/ets-labs/python-dependency-injector/issues/318>`_).
+
+4.3.2
+-----
+- Fix a bug in ``wiring`` with mistakenly initialized and shutdown resource with ``Closing``
+  marker on context argument providing.
+
+4.3.1
+-----
+- Fix README.
+
+4.3.0
+-----
+- Implement per-function execution scope for ``Resource`` provider in tandem
+  with ``wiring.Closing``.
+
+4.2.0
+-----
+- Add support of Python 3.9.
+- Update readme.
+
+4.1.8
+-----
+- Update asyncio daemon, single- and multi-container examples to use ``Resource`` provider.
+
+4.1.7
+-----
+- Add CI job to build and push documentation to S3 bucket.
+
+4.1.6
+-----
+- Fix wiring of multiple containers
+  (see issue `#313 <https://github.com/ets-labs/python-dependency-injector/issues/313>`_).
+  Thanks to `iskorini <https://github.com/iskorini>`_ for reporting the  issue.
+- Fix wiring for ``@classmethod``.
+
+4.1.5
+-----
+- Fix Travis CI windows and MacOS builds.
+
+4.1.4
+-----
+- Fix version of ``cibuildwheel==1.63``.
+- Update Travis CI webhooks to fix builds triggering.
+
+4.1.3
+-----
+- Migrate from ``travis-ci.org`` to ``travis-ci.com`` to fix build issues.
+- Add explicit installation of ``certifi`` for Windows build to resolve build problems.
+
+4.1.2
+-----
+- Bump version of ``cibuildwheel>=1.5.1`` to resolve Windows build problem.
+
+4.1.1
+-----
+- Fix a few typos in ``Resource`` provider docs.
+
+4.1.0
+-----
+- Add ``Resource`` provider.
+- Add ``Dict`` provider.
+- "Un-deprecate" ``@containers.override()`` and ``@containers.copy()`` decorators (
+  see `Issue 301 <https://github.com/ets-labs/python-dependency-injector/issues/301>`_
+  for more information).
+- Add favicon.
+- Remove redirects that occur while getting badge images to optimize docs load speed.
+- Update license year.
+- Update short description on PyPI.
+
+4.0.6
+-----
+- Fix wiring for top-level package ``__init__.py``.
+
+4.0.5
+-----
+- Move ``.provided`` attribute to ``providers.Provider``.
+- Update all links in documentation and examples to use ``https://`` instead of ``http``.
+
+4.0.4
+-----
+- Fix typing stubs for ``container.override()`` method.
+
+4.0.3
+-----
+- Deprecate ``@containers.override()`` and ``@containers.copy()`` decorators.
+- Update changelog of version ``4.0.0`` so it lists all deprecated features.
+
+4.0.2
+-----
+- Fix typing stubs for ``@container.override()`` and ``@containers.copy()`` decorators (
+  see `PR 302 <https://github.com/ets-labs/python-dependency-injector/pull/302>`_). Thanks
+  to `JarnoRFB <https://github.com/JarnoRFB>`_ for reporting the issue.
+
+4.0.1
+-----
+- Extend ``Configuration.from_ini()`` and ``Configuration.from_yaml()`` typing stubs to
+  accept ``pathlib.Path``. The methods were already compatible with ``pathlib.Path``
+  and just did not accept it in their signatures (see
+  `PR 300 <https://github.com/ets-labs/python-dependency-injector/pull/300>`_). Fix
+  was provided by `JarnoRFB <https://github.com/JarnoRFB>`_. Many thanks to you again,
+  JarnoRFB.
+
+4.0.0
+-----
+New features:
+
+- Add ``wiring`` feature.
+
+Deprecations:
+
+- Deprecate ``ext.aiohttp`` module in favor of ``wiring`` feature.
+- Deprecate ``ext.flask`` module in favor of ``wiring`` feature.
+- Deprecate ``.delegate()`` provider method in favor of ``.provider`` attribute.
+
+Removals:
+
+- Remove deprecated ``types`` module.
+
+Tutorials:
+
+-  Update ``flask`` tutorial.
+-  Update ``aiohttp`` tutorial.
+-  Update ``asyncio`` daemon tutorial.
+-  Update CLI application tutorial.
+
+Examples:
+
+- Add ``django`` example.
+- Add ``sanic`` example.
+- Update ``aiohttp`` example.
+- Update ``flask`` example.
+- Update ``asyncio`` daemon example.
+- Update ``movie-lister`` example.
+- Update CLI application example.
+
+Misc:
+
+- Regenerate C sources using Cython 0.29.21.
+- Improve documentation and README (typos removal, rewording, etc).
+
+3.44.0
+------
+- Add native support of the generics to the providers: ``some_provider = providers.Provider[SomeClass]``.
+- Deprecate module ``types``.
+- Add documentation page on providers typing and ``mypy`` support.
+- Update README.
+
+3.43.1
+------
+- Fix a typo in README.
+
+3.43.0
+------
+- Update API documentation.
+- Remove not relevant "speech" example.
+- Fix a few typos.
+
+3.42.0
+------
+- Update "DI in Python" documentation page.
+- Delete "What is DI?" documentation page.
+- Delete "engines cars" example mini app.
+- Update README.
+
+3.41.0
+------
+- Refactor "use cases" example.
+- Refactor "password hashing" example.
+- Refactor "chained factories" pattern example.
+- Refactor "factory of factories" pattern example.
+- Fix declarative container mypy stub to ``__init__`` to accept not only providers.
+- Refactor main module of the "decoupled packages" example.
+- Delete "api client" example mini app.
+- Delete "mail service" example mini app.
+
+3.40.0
+------
+- Add "Decoupled packages" example.
+- Delete "Bundles" examples mini application.
+
+3.39.0
+------
+- Add application examples with single and multiple containers.
+- Remove "Services" application examples.
+- Split examples page into "Examples" with main examples and "Other Examples" with secondary
+  examples.
+- Move "Installation" page to "Introduction" section.
+
+3.38.1
+------
+- Fix README.
+
+3.38.0
+------
+- Update "What is What is dependency injection?" documentation page.
+- Update README.
+- Fix a bunch of typos.
+
+3.37.0
+------
+- Update index documentation page.
+- Make multiple improvements and fixes for the providers documentation.
+- Update "Key Features" documentation page.
+- Remove "Structure of Dependency Injector" documentation page.
+- Edit "Feedback" documentation page.
+
+3.36.0
+------
+- Update providers overriding documentation and rework examples.
+- Update documentation on injecting provided object attributes, items or method calls.
+- Update documentation and example on creating a custom provider.
+- Update providers index documentation page to give better overview of providers functionality.
+- Fix mypy stub of the ``Provider`` to specify the protected ``._copy_overridings()`` method.
+- Update copyright year in the documentation.
+
+3.35.1
+------
+- Fix minor issues in the providers documentation and examples.
+
 3.35.0
 ------
 - Update documentation and rework examples for: ``Singleton``, ``Callable``, ``Coroutine``,
@@ -1048,4 +2030,4 @@ Previous versions
 .. disqus::
 
 
-.. _Semantic versioning: http://semver.org/
+.. _Semantic versioning: https://semver.org/

docs/main/feedback.rst

@@ -1,12 +1,8 @@
 Feedback
 ========
 
-Feel free to post questions, bugs, feature requests, proposals etc. on
-*Dependency Injector*  GitHub Issues:
-
-    https://github.com/ets-labs/python-dependency-injector/issues
-
-Your feedback is quite important!
-
+To post a question, bug report, a feature proposal or get some help open a
+`Github Issue <https://github.com/ets-labs/python-dependency-injector/issues>`_ or leave a comment
+below.
 
 .. disqus::

docs/main/installation.rst

@@ -1,41 +0,0 @@
-Installation
-============
-
-*Dependency Injector* framework is distributed by PyPi_.
-
-Latest stable version (and all previous versions) of *Dependency Injector* 
-framework can be installed from PyPi_:
-
-.. code-block:: bash
-
-    pip install dependency-injector
-
-.. note::
-    Some components of *Dependency Injector* are implemented as C extension types. 
-    *Dependency Injector* is distributed as an archive with a source code, so 
-    C compiler and Python header files are required for the installation.
-
-Sources can be cloned from GitHub_:
-
-.. code-block:: bash
-
-    git clone https://github.com/ets-labs/python-dependency-injector.git
-
-Also all *Dependency Injector* releases can be downloaded from 
-`GitHub releases page`_.
-
-Verification of currently installed version could be done using 
-:py:obj:`dependency_injector.VERSION` constant:
-
-.. code-block:: bash
-
-    >>> import dependency_injector
-    >>> dependency_injector.__version__
-    '3.15.2'
-
-.. _PyPi: https://pypi.org/project/dependency-injector/
-.. _GitHub: https://github.com/ets-labs/python-dependency-injector
-.. _GitHub releases page: https://github.com/ets-labs/python-dependency-injector/releases
-
-
-.. disqus::

docs/providers/aggregate.rst

@@ -0,0 +1,72 @@
+.. _aggregate-provider:
+
+Aggregate provider
+==================
+
+.. meta::
+   :keywords: Python,DI,Dependency injection,IoC,Inversion of Control,Configuration,Injection,
+              Aggregate,Polymorphism,Environment Variable,Flexibility
+   :description: Aggregate provider aggregates other providers.
+                 This page demonstrates how to implement the polymorphism and increase the
+                 flexibility of your application using the Aggregate provider.
+
+:py:class:`Aggregate` provider aggregates a group of other providers.
+
+.. currentmodule:: dependency_injector.providers
+
+.. literalinclude:: ../../examples/providers/aggregate.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 24-27
+
+Each provider in the ``Aggregate`` is associated with a key. You can call aggregated providers by providing
+their key as a first argument. All positional and keyword arguments following the key will be forwarded to
+the called provider:
+
+.. code-block:: python
+
+   yaml_reader = container.config_readers("yaml", "./config.yml", foo=...)
+
+You can also retrieve an aggregated provider by providing its key as an attribute name:
+
+.. code-block:: python
+
+   yaml_reader = container.config_readers.yaml("./config.yml", foo=...)
+
+To retrieve a dictionary of aggregated providers, use ``.providers`` attribute:
+
+.. code-block:: python
+
+   container.config_readers.providers == {
+       "yaml": <YAML provider>,
+       "json": <JSON provider>,
+   }
+
+.. note::
+   You can not override the ``Aggregate`` provider.
+
+.. note::
+   When you inject the ``Aggregate`` provider, it is passed "as is".
+
+To use non-string keys or string keys with ``.`` and ``-``, provide a dictionary as a positional argument:
+
+.. code-block:: python
+
+   aggregate = providers.Aggregate({
+       SomeClass: providers.Factory(...),
+       "key.with.periods": providers.Factory(...),
+       "key-with-dashes": providers.Factory(...),
+   })
+
+.. seealso::
+   :ref:`selector-provider` to make injections based on a configuration value, environment variable, or a result of a callable.
+
+   ``Aggregate`` provider is different from the :ref:`selector-provider`. ``Aggregate`` provider doesn't select which provider
+   to inject and doesn't have a selector. It is a group of providers and is always injected "as is". The rest of the interface
+   of both providers is similar.
+
+.. note::
+   ``Aggregate`` provider is a successor of :ref:`factory-aggregate-provider` provider. ``Aggregate`` provider doesn't have
+   a restriction on the provider type, while ``FactoryAggregate`` aggregates only ``Factory`` providers.
+
+.. disqus::

docs/providers/async.rst

@@ -0,0 +1,110 @@
+.. _async-injections:
+
+Asynchronous injections
+=======================
+
+.. meta::
+   :keywords: Python,DI,Dependency injection,IoC,Inversion of Control,Providers,Async,Injections,Asynchronous,Await,
+              Asyncio
+   :description: Dependency Injector providers support asynchronous injections. This page
+                 demonstrates how make asynchronous dependency injections in Python.
+
+Providers support asynchronous injections.
+
+.. literalinclude:: ../../examples/providers/async.py
+   :language: python
+   :emphasize-lines: 26-29
+   :lines: 3-
+
+If provider has any awaitable injections it switches into async mode. In async mode provider always returns awaitable.
+This causes a cascade effect:
+
+.. code-block:: bash
+
+   provider1()              <── Async mode enabled <──┐
+   │                                                  │
+   ├──> provider2()                                   │
+   │                                                  │
+   ├──> provider3()         <── Async mode enabled <──┤
+   │    │                                             │
+   │    └──> provider4()    <── Async provider ───────┘
+   │
+   └──> provider5()
+        │
+        └──> provider6()
+
+In async mode provider prepares injections asynchronously.
+
+If provider has multiple awaitable dependencies, it will run them concurrently. Provider will wait until all
+dependencies are ready and inject them afterwards.
+
+.. code-block:: bash
+
+   provider1()
+   │
+   ├──> provider2()         <── Async mode enabled
+   │
+   ├──> provider3()         <── Async mode enabled
+   │
+   └──> provider4()         <── Async mode enabled
+
+Here is what provider will do for the previous example:
+
+.. code-block:: python
+
+   injections = await asyncio.gather(
+       provider2(),
+       provider3(),
+       provider4(),
+   )
+   await provider1(*injections)
+
+Overriding behaviour
+--------------------
+
+In async mode provider always returns awaitable. It applies to the overriding too. If provider in async mode is
+overridden by a provider that doesn't return awaitable result, the result will be wrapped into awaitable.
+
+.. literalinclude:: ../../examples/providers/async_overriding.py
+   :language: python
+   :emphasize-lines: 19-24
+   :lines: 3-
+
+Async mode mechanics and API
+----------------------------
+
+By default provider's async mode is undefined.
+
+When provider async mode is undefined, provider will automatically select the mode during the next call.
+If the result is awaitable, provider will enable async mode, if not - disable it.
+
+If provider async mode is enabled, provider always returns awaitable. If the result is not awaitable,
+provider wraps it into awaitable explicitly. You can safely ``await`` provider in async mode.
+
+If provider async mode is disabled, provider behaves the regular way. It doesn't do async injections
+preparation or non-awaitables to awaitables conversion.
+
+Once provider async mode is enabled or disabled, provider will stay in this state. No automatic switching
+will be done.
+
+.. image:: images/async_mode.png
+
+You can also use following methods to change provider's async mode manually:
+
+- ``Provider.enable_async_mode()``
+- ``Provider.disable_async_mode()``
+- ``Provider.reset_async_mode()``
+
+To check the state of provider's async mode use:
+
+- ``Provider.is_async_mode_enabled()``
+- ``Provider.is_async_mode_disabled()``
+- ``Provider.is_async_mode_undefined()``
+
+See also:
+
+- Wiring :ref:`async-injections-wiring`
+- Resource provider :ref:`resource-async-initializers`
+- :ref:`fastapi-redis-example`
+
+.. disqus::

docs/providers/callable.rst

@@ -1,5 +1,5 @@
 Callable provider
------------------
+=================
 
 .. meta::
    :keywords: Python,DI,Dependency injection,IoC,Inversion of Control,Function,Method,Example

docs/providers/configuration.rst

@@ -1,12 +1,18 @@
+.. _configuration-provider:
+
 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 Interpolation,
+              Environment Variable Substitution,Environment Variable in Config,
+              Environment Variable in YAML file,Environment Variable in INI file,Default,Load,Read
    :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. This page also describes how to substitute (interpolate)
+                 environment variables in YAML and INI configuration files.
 
 .. currentmodule:: dependency_injector.providers
 
@@ -14,50 +20,107 @@ Configuration provider
 
 .. literalinclude:: ../../examples/providers/configuration/configuration.py
    :language: python
-   :emphasize-lines: 4,9-10
-   :lines: 4-14
+   :emphasize-lines: 7,12-13
+   :lines: 3-
 
 It implements the principle "use first, define later".
 
+.. contents::
+   :local:
+   :backlinks: none
+
 Loading from an INI file
-~~~~~~~~~~~~~~~~~~~~~~~~
+------------------------
 
 ``Configuration`` provider can load configuration from an ``ini`` file using the
 :py:meth:`Configuration.from_ini` method:
 
 .. literalinclude:: ../../examples/providers/configuration/configuration_ini.py
    :language: python
-   :lines: 3-5,6-
-   :emphasize-lines: 6
+   :lines: 3-
+   :emphasize-lines: 12
 
 where ``examples/providers/configuration/config.ini`` is:
 
 .. literalinclude:: ../../examples/providers/configuration/config.ini
    :language: ini
 
-:py:meth:`Configuration.from_ini` method supports environment variables interpolation. Use
-``${ENV_NAME}`` format in the configuration file to substitute value of the environment
-variable ``ENV_NAME``.
+Alternatively, you can provide a path to the INI file over the configuration provider argument. In that case,
+the container will call ``config.from_ini()`` automatically:
+
+.. code-block:: python
+   :emphasize-lines: 3
+
+   class Container(containers.DeclarativeContainer):
+
+       config = providers.Configuration(ini_files=["./config.ini"])
+
+
+   if __name__ == "__main__":
+       container = Container()  # Config is loaded from ./config.ini
+
+
+:py:meth:`Configuration.from_ini` method supports environment variables interpolation.
+
+.. code-block:: ini
+
+   [section]
+   option1 = ${ENV_VAR}
+   option2 = ${ENV_VAR}/path
+   option3 = ${ENV_VAR:default}
+
+See also: :ref:`configuration-envs-interpolation`.
 
 Loading from a YAML file
-~~~~~~~~~~~~~~~~~~~~~~~~
+------------------------
 
 ``Configuration`` provider can load configuration from a ``yaml`` file using the
 :py:meth:`Configuration.from_yaml` method:
 
 .. literalinclude:: ../../examples/providers/configuration/configuration_yaml.py
    :language: python
-   :lines: 3-5,6-
-   :emphasize-lines: 6
+   :lines: 3-
+   :emphasize-lines: 12
 
 where ``examples/providers/configuration/config.yml`` is:
 
 .. literalinclude:: ../../examples/providers/configuration/config.yml
    :language: ini
 
-:py:meth:`Configuration.from_yaml` method supports environment variables interpolation. Use
-``${ENV_NAME}`` format in the configuration file to substitute value of the environment
-variable ``ENV_NAME``.
+Alternatively, you can provide a path to the YAML file over the configuration provider argument. In that case,
+the container will call ``config.from_yaml()`` automatically:
+
+.. code-block:: python
+   :emphasize-lines: 3
+
+   class Container(containers.DeclarativeContainer):
+
+       config = providers.Configuration(yaml_files=["./config.yml"])
+
+
+   if __name__ == "__main__":
+       container = Container()  # Config is loaded from ./config.yml
+
+:py:meth:`Configuration.from_yaml` method supports environment variables interpolation.
+
+.. code-block:: ini
+
+   section:
+     option1: ${ENV_VAR}
+     option2: ${ENV_VAR}/path
+     option3: ${ENV_VAR:default}
+
+See also: :ref:`configuration-envs-interpolation`.
+
+:py:meth:`Configuration.from_yaml` method uses custom version of ``yaml.SafeLoader``.
+To use another loader use ``loader`` argument:
+
+.. code-block:: python
+
+   import yaml
+
+
+   container.config.from_yaml("config.yml", loader=yaml.UnsafeLoader)
 
 .. note::
 
@@ -73,46 +136,288 @@ variable ``ENV_NAME``.
 
    *Don't forget to mirror the changes in the requirements file.*
 
+Loading from a JSON file
+------------------------
+
+``Configuration`` provider can load configuration from a ``json`` file using the
+:py:meth:`Configuration.from_json` method:
+
+.. literalinclude:: ../../examples/providers/configuration/configuration_json.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 12
+
+where ``examples/providers/configuration/config.json`` is:
+
+.. literalinclude:: ../../examples/providers/configuration/config.json
+   :language: json
+
+Alternatively, you can provide a path to a json file over the configuration provider argument. In that case,
+the container will call ``config.from_json()`` automatically:
+
+.. code-block:: python
+   :emphasize-lines: 3
+
+   class Container(containers.DeclarativeContainer):
+
+       config = providers.Configuration(json_files=["./config.json"])
+
+
+   if __name__ == "__main__":
+       container = Container()  # Config is loaded from ./config.json
+
+:py:meth:`Configuration.from_json` method supports environment variables interpolation.
+
+.. code-block:: json
+
+   {
+       "section": {
+           "option1": "${ENV_VAR}",
+           "option2": "${ENV_VAR}/path",
+           "option3": "${ENV_VAR:default}"
+       }
+   }
+
+See also: :ref:`configuration-envs-interpolation`.
+
+Loading from a Pydantic settings
+--------------------------------
+
+``Configuration`` provider can load configuration from a ``pydantic_settings.BaseSettings`` object using the
+:py:meth:`Configuration.from_pydantic` method:
+
+.. literalinclude:: ../../examples/providers/configuration/configuration_pydantic.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 32
+
+To get the data from pydantic settings ``Configuration`` provider calls its ``model_dump()`` 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"})
+
+Alternatively, you can provide a ``pydantic_settings.BaseSettings`` object over the configuration provider argument. In that case,
+the container will call ``config.from_pydantic()`` automatically:
+
+.. code-block:: python
+   :emphasize-lines: 3
+
+   class Container(containers.DeclarativeContainer):
+
+       config = providers.Configuration(pydantic_settings=[Settings()])
+
+
+   if __name__ == "__main__":
+       container = Container()  # Config is loaded from Settings()
+
+
+.. note::
+
+   ``Dependency Injector`` doesn't install ``pydantic-settings`` by default.
+
+   You can install the ``Dependency Injector`` with an extra dependency::
+
+      pip install dependency-injector[pydantic2]
+
+   or install ``pydantic-settings`` directly::
+
+      pip install pydantic-settings
+
+   *Don't forget to mirror the changes in the requirements file.*
+
+.. note::
+
+   For backward-compatibility, Pydantic v1 is still supported.
+   Passing ``pydantic.BaseSettings`` instances will work just as fine as ``pydantic_settings.BaseSettings``.
+
 Loading from a dictionary
-~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------
 
 ``Configuration`` provider can load configuration from a Python ``dict`` using the
 :py:meth:`Configuration.from_dict` method:
 
 .. literalinclude:: ../../examples/providers/configuration/configuration_dict.py
    :language: python
-   :lines: 3-5,6-
-   :emphasize-lines: 6-13
+   :lines: 3-
+   :emphasize-lines: 12-19
 
 Loading from an environment variable
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+------------------------------------
 
 ``Configuration`` provider can load configuration from an environment variable using the
 :py:meth:`Configuration.from_env` method:
 
 .. literalinclude:: ../../examples/providers/configuration/configuration_env.py
    :language: python
-   :lines: 5-7,13-21
-   :emphasize-lines: 6-8
+   :lines: 3-
+   :emphasize-lines: 18-20
+
+You can use ``as_`` argument for the type casting of an environment variable value:
+
+.. code-block:: python
+   :emphasize-lines: 2,6,10
+
+   # API_KEY=secret
+   container.config.api_key.from_env("API_KEY", as_=str, required=True)
+   assert container.config.api_key() == "secret"
+
+   # SAMPLING_RATIO=0.5
+   container.config.sampling.from_env("SAMPLING_RATIO", as_=float, required=True)
+   assert container.config.sampling() == 0.5
+
+   # TIMEOUT undefined, default is used
+   container.config.timeout.from_env("TIMEOUT", as_=int, default=5)
+   assert container.config.timeout() == 5
+
+
+Loading a value
+---------------
+
+``Configuration`` provider can load configuration value using the
+:py:meth:`Configuration.from_value` method:
+
+.. literalinclude:: ../../examples/providers/configuration/configuration_value.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 14-15
 
 Loading from the multiple sources
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+---------------------------------
 
 ``Configuration`` provider can load configuration from the multiple sources. Loaded
 configuration is merged recursively over the existing configuration.
 
 .. literalinclude:: ../../examples/providers/configuration/configuration_multiple.py
    :language: python
-   :lines: 3-5,6-14
-   :emphasize-lines: 6-7
+   :lines: 3-
+   :emphasize-lines: 12-13
 
 where ``examples/providers/configuration/config.local.yml`` is:
 
 .. literalinclude:: ../../examples/providers/configuration/config.local.yml
    :language: ini
 
+.. _configuration-envs-interpolation:
+
+Using environment variables in configuration files
+--------------------------------------------------
+
+``Configuration`` provider supports environment variables interpolation in configuration files.
+Use ``${ENV_NAME}`` in the configuration file to substitute value from environment
+variable ``ENV_NAME``.
+
+.. code-block:: ini
+
+   section:
+     option: ${ENV_NAME}
+
+You can also specify a default value using ``${ENV_NAME:default}`` format. If environment
+variable ``ENV_NAME`` is undefined, configuration provider will substitute value ``default``.
+
+.. code-block:: ini
+
+   [section]
+   option = ${ENV_NAME:default}
+
+If you'd like to specify a default value for environment variable inside of the application you can use
+``os.environ.setdefault()``.
+
+.. literalinclude:: ../../examples/providers/configuration/configuration_env_interpolation_os_default.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 12
+
+If environment variable is undefined and doesn't have a default, ``Configuration`` provider
+will replace it with an empty value. This is a default behavior. To raise an error on
+undefined environment variable that doesn't have a default value, pass argument
+``envs_required=True`` to a configuration reading method:
+
+.. code-block:: python
+
+   container.config.from_yaml("config.yml", envs_required=True)
+
+See also: :ref:`configuration-strict-mode`.
+
+.. note::
+   ``Configuration`` provider makes environment variables interpolation before parsing. This preserves
+   original parser behavior. For instance, undefined environment variable in YAML configuration file
+   will be replaced with an empty value and then YAML parser will load the file.
+
+   Original configuration file:
+
+   .. code-block:: ini
+
+      section:
+        option: ${ENV_NAME}
+
+   Configuration file after interpolation where ``ENV_NAME`` is undefined:
+
+   .. code-block:: ini
+
+      section:
+        option:
+
+   Configuration provider after parsing interpolated YAML file contains ``None`` in
+   option ``section.option``:
+
+   .. code-block:: python
+
+      assert container.config.section.option() is None
+
+If you want to disable environment variables interpolation, pass ``envs_required=None``:
+
+.. code-block:: yaml
+   :caption: templates.yml
+
+   template_string: 'Hello, ${name}!'
+
+.. code-block:: python
+
+   >>> container.config.from_yaml("templates.yml", envs_required=None)
+   >>> container.config.template_string()
+   'Hello, ${name}!'
+
+Mandatory and optional sources
+------------------------------
+
+By default, methods ``.from_yaml()`` and ``.from_ini()`` ignore errors if configuration file does not exist.
+You can use this to specify optional configuration files.
+
+If configuration file is mandatory, use ``required`` argument. Configuration provider will raise an error
+if required file does not exist.
+
+You can also use ``required`` argument when loading configuration from dictionaries and environment variables.
+
+Mandatory YAML file:
+
+.. code-block:: python
+
+   container.config.from_yaml("config.yaml", required=True)
+
+Mandatory INI file:
+
+.. code-block:: python
+
+   container.config.from_ini("config.ini", required=True)
+
+Mandatory dictionary:
+
+.. code-block:: python
+
+   container.config.from_dict(config_dict, required=True)
+
+Mandatory environment variable:
+
+.. code-block:: python
+
+   container.config.api_key.from_env("API_KEY", required=True)
+
+See also: :ref:`configuration-strict-mode`.
+
 Specifying the value type
-~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------
 
 You can specify the type of the injected configuration value explicitly.
 
@@ -122,7 +427,7 @@ convert it into an ``int`` or a ``float``.
 .. literalinclude:: ../../examples/providers/configuration/configuration_type.py
    :language: python
    :lines: 3-
-   :emphasize-lines: 17
+   :emphasize-lines: 19
 
 ``Configuration`` provider has next helper methods:
 
@@ -135,10 +440,140 @@ The last method ``.as_(callback, *args, **kwargs)`` helps to implement other con
 .. literalinclude:: ../../examples/providers/configuration/configuration_type_custom.py
    :language: python
    :lines: 3-
-   :emphasize-lines: 16
+   :emphasize-lines: 18
 
 With the ``.as_(callback, *args, **kwargs)`` you can specify a function that will be called
 before the injection. The value from the config will be passed as a first argument. The returned
 value will be injected. Parameters ``*args`` and ``**kwargs`` are handled as any other injections.
 
+.. _configuration-strict-mode:
+
+Strict mode and required options
+--------------------------------
+
+You can use configuration provider in strict mode. In strict mode configuration provider raises an error
+on access to any undefined option.
+
+.. literalinclude:: ../../examples/providers/configuration/configuration_strict.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 12
+
+Methods ``.from_*()`` in strict mode raise an exception if configuration file does not exist or
+configuration data is undefined:
+
+.. code-block:: python
+   :emphasize-lines: 10,15,20,25,30
+
+   class Container(containers.DeclarativeContainer):
+
+       config = providers.Configuration(strict=True)
+
+
+   if __name__ == "__main__":
+       container = Container()
+
+       try:
+           container.config.from_yaml("does-not_exist.yml")  # raise exception
+       except FileNotFoundError:
+           ...
+
+       try:
+           container.config.from_ini("does-not_exist.ini")  # raise exception
+       except FileNotFoundError:
+           ...
+
+       try:
+           container.config.from_pydantic(EmptySettings())  # raise exception
+       except ValueError:
+           ...
+
+       try:
+           container.config.from_env("UNDEFINED_ENV_VAR")  # raise exception
+       except ValueError:
+           ...
+
+       try:
+           container.config.from_dict({})  # raise exception
+       except ValueError:
+           ...
+
+Environment variables interpolation in strict mode raises an exception when encounters
+an undefined environment variable without a default value.
+
+.. code-block:: ini
+
+   section:
+     option: ${UNDEFINED}
+
+.. code-block:: python
+
+       try:
+           container.config.from_yaml("undefined_env.yml")  # raise exception
+       except ValueError:
+           ...
+
+You can override ``.from_*()`` methods behaviour in strict mode using ``required`` argument:
+
+.. code-block:: python
+
+   class Container(containers.DeclarativeContainer):
+
+       config = providers.Configuration(strict=True)
+
+
+   if __name__ == "__main__":
+       container = Container()
+
+       container.config.from_yaml("config.yml")
+       container.config.from_yaml("config.local.yml", required=False)
+
+You can also use ``.required()`` option modifier when making an injection. It does not require to switch
+configuration provider to strict mode.
+
+.. literalinclude:: ../../examples/providers/configuration/configuration_required.py
+   :language: python
+   :lines: 11-20
+   :emphasize-lines: 8-9
+
+.. note::
+
+   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
+--------------------
+
+You can inject invariant configuration options based on the value of the other configuration
+option.
+
+To use that you should provide the switch-value as an item of the configuration option that
+contains sections ``config.options[config.switch]``:
+
+- When the value of the ``config.switch`` is ``A``, the ``config.options.A`` is injected
+- When the value of the ``config.switch`` is ``B``, the ``config.options.B`` is injected
+
+.. literalinclude:: ../../examples/providers/configuration/configuration_itemselector.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 15,30-31,38
+
 .. disqus::

docs/providers/coroutine.rst

@@ -1,5 +1,5 @@
 Coroutine provider
-------------------
+==================
 
 .. meta::
    :keywords: Python,DI,Dependency injection,IoC,Inversion of Control,Coroutine,Asynchronous,

docs/providers/custom.rst

@@ -1,35 +1,49 @@
-Writing of custom providers
----------------------------
+.. _create-provider:
+
+Creating a custom provider
+==========================
+
+.. meta::
+   :keywords: Python,DI,Dependency injection,IoC,Inversion of Control,Custom provider, Create
+   :description: This page demonstrates how to create a custom provider.
 
 .. currentmodule:: dependency_injector.providers
 
-List of *Dependency Injector* providers could be widened with custom providers.
+You can create a custom provider.
 
-Below are some tips and recommendations that have to be met:
+To create a custom provider you need to follow these rules:
 
-    1. Every custom provider has to extend base provider class - 
-       :py:class:`Provider`.
-    2. Custom provider's ``__init__()`` could be overridden, but parent's
-       initializer (:py:meth:`Provider.__init__`) has to be called.
-    3. Providing strategy has to be implemented in custom provider's 
-       :py:meth:`Provider.__call__` method.
-    4. If custom provider is based on some standard providers, it is better to
-       use delegation of standard providers, then extending of them.
-    5. If custom provider defines any attributes, it is good to list them in 
-       ``__slots__`` attribute (as *Dependency Injector* does). It can save 
-       some memory.
-    6. If custom provider deals with injections, it is strongly recommended 
-       to be consistent with :py:class:`Factory`, :py:class:`Singleton` and 
-       :py:class:`Callable` providers style. 
-
-Example:
-
-.. image:: /images/providers/custom_provider.png
-    :width: 100%
-    :align: center
+1. New provider class should inherit :py:class:`Provider`.
+2. You need to implement the ``Provider._provide()`` method.
+3. You need to implement the ``Provider.__deepcopy__()`` method. It should return an
+   equivalent copy of a provider. All providers must be copied with the ``deepcopy()`` function
+   from the ``providers`` module. It's essential to pass ``memo`` into ``deepcopy`` in order to keep
+   the preconfigured ``args`` and ``kwargs`` of stored providers. After the a new provider object
+   is created, use ``Provider._copy_overriding()`` method to copy all overriding providers. See the
+   example below.
+4. If new provider has a ``__init__()`` method, it should call the parent
+   ``Provider.__init__()``.
+5. If new provider stores any other providers, these providers should be listed in
+   ``.related`` property. Property ``.related`` also should yield providers from parent
+   ``.related`` property.
 
 .. literalinclude:: ../../examples/providers/custom_factory.py
    :language: python
+   :lines: 3-
 
+.. note::
+   1. Prefer delegation over inheritance. If you choose between inheriting a ``Factory`` or
+      inheriting a ``Provider`` and use ``Factory`` internally - the last is better.
+   2. When creating a new provider follow the ``Factory``-like injections style. Consistency matters.
+   3. Use the ``__slots__`` attribute to make sure nothing could be attached to your provider. You
+      will also save some memory.
+
+.. note::
+   If you don't find needed provider in the ``providers`` module and experience troubles creating
+   one by your own - open a
+   `Github Issue <https://github.com/ets-labs/python-dependency-injector/issues>`_.
+
+   I'll help you to resolve the issue if that's possible. If the new provider can be useful for
+   others I'll include it into the ``providers`` module.
 
 .. disqus::

docs/providers/dependency.rst

@@ -1,21 +1,38 @@
+.. _dependency-provider:
+
 Dependency provider
--------------------
+===================
 
 .. currentmodule:: dependency_injector.providers
 
-:py:class:`Dependency` provider is a placeholder for the dependency of the specified type.
+:py:class:`Dependency` provider is a placeholder for a dependency of a certain type.
 
-The first argument of the ``Dependency`` provider specifies a type of the dependency. It is
-called ``instance_of``. ``Dependency`` provider controls the type of the returned object to be an
-instance of the ``instance_of`` type.
-
-The ``Dependency`` provider must be overridden before usage. It can be overridden by any type of
-the provider. The only rule is that overriding provider must return an instance of ``instance_of``
-dependency type.
+To specify a type of the dependency use ``instance_of`` argument: ``Dependency(instance_of=SomeClass)``.
+Dependency provider will control that returned object is an instance of ``instance_of`` type.
 
 .. literalinclude:: ../../examples/providers/dependency.py
    :language: python
    :lines: 3-
-   :emphasize-lines: 26
+   :emphasize-lines: 26,35-36
+
+To provide a dependency you need to override the ``Dependency`` provider. You can call
+provider ``.override()`` method or provide an overriding provider when creating a container.
+See :ref:`provider-overriding`. If you don't provide a dependency, ``Dependency`` provider
+will raise an error:
+
+.. literalinclude:: ../../examples/providers/dependency_undefined_error.py
+   :language: python
+   :lines: 18-
+
+You also can provide a default for the dependency. To provide a default use ``default`` argument:
+``Dependency(..., default=...)``. Default can be a value or a provider. If default is not a provider,
+dependency provider will wrap it into the ``Object`` provider.
+
+.. literalinclude:: ../../examples/providers/dependency_default.py
+   :language: python
+   :lines: 16-23
+   :emphasize-lines: 3
+
+See also: :ref:`check-container-dependencies`.
 
 .. disqus::

docs/providers/dict.rst

@@ -0,0 +1,37 @@
+Dict provider
+=============
+
+.. meta::
+   :keywords: Python,DI,Dependency injection,IoC,Inversion of Control,Dict,Injection
+   :description: Dict provider helps to inject a dictionary of the dependencies. This page demonstrates
+                 how to use Dict provider.
+
+.. currentmodule:: dependency_injector.providers
+
+:py:class:`Dict` provider provides a dictionary of values.
+
+.. literalinclude:: ../../examples/providers/dict.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 21-24
+
+``Dict`` provider handles keyword arguments the same way as a :ref:`factory-provider`.
+
+To use non-string keys or keys with ``.`` and ``-`` provide a dictionary as a positional argument:
+
+.. code-block:: python
+
+   providers.Dict({
+       SomeClass: providers.Factory(...),
+       "key.with.periods": providers.Factory(...),
+       "key-with-dashes": providers.Factory(...),
+   })
+
+Example:
+
+.. literalinclude:: ../../examples/providers/dict_non_string_keys.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 40-43
+
+.. disqus::

docs/providers/factory.rst

@@ -40,8 +40,16 @@ injected following these rules:
    :language: python
    :lines: 3-
 
+``Factory`` provider can inject attributes. Use ``.add_attributes()`` method to specify
+attribute injections.
+
+.. literalinclude:: ../../examples/providers/factory_attribute_injections.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 18-18
+
 Passing arguments to the underlying providers
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+---------------------------------------------
 
 ``Factory`` provider can pass the arguments to the underlying providers. This helps when you need
 to assemble a nested objects graph and pass the arguments deep inside.
@@ -73,12 +81,12 @@ all the classes and use special double-underscore ``__`` syntax for passing the
 .. literalinclude:: ../../examples/providers/factory_init_injections_underlying.py
    :language: python
    :lines: 3-
-   :emphasize-lines: 24-35,39,42,45
+   :emphasize-lines: 44,49
 
 When you use ``__`` separator in the name of the keyword argument the ``Factory`` looks for
 the dependency with the same name as the left part of the ``__`` expression.
 
-.. code-block::
+.. code-block:: none
 
    <dependency>__<keyword for the underlying provider>=<value>
 
@@ -88,7 +96,7 @@ If ``<dependency>`` is found the underlying provider will receive the
 .. _factory_providers_delegation:
 
 Passing providers to the objects
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+--------------------------------
 
 When you need to inject the provider itself, but not the result of its call, use the ``.provider``
 attribute of the provider that you're going to inject.
@@ -98,14 +106,53 @@ attribute of the provider that you're going to inject.
 .. literalinclude:: ../../examples/providers/factory_delegation.py
    :language: python
    :lines: 3-
-   :emphasize-lines: 25
+   :emphasize-lines: 28
 
 .. note:: Any provider has a ``.provider`` attribute.
 
+.. _factory-string-imports:
+
+String imports
+--------------
+
+``Factory`` provider can handle string imports:
+
+.. code-block:: python
+
+   class Container(containers.DeclarativeContainer):
+
+       service = providers.Factory("myapp.mypackage.mymodule.Service")
+
+You can also make a relative import:
+
+.. code-block:: python
+
+   # in myapp/container.py
+
+   class Container(containers.DeclarativeContainer):
+
+       service = providers.Factory(".mypackage.mymodule.Service")
+
+or import a member of the current module just specifying its name:
+
+.. code-block:: python
+
+   class Service:
+       ...
+
+
+   class Container(containers.DeclarativeContainer):
+
+       service = providers.Factory("Service")
+
+.. note::
+   ``Singleton``, ``Callable``, ``Resource``, and ``Coroutine`` providers handle string imports
+   the same way as a ``Factory`` provider.
+
 .. _factory-specialize-provided-type:
 
 Specializing the provided type
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+------------------------------
 
 You can create a specialized ``Factory`` provider that provides only specific type. For doing
 this you need to create a subclass of the ``Factory`` provider and define the ``provided_type``
@@ -119,7 +166,7 @@ class attribute.
 .. _abstract-factory:
 
 Abstract factory
-~~~~~~~~~~~~~~~~
+----------------
 
 :py:class:`AbstractFactory` provider helps when you need to create a provider of some base class
 and the particular implementation is not yet know. ``AbstractFactory`` provider is a ``Factory``
@@ -135,18 +182,22 @@ provider with two peculiarities:
 .. literalinclude:: ../../examples/providers/abstract_factory.py
    :language: python
    :lines: 3-
-   :emphasize-lines: 32
+   :emphasize-lines: 34
+
+.. _factory-aggregate-provider:
 
 Factory aggregate
-~~~~~~~~~~~~~~~~~
+-----------------
 
-:py:class:`FactoryAggregate` provider aggregates multiple factories. When you call the
-``FactoryAggregate`` it delegates the call to one of the factories.
+:py:class:`FactoryAggregate` provider aggregates multiple factories.
 
-The aggregated factories are associated with the string names. When you call the
-``FactoryAggregate`` you have to provide one of the these names as a first argument.
-``FactoryAggregate`` looks for the factory with a matching name and delegates it the work. The
-rest of the arguments are passed to the delegated ``Factory``.
+.. seealso::
+   :ref:`aggregate-provider` – it's a successor of ``FactoryAggregate`` provider that can aggregate
+   any type of provider, not only ``Factory``.
+
+The aggregated factories are associated with the string keys. When you call the
+``FactoryAggregate`` you have to provide one of the these keys as a first argument.
+``FactoryAggregate`` looks for the factory with a matching key and calls it with the rest of the arguments.
 
 .. image:: images/factory_aggregate.png
     :width: 100%
@@ -155,14 +206,14 @@ rest of the arguments are passed to the delegated ``Factory``.
 .. literalinclude:: ../../examples/providers/factory_aggregate.py
    :language: python
    :lines: 3-
-   :emphasize-lines: 31-35,43
+   :emphasize-lines: 33-37,47
 
-You can get a dictionary of the aggregated factories using the ``.factories`` attribute of the
-``FactoryAggregate``. To get a game factories dictionary from the previous example you can use
-``game_factory.factories`` attribute.
+You can get a dictionary of the aggregated providers using ``.providers`` attribute.
+To get a game provider dictionary from the previous example you can use
+``game_factory.providers`` attribute.
 
 You can also access an aggregated factory as an attribute. To create the ``Chess`` object from the
-previous example you can do ``chess = game_factory.chess('John', 'Jane')``.
+previous example you can do ``chess = game_factory.chess("John", "Jane")``.
 
 .. note::
    You can not override the ``FactoryAggregate`` provider.
@@ -170,4 +221,22 @@ previous example you can do ``chess = game_factory.chess('John', 'Jane')``.
 .. note::
    When you inject the ``FactoryAggregate`` provider it is passed "as is".
 
+To use non-string keys or string keys with ``.`` and ``-``, you can provide a dictionary as a positional argument:
+
+.. code-block:: python
+
+   providers.FactoryAggregate({
+       SomeClass: providers.Factory(...),
+       "key.with.periods": providers.Factory(...),
+       "key-with-dashes": providers.Factory(...),
+   })
+
+Example:
+
+.. literalinclude:: ../../examples/providers/factory_aggregate_non_string_keys.py
+   :language: python
+   :lines: 3-
+   :emphasize-lines: 30-33,39-40
+
+
 .. disqus::

docs/providers/index.rst

@@ -7,7 +7,8 @@ Providers help to assemble the objects. They create objects and inject the depen
 
 Each provider is a callable. You call the provider like a function when you need to create an
 object. Provider retrieves the underlying dependencies and inject them into the created object.
-It causes the cascade effect that helps to assemble object graphs.
+It causes the cascade effect that helps to assemble object graphs. See ``Factory``, ``Singleton``,
+``Callable`` and other provider docs below.
 
 .. code-block:: bash
 
@@ -23,10 +24,13 @@ It causes the cascade effect that helps to assemble object graphs.
         │
         └──> provider6()
 
-Another providers feature is an overriding. Any of the providers can be overridden by another
-provider. When provider is overridden it calls to the overriding provider instead of providing
-the object by its own. This helps in testing. This also helps in overriding API clients with
-stubs for the development or staging environment.
+Another providers feature is an overriding. You can override any provider with another provider.
+This helps in testing. This also helps in overriding API clients with stubs for the development
+or staging environment. See the example at :ref:`provider-overriding`.
+
+If you need to inject not the whole object but the parts see :ref:`provided-instance`.
+
+To create a new provider see :ref:`create-provider`.
 
 Providers module API docs - :py:mod:`dependency_injector.providers`
 
@@ -39,9 +43,15 @@ Providers module API docs - :py:mod:`dependency_injector.providers`
     coroutine
     object
     list
+    dict
     configuration
+    resource
+    aggregate
     selector
     dependency
     overriding
     provided_instance
+    inject_self
     custom
+    async
+    typing_mypy