Merge branch 'develop' into fix/inject_decorator_cython

.coveragerc

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

.github/FUNDING.yml

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

.github/workflows/publishing.yml

@@ -10,20 +10,20 @@ jobs:
 
   tests:
     name: Run tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.13
       - run: pip install tox
       - run: tox
         env:
-          TOXENV: 3.11
+          TOXENV: 3.13
 
   linters:
     name: Run linters
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         toxenv: [flake8, pydocstyle, mypy, pylint]
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.13
       - run: pip install tox
       - run: tox
         env:
@@ -40,15 +40,18 @@ jobs:
   build-sdist:
     name: Build source tarball
     needs: [tests, linters]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.13
-      - run: python setup.py sdist
+      - run: |
-      - uses: actions/upload-artifact@v3
+          python -m pip install --upgrade build
+          python -m build --sdist
+      - uses: actions/upload-artifact@v4
         with:
+          name: cibw-sdist
           path: ./dist/*
 
   build-wheels:
@@ -57,43 +60,28 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2019, macos-11]
+        os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2019, macos-14]
     env:
-      CIBW_SKIP: cp27-win*
+      CIBW_SKIP: cp27-*
     steps:
       - uses: actions/checkout@v3
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.11.3
+        uses: pypa/cibuildwheel@v2.20.0
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
-        with:
-          path: ./wheelhouse/*.whl
-
-  build-wheels-linux-aarch64:
-    name: Build wheels (ubuntu-22.04-aarch64)
-    needs: [tests, linters]
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up QEMU
-        if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@v2
-      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.11.3
-        env:
-          CIBW_ARCHS_LINUX: aarch64
-      - uses: actions/upload-artifact@v3
         with:
+          name: cibw-wheels-x86-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
 
   publish:
     name: Publish on PyPI
-    needs: [build-sdist, build-wheels, build-wheels-linux-aarch64]
+    needs: [build-sdist, build-wheels]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          pattern: cibw-*
           path: dist
+          merge-multiple: true
       - uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
@@ -105,14 +93,14 @@ jobs:
   publish-docs:
     name: Publish docs
     needs: [publish]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.13
-      - run: pip install -r requirements-doc.txt
       - run: pip install awscli
+      - run: pip install -r requirements-doc.txt
       - run: pip install -e .
       - run: (cd docs && make clean html)
       - run: |

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

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, pypy2.7, pypy3.9]
+        python-version: [3.7]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", 3.11]
+        python-version: [3.8, 3.9, "3.10", 3.11, 3.12, 3.13]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -36,21 +36,32 @@ jobs:
         env:
           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.11
+          python-version: 3.12
-      - run: pip install tox cython
+      - run: pip install tox 'cython>=3,<4'
-      - run: make cythonize
+      - run: tox -vv
-      - run: tox
         env:
           TOXENV: coveralls
 
@@ -64,7 +75,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.13
       - run: pip install tox
       - run: tox
         env:

.gitignore

@@ -63,13 +63,13 @@ venv*/
 # Vim Rope
 .ropeproject/
 
-# C extensions
+# Cython artifacts
-src/dependency_injector/*.h
+src/**/*.c
-src/dependency_injector/*.so
+src/**/*.h
-src/dependency_injector/containers/*.h
+src/**/*.so
-src/dependency_injector/containers/*.so
+src/**/*.html
-src/dependency_injector/providers/*.h
-src/dependency_injector/providers/*.so
 
 # 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

CONTRIBUTORS.rst

@@ -20,3 +20,5 @@ Dependency Injector Contributors
 + 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) 2022, Roman Mogylatov
+Copyright (c) 2024, Roman Mogylatov
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -1,14 +1,6 @@
 VERSION := $(shell python setup.py --version)
 
-CYTHON_SRC := $(shell find src/dependency_injector -name '*.pyx')
+export COVERAGE_RCFILE := pyproject.toml
-
-CYTHON_DIRECTIVES = -Xlanguage_level=2
-
-ifdef DEPENDENCY_INJECTOR_DEBUG_MODE
-	CYTHON_DIRECTIVES += -Xprofile=True
-	CYTHON_DIRECTIVES += -Xlinetrace=True
-endif
-
 
 clean:
 	# Clean sources
@@ -25,21 +17,17 @@ clean:
 	find examples -name '*.py[co]' -delete
 	find examples -name '__pycache__' -delete
 
-cythonize:
+build: clean
-	# Compile Cython to C
+	# Compile C extensions
-	cython -a $(CYTHON_DIRECTIVES) $(CYTHON_SRC)
+	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:
@@ -48,9 +36,9 @@ uninstall:
 test:
 	# Unit tests with coverage report
 	coverage erase
-	coverage run --rcfile=./.coveragerc -m pytest -c tests/.configs/pytest.ini
+	coverage run -m pytest -c tests/.configs/pytest.ini
-	coverage report --rcfile=./.coveragerc
+	coverage report
-	coverage html --rcfile=./.coveragerc
+	coverage html
 
 check:
 	flake8 src/dependency_injector/
@@ -61,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)*
 

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/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/conf.py

@@ -33,7 +33,7 @@ sys.path.insert(0, os.path.abspath(".."))
 extensions = [
     "alabaster",
     "sphinx.ext.autodoc",
-    "sphinxcontrib.disqus",
+    "sphinx_disqus.disqus",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -52,7 +52,7 @@ master_doc = "index"
 
 # General information about the project.
 project = "Dependency Injector"
-copyright = "2022, Roman Mogylatov"
+copyright = "2024, Roman Mogylatov"
 author = "Roman Mogylatov"
 
 # The version info for the project you"re documenting, acts as replacement for
@@ -147,6 +147,9 @@ html_favicon = "favicon.ico"
 # 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_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
@@ -306,4 +309,5 @@ html_theme_options = {
     "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/examples/aiohttp.rst

@@ -78,4 +78,6 @@ 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

@@ -84,4 +84,6 @@ 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

@@ -90,4 +90,6 @@ 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

@@ -17,4 +17,6 @@ Listing of ``boto3_session_example.py``:
 .. literalinclude:: ../../examples/miniapps/boto3-session/boto3_session_example.py
    :language: python
 
+.. include:: ../sponsor.rst
+
 .. disqus::

docs/examples/decoupled-packages.rst

@@ -129,4 +129,6 @@ 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

@@ -94,4 +94,6 @@ 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/fastapi-redis.rst

@@ -95,4 +95,6 @@ See also:
 - Resource provider :ref:`resource-async-initializers`
 - Wiring :ref:`async-injections-wiring`
 
+.. include:: ../sponsor.rst
+
 .. disqus::

docs/examples/fastapi-sqlalchemy.rst

@@ -116,4 +116,6 @@ 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

@@ -76,4 +76,6 @@ 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/flask-blueprints.rst

@@ -86,4 +86,6 @@ 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

@@ -84,4 +84,6 @@ 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/sanic.rst

@@ -77,4 +77,6 @@ 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/introduction/di_in_python.rst

@@ -310,4 +310,6 @@ A few useful links related to a dependency injection design pattern for further
 + https://github.com/ets-labs/python-dependency-injector
 + https://pypi.org/project/dependency-injector/
 
+.. include:: ../sponsor.rst
+
 .. disqus::

docs/main/changelog.rst

@@ -7,6 +7,48 @@ that were made in every particular version.
 From version 0.7.6 *Dependency Injector* framework strictly
 follows `Semantic versioning`_
 
+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.

docs/providers/configuration.rst

@@ -183,22 +183,22 @@ See also: :ref:`configuration-envs-interpolation`.
 Loading from a Pydantic settings
 --------------------------------
 
-``Configuration`` provider can load configuration from a ``pydantic`` settings object using the
+``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: 31
+   :emphasize-lines: 32
 
-To get the data from pydantic settings ``Configuration`` provider calls ``Settings.dict()`` method.
+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 object over the configuration provider argument. In that case,
+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
@@ -215,18 +215,23 @@ the container will call ``config.from_pydantic()`` automatically:
 
 .. note::
 
-   ``Dependency Injector`` doesn't install ``pydantic`` by default.
+   ``Dependency Injector`` doesn't install ``pydantic-settings`` by default.
 
    You can install the ``Dependency Injector`` with an extra dependency::
 
-      pip install dependency-injector[pydantic]
+      pip install dependency-injector[pydantic2]
 
-   or install ``pydantic`` directly::
+   or install ``pydantic-settings`` directly::
 
-      pip install pydantic
+      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
 -------------------------
 

docs/providers/singleton.rst

@@ -24,7 +24,7 @@ returns it on the rest of the calls.
 
 .. note::
 
-   ``Singleton`` provider makes dependencies injection only when creates an object. When an object
+   ``Singleton`` provider makes dependencies injection only when it creates an object. When an object
    is created and memorized ``Singleton`` provider just returns it without applying injections.
 
 Specialization of the provided type and abstract singletons work the same like like for the

docs/sponsor.rst

@@ -0,0 +1,7 @@
+.. list-table::
+  :class: no-border
+  :align: left
+
+  * - Sponsor the project on GitHub:
+    - .. raw:: html
+         :file: _static/sponsor.html

docs/tutorials/aiohttp.rst

@@ -859,4 +859,6 @@ What's next?
 - Know more about the :ref:`providers`
 - Go to the :ref:`contents`
 
+.. include:: ../sponsor.rst
+
 .. disqus::

docs/tutorials/asyncio-daemon.rst

@@ -18,7 +18,7 @@ In this tutorial we will use:
 
 - Python 3
 - Docker
-- Docker-compose
+- Docker Compose
 
 Start from the scratch or jump to the section:
 
@@ -47,28 +47,27 @@ response it will log:
 Prerequisites
 -------------
 
-We will use `Docker <https://www.docker.com/>`_ and
+We will use `docker compose <https://docs.docker.com/compose/>`_ in this tutorial. Let's check the versions:
-`docker-compose <https://docs.docker.com/compose/>`_ in this tutorial. Let's check the versions:
 
 .. code-block:: bash
 
    docker --version
-   docker-compose --version
+   docker compose version
 
 The output should look something like:
 
 .. code-block:: bash
 
-   Docker version 20.10.5, build 55c4c88
+   Docker version 27.3.1, build ce12230
-   docker-compose version 1.29.0, build 07737305
+   Docker Compose version v2.29.7
 
 .. note::
 
-   If you don't have ``Docker`` or ``docker-compose`` you need to install them before proceeding.
+   If you don't have ``Docker`` or ``docker compose`` you need to install them before proceeding.
    Follow these installation guides:
 
    - `Install Docker <https://docs.docker.com/get-docker/>`_
-   - `Install docker-compose <https://docs.docker.com/compose/install/>`_
+   - `Install docker compose <https://docs.docker.com/compose/install/>`_
 
 The prerequisites are satisfied. Let's get started with the project layout.
 
@@ -129,13 +128,13 @@ Put next lines into the ``requirements.txt`` file:
    pytest-cov
 
 Second, we need to create the ``Dockerfile``. It will describe the daemon's build process and
-specify how to run it. We will use ``python:3.9-buster`` as a base image.
+specify how to run it. We will use ``python:3.13-bookworm`` as a base image.
 
 Put next lines into the ``Dockerfile`` file:
 
 .. code-block:: bash
 
-   FROM python:3.10-buster
+   FROM python:3.13-bookworm
 
    ENV PYTHONUNBUFFERED=1
 
@@ -155,8 +154,6 @@ Put next lines into the ``docker-compose.yml`` file:
 
 .. code-block:: yaml
 
-   version: "3.7"
-
    services:
 
      monitor:
@@ -171,7 +168,7 @@ Run in the terminal:
 
 .. code-block:: bash
 
-   docker-compose build
+   docker compose build
 
 The build process may take a couple of minutes. You should see something like this in the end:
 
@@ -184,7 +181,7 @@ After the build is done run the container:
 
 .. code-block:: bash
 
-   docker-compose up
+   docker compose up
 
 The output should look like:
 
@@ -461,7 +458,7 @@ Run in the terminal:
 
 .. code-block:: bash
 
-   docker-compose up
+   docker compose up
 
 The output should look like:
 
@@ -705,7 +702,7 @@ Run in the terminal:
 
 .. code-block:: bash
 
-   docker-compose up
+   docker compose up
 
 You should see:
 
@@ -813,7 +810,7 @@ Run in the terminal:
 
 .. code-block:: bash
 
-   docker-compose up
+   docker compose up
 
 You should see:
 
@@ -965,15 +962,16 @@ Run in the terminal:
 
 .. code-block:: bash
 
-   docker-compose run --rm monitor py.test monitoringdaemon/tests.py --cov=monitoringdaemon
+   docker compose run --rm monitor py.test monitoringdaemon/tests.py --cov=monitoringdaemon
 
 You should see:
 
 .. code-block:: bash
 
-   platform linux -- Python 3.10.0, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
+   platform linux -- Python 3.13.1, pytest-8.3.4, pluggy-1.5.0
    rootdir: /code
-   plugins: asyncio-0.16.0, cov-3.0.0
+   plugins: cov-6.0.0, asyncio-0.24.0
+   asyncio: mode=Mode.STRICT, default_loop_scope=None
    collected 2 items
 
    monitoringdaemon/tests.py ..                                    [100%]
@@ -1028,4 +1026,6 @@ What's next?
 - Know more about the :ref:`providers`
 - Go to the :ref:`contents`
 
+.. include:: ../sponsor.rst
+
 .. disqus::

docs/tutorials/cli.rst

@@ -911,7 +911,7 @@ Create ``tests.py`` in the ``movies`` package:
 and put next into it:
 
 .. code-block:: python
-   :emphasize-lines: 36,51
+   :emphasize-lines: 41,50
 
    """Tests module."""
 
@@ -941,13 +941,18 @@ and put next into it:
        return container
 
 
-   def test_movies_directed_by(container):
+   @pytest.fixture
+   def finder_mock(container):
        finder_mock = mock.Mock()
        finder_mock.find_all.return_value = [
            container.movie("The 33", 2015, "Patricia Riggen"),
            container.movie("The Jungle Book", 2016, "Jon Favreau"),
        ]
 
+       return finder_mock
+
+
+   def test_movies_directed_by(container, finder_mock):
        with container.finder.override(finder_mock):
            lister = container.lister()
            movies = lister.movies_directed_by("Jon Favreau")
@@ -956,13 +961,7 @@ and put next into it:
        assert movies[0].title == "The Jungle Book"
 
 
-   def test_movies_released_in(container):
+   def test_movies_released_in(container, finder_mock):
-       finder_mock = mock.Mock()
-       finder_mock.find_all.return_value = [
-           container.movie("The 33", 2015, "Patricia Riggen"),
-           container.movie("The Jungle Book", 2016, "Jon Favreau"),
-       ]
-
        with container.finder.override(finder_mock):
            lister = container.lister()
            movies = lister.movies_released_in(2015)
@@ -995,9 +994,9 @@ You should see:
    movies/entities.py         7      1    86%
    movies/finders.py         26     13    50%
    movies/listers.py          8      0   100%
-   movies/tests.py           23      0   100%
+   movies/tests.py           24      0   100%
    ------------------------------------------
-   TOTAL                     89     30    66%
+   TOTAL                     90     30    67%
 
 .. note::
 
@@ -1034,4 +1033,6 @@ What's next?
 - Know more about the :ref:`providers`
 - Go to the :ref:`contents`
 
+.. include:: ../sponsor.rst
+
 .. disqus::

docs/tutorials/flask.rst

@@ -998,5 +998,6 @@ What's next?
 - Know more about the :ref:`providers`
 - Go to the :ref:`contents`
 
+.. include:: ../sponsor.rst
 
 .. disqus::

examples/miniapps/aiohttp/README.rst

@@ -98,8 +98,9 @@ The output should be something like:
 
 .. code-block::
 
-   platform darwin -- Python 3.10.0, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
+   platform linux -- Python 3.12.3, pytest-8.3.2, pluggy-1.5.0
-   plugins: asyncio-0.16.0, anyio-3.3.4, aiohttp-0.3.0, cov-3.0.0
+   plugins: cov-6.0.0, anyio-4.4.0, asyncio-0.24.0, aiohttp-1.0.5
+   asyncio: mode=Mode.STRICT, default_loop_scope=None
    collected 3 items
 
    giphynavigator/tests.py ...                                     [100%]

examples/miniapps/aiohttp/giphynavigator/tests.py

@@ -3,11 +3,15 @@
 from unittest import mock
 
 import pytest
+import pytest_asyncio
 
 from giphynavigator.application import create_app
 from giphynavigator.giphy import GiphyClient
 
 
+pytestmark = pytest.mark.asyncio
+
+
 @pytest.fixture
 def app():
     app = create_app()
@@ -15,9 +19,9 @@ def app():
     app.container.unwire()
 
 
-@pytest.fixture
+@pytest_asyncio.fixture
-def client(app, aiohttp_client, loop):
+async def client(app, aiohttp_client):
-    return loop.run_until_complete(aiohttp_client(app))
+    return await aiohttp_client(app)
 
 
 async def test_index(client, app):

examples/miniapps/aiohttp/requirements.txt

@@ -2,4 +2,5 @@ dependency-injector
 aiohttp
 pyyaml
 pytest-aiohttp
+pytest-asyncio
 pytest-cov

examples/miniapps/asyncio-daemon/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-buster
+FROM python:3.13-bookworm
 
 ENV PYTHONUNBUFFERED=1
 

examples/miniapps/asyncio-daemon/README.rst

@@ -13,13 +13,13 @@ Build the Docker image:
 
 .. code-block:: bash
 
-   docker-compose build
+   docker compose build
 
 Run the docker-compose environment:
 
 .. code-block:: bash
 
-    docker-compose up
+    docker compose up
 
 The output should be something like:
 
@@ -59,15 +59,16 @@ To run the tests do:
 
 .. code-block:: bash
 
-   docker-compose run --rm monitor py.test monitoringdaemon/tests.py --cov=monitoringdaemon
+   docker compose run --rm monitor py.test monitoringdaemon/tests.py --cov=monitoringdaemon
 
 The output should be something like:
 
 .. code-block::
 
-   platform linux -- Python 3.10.0, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
+   platform linux -- Python 3.13.1, pytest-8.3.4, pluggy-1.5.0
    rootdir: /code
-   plugins: asyncio-0.16.0, cov-3.0.0
+   plugins: cov-6.0.0, asyncio-0.24.0
+   asyncio: mode=Mode.STRICT, default_loop_scope=None
    collected 2 items
 
    monitoringdaemon/tests.py ..                                    [100%]

examples/miniapps/asyncio-daemon/monitoringdaemon/tests.py

@@ -61,7 +61,7 @@ async def test_example_monitor(container, caplog):
 
 
 @pytest.mark.asyncio
-async def test_dispatcher(container, caplog, event_loop):
+async def test_dispatcher(container, caplog):
     caplog.set_level("INFO")
 
     example_monitor_mock = mock.AsyncMock()
@@ -72,6 +72,7 @@ async def test_dispatcher(container, caplog, event_loop):
             httpbin_monitor=httpbin_monitor_mock,
     ):
         dispatcher = container.dispatcher()
+        event_loop = asyncio.get_running_loop()
         event_loop.create_task(dispatcher.start())
         await asyncio.sleep(0.1)
         dispatcher.stop()

examples/miniapps/fastapi-redis/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-buster
+FROM python:3.13-bookworm
 
 ENV PYTHONUNBUFFERED=1
 

examples/miniapps/fastapi-redis/README.rst

@@ -12,13 +12,13 @@ Build the Docker image:
 
 .. code-block:: bash
 
-   docker-compose build
+   docker compose build
 
 Run the docker-compose environment:
 
 .. code-block:: bash
 
-    docker-compose up
+    docker compose up
 
 The output should be something like:
 
@@ -54,16 +54,16 @@ To run the tests do:
 
 .. code-block:: bash
 
-   docker-compose run --rm example py.test fastapiredis/tests.py --cov=fastapiredis
+   docker compose run --rm example py.test fastapiredis/tests.py --cov=fastapiredis
 
 The output should be something like:
 
 .. code-block::
 
-   platform linux -- Python 3.10.9, pytest-7.2.0, pluggy-1.0.0
+   platform linux -- Python 3.13.1, pytest-8.3.4, pluggy-1.5.0
    rootdir: /code
-   plugins: cov-4.0.0, asyncio-0.20.3
+   plugins: cov-6.0.0, asyncio-0.24.0, anyio-4.7.0
-   collected 1 item
+   asyncio: mode=Mode.STRICT, default_loop_scope=None
 
    fastapiredis/tests.py .                                         [100%]
 

examples/miniapps/fastapi-redis/fastapiredis/redis.py

@@ -1,6 +1,6 @@
 from typing import AsyncIterator
 
-from aioredis import from_url, Redis
+from redis.asyncio import from_url, Redis
 
 
 async def init_redis_pool(host: str, password: str) -> AsyncIterator[Redis]:

examples/miniapps/fastapi-redis/fastapiredis/services.py

@@ -1,6 +1,6 @@
 """Services module."""
 
-from aioredis import Redis
+from redis.asyncio import Redis
 
 
 class Service:

examples/miniapps/fastapi-redis/fastapiredis/tests.py

@@ -3,7 +3,7 @@
 from unittest import mock
 
 import pytest
-from httpx import AsyncClient
+from httpx import ASGITransport, AsyncClient
 
 from .application import app, container
 from .services import Service
@@ -11,7 +11,10 @@ from .services import Service
 
 @pytest.fixture
 def client(event_loop):
-    client = AsyncClient(app=app, base_url="http://test")
+    client = AsyncClient(
+        transport=ASGITransport(app=app),
+        base_url="http://test",
+    )
     yield client
     event_loop.run_until_complete(client.aclose())
 

examples/miniapps/fastapi-redis/requirements.txt

@@ -1,7 +1,7 @@
 dependency-injector
 fastapi
 uvicorn
-aioredis
+redis>=4.2
 
 # For testing:
 pytest

examples/miniapps/fastapi-simple/tests.py

@@ -1,14 +1,18 @@
 from unittest import mock
 
 import pytest
-from httpx import AsyncClient
+import pytest_asyncio
+from httpx import ASGITransport, AsyncClient
 
 from fastapi_di_example import app, container, Service
 
 
-@pytest.fixture
+@pytest_asyncio.fixture
-async def client(event_loop):
+async def client():
-    async with AsyncClient(app=app, base_url="http://test") as client:
+    async with AsyncClient(
+        transport=ASGITransport(app=app),
+        base_url="http://test",
+    ) as client:
         yield client
 
 

examples/miniapps/fastapi-sqlalchemy/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-buster
+FROM python:3.13-bookworm
 
 ENV PYTHONUNBUFFERED=1
 ENV HOST=0.0.0.0

examples/miniapps/fastapi-sqlalchemy/README.rst

@@ -15,13 +15,13 @@ Build the Docker image:
 
 .. code-block:: bash
 
-   docker-compose build
+   docker compose build
 
 Run the docker-compose environment:
 
 .. code-block:: bash
 
-    docker-compose up
+    docker compose up
 
 The output should be something like:
 
@@ -67,15 +67,15 @@ To run the tests do:
 
 .. code-block:: bash
 
-   docker-compose run --rm webapp py.test webapp/tests.py --cov=webapp
+   docker compose run --rm webapp py.test webapp/tests.py --cov=webapp
 
 The output should be something like:
 
 .. code-block::
 
-   platform linux -- Python 3.10.0, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
+   platform linux -- Python 3.13.1, pytest-8.3.4, pluggy-1.5.0
    rootdir: /code
-   plugins: cov-3.0.0
+   plugins: cov-6.0.0, anyio-4.7.0
    collected 7 items
 
    webapp/tests.py .......                                         [100%]

examples/miniapps/fastapi-sqlalchemy/requirements.txt

@@ -1,5 +1,5 @@
 dependency-injector
-fastapi
+fastapi[standard]
 uvicorn
 pyyaml
 sqlalchemy

examples/miniapps/fastapi/README.rst

@@ -101,9 +101,9 @@ The output should be something like:
 
 .. code-block::
 
-   platform darwin -- Python 3.10.0, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
+   platform linux -- Python 3.12.3, pytest-8.3.2, pluggy-1.5.0
-   plugins: asyncio-0.16.0, cov-3.0.0
+   plugins: cov-6.0.0, anyio-4.4.0, asyncio-0.24.0, aiohttp-1.0.5
-   collected 3 items
+   asyncio: mode=Mode.STRICT, default_loop_scope=None
 
    giphynavigator/tests.py ...                                     [100%]
 

examples/miniapps/fastapi/giphynavigator/tests.py

@@ -3,15 +3,19 @@
 from unittest import mock
 
 import pytest
-from httpx import AsyncClient
+import pytest_asyncio
+from httpx import ASGITransport, AsyncClient
 
 from giphynavigator.application import app
 from giphynavigator.giphy import GiphyClient
 
 
-@pytest.fixture
+@pytest_asyncio.fixture
 async def client():
-    async with AsyncClient(app=app, base_url="http://test") as client:
+    async with AsyncClient(
+        transport=ASGITransport(app=app),
+        base_url="http://test",
+    ) as client:
         yield client
 
 

examples/miniapps/flask-blueprints/README.rst

@@ -81,8 +81,9 @@ The output should be something like:
 
 .. code-block::
 
-   platform darwin -- Python 3.10.0, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
+   platform linux -- Python 3.12.3, pytest-8.3.2, pluggy-1.5.0
-   plugins: cov-3.0.0, flask-1.2.0
+   plugins: cov-6.0.0, flask-1.3.0
+   asyncio: mode=Mode.STRICT, default_loop_scope=None
    collected 2 items
 
    githubnavigator/tests.py ..                                     [100%]

examples/miniapps/flask-blueprints/githubnavigator/application.py

@@ -1,7 +1,7 @@
 """Application module."""
 
 from flask import Flask
-from flask_bootstrap import Bootstrap
+from flask_bootstrap import Bootstrap4
 
 from .containers import Container
 from .blueprints import example
@@ -15,7 +15,7 @@ def create_app() -> Flask:
     app.container = container
     app.register_blueprint(example.blueprint)
 
-    bootstrap = Bootstrap()
+    bootstrap = Bootstrap4()
     bootstrap.init_app(app)
 
     return app

examples/miniapps/flask/README.rst

@@ -81,8 +81,9 @@ The output should be something like:
 
 .. code-block::
 
-   platform darwin -- Python 3.10.0, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
+   platform linux -- Python 3.12.3, pytest-8.3.2, pluggy-1.5.0
-   plugins: cov-3.0.0, flask-1.2.0
+   plugins: cov-6.0.0, flask-1.3.0
+   asyncio: mode=Mode.STRICT, default_loop_scope=None
    collected 2 items
 
    githubnavigator/tests.py ..                                     [100%]

examples/miniapps/flask/githubnavigator/application.py

@@ -1,7 +1,7 @@
 """Application module."""
 
 from flask import Flask
-from flask_bootstrap import Bootstrap
+from flask_bootstrap import Bootstrap4
 
 from .containers import Container
 from . import views
@@ -15,7 +15,7 @@ def create_app() -> Flask:
     app.container = container
     app.add_url_rule("/", "index", views.index)
 
-    bootstrap = Bootstrap()
+    bootstrap = Bootstrap4()
     bootstrap.init_app(app)
 
     return app

examples/miniapps/movie-lister/README.rst

@@ -58,8 +58,8 @@ The output should be something like:
 
 .. code-block::
 
-   platform darwin -- Python 3.10.0, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
+   platform linux -- Python 3.12.3, pytest-8.3.2, pluggy-1.5.0
-   plugins: cov-3.0.0
+   plugins: cov-6.0.0
    collected 2 items
 
    movies/tests.py ..                                              [100%]

examples/miniapps/movie-lister/movies/tests.py

@@ -26,13 +26,18 @@ def container():
     return container
 
 
-def test_movies_directed_by(container):
+@pytest.fixture
+def finder_mock(container):
     finder_mock = mock.Mock()
     finder_mock.find_all.return_value = [
         container.movie("The 33", 2015, "Patricia Riggen"),
         container.movie("The Jungle Book", 2016, "Jon Favreau"),
     ]
 
+    return finder_mock
+
+
+def test_movies_directed_by(container, finder_mock):
     with container.finder.override(finder_mock):
         lister = container.lister()
         movies = lister.movies_directed_by("Jon Favreau")
@@ -41,13 +46,7 @@ def test_movies_directed_by(container):
     assert movies[0].title == "The Jungle Book"
 
 
-def test_movies_released_in(container):
+def test_movies_released_in(container, finder_mock):
-    finder_mock = mock.Mock()
-    finder_mock.find_all.return_value = [
-        container.movie("The 33", 2015, "Patricia Riggen"),
-        container.movie("The Jungle Book", 2016, "Jon Favreau"),
-    ]
-
     with container.finder.override(finder_mock):
         lister = container.lister()
         movies = lister.movies_released_in(2015)

examples/miniapps/sanic/README.rst

@@ -27,7 +27,7 @@ To run the application do:
 .. code-block:: bash
 
     export GIPHY_API_KEY=wBJ2wZG7SRqfrU9nPgPiWvORmloDyuL0
-    python -m giphynavigator
+    sanic giphynavigator.application:create_app
 
 The output should be something like:
 
@@ -98,8 +98,9 @@ The output should be something like:
 
 .. code-block::
 
-   platform darwin -- Python 3.10.0, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
+   platform linux -- Python 3.12.3, pytest-8.3.2, pluggy-1.5.0
-   plugins: sanic-1.9.1, anyio-3.3.4, cov-3.0.0
+   plugins: cov-6.0.0, anyio-4.4.0, asyncio-0.24.0
+   asyncio: mode=Mode.STRICT, default_loop_scope=None
    collected 3 items
 
    giphynavigator/tests.py ...                                     [100%]

examples/miniapps/sanic/giphynavigator/tests.py

@@ -8,6 +8,8 @@ from sanic import Sanic
 from giphynavigator.application import create_app
 from giphynavigator.giphy import GiphyClient
 
+pytestmark = pytest.mark.asyncio
+
 
 @pytest.fixture
 def app():
@@ -17,12 +19,7 @@ def app():
     app.ctx.container.unwire()
 
 
-@pytest.fixture
+async def test_index(app):
-def test_client(loop, app, sanic_client):
-    return loop.run_until_complete(sanic_client(app))
-
-
-async def test_index(app, test_client):
     giphy_client_mock = mock.AsyncMock(spec=GiphyClient)
     giphy_client_mock.search.return_value = {
         "data": [
@@ -32,7 +29,7 @@ async def test_index(app, test_client):
     }
 
     with app.ctx.container.giphy_client.override(giphy_client_mock):
-        response = await test_client.get(
+        _, response = await app.asgi_client.get(
             "/",
             params={
                 "query": "test",
@@ -41,7 +38,7 @@ async def test_index(app, test_client):
         )
 
     assert response.status_code == 200
-    data = response.json()
+    data = response.json
     assert data == {
         "query": "test",
         "limit": 10,
@@ -52,30 +49,30 @@ async def test_index(app, test_client):
     }
 
 
-async def test_index_no_data(app, test_client):
+async def test_index_no_data(app):
     giphy_client_mock = mock.AsyncMock(spec=GiphyClient)
     giphy_client_mock.search.return_value = {
         "data": [],
     }
 
     with app.ctx.container.giphy_client.override(giphy_client_mock):
-        response = await test_client.get("/")
+        _, response = await app.asgi_client.get("/")
 
     assert response.status_code == 200
-    data = response.json()
+    data = response.json
     assert data["gifs"] == []
 
 
-async def test_index_default_params(app, test_client):
+async def test_index_default_params(app):
     giphy_client_mock = mock.AsyncMock(spec=GiphyClient)
     giphy_client_mock.search.return_value = {
         "data": [],
     }
 
     with app.ctx.container.giphy_client.override(giphy_client_mock):
-        response = await test_client.get("/")
+        _, response = await app.asgi_client.get("/")
 
     assert response.status_code == 200
-    data = response.json()
+    data = response.json
     assert data["query"] == app.ctx.container.config.default.query()
     assert data["limit"] == app.ctx.container.config.default.limit()

examples/miniapps/sanic/requirements.txt

@@ -1,6 +1,6 @@
 dependency-injector
-sanic<=21.6
+sanic
+sanic-testing
 aiohttp
 pyyaml
-pytest-sanic
 pytest-cov

examples/miniapps/starlette-lifespan/README.rst

@@ -0,0 +1,39 @@
+Integration With Starlette-based Frameworks
+===========================================
+
+This is a `Starlette <https://www.starlette.io/>`_ +
+`Dependency Injector <https://python-dependency-injector.ets-labs.org/>`_ example application
+utilizing `lifespan API <https://www.starlette.io/lifespan/>`_.
+
+.. note::
+
+    Pretty much `any framework built on top of Starlette <https://www.starlette.io/third-party-packages/#frameworks>`_
+    supports this feature (`FastAPI <https://fastapi.tiangolo.com/advanced/events/#lifespan>`_,
+    `Xpresso <https://xpresso-api.dev/latest/tutorial/lifespan/>`_, etc...).
+
+Run
+---
+
+Create virtual environment:
+
+.. code-block:: bash
+
+    python -m venv env
+    . env/bin/activate
+
+Install requirements:
+
+.. code-block:: bash
+
+    pip install -r requirements.txt
+
+To run the application do:
+
+.. code-block:: bash
+
+    python example.py
+    # or (logging won't be configured):
+    uvicorn --factory example:container.app
+
+After that visit http://127.0.0.1:8000/ in your browser or use CLI command (``curl``, ``httpie``,
+etc).

examples/miniapps/starlette-lifespan/example.py

@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+
+from logging import basicConfig, getLogger
+
+from dependency_injector.containers import DeclarativeContainer
+from dependency_injector.ext.starlette import Lifespan
+from dependency_injector.providers import Factory, Resource, Self, Singleton
+from starlette.applications import Starlette
+from starlette.requests import Request
+from starlette.responses import JSONResponse
+from starlette.routing import Route
+
+count = 0
+
+
+def init():
+    log = getLogger(__name__)
+    log.info("Inittializing resources")
+    yield
+    log.info("Cleaning up resources")
+
+
+async def homepage(request: Request) -> JSONResponse:
+    global count
+    response = JSONResponse({"hello": "world", "count": count})
+    count += 1
+    return response
+
+
+class Container(DeclarativeContainer):
+    __self__ = Self()
+    lifespan = Singleton(Lifespan, __self__)
+    logging = Resource(
+        basicConfig,
+        level="DEBUG",
+        datefmt="%Y-%m-%d %H:%M",
+        format="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
+    )
+    init = Resource(init)
+    app = Factory(
+        Starlette,
+        debug=True,
+        lifespan=lifespan,
+        routes=[Route("/", homepage)],
+    )
+
+
+container = Container()
+
+if __name__ == "__main__":
+    import uvicorn
+
+    uvicorn.run(
+        container.app,
+        factory=True,
+        # NOTE: `None` prevents uvicorn from configuring logging, which is
+        #       impossible via CLI
+        log_config=None,
+    )

examples/miniapps/starlette-lifespan/requirements.txt

@@ -0,0 +1,3 @@
+dependency-injector
+starlette
+uvicorn

examples/providers/configuration/configuration_pydantic.py

@@ -3,7 +3,7 @@
 import os
 
 from dependency_injector import containers, providers
-from pydantic import BaseSettings, Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 # Emulate environment variables
 os.environ["AWS_ACCESS_KEY_ID"] = "KEY"
@@ -11,15 +11,16 @@ os.environ["AWS_SECRET_ACCESS_KEY"] = "SECRET"
 
 
 class AwsSettings(BaseSettings):
+    model_config = SettingsConfigDict(env_prefix="aws_")
 
-    access_key_id: str = Field(env="aws_access_key_id")
+    access_key_id: str
-    secret_access_key: str = Field(env="aws_secret_access_key")
+    secret_access_key: str
 
 
 class Settings(BaseSettings):
 
     aws: AwsSettings = AwsSettings()
-    optional: str = Field(default="default_value")
+    optional: str = "default_value"
 
 
 class Container(containers.DeclarativeContainer):

examples/providers/configuration/configuration_pydantic_init.py

@@ -3,7 +3,7 @@
 import os
 
 from dependency_injector import containers, providers
-from pydantic import BaseSettings, Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 # Emulate environment variables
 os.environ["AWS_ACCESS_KEY_ID"] = "KEY"
@@ -11,15 +11,16 @@ os.environ["AWS_SECRET_ACCESS_KEY"] = "SECRET"
 
 
 class AwsSettings(BaseSettings):
+    model_config = SettingsConfigDict(env_prefix="aws_")
 
-    access_key_id: str = Field(env="aws_access_key_id")
+    access_key_id: str
-    secret_access_key: str = Field(env="aws_secret_access_key")
+    secret_access_key: str
 
 
 class Settings(BaseSettings):
 
     aws: AwsSettings = AwsSettings()
-    optional: str = Field(default="default_value")
+    optional: str = "default_value"
 
 
 class Container(containers.DeclarativeContainer):

examples/wiring/example.py

@@ -2,10 +2,10 @@
 
 from dependency_injector import containers, providers
 from dependency_injector.wiring import Provide, inject
+from typing import Annotated
 
 
-class Service:
+class Service: ...
-    ...
 
 
 class Container(containers.DeclarativeContainer):
@@ -13,9 +13,16 @@ class Container(containers.DeclarativeContainer):
     service = providers.Factory(Service)
 
 
+# You can place marker on parameter default value
 @inject
-def main(service: Service = Provide[Container.service]) -> None:
+def main(service: Service = Provide[Container.service]) -> None: ...
-    ...
+
+
+# Also, you can place marker with typing.Annotated
+@inject
+def main_with_annotated(
+    service: Annotated[Service, Provide[Container.service]]
+) -> None: ...
 
 
 if __name__ == "__main__":

pyproject.toml

@@ -0,0 +1,101 @@
+[build-system]
+requires = ["setuptools", "Cython"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "dependency-injector"
+authors = [
+    {name = "Roman Mogylatov", email = "rmogilatov@gmail.com"},
+]
+maintainers = [
+    {name = "Roman Mogylatov", email = "rmogilatov@gmail.com"},
+]
+description = "Dependency injection framework for Python"
+readme = {file = "README.rst", content-type = "text/x-rst"}
+license = {file = "LICENSE.rst", content-type = "text/x-rst"}
+requires-python = ">=3.7"
+keywords = [
+    "Dependency injection",
+    "DI",
+    "Inversion of Control",
+    "IoC",
+    "Factory",
+    "Singleton",
+    "Design patterns",
+    "Flask",
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: BSD License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+    "Framework :: AsyncIO",
+    "Framework :: Bottle",
+    "Framework :: Django",
+    "Framework :: Flask",
+    "Framework :: Pylons",
+    "Framework :: Pyramid",
+    "Framework :: Pytest",
+    "Framework :: TurboGears",
+    "Topic :: Software Development",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+]
+dynamic = ["version"]
+
+[project.optional-dependencies]
+yaml = ["pyyaml"]
+pydantic = ["pydantic"]
+pydantic2 = ["pydantic-settings"]
+flask = ["flask"]
+aiohttp = ["aiohttp"]
+
+[project.urls]
+Homepage = "https://github.com/ets-labs/python-dependency-injector"
+Documentation = "https://python-dependency-injector.ets-labs.org/"
+Download = "https://pypi.python.org/pypi/dependency_injector"
+
+[tool.setuptools]
+package-dir = {"" = "src"}
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.setuptools.package-data]
+dependency_injector = ["*.pxd", "*.pyi", "py.typed"]
+
+[tool.setuptools.dynamic]
+version = {attr = "dependency_injector.__version__"}
+
+[tool.coverage.run]
+branch = false
+relative_files = true
+source_pkgs = ["dependency_injector"]
+plugins = ["Cython.Coverage"]
+
+[tool.coverage.html]
+directory = "reports/unittests/"
+
+[tool.coverage.report]
+show_missing = true
+
+[tool.isort]
+profile = "black"
+
+[tool.pylint.main]
+ignore = ["tests"]
+
+[tool.pylint.design]
+min-public-methods = 0
+max-public-methods = 30

requirements-dev.txt

@@ -1,9 +1,11 @@
-cython==0.29.32
+cython==3.0.11
+setuptools
 pytest
 pytest-asyncio
 tox
 coverage
 flake8
+flake8-pyproject
 pydocstyle
 sphinx_autobuild
 pip
@@ -11,10 +13,11 @@ mypy
 pyyaml
 httpx
 fastapi
-pydantic
+pydantic==1.10.17
 numpy
 scipy
 boto3
 mypy_boto3_s3
+typing_extensions
 
 -r requirements-ext.txt

requirements-doc.txt

@@ -1,9 +1,9 @@
 # TODO: unpin 3.5.0 when this bug is fixed: https://github.com/sphinx-doc/sphinx/issues/8885
-sphinx<3.5.0
+sphinx
 
 # TODO: unpin jinja2 after sphinx update to 4+
-jinja2<3.1
+jinja2
 
--e git+https://github.com/rmk135/sphinxcontrib-disqus.git#egg=sphinxcontrib-disqus
+sphinx-disqus==1.3.0
 
 -r requirements-ext.txt

requirements-ext.txt

@@ -1,2 +1,3 @@
 flask
+werkzeug
 aiohttp

requirements.txt

@@ -1 +0,0 @@
-six>=1.7.0,<=1.16.0

setup.cfg

@@ -2,6 +2,7 @@
 max_line_length = 120
 max_complexity = 10
 exclude = types.py
+extend-ignore = E203,E701
 per-file-ignores =
     examples/demo/*: F841
     examples/containers/traverse.py: E501

setup.py

@@ -1,130 +1,42 @@
 """`Dependency injector` setup script."""
 
 import os
-import re
-import sys
 
-from setuptools import setup, Extension
+from Cython.Build import cythonize
+from Cython.Compiler import Options
+from setuptools import Extension, setup
 
-
+debug = os.environ.get("DEPENDENCY_INJECTOR_DEBUG_MODE") == "1"
-def _open(filename):
+defined_macros = []
-    if sys.version_info[0] == 2:
+compiler_directives = {
-        return open(filename)
+    "language_level": 3,
-    return open(filename, encoding="utf-8")
+    "profile": debug,
-
+    "linetrace": debug,
-
+}
-# Defining setup variables:
+Options.annotate = debug
-defined_macros = dict()
-defined_macros["CYTHON_CLINE_IN_TRACEBACK"] = 0
-
-# Getting description:
-with _open("README.rst") as readme_file:
-    description = readme_file.read()
-
-# Getting requirements:
-with _open("requirements.txt") as requirements_file:
-    requirements = requirements_file.readlines()
-
-# Getting version:
-with _open("src/dependency_injector/__init__.py") as init_file:
-    version = re.search("__version__ = \"(.*?)\"", init_file.read()).group(1)
 
 # Adding debug options:
-if os.environ.get("DEPENDENCY_INJECTOR_DEBUG_MODE") == "1":
+if debug:
-    defined_macros["CYTHON_TRACE"] = 1
+    defined_macros.extend(
-    defined_macros["CYTHON_TRACE_NOGIL"] = 1
+        [
-    defined_macros["CYTHON_CLINE_IN_TRACEBACK"] = 1
+            ("CYTHON_TRACE", "1"),
+            ("CYTHON_TRACE_NOGIL", "1"),
+            ("CYTHON_CLINE_IN_TRACEBACK", "1"),
+        ]
+    )
 
 
-setup(name="dependency-injector",
+setup(
-      version=version,
+    ext_modules=cythonize(
-      description="Dependency injection framework for Python",
+        [
-      long_description=description,
+            Extension(
-      author="Roman Mogylatov",
+                "*",
-      author_email="rmogilatov@gmail.com",
+                ["src/**/*.pyx"],
-      maintainer="Roman Mogylatov",
+                define_macros=defined_macros,
-      maintainer_email="rmogilatov@gmail.com",
+            ),
-      url="https://github.com/ets-labs/python-dependency-injector",
-      download_url="https://pypi.python.org/pypi/dependency_injector",
-      packages=[
-          "dependency_injector",
-          "dependency_injector.ext",
         ],
-      package_dir={
+        annotate=debug,
-          "": "src",
+        show_all_warnings=True,
-      },
+        compiler_directives=compiler_directives,
-      package_data={
+    ),
-          "dependency_injector": ["*.pxd", "*.pyi", "py.typed"],
+)
-      },
-      ext_modules=[
-          Extension("dependency_injector.containers",
-                    ["src/dependency_injector/containers.c"],
-                    define_macros=list(defined_macros.items()),
-                    extra_compile_args=["-O2"]),
-          Extension("dependency_injector.providers",
-                    ["src/dependency_injector/providers.c"],
-                    define_macros=list(defined_macros.items()),
-                    extra_compile_args=["-O2"]),
-          Extension("dependency_injector._cwiring",
-                    ["src/dependency_injector/_cwiring.c"],
-                    define_macros=list(defined_macros.items()),
-                    extra_compile_args=["-O2"]),
-      ],
-      install_requires=requirements,
-      extras_require={
-          "yaml": [
-              "pyyaml",
-          ],
-          "pydantic": [
-              "pydantic",
-          ],
-          "flask": [
-              "flask",
-          ],
-          "aiohttp": [
-              "aiohttp",
-          ],
-      },
-      zip_safe=True,
-      license="BSD New",
-      platforms=["any"],
-      keywords=[
-          "Dependency injection",
-          "DI",
-          "Inversion of Control",
-          "IoC",
-          "Factory",
-          "Singleton",
-          "Design patterns",
-          "Flask",
-      ],
-      classifiers=[
-          "Development Status :: 5 - Production/Stable",
-          "Intended Audience :: Developers",
-          "License :: OSI Approved :: BSD License",
-          "Operating System :: OS Independent",
-          "Programming Language :: Python",
-          "Programming Language :: Python :: 2",
-          "Programming Language :: Python :: 2.7",
-          "Programming Language :: Python :: 3",
-          "Programming Language :: Python :: 3.5",
-          "Programming Language :: Python :: 3.6",
-          "Programming Language :: Python :: 3.7",
-          "Programming Language :: Python :: 3.8",
-          "Programming Language :: Python :: 3.9",
-          "Programming Language :: Python :: 3.10",
-          "Programming Language :: Python :: 3.11",
-          "Programming Language :: Python :: Implementation :: CPython",
-          "Programming Language :: Python :: Implementation :: PyPy",
-          "Framework :: AsyncIO",
-          "Framework :: Bottle",
-          "Framework :: Django",
-          "Framework :: Flask",
-          "Framework :: Pylons",
-          "Framework :: Pyramid",
-          "Framework :: Pytest",
-          "Framework :: TurboGears",
-          "Topic :: Software Development",
-          "Topic :: Software Development :: Libraries",
-          "Topic :: Software Development :: Libraries :: Python Modules",
-      ])

src/dependency_injector/__init__.py

@@ -1,6 +1,6 @@
 """Top-level package."""
 
-__version__ = "4.41.0"
+__version__ = "4.45.0"
 """Version number.
 
 :type: str

src/dependency_injector/containers.pyi

@@ -19,21 +19,24 @@ from typing import (
 
 from .providers import Provider, Self, ProviderParent
 
-
 C_Base = TypeVar("C_Base", bound="Container")
 C = TypeVar("C", bound="DeclarativeContainer")
 C_Overriding = TypeVar("C_Overriding", bound="DeclarativeContainer")
 T = TypeVar("T")
 TT = TypeVar("TT")
 
-
 class WiringConfiguration:
     modules: List[Any]
     packages: List[Any]
     from_package: Optional[str]
     auto_wire: bool
-    def __init__(self, modules: Optional[Iterable[Any]] = None, packages: Optional[Iterable[Any]] = None, from_package: Optional[str] = None, auto_wire: bool = True) -> None: ...
+    def __init__(
-
+        self,
+        modules: Optional[Iterable[Any]] = None,
+        packages: Optional[Iterable[Any]] = None,
+        from_package: Optional[str] = None,
+        auto_wire: bool = True,
+    ) -> None: ...
 
 class Container:
     provider_type: Type[Provider] = Provider
@@ -51,11 +54,18 @@ class Container:
     def set_providers(self, **providers: Provider): ...
     def set_provider(self, name: str, provider: Provider) -> None: ...
     def override(self, overriding: Union[Container, Type[Container]]) -> None: ...
-    def override_providers(self, **overriding_providers: Union[Provider, Any]) -> ProvidersOverridingContext[C_Base]: ...
+    def override_providers(
+        self, **overriding_providers: Union[Provider, Any]
+    ) -> ProvidersOverridingContext[C_Base]: ...
     def reset_last_overriding(self) -> None: ...
     def reset_override(self) -> None: ...
     def is_auto_wiring_enabled(self) -> bool: ...
-    def wire(self, modules: Optional[Iterable[Any]] = None, packages: Optional[Iterable[Any]] = None, from_package: Optional[str] = None) -> None: ...
+    def wire(
+        self,
+        modules: Optional[Iterable[Any]] = None,
+        packages: Optional[Iterable[Any]] = None,
+        from_package: Optional[str] = None,
+    ) -> None: ...
     def unwire(self) -> None: ...
     def init_resources(self) -> Optional[Awaitable]: ...
     def shutdown_resources(self) -> Optional[Awaitable]: ...
@@ -64,7 +74,9 @@ class Container:
     def reset_singletons(self) -> SingletonResetContext[C_Base]: ...
     def check_dependencies(self) -> None: ...
     def from_schema(self, schema: Dict[Any, Any]) -> None: ...
-    def from_yaml_schema(self, filepath: Union[Path, str], loader: Optional[Any]=None) -> None: ...
+    def from_yaml_schema(
+        self, filepath: Union[Path, str], loader: Optional[Any] = None
+    ) -> None: ...
     def from_json_schema(self, filepath: Union[Path, str]) -> None: ...
     @overload
     def resolve_provider_name(self, provider: Provider) -> str: ...
@@ -82,10 +94,8 @@ class Container:
     @overload
     def traverse(cls, types: Optional[Iterable[Type[TT]]] = None) -> Iterator[TT]: ...
 
-
 class DynamicContainer(Container): ...
 
-
 class DeclarativeContainer(Container):
     cls_providers: ClassVar[Dict[str, Provider]]
     inherited_providers: ClassVar[Dict[str, Provider]]
@@ -93,29 +103,28 @@ class DeclarativeContainer(Container):
     @classmethod
     def override(cls, overriding: Union[Container, Type[Container]]) -> None: ...
     @classmethod
-    def override_providers(cls, **overriding_providers: Union[Provider, Any]) -> ProvidersOverridingContext[C_Base]: ...
+    def override_providers(
+        cls, **overriding_providers: Union[Provider, Any]
+    ) -> ProvidersOverridingContext[C_Base]: ...
     @classmethod
     def reset_last_overriding(cls) -> None: ...
     @classmethod
     def reset_override(cls) -> None: ...
 
-
 class ProvidersOverridingContext(Generic[T]):
-    def __init__(self, container: T, overridden_providers: Iterable[Union[Provider, Any]]) -> None: ...
+    def __init__(
+        self, container: T, overridden_providers: Iterable[Union[Provider, Any]]
+    ) -> None: ...
     def __enter__(self) -> T: ...
     def __exit__(self, *_: Any) -> None: ...
 
-
 class SingletonResetContext(Generic[T]):
     def __init__(self, container: T): ...
     def __enter__(self) -> T: ...
     def __exit__(self, *_: Any) -> None: ...
 
-
+def override(
-def override(container: Type[C]) -> _Callable[[Type[C_Overriding]], Type[C_Overriding]]: ...
+    container: Type[C],
-
+) -> _Callable[[Type[C_Overriding]], Type[C_Overriding]]: ...
-
 def copy(container: Type[C]) -> _Callable[[Type[C_Overriding]], Type[C_Overriding]]: ...
-
-
 def is_container(instance: Any) -> bool: ...

src/dependency_injector/containers.pyx

@@ -18,8 +18,6 @@ try:
 except ImportError:
     yaml = None
 
-import six
-
 from . import providers, errors
 from .providers cimport __is_future_or_coroutine
 
@@ -201,7 +199,7 @@ class DynamicContainer(Container):
 
         :rtype: None
         """
-        for name, provider in six.iteritems(providers):
+        for name, provider in providers.items():
             setattr(self, name, provider)
 
     def set_provider(self, name, provider):
@@ -234,7 +232,7 @@ class DynamicContainer(Container):
 
         self.overridden += (overriding,)
 
-        for name, provider in six.iteritems(overriding.providers):
+        for name, provider in overriding.providers.items():
             try:
                 getattr(self, name).override(provider)
             except AttributeError:
@@ -250,7 +248,7 @@ class DynamicContainer(Container):
         :rtype: None
         """
         overridden_providers = []
-        for name, overriding_provider in six.iteritems(overriding_providers):
+        for name, overriding_provider in overriding_providers.items():
             container_provider = getattr(self, name)
             container_provider.override(overriding_provider)
             overridden_providers.append(container_provider)
@@ -266,7 +264,7 @@ class DynamicContainer(Container):
 
         self.overridden = self.overridden[:-1]
 
-        for provider in six.itervalues(self.providers):
+        for provider in self.providers.values():
             provider.reset_last_overriding()
 
     def reset_override(self):
@@ -276,7 +274,7 @@ class DynamicContainer(Container):
         """
         self.overridden = tuple()
 
-        for provider in six.itervalues(self.providers):
+        for provider in self.providers.values():
             provider.reset_override()
 
     def is_auto_wiring_enabled(self):
@@ -495,13 +493,13 @@ class DeclarativeContainerMetaClass(type):
 
         containers = {
             name: container
-            for name, container in six.iteritems(attributes)
+            for name, container in attributes.items()
             if is_container(container)
         }
 
         cls_providers = {
             name: provider
-            for name, provider in six.iteritems(attributes)
+            for name, provider in attributes.items()
             if isinstance(provider, providers.Provider) and not isinstance(provider, providers.Self)
         }
 
@@ -509,7 +507,7 @@ class DeclarativeContainerMetaClass(type):
             name: provider
             for base in bases
             if is_container(base) and base is not DynamicContainer
-            for name, provider in six.iteritems(base.providers)
+            for name, provider in base.providers.items()
         }
 
         all_providers = {}
@@ -536,10 +534,10 @@ class DeclarativeContainerMetaClass(type):
         self.set_container(cls)
         cls.__self__ = self
 
-        for provider in six.itervalues(cls.providers):
+        for provider in cls.providers.values():
             _check_provider_type(cls, provider)
 
-        for provider in six.itervalues(cls.cls_providers):
+        for provider in cls.cls_providers.values():
             if isinstance(provider, providers.CHILD_PROVIDERS):
                 provider.assign_parent(cls)
 
@@ -641,8 +639,7 @@ class DeclarativeContainerMetaClass(type):
         return self
 
 
-@six.add_metaclass(DeclarativeContainerMetaClass)
+class DeclarativeContainer(Container, metaclass=DeclarativeContainerMetaClass):
-class DeclarativeContainer(Container):
     """Declarative inversion of control container.
 
     .. code-block:: python
@@ -767,7 +764,7 @@ class DeclarativeContainer(Container):
 
         cls.overridden += (overriding,)
 
-        for name, provider in six.iteritems(overriding.cls_providers):
+        for name, provider in overriding.cls_providers.items():
             try:
                 getattr(cls, name).override(provider)
             except AttributeError:
@@ -784,7 +781,7 @@ class DeclarativeContainer(Container):
 
         cls.overridden = cls.overridden[:-1]
 
-        for provider in six.itervalues(cls.providers):
+        for provider in cls.providers.values():
             provider.reset_last_overriding()
 
     @classmethod
@@ -795,7 +792,7 @@ class DeclarativeContainer(Container):
         """
         cls.overridden = tuple()
 
-        for provider in six.itervalues(cls.providers):
+        for provider in cls.providers.values():
             provider.reset_override()
 
 
@@ -858,7 +855,7 @@ def copy(object base_container):
     """
     def _get_memo_for_matching_names(new_providers, base_providers):
         memo = {}
-        for new_provider_name, new_provider in six.iteritems(new_providers):
+        for new_provider_name, new_provider in new_providers.items():
             if new_provider_name not in base_providers:
                 continue
             source_provider = base_providers[new_provider_name]
@@ -877,7 +874,7 @@ def copy(object base_container):
         new_providers.update(providers.deepcopy(base_container.providers, memo))
         new_providers.update(providers.deepcopy(new_container.cls_providers, memo))
 
-        for name, provider in six.iteritems(new_providers):
+        for name, provider in new_providers.items():
             setattr(new_container, name, provider)
         return new_container
 

src/dependency_injector/errors.py

@@ -10,3 +10,24 @@ class Error(Exception):
 
 class NoSuchProviderError(Error, AttributeError):
     """Error that is raised when provider lookup is failed."""
+
+
+class NonCopyableArgumentError(Error):
+    """Error that is raised when provider argument is not deep-copyable."""
+
+    index: int
+    keyword: str
+    provider: object
+
+    def __init__(self, provider: object, index: int = -1, keyword: str = "") -> None:
+        self.provider = provider
+        self.index = index
+        self.keyword = keyword
+
+    def __str__(self) -> str:
+        s = (
+            f"keyword argument {self.keyword}"
+            if self.keyword
+            else f"argument at index {self.index}"
+        )
+        return f"Couldn't copy {s} for provider {self.provider!r}"

src/dependency_injector/ext/aiohttp.py

@@ -38,9 +38,11 @@ class View(providers.Callable):
 
     def as_view(self):
         """Return aiohttp view function."""
+
         @functools.wraps(self.provides)
         async def _view(request, *args, **kwargs):
             return await self.__call__(request, *args, **kwargs)
+
         return _view
 
 
@@ -49,6 +51,8 @@ class ClassBasedView(providers.Factory):
 
     def as_view(self):
         """Return aiohttp view function."""
+
         async def _view(request, *args, **kwargs):
             return await self.__call__(request, *args, **kwargs)
+
         return _view

src/dependency_injector/ext/aiohttp.pyi

@@ -2,22 +2,13 @@ from typing import Awaitable as _Awaitable
 
 from dependency_injector import providers
 
-
 class Application(providers.Singleton): ...
-
-
 class Extension(providers.Singleton): ...
-
-
 class Middleware(providers.DelegatedCallable): ...
-
-
 class MiddlewareFactory(providers.Factory): ...
 
-
 class View(providers.Callable):
     def as_view(self) -> _Awaitable: ...
 
-
 class ClassBasedView(providers.Factory):
     def as_view(self) -> _Awaitable: ...

src/dependency_injector/ext/flask.py

@@ -45,6 +45,7 @@ class ClassBasedView(providers.Factory):
 def as_view(provider, name=None):
     """Transform class-based view provider to view function."""
     if isinstance(provider, providers.Factory):
+
         def view(*args, **kwargs):
             self = provider()
             return self.dispatch_request(*args, **kwargs)
@@ -52,12 +53,13 @@ def as_view(provider, name=None):
         assert name, 'Argument "endpoint" is required for class-based views'
         view.__name__ = name
     elif isinstance(provider, providers.Callable):
+
         def view(*args, **kwargs):
             return provider(*args, **kwargs)
 
         view.__name__ = provider.provides.__name__
     else:
-        raise errors.Error('Undefined provider type')
+        raise errors.Error("Undefined provider type")
 
     view.__doc__ = provider.provides.__doc__
     view.__module__ = provider.provides.__module__
@@ -65,14 +67,14 @@ def as_view(provider, name=None):
     if isinstance(provider.provides, type):
         view.view_class = provider.provides
 
-    if hasattr(provider.provides, 'decorators'):
+    if hasattr(provider.provides, "decorators"):
         for decorator in provider.provides.decorators:
             view = decorator(view)
 
-    if hasattr(provider.provides, 'methods'):
+    if hasattr(provider.provides, "methods"):
         view.methods = provider.provides.methods
 
-    if hasattr(provider.provides, 'provide_automatic_options'):
+    if hasattr(provider.provides, "provide_automatic_options"):
         view.provide_automatic_options = provider.provides.provide_automatic_options
 
     return view

src/dependency_injector/ext/flask.pyi

@@ -3,22 +3,17 @@ from typing import Union, Optional, Callable as _Callable, Any
 from flask import request as flask_request
 from dependency_injector import providers
 
-
 request: providers.Object[flask_request]
 
-
 class Application(providers.Singleton): ...
-
-
 class Extension(providers.Singleton): ...
 
-
 class View(providers.Callable):
     def as_view(self) -> _Callable[..., Any]: ...
 
-
 class ClassBasedView(providers.Factory):
     def as_view(self, name: str) -> _Callable[..., Any]: ...
 
-
+def as_view(
-def as_view(provider: Union[View, ClassBasedView], name: Optional[str] = None) -> _Callable[..., Any]: ...
+    provider: Union[View, ClassBasedView], name: Optional[str] = None
+) -> _Callable[..., Any]: ...

src/dependency_injector/ext/starlette.py

@@ -0,0 +1,52 @@
+import sys
+from typing import Any
+
+if sys.version_info >= (3, 11):  # pragma: no cover
+    from typing import Self
+else:  # pragma: no cover
+    from typing_extensions import Self
+
+from dependency_injector.containers import Container
+
+
+class Lifespan:
+    """A starlette lifespan handler performing container resource initialization and shutdown.
+
+    See https://www.starlette.io/lifespan/ for details.
+
+    Usage:
+
+    .. code-block:: python
+
+        from dependency_injector.containers import DeclarativeContainer
+        from dependency_injector.ext.starlette import Lifespan
+        from dependency_injector.providers import Factory, Self, Singleton
+        from starlette.applications import Starlette
+
+        class Container(DeclarativeContainer):
+            __self__ = Self()
+            lifespan = Singleton(Lifespan, __self__)
+            app = Factory(Starlette, lifespan=lifespan)
+
+    :param container: container instance
+    """
+
+    container: Container
+
+    def __init__(self, container: Container) -> None:
+        self.container = container
+
+    def __call__(self, app: Any) -> Self:
+        return self
+
+    async def __aenter__(self) -> None:
+        result = self.container.init_resources()
+
+        if result is not None:
+            await result
+
+    async def __aexit__(self, *exc_info: Any) -> None:
+        result = self.container.shutdown_resources()
+
+        if result is not None:
+            await result

src/dependency_injector/providers.pxd

@@ -20,10 +20,10 @@ cdef tuple __COROUTINE_TYPES
 
 # Base providers
 cdef class Provider(object):
-    cdef tuple __overridden
+    cdef tuple _overridden
-    cdef Provider __last_overriding
+    cdef Provider _last_overriding
-    cdef tuple __overrides
+    cdef tuple _overrides
-    cdef int __async_mode
+    cdef int _async_mode
 
     cpdef bint is_async_mode_enabled(self)
     cpdef bint is_async_mode_disabled(self)
@@ -34,32 +34,32 @@ cdef class Provider(object):
 
 
 cdef class Object(Provider):
-    cdef object __provides
+    cdef object _provides
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
 
 cdef class Self(Provider):
-    cdef object __container
+    cdef object _container
-    cdef tuple __alt_names
+    cdef tuple _alt_names
 
 
 cdef class Delegate(Provider):
-    cdef object __provides
+    cdef object _provides
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
 
 cdef class Aggregate(Provider):
-    cdef dict __providers
+    cdef dict _providers
 
     cdef Provider __get_provider(self, object provider_name)
 
 
 cdef class Dependency(Provider):
-    cdef object __instance_of
+    cdef object _instance_of
-    cdef object __default
+    cdef object _default
-    cdef object __parent
+    cdef object _parent
 
 
 cdef class ExternalDependency(Dependency):
@@ -67,21 +67,21 @@ cdef class ExternalDependency(Dependency):
 
 
 cdef class DependenciesContainer(Object):
-    cdef dict __providers
+    cdef dict _providers
-    cdef object __parent
+    cdef object _parent
 
     cpdef object _override_providers(self, object container)
 
 
 # Callable providers
 cdef class Callable(Provider):
-    cdef object __provides
+    cdef object _provides
 
-    cdef tuple __args
+    cdef tuple _args
-    cdef int __args_len
+    cdef int _args_len
 
-    cdef tuple __kwargs
+    cdef tuple _kwargs
-    cdef int __kwargs_len
+    cdef int _kwargs_len
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
@@ -117,11 +117,11 @@ cdef class CoroutineDelegate(Delegate):
 
 # Configuration providers
 cdef class ConfigurationOption(Provider):
-    cdef tuple __name
+    cdef tuple _name
-    cdef Configuration __root
+    cdef Configuration _root
-    cdef dict __children
+    cdef dict _children
-    cdef bint __required
+    cdef bint _required
-    cdef object __cache
+    cdef object _cache
 
 
 cdef class TypedConfigurationOption(Callable):
@@ -129,22 +129,22 @@ cdef class TypedConfigurationOption(Callable):
 
 
 cdef class Configuration(Object):
-    cdef str __name
+    cdef str _name
     cdef bint __strict
-    cdef dict __children
+    cdef dict _children
-    cdef list __ini_files
+    cdef list _ini_files
-    cdef list __yaml_files
+    cdef list _yaml_files
-    cdef list __json_files
+    cdef list _json_files
-    cdef list __pydantic_settings
+    cdef list _pydantic_settings
     cdef object __weakref__
 
 
 # Factory providers
 cdef class Factory(Provider):
-    cdef Callable __instantiator
+    cdef Callable _instantiator
 
-    cdef tuple __attributes
+    cdef tuple _attributes
-    cdef int __attributes_len
+    cdef int _attributes_len
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
@@ -167,8 +167,8 @@ cdef class FactoryAggregate(Aggregate):
 
 # Singleton providers
 cdef class BaseSingleton(Provider):
-    cdef Factory __instantiator
+    cdef Factory _instantiator
-    cdef object __storage
+    cdef object _storage
 
 
 cdef class Singleton(BaseSingleton):
@@ -181,7 +181,7 @@ cdef class DelegatedSingleton(Singleton):
 
 
 cdef class ThreadSafeSingleton(BaseSingleton):
-    cdef object __storage_lock
+    cdef object _storage_lock
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
@@ -215,87 +215,87 @@ cdef class SingletonDelegate(Delegate):
 # Miscellaneous providers
 
 cdef class List(Provider):
-    cdef tuple __args
+    cdef tuple _args
-    cdef int __args_len
+    cdef int _args_len
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
 
 cdef class Dict(Provider):
-    cdef tuple __kwargs
+    cdef tuple _kwargs
-    cdef int __kwargs_len
+    cdef int _kwargs_len
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
 
 cdef class Resource(Provider):
-    cdef object __provides
+    cdef object _provides
-    cdef bint __initialized
+    cdef bint _initialized
-    cdef object __shutdowner
+    cdef object _shutdowner
-    cdef object __resource
+    cdef object _resource
 
-    cdef tuple __args
+    cdef tuple _args
-    cdef int __args_len
+    cdef int _args_len
 
-    cdef tuple __kwargs
+    cdef tuple _kwargs
-    cdef int __kwargs_len
+    cdef int _kwargs_len
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
 
 cdef class Container(Provider):
-    cdef object __container_cls
+    cdef object _container_cls
-    cdef dict __overriding_providers
+    cdef dict _overriding_providers
-    cdef object __container
+    cdef object _container
-    cdef object __parent
+    cdef object _parent
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
 
 cdef class Selector(Provider):
-    cdef object __selector
+    cdef object _selector
-    cdef dict __providers
+    cdef dict _providers
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
 # Provided instance
 
 cdef class ProvidedInstance(Provider):
-    cdef object __provides
+    cdef object _provides
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
 
 cdef class AttributeGetter(Provider):
-    cdef object __provides
+    cdef object _provides
-    cdef object __name
+    cdef object _name
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
 
 cdef class ItemGetter(Provider):
-    cdef object __provides
+    cdef object _provides
-    cdef object __name
+    cdef object _name
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
 
 cdef class MethodCaller(Provider):
-    cdef object __provides
+    cdef object _provides
-    cdef tuple __args
+    cdef tuple _args
-    cdef int __args_len
+    cdef int _args_len
-    cdef tuple __kwargs
+    cdef tuple _kwargs
-    cdef int __kwargs_len
+    cdef int _kwargs_len
 
     cpdef object _provide(self, tuple args, dict kwargs)
 
 
 # Injections
 cdef class Injection(object):
-    cdef object __value
+    cdef object _value
-    cdef int __is_provider
+    cdef int _is_provider
-    cdef int __is_delegated
+    cdef int _is_delegated
-    cdef int __call
+    cdef int _call
 
 
 cdef class PositionalInjection(Injection):
@@ -303,7 +303,7 @@ cdef class PositionalInjection(Injection):
 
 
 cdef class NamedInjection(Injection):
-    cdef object __name
+    cdef object _name
 
 
 cpdef tuple parse_positional_injections(tuple args)
@@ -314,12 +314,12 @@ cpdef tuple parse_named_injections(dict kwargs)
 
 # Utils
 cdef class OverridingContext(object):
-    cdef Provider __overridden
+    cdef Provider _overridden
-    cdef Provider __overriding
+    cdef Provider _overriding
 
 
 cdef class BaseSingletonResetContext(object):
-    cdef object __singleton
+    cdef object _singleton
 
 
 cdef class SingletonResetContext(BaseSingletonResetContext):
@@ -356,19 +356,19 @@ cpdef object deepcopy(object instance, dict memo=*)
 
 # Inline helper functions
 cdef inline object __get_name(NamedInjection self):
-    return self.__name
+    return self._name
 
 
 cdef inline object __get_value(Injection self):
-    if self.__call == 0:
+    if self._call == 0:
-        return self.__value
+        return self._value
-    return self.__value()
+    return self._value()
 
 
 cdef inline object __get_value_kwargs(Injection self, dict kwargs):
-    if self.__call == 0:
+    if self._call == 0:
-        return self.__value
+        return self._value
-    return self.__value(**kwargs)
+    return self._value(**kwargs)
 
 
 cdef inline tuple __separate_prefixed_kwargs(dict kwargs):
@@ -633,14 +633,14 @@ cdef inline object __async_result_callback(object future_result, object future):
 
 cdef inline object __callable_call(Callable self, tuple args, dict kwargs, ):
     return __call(
-        self.__provides,
+        self._provides,
         args,
-        self.__args,
+        self._args,
-        self.__args_len,
+        self._args_len,
         kwargs,
-        self.__kwargs,
+        self._kwargs,
-        self.__kwargs_len,
+        self._kwargs_len,
-        self.__async_mode,
+        self._async_mode,
     )
 
 
@@ -648,18 +648,18 @@ cdef inline object __factory_call(Factory self, tuple args, dict kwargs):
     cdef object instance
 
     instance = __call(
-        self.__instantiator.__provides,
+        self._instantiator._provides,
         args,
-        self.__instantiator.__args,
+        self._instantiator._args,
-        self.__instantiator.__args_len,
+        self._instantiator._args_len,
         kwargs,
-        self.__instantiator.__kwargs,
+        self._instantiator._kwargs,
-        self.__instantiator.__kwargs_len,
+        self._instantiator._kwargs_len,
-        self.__async_mode,
+        self._async_mode,
     )
 
-    if self.__attributes_len > 0:
+    if self._attributes_len > 0:
-        attributes = __provide_attributes(self.__attributes, self.__attributes_len)
+        attributes = __provide_attributes(self._attributes, self._attributes_len)
 
         is_future_instance = __is_future_or_coroutine(instance)
         is_future_attributes = __is_future_or_coroutine(attributes)

src/dependency_injector/providers.pyi

@@ -33,7 +33,6 @@ except ImportError:
 
 from . import resources
 
-
 Injection = Any
 ProviderParent = Union["Provider", Any]
 T = TypeVar("T")
@@ -41,16 +40,13 @@ TT = TypeVar("TT")
 P = TypeVar("P", bound="Provider")
 BS = TypeVar("BS", bound="BaseSingleton")
 
-
 class Provider(Generic[T]):
     def __init__(self) -> None: ...
-
     @overload
     def __call__(self, *args: Injection, **kwargs: Injection) -> T: ...
     @overload
     def __call__(self, *args: Injection, **kwargs: Injection) -> Awaitable[T]: ...
     def async_(self, *args: Injection, **kwargs: Injection) -> Awaitable[T]: ...
-
     def __deepcopy__(self, memo: Optional[_Dict[Any, Any]]) -> Provider: ...
     def __str__(self) -> str: ...
     def __repr__(self) -> str: ...
@@ -67,9 +63,9 @@ class Provider(Generic[T]):
     def unregister_overrides(self, provider: Union[Provider, Any]) -> None: ...
     def delegate(self) -> Provider: ...
     @property
-    def provider(self) -> Provider: ...
+    def provider(self) -> Provider[T]: ...
     @property
-    def provided(self) -> ProvidedInstance: ...
+    def provided(self) -> ProvidedInstance[T]: ...
     def enable_async_mode(self) -> None: ...
     def disable_async_mode(self) -> None: ...
     def reset_async_mode(self) -> None: ...
@@ -78,9 +74,12 @@ class Provider(Generic[T]):
     def is_async_mode_undefined(self) -> bool: ...
     @property
     def related(self) -> _Iterator[Provider]: ...
-    def traverse(self, types: Optional[_Iterable[Type[TT]]] = None) -> _Iterator[TT]: ...
+    def traverse(
-    def _copy_overridings(self, copied: Provider, memo: Optional[_Dict[Any, Any]]) -> None: ...
+        self, types: Optional[_Iterable[Type[TT]]] = None
-
+    ) -> _Iterator[TT]: ...
+    def _copy_overridings(
+        self, copied: Provider, memo: Optional[_Dict[Any, Any]]
+    ) -> None: ...
 
 class Object(Provider[T]):
     def __init__(self, provides: Optional[T] = None) -> None: ...
@@ -88,7 +87,6 @@ class Object(Provider[T]):
     def provides(self) -> Optional[T]: ...
     def set_provides(self, provides: Optional[T]) -> Object: ...
 
-
 class Self(Provider[T]):
     def __init__(self, container: Optional[T] = None) -> None: ...
     def set_container(self, container: T) -> None: ...
@@ -96,41 +94,51 @@ class Self(Provider[T]):
     @property
     def alt_names(self) -> Tuple[Any]: ...
 
-
 class Delegate(Provider[Provider]):
     def __init__(self, provides: Optional[Provider] = None) -> None: ...
     @property
     def provides(self) -> Optional[Provider]: ...
     def set_provides(self, provides: Optional[Provider]) -> Delegate: ...
 
-
 class Aggregate(Provider[T]):
-    def __init__(self, provider_dict: Optional[_Dict[Any, Provider[T]]] = None, **provider_kwargs: Provider[T]): ...
+    def __init__(
+        self,
+        provider_dict: Optional[_Dict[Any, Provider[T]]] = None,
+        **provider_kwargs: Provider[T],
+    ): ...
     def __getattr__(self, provider_name: Any) -> Provider[T]: ...
-
     @overload
-    def __call__(self, provider_name: Optional[Any] = None, *args: Injection, **kwargs: Injection) -> T: ...
+    def __call__(
+        self, provider_name: Optional[Any] = None, *args: Injection, **kwargs: Injection
+    ) -> T: ...
     @overload
-    def __call__(self, provider_name: Optional[Any] = None, *args: Injection, **kwargs: Injection) -> Awaitable[T]: ...
+    def __call__(
-    def async_(self, provider_name: Optional[Any] = None, *args: Injection, **kwargs: Injection) -> Awaitable[T]: ...
+        self, provider_name: Optional[Any] = None, *args: Injection, **kwargs: Injection
-
+    ) -> Awaitable[T]: ...
+    def async_(
+        self, provider_name: Optional[Any] = None, *args: Injection, **kwargs: Injection
+    ) -> Awaitable[T]: ...
     @property
     def providers(self) -> _Dict[Any, Provider[T]]: ...
-    def set_providers(self, provider_dict: Optional[_Dict[Any, Provider[T]]] = None, **provider_kwargs: Provider[T]) -> Aggregate[T]: ...
+    def set_providers(
-
+        self,
+        provider_dict: Optional[_Dict[Any, Provider[T]]] = None,
+        **provider_kwargs: Provider[T],
+    ) -> Aggregate[T]: ...
 
 class Dependency(Provider[T]):
-    def __init__(self, instance_of: Type[T] = object, default: Optional[Union[Provider, Any]] = None) -> None: ...
+    def __init__(
+        self,
+        instance_of: Type[T] = object,
+        default: Optional[Union[Provider, Any]] = None,
+    ) -> None: ...
     def __getattr__(self, name: str) -> Any: ...
-
     @property
     def instance_of(self) -> Type[T]: ...
     def set_instance_of(self, instance_of: Type[T]) -> Dependency[T]: ...
-
     @property
     def default(self) -> Provider[T]: ...
     def set_default(self, default: Optional[Union[Provider, Any]]) -> Dependency[T]: ...
-
     @property
     def is_defined(self) -> bool: ...
     def provided_by(self, provider: Provider) -> OverridingContext[P]: ...
@@ -140,10 +148,8 @@ class Dependency(Provider[T]):
     def parent_name(self) -> Optional[str]: ...
     def assign_parent(self, parent: ProviderParent) -> None: ...
 
-
 class ExternalDependency(Dependency[T]): ...
 
-
 class DependenciesContainer(Object):
     def __init__(self, **dependencies: Provider) -> None: ...
     def __getattr__(self, name: str) -> Provider: ...
@@ -156,12 +162,18 @@ class DependenciesContainer(Object):
     def parent_name(self) -> Optional[str]: ...
     def assign_parent(self, parent: ProviderParent) -> None: ...
 
-
 class Callable(Provider[T]):
-    def __init__(self, provides: Optional[Union[_Callable[..., T], str]] = None, *args: Injection, **kwargs: Injection) -> None: ...
+    def __init__(
+        self,
+        provides: Optional[Union[_Callable[..., T], str]] = None,
+        *args: Injection,
+        **kwargs: Injection,
+    ) -> None: ...
     @property
     def provides(self) -> Optional[_Callable[..., T]]: ...
-    def set_provides(self, provides: Optional[Union[_Callable[..., T], str]]) -> Callable[T]: ...
+    def set_provides(
+        self, provides: Optional[Union[_Callable[..., T], str]]
+    ) -> Callable[T]: ...
     @property
     def args(self) -> Tuple[Injection]: ...
     def add_args(self, *args: Injection) -> Callable[T]: ...
@@ -173,32 +185,23 @@ class Callable(Provider[T]):
     def set_kwargs(self, **kwargs: Injection) -> Callable[T]: ...
     def clear_kwargs(self) -> Callable[T]: ...
 
-
 class DelegatedCallable(Callable[T]): ...
 
-
 class AbstractCallable(Callable[T]):
     def override(self, provider: Callable) -> OverridingContext[P]: ...
 
-
 class CallableDelegate(Delegate):
     def __init__(self, callable: Callable) -> None: ...
 
-
 class Coroutine(Callable[T]): ...
-
-
 class DelegatedCoroutine(Coroutine[T]): ...
 
-
 class AbstractCoroutine(Coroutine[T]):
     def override(self, provider: Coroutine) -> OverridingContext[P]: ...
 
-
 class CoroutineDelegate(Delegate):
     def __init__(self, coroutine: Coroutine) -> None: ...
 
-
 class ConfigurationOption(Provider[Any]):
     UNDEFINED: object
     def __init__(self, name: Tuple[str], root: Configuration) -> None: ...
@@ -212,24 +215,48 @@ class ConfigurationOption(Provider[Any]):
     def get_name_segments(self) -> Tuple[Union[str, Provider]]: ...
     def as_int(self) -> TypedConfigurationOption[int]: ...
     def as_float(self) -> TypedConfigurationOption[float]: ...
-    def as_(self, callback: _Callable[..., T], *args: Injection, **kwargs: Injection) -> TypedConfigurationOption[T]: ...
+    def as_(
+        self, callback: _Callable[..., T], *args: Injection, **kwargs: Injection
+    ) -> TypedConfigurationOption[T]: ...
     def required(self) -> ConfigurationOption: ...
     def is_required(self) -> bool: ...
     def update(self, value: Any) -> None: ...
-    def from_ini(self, filepath: Union[Path, str], required: bool = False, envs_required: bool = False) -> None: ...
+    def from_ini(
-    def from_yaml(self, filepath: Union[Path, str], required: bool = False, loader: Optional[Any] = None, envs_required: bool = False) -> None: ...
+        self,
-    def from_json(self, filepath: Union[Path, str], required: bool = False, envs_required: bool = False) -> None: ...
+        filepath: Union[Path, str],
-    def from_pydantic(self, settings: PydanticSettings, required: bool = False, **kwargs: Any) -> None: ...
+        required: bool = False,
+        envs_required: bool = False,
+    ) -> None: ...
+    def from_yaml(
+        self,
+        filepath: Union[Path, str],
+        required: bool = False,
+        loader: Optional[Any] = None,
+        envs_required: bool = False,
+    ) -> None: ...
+    def from_json(
+        self,
+        filepath: Union[Path, str],
+        required: bool = False,
+        envs_required: bool = False,
+    ) -> None: ...
+    def from_pydantic(
+        self, settings: PydanticSettings, required: bool = False, **kwargs: Any
+    ) -> None: ...
     def from_dict(self, options: _Dict[str, Any], required: bool = False) -> None: ...
-    def from_env(self, name: str, default: Optional[Any] = None, required: bool = False, as_: Optional[_Callable[..., Any]] = None) -> None: ...
+    def from_env(
+        self,
+        name: str,
+        default: Optional[Any] = None,
+        required: bool = False,
+        as_: Optional[_Callable[..., Any]] = None,
+    ) -> None: ...
     def from_value(self, value: Any) -> None: ...
 
-
 class TypedConfigurationOption(Callable[T]):
     @property
     def option(self) -> ConfigurationOption: ...
 
-
 class Configuration(Object[Any]):
     DEFAULT_NAME: str = "config"
     def __init__(
@@ -243,58 +270,82 @@ class Configuration(Object[Any]):
         json_files: Optional[_Iterable[Union[Path, str]]] = None,
         pydantic_settings: Optional[_Iterable[PydanticSettings]] = None,
     ) -> None: ...
-    def __enter__(self) -> Configuration : ...
+    def __enter__(self) -> Configuration: ...
     def __exit__(self, *exc_info: Any) -> None: ...
     def __getattr__(self, item: str) -> ConfigurationOption: ...
     def __getitem__(self, item: Union[str, Provider]) -> ConfigurationOption: ...
-
     def get_name(self) -> str: ...
     def set_name(self, name: str) -> Configuration: ...
-
     def get_default(self) -> _Dict[Any, Any]: ...
     def set_default(self, default: _Dict[Any, Any]): ...
-
     def get_strict(self) -> bool: ...
     def set_strict(self, strict: bool) -> Configuration: ...
-
     def get_children(self) -> _Dict[str, ConfigurationOption]: ...
-    def set_children(self, children: _Dict[str, ConfigurationOption]) -> Configuration: ...
+    def set_children(
-
+        self, children: _Dict[str, ConfigurationOption]
+    ) -> Configuration: ...
     def get_ini_files(self) -> _List[Union[Path, str]]: ...
     def set_ini_files(self, files: _Iterable[Union[Path, str]]) -> Configuration: ...
-
     def get_yaml_files(self) -> _List[Union[Path, str]]: ...
     def set_yaml_files(self, files: _Iterable[Union[Path, str]]) -> Configuration: ...
-
     def get_json_files(self) -> _List[Union[Path, str]]: ...
     def set_json_files(self, files: _Iterable[Union[Path, str]]) -> Configuration: ...
-
     def get_pydantic_settings(self) -> _List[PydanticSettings]: ...
-    def set_pydantic_settings(self, settings: _Iterable[PydanticSettings]) -> Configuration: ...
+    def set_pydantic_settings(
-
+        self, settings: _Iterable[PydanticSettings]
+    ) -> Configuration: ...
     def load(self, required: bool = False, envs_required: bool = False) -> None: ...
-
     def get(self, selector: str) -> Any: ...
     def set(self, selector: str, value: Any) -> OverridingContext[P]: ...
     def reset_cache(self) -> None: ...
     def update(self, value: Any) -> None: ...
-    def from_ini(self, filepath: Union[Path, str], required: bool = False, envs_required: bool = False) -> None: ...
+    def from_ini(
-    def from_yaml(self, filepath: Union[Path, str], required: bool = False, loader: Optional[Any] = None, envs_required: bool = False) -> None: ...
+        self,
-    def from_json(self, filepath: Union[Path, str], required: bool = False, envs_required: bool = False) -> None: ...
+        filepath: Union[Path, str],
-    def from_pydantic(self, settings: PydanticSettings, required: bool = False, **kwargs: Any) -> None: ...
+        required: bool = False,
+        envs_required: bool = False,
+    ) -> None: ...
+    def from_yaml(
+        self,
+        filepath: Union[Path, str],
+        required: bool = False,
+        loader: Optional[Any] = None,
+        envs_required: bool = False,
+    ) -> None: ...
+    def from_json(
+        self,
+        filepath: Union[Path, str],
+        required: bool = False,
+        envs_required: bool = False,
+    ) -> None: ...
+    def from_pydantic(
+        self, settings: PydanticSettings, required: bool = False, **kwargs: Any
+    ) -> None: ...
     def from_dict(self, options: _Dict[str, Any], required: bool = False) -> None: ...
-    def from_env(self, name: str, default: Optional[Any] = None, required: bool = False, as_: Optional[_Callable[..., Any]] = None) -> None: ...
+    def from_env(
+        self,
+        name: str,
+        default: Optional[Any] = None,
+        required: bool = False,
+        as_: Optional[_Callable[..., Any]] = None,
+    ) -> None: ...
     def from_value(self, value: Any) -> None: ...
 
-
 class Factory(Provider[T]):
     provided_type: Optional[Type]
-    def __init__(self, provides: Optional[Union[_Callable[..., T], str]] = None, *args: Injection, **kwargs: Injection) -> None: ...
+    def __init__(
+        self,
+        provides: Optional[Union[_Callable[..., T], str]] = None,
+        *args: Injection,
+        **kwargs: Injection,
+    ) -> None: ...
     @property
     def cls(self) -> Type[T]: ...
     @property
     def provides(self) -> Optional[_Callable[..., T]]: ...
-    def set_provides(self, provides: Optional[Union[_Callable[..., T], str]]) -> Factory[T]: ...
+    def set_provides(
+        self, provides: Optional[Union[_Callable[..., T], str]]
+    ) -> Factory[T]: ...
     @property
     def args(self) -> Tuple[Injection]: ...
     def add_args(self, *args: Injection) -> Factory[T]: ...
@@ -311,33 +362,39 @@ class Factory(Provider[T]):
     def set_attributes(self, **kwargs: Injection) -> Factory[T]: ...
     def clear_attributes(self) -> Factory[T]: ...
 
-
 class DelegatedFactory(Factory[T]): ...
 
-
 class AbstractFactory(Factory[T]):
     def override(self, provider: Factory) -> OverridingContext[P]: ...
 
-
 class FactoryDelegate(Delegate):
     def __init__(self, factory: Factory): ...
 
-
 class FactoryAggregate(Aggregate[T]):
     def __getattr__(self, provider_name: Any) -> Factory[T]: ...
     @property
     def factories(self) -> _Dict[Any, Factory[T]]: ...
-    def set_factories(self, provider_dict: Optional[_Dict[Any, Factory[T]]] = None, **provider_kwargs: Factory[T]) -> FactoryAggregate[T]: ...
+    def set_factories(
-
+        self,
+        provider_dict: Optional[_Dict[Any, Factory[T]]] = None,
+        **provider_kwargs: Factory[T],
+    ) -> FactoryAggregate[T]: ...
 
 class BaseSingleton(Provider[T]):
     provided_type = Optional[Type]
-    def __init__(self, provides: Optional[Union[_Callable[..., T], str]] = None, *args: Injection, **kwargs: Injection) -> None: ...
+    def __init__(
+        self,
+        provides: Optional[Union[_Callable[..., T], str]] = None,
+        *args: Injection,
+        **kwargs: Injection,
+    ) -> None: ...
     @property
     def cls(self) -> Type[T]: ...
     @property
     def provides(self) -> Optional[_Callable[..., T]]: ...
-    def set_provides(self, provides: Optional[Union[_Callable[..., T], str]]) -> BaseSingleton[T]: ...
+    def set_provides(
+        self, provides: Optional[Union[_Callable[..., T], str]]
+    ) -> BaseSingleton[T]: ...
     @property
     def args(self) -> Tuple[Injection]: ...
     def add_args(self, *args: Injection) -> BaseSingleton[T]: ...
@@ -356,36 +413,20 @@ class BaseSingleton(Provider[T]):
     def reset(self) -> SingletonResetContext[BS]: ...
     def full_reset(self) -> SingletonFullResetContext[BS]: ...
 
-
 class Singleton(BaseSingleton[T]): ...
-
-
 class DelegatedSingleton(Singleton[T]): ...
-
-
 class ThreadSafeSingleton(Singleton[T]): ...
-
-
 class DelegatedThreadSafeSingleton(ThreadSafeSingleton[T]): ...
-
-
 class ThreadLocalSingleton(BaseSingleton[T]): ...
-
-
 class ContextLocalSingleton(BaseSingleton[T]): ...
-
-
 class DelegatedThreadLocalSingleton(ThreadLocalSingleton[T]): ...
 
-
 class AbstractSingleton(BaseSingleton[T]):
     def override(self, provider: BaseSingleton) -> OverridingContext[P]: ...
 
-
 class SingletonDelegate(Delegate):
     def __init__(self, singleton: BaseSingleton): ...
 
-
 class List(Provider[_List]):
     def __init__(self, *args: Injection): ...
     @property
@@ -394,29 +435,63 @@ class List(Provider[_List]):
     def set_args(self, *args: Injection) -> List[T]: ...
     def clear_args(self) -> List[T]: ...
 
-
 class Dict(Provider[_Dict]):
-    def __init__(self, dict_: Optional[_Dict[Any, Injection]] = None, **kwargs: Injection): ...
+    def __init__(
+        self, dict_: Optional[_Dict[Any, Injection]] = None, **kwargs: Injection
+    ): ...
     @property
     def kwargs(self) -> _Dict[Any, Injection]: ...
-    def add_kwargs(self, dict_: Optional[_Dict[Any, Injection]] = None, **kwargs: Injection) -> Dict: ...
+    def add_kwargs(
-    def set_kwargs(self, dict_: Optional[_Dict[Any, Injection]] = None, **kwargs: Injection) -> Dict: ...
+        self, dict_: Optional[_Dict[Any, Injection]] = None, **kwargs: Injection
+    ) -> Dict: ...
+    def set_kwargs(
+        self, dict_: Optional[_Dict[Any, Injection]] = None, **kwargs: Injection
+    ) -> Dict: ...
     def clear_kwargs(self) -> Dict: ...
 
-
 class Resource(Provider[T]):
     @overload
-    def __init__(self, provides: Optional[Type[resources.Resource[T]]] = None, *args: Injection, **kwargs: Injection) -> None: ...
+    def __init__(
+        self,
+        provides: Optional[Type[resources.Resource[T]]] = None,
+        *args: Injection,
+        **kwargs: Injection,
+    ) -> None: ...
     @overload
-    def __init__(self, provides: Optional[Type[resources.AsyncResource[T]]] = None, *args: Injection, **kwargs: Injection) -> None: ...
+    def __init__(
+        self,
+        provides: Optional[Type[resources.AsyncResource[T]]] = None,
+        *args: Injection,
+        **kwargs: Injection,
+    ) -> None: ...
     @overload
-    def __init__(self, provides: Optional[_Callable[..., _Iterator[T]]] = None, *args: Injection, **kwargs: Injection) -> None: ...
+    def __init__(
+        self,
+        provides: Optional[_Callable[..., _Iterator[T]]] = None,
+        *args: Injection,
+        **kwargs: Injection,
+    ) -> None: ...
     @overload
-    def __init__(self, provides: Optional[_Callable[..., _AsyncIterator[T]]] = None, *args: Injection, **kwargs: Injection) -> None: ...
+    def __init__(
+        self,
+        provides: Optional[_Callable[..., _AsyncIterator[T]]] = None,
+        *args: Injection,
+        **kwargs: Injection,
+    ) -> None: ...
     @overload
-    def __init__(self, provides: Optional[_Callable[..., _Coroutine[Injection, Injection, T]]] = None, *args: Injection, **kwargs: Injection) -> None: ...
+    def __init__(
+        self,
+        provides: Optional[_Callable[..., _Coroutine[Injection, Injection, T]]] = None,
+        *args: Injection,
+        **kwargs: Injection,
+    ) -> None: ...
     @overload
-    def __init__(self, provides: Optional[Union[_Callable[..., T], str]] = None, *args: Injection, **kwargs: Injection) -> None: ...
+    def __init__(
+        self,
+        provides: Optional[Union[_Callable[..., T], str]] = None,
+        *args: Injection,
+        **kwargs: Injection,
+    ) -> None: ...
     @property
     def provides(self) -> Optional[_Callable[..., Any]]: ...
     def set_provides(self, provides: Optional[Any]) -> Resource[T]: ...
@@ -435,9 +510,13 @@ class Resource(Provider[T]):
     def init(self) -> Optional[Awaitable[T]]: ...
     def shutdown(self) -> Optional[Awaitable]: ...
 
-
 class Container(Provider[T]):
-    def __init__(self, container_cls: Type[T], container: Optional[T] = None, **overriding_providers: Union[Provider, Any]) -> None: ...
+    def __init__(
+        self,
+        container_cls: Type[T],
+        container: Optional[T] = None,
+        **overriding_providers: Union[Provider, Any],
+    ) -> None: ...
     def __getattr__(self, name: str) -> Provider: ...
     @property
     def container(self) -> T: ...
@@ -448,50 +527,51 @@ class Container(Provider[T]):
     def parent_name(self) -> Optional[str]: ...
     def assign_parent(self, parent: ProviderParent) -> None: ...
 
-
 class Selector(Provider[Any]):
-    def __init__(self, selector: Optional[_Callable[..., Any]] = None, **providers: Provider): ...
+    def __init__(
+        self, selector: Optional[_Callable[..., Any]] = None, **providers: Provider
+    ): ...
     def __getattr__(self, name: str) -> Provider: ...
-
     @property
     def selector(self) -> Optional[_Callable[..., Any]]: ...
     def set_selector(self, selector: Optional[_Callable[..., Any]]) -> Selector: ...
-
     @property
     def providers(self) -> _Dict[str, Provider]: ...
     def set_providers(self, **providers: Provider) -> Selector: ...
 
-
 class ProvidedInstanceFluentInterface:
     def __getattr__(self, item: Any) -> AttributeGetter: ...
     def __getitem__(self, item: Any) -> ItemGetter: ...
     def call(self, *args: Injection, **kwargs: Injection) -> MethodCaller: ...
     @property
     def provides(self) -> Optional[Provider]: ...
-    def set_provides(self, provides: Optional[Provider]) -> ProvidedInstanceFluentInterface: ...
+    def set_provides(
-
+        self, provides: Optional[Provider]
+    ) -> ProvidedInstanceFluentInterface: ...
 
 class ProvidedInstance(Provider, ProvidedInstanceFluentInterface):
     def __init__(self, provides: Optional[Provider] = None) -> None: ...
 
-
 class AttributeGetter(Provider, ProvidedInstanceFluentInterface):
-    def __init__(self, provides: Optional[Provider] = None, name: Optional[str] = None) -> None: ...
+    def __init__(
+        self, provides: Optional[Provider] = None, name: Optional[str] = None
+    ) -> None: ...
     @property
     def name(self) -> Optional[str]: ...
     def set_name(self, name: Optional[str]) -> ProvidedInstanceFluentInterface: ...
 
-
 class ItemGetter(Provider, ProvidedInstanceFluentInterface):
-    def __init__(self, provides: Optional[Provider] = None, name: Optional[str] = None) -> None: ...
+    def __init__(
+        self, provides: Optional[Provider] = None, name: Optional[str] = None
+    ) -> None: ...
     @property
     def name(self) -> Optional[str]: ...
     def set_name(self, name: Optional[str]) -> ProvidedInstanceFluentInterface: ...
 
-
 class MethodCaller(Provider, ProvidedInstanceFluentInterface):
-    def __init__(self, provides: Optional[Provider] = None, *args: Injection, **kwargs: Injection) -> None: ...
+    def __init__(
-
+        self, provides: Optional[Provider] = None, *args: Injection, **kwargs: Injection
+    ) -> None: ...
 
 class OverridingContext(Generic[T]):
     def __init__(self, overridden: Provider, overriding: Provider): ...
@@ -500,47 +580,39 @@ class OverridingContext(Generic[T]):
         pass
     ...
 
-
 class BaseSingletonResetContext(Generic[T]):
     def __init__(self, provider: T): ...
     def __enter__(self) -> T: ...
     def __exit__(self, *_: Any) -> None: ...
 
-
+class SingletonResetContext(BaseSingletonResetContext): ...
-class SingletonResetContext(BaseSingletonResetContext):
+class SingletonFullResetContext(BaseSingletonResetContext): ...
-    ...
-
-
-class SingletonFullResetContext(BaseSingletonResetContext):
-    ...
-
 
 CHILD_PROVIDERS: Tuple[Provider]
 
-
 def is_provider(instance: Any) -> bool: ...
-
-
 def ensure_is_provider(instance: Any) -> Provider: ...
-
-
 def is_delegated(instance: Any) -> bool: ...
-
-
 def represent_provider(provider: Provider, provides: Any) -> str: ...
-
+def deepcopy(instance: Any, memo: Optional[_Dict[Any, Any]] = None) -> Any: ...
-
+def deepcopy_args(
-def deepcopy(instance: Any, memo: Optional[_Dict[Any, Any]] = None): Any: ...
+    provider: Provider[Any],
-
+    args: Tuple[Any, ...],
-
+    memo: Optional[_Dict[int, Any]] = None,
+) -> Tuple[Any, ...]: ...
+def deepcopy_kwargs(
+    provider: Provider[Any],
+    kwargs: _Dict[str, Any],
+    memo: Optional[_Dict[int, Any]] = None,
+) -> Dict[str, Any]: ...
 def merge_dicts(dict1: _Dict[Any, Any], dict2: _Dict[Any, Any]) -> _Dict[Any, Any]: ...
-
+def traverse(
-
+    *providers: Provider, types: Optional[_Iterable[Type]] = None
-def traverse(*providers: Provider, types: Optional[_Iterable[Type]]=None) -> _Iterator[Provider]: ...
+) -> _Iterator[Provider]: ...
-
 
 if yaml:
     class YamlLoader(yaml.SafeLoader): ...
+
 else:
     class YamlLoader: ...
 

src/dependency_injector/resources.py

@@ -10,18 +10,14 @@ T = TypeVar("T")
 class Resource(Generic[T], metaclass=abc.ABCMeta):
 
     @abc.abstractmethod
-    def init(self, *args, **kwargs) -> Optional[T]:
+    def init(self, *args, **kwargs) -> Optional[T]: ...
-        ...
 
-    def shutdown(self, resource: Optional[T]) -> None:
+    def shutdown(self, resource: Optional[T]) -> None: ...
-        ...
 
 
 class AsyncResource(Generic[T], metaclass=abc.ABCMeta):
 
     @abc.abstractmethod
-    async def init(self, *args, **kwargs) -> Optional[T]:
+    async def init(self, *args, **kwargs) -> Optional[T]: ...
-        ...
 
-    async def shutdown(self, resource: Optional[T]) -> None:
+    async def shutdown(self, resource: Optional[T]) -> None: ...
-        ...

src/dependency_injector/schema.py

@@ -72,7 +72,7 @@ class SchemaProcessorV1:
             provides = data.get("provides")
             if provides:
                 if isinstance(provides, str) and provides.startswith("container."):
-                    provides = self._resolve_provider(provides[len("container."):])
+                    provides = self._resolve_provider(provides[len("container.") :])
                 else:
                     provides = _import_string(provides)
                 provider.set_provides(provides)
@@ -83,7 +83,7 @@ class SchemaProcessorV1:
                     injection = None
 
                     if isinstance(arg, str) and arg.startswith("container."):
-                        injection = self._resolve_provider(arg[len("container."):])
+                        injection = self._resolve_provider(arg[len("container.") :])
 
                     # TODO: refactoring
                     if isinstance(arg, dict):
@@ -91,16 +91,23 @@ class SchemaProcessorV1:
                         provider_type = _get_provider_cls(arg.get("provider"))
                         provides = arg.get("provides")
                         if provides:
-                            if isinstance(provides, str) and provides.startswith("container."):
+                            if isinstance(provides, str) and provides.startswith(
-                                provides = self._resolve_provider(provides[len("container."):])
+                                "container."
+                            ):
+                                provides = self._resolve_provider(
+                                    provides[len("container.") :]
+                                )
                             else:
                                 provides = _import_string(provides)
                             provider_args.append(provides)
                         for provider_arg in arg.get("args", []):
-                            if isinstance(provider_arg, str) \
+                            if isinstance(
-                                    and provider_arg.startswith("container."):
+                                provider_arg, str
+                            ) and provider_arg.startswith("container."):
                                 provider_args.append(
-                                    self._resolve_provider(provider_arg[len("container."):]),
+                                    self._resolve_provider(
+                                        provider_arg[len("container.") :]
+                                    ),
                                 )
                         injection = provider_type(*provider_args)
 
@@ -117,7 +124,7 @@ class SchemaProcessorV1:
                     injection = None
 
                     if isinstance(arg, str) and arg.startswith("container."):
-                        injection = self._resolve_provider(arg[len("container."):])
+                        injection = self._resolve_provider(arg[len("container.") :])
 
                     # TODO: refactoring
                     if isinstance(arg, dict):
@@ -125,16 +132,23 @@ class SchemaProcessorV1:
                         provider_type = _get_provider_cls(arg.get("provider"))
                         provides = arg.get("provides")
                         if provides:
-                            if isinstance(provides, str) and provides.startswith("container."):
+                            if isinstance(provides, str) and provides.startswith(
-                                provides = self._resolve_provider(provides[len("container."):])
+                                "container."
+                            ):
+                                provides = self._resolve_provider(
+                                    provides[len("container.") :]
+                                )
                             else:
                                 provides = _import_string(provides)
                             provider_args.append(provides)
                         for provider_arg in arg.get("args", []):
-                            if isinstance(provider_arg, str) \
+                            if isinstance(
-                                    and provider_arg.startswith("container."):
+                                provider_arg, str
+                            ) and provider_arg.startswith("container."):
                                 provider_args.append(
-                                    self._resolve_provider(provider_arg[len("container."):]),
+                                    self._resolve_provider(
+                                        provider_arg[len("container.") :]
+                                    ),
                                 )
                         injection = provider_type(*provider_args)
 
@@ -158,7 +172,7 @@ class SchemaProcessorV1:
         for segment in segments[1:]:
             parentheses = ""
             if "(" in segment and ")" in segment:
-                parentheses = segment[segment.find("("):segment.rfind(")")+1]
+                parentheses = segment[segment.find("(") : segment.rfind(")") + 1]
                 segment = segment.replace(parentheses, "")
 
             try:
@@ -190,10 +204,12 @@ def _get_provider_cls(provider_cls_name: str) -> Type[providers.Provider]:
     if custom_provider_type:
         return custom_provider_type
 
-    raise SchemaError(f"Undefined provider class \"{provider_cls_name}\"")
+    raise SchemaError(f'Undefined provider class "{provider_cls_name}"')
 
 
-def _fetch_provider_cls_from_std(provider_cls_name: str) -> Optional[Type[providers.Provider]]:
+def _fetch_provider_cls_from_std(
+    provider_cls_name: str,
+) -> Optional[Type[providers.Provider]]:
     return getattr(providers, provider_cls_name, None)
 
 
@@ -201,12 +217,16 @@ def _import_provider_cls(provider_cls_name: str) -> Optional[Type[providers.Prov
     try:
         cls = _import_string(provider_cls_name)
     except (ImportError, ValueError) as exception:
-        raise SchemaError(f"Can not import provider \"{provider_cls_name}\"") from exception
+        raise SchemaError(
+            f'Can not import provider "{provider_cls_name}"'
+        ) from exception
     except AttributeError:
         return None
     else:
         if isinstance(cls, type) and not issubclass(cls, providers.Provider):
-            raise SchemaError(f"Provider class \"{cls}\" is not a subclass of providers base class")
+            raise SchemaError(
+                f'Provider class "{cls}" is not a subclass of providers base class'
+            )
         return cls
 
 

src/dependency_injector/wiring.py

@@ -27,8 +27,9 @@ from typing import (
 if sys.version_info < (3, 7):
     from typing import GenericMeta
 else:
-    class GenericMeta(type):
+
-        ...
+    class GenericMeta(type): ...
+
 
 # Hotfix, see: https://github.com/ets-labs/python-dependency-injector/issues/362
 if sys.version_info >= (3, 9):
@@ -36,6 +37,21 @@ if sys.version_info >= (3, 9):
 else:
     GenericAlias = None
 
+if sys.version_info >= (3, 9):
+    from typing import Annotated, get_args, get_origin
+else:
+    try:
+        from typing_extensions import Annotated, get_args, get_origin
+    except ImportError:
+        Annotated = object()
+
+        # For preventing NameError. Never executes
+        def get_args(hint):
+            return ()
+
+        def get_origin(tp):
+            return None
+
 
 try:
     import fastapi.params
@@ -99,7 +115,9 @@ class PatchedRegistry:
     def register_callable(self, patched: "PatchedCallable") -> None:
         self._callables[patched.patched] = patched
 
-    def get_callables_from_module(self, module: ModuleType) -> Iterator[Callable[..., Any]]:
+    def get_callables_from_module(
+        self, module: ModuleType
+    ) -> Iterator[Callable[..., Any]]:
         for patched_callable in self._callables.values():
             if not patched_callable.is_in_module(module):
                 continue
@@ -114,7 +132,9 @@ class PatchedRegistry:
     def register_attribute(self, patched: "PatchedAttribute") -> None:
         self._attributes.add(patched)
 
-    def get_attributes_from_module(self, module: ModuleType) -> Iterator["PatchedAttribute"]:
+    def get_attributes_from_module(
+        self, module: ModuleType
+    ) -> Iterator["PatchedAttribute"]:
         for attribute in self._attributes:
             if not attribute.is_in_module(module):
                 continue
@@ -220,12 +240,15 @@ class ProvidersMap:
     ) -> Optional[providers.Provider]:
         if isinstance(provider, providers.Delegate):
             return self._resolve_delegate(provider)
-        elif isinstance(provider, (
+        elif isinstance(
+            provider,
+            (
                 providers.ProvidedInstance,
                 providers.AttributeGetter,
                 providers.ItemGetter,
                 providers.MethodCaller,
-        )):
+            ),
+        ):
             return self._resolve_provided_instance(provider)
         elif isinstance(provider, providers.ConfigurationOption):
             return self._resolve_config_option(provider)
@@ -260,12 +283,15 @@ class ProvidersMap:
         original: providers.Provider,
     ) -> Optional[providers.Provider]:
         modifiers = []
-        while isinstance(original, (
+        while isinstance(
+            original,
+            (
                 providers.ProvidedInstance,
                 providers.AttributeGetter,
                 providers.ItemGetter,
                 providers.MethodCaller,
-        )):
+            ),
+        ):
             modifiers.insert(0, original)
             original = original.provides
 
@@ -349,8 +375,9 @@ class ProvidersMap:
             original_provider = original_providers[provider_name]
             providers_map[original_provider] = current_provider
 
-            if isinstance(current_provider, providers.Container) \
+            if isinstance(current_provider, providers.Container) and isinstance(
-                    and isinstance(original_provider, providers.Container):
+                original_provider, providers.Container
+            ):
                 subcontainer_map = cls._create_providers_map(
                     current_container=current_provider.container,
                     original_container=original_provider.container,
@@ -376,9 +403,11 @@ class InspectFilter:
         return werkzeug and isinstance(instance, werkzeug.local.LocalProxy)
 
     def _is_starlette_request_cls(self, instance: object) -> bool:
-        return starlette \
+        return (
-               and isinstance(instance, type) \
+            starlette
+            and isinstance(instance, type)
             and _safe_is_subclass(instance, starlette.requests.Request)
+        )
 
     def _is_builtin(self, instance: object) -> bool:
         return inspect.isbuiltin(instance)
@@ -418,9 +447,13 @@ def wire(  # noqa: C901
                 else:
                     for cls_member_name, cls_member in cls_members:
                         if _is_marker(cls_member):
-                            _patch_attribute(cls, cls_member_name, cls_member, providers_map)
+                            _patch_attribute(
+                                cls, cls_member_name, cls_member, providers_map
+                            )
                         elif _is_method(cls_member):
-                            _patch_method(cls, cls_member_name, cls_member, providers_map)
+                            _patch_method(
+                                cls, cls_member_name, cls_member, providers_map
+                            )
 
         for patched in _patched_registry.get_callables_from_module(module):
             _bind_injections(patched, providers_map)
@@ -443,7 +476,9 @@ def unwire(  # noqa: C901
             if inspect.isfunction(member):
                 _unpatch(module, name, member)
             elif inspect.isclass(member):
-                for method_name, method in inspect.getmembers(member, inspect.isfunction):
+                for method_name, method in inspect.getmembers(
+                    member, inspect.isfunction
+                ):
                     _unpatch(member, method_name, method)
 
         for patched in _patched_registry.get_callables_from_module(module):
@@ -484,9 +519,11 @@ def _patch_method(
     method: Callable[..., Any],
     providers_map: ProvidersMap,
 ) -> None:
-    if hasattr(cls, "__dict__") \
+    if (
-            and name in cls.__dict__ \
+        hasattr(cls, "__dict__")
-            and isinstance(cls.__dict__[name], (classmethod, staticmethod)):
+        and name in cls.__dict__
+        and isinstance(cls.__dict__[name], (classmethod, staticmethod))
+    ):
         method = cls.__dict__[name]
         fn = method.__func__
     else:
@@ -511,9 +548,11 @@ def _unpatch(
     name: str,
     fn: Callable[..., Any],
 ) -> None:
-    if hasattr(module, "__dict__") \
+    if (
-            and name in module.__dict__ \
+        hasattr(module, "__dict__")
-            and isinstance(module.__dict__[name], (classmethod, staticmethod)):
+        and name in module.__dict__
+        and isinstance(module.__dict__[name], (classmethod, staticmethod))
+    ):
         method = module.__dict__[name]
         fn = method.__func__
 
@@ -548,16 +587,33 @@ def _unpatch_attribute(patched: PatchedAttribute) -> None:
     setattr(patched.member, patched.name, patched.marker)
 
 
+def _extract_marker(parameter: inspect.Parameter) -> Optional["_Marker"]:
+    if get_origin(parameter.annotation) is Annotated:
+        marker = get_args(parameter.annotation)[1]
+    else:
+        marker = parameter.default
+
+    if not isinstance(marker, _Marker) and not _is_fastapi_depends(marker):
+        return None
+
+    if _is_fastapi_depends(marker):
+        marker = marker.dependency
+
+        if not isinstance(marker, _Marker):
+            return None
+
+    return marker
+
+
 def _fetch_reference_injections(  # noqa: C901
     fn: Callable[..., Any],
 ) -> Tuple[Dict[str, Any], Dict[str, Any]]:
     # Hotfix, see:
     # - https://github.com/ets-labs/python-dependency-injector/issues/362
     # - https://github.com/ets-labs/python-dependency-injector/issues/398
-    if GenericAlias and any((
+    if GenericAlias and any(
-                fn is GenericAlias,
+        (fn is GenericAlias, getattr(fn, "__func__", None) is GenericAlias)
-                getattr(fn, "__func__", None) is GenericAlias
+    ):
-            )):
         fn = fn.__init__
 
     try:
@@ -573,16 +629,9 @@ def _fetch_reference_injections(  # noqa: C901
     injections = {}
     closing = {}
     for parameter_name, parameter in signature.parameters.items():
-        if not isinstance(parameter.default, _Marker) \
+        marker = _extract_marker(parameter)
-                and not _is_fastapi_depends(parameter.default):
-            continue
 
-        marker = parameter.default
+        if marker is None:
-
-        if _is_fastapi_depends(marker):
-            marker = marker.dependency
-
-            if not isinstance(marker, _Marker):
             continue
 
         if isinstance(marker, Closing):
@@ -593,7 +642,9 @@ def _fetch_reference_injections(  # noqa: C901
     return injections, closing
 
 
-def _locate_dependent_closing_args(provider: providers.Provider) -> Dict[str, providers.Provider]:
+def _locate_dependent_closing_args(
+    provider: providers.Provider,
+) -> Dict[str, providers.Provider]:
     if not hasattr(provider, "args"):
         return {}
 
@@ -694,9 +745,11 @@ def _is_patched(fn) -> bool:
 
 
 def _is_declarative_container(instance: Any) -> bool:
-    return (isinstance(instance, type)
+    return (
+        isinstance(instance, type)
         and getattr(instance, "__IS_CONTAINER__", False) is True
-            and getattr(instance, "declarative_parent", None) is None)
+        and getattr(instance, "declarative_parent", None) is None
+    )
 
 
 def _safe_is_subclass(instance: Any, cls: Type) -> bool:
@@ -712,8 +765,7 @@ class Modifier:
         self,
         provider: providers.ConfigurationOption,
         providers_map: ProvidersMap,
-    ) -> providers.Provider:
+    ) -> providers.Provider: ...
-        ...
 
 
 class TypeModifier(Modifier):
@@ -869,16 +921,13 @@ class _Marker(Generic[T], metaclass=ClassGetItemMeta):
         return self
 
 
-class Provide(_Marker):
+class Provide(_Marker): ...
-    ...
 
 
-class Provider(_Marker):
+class Provider(_Marker): ...
-    ...
 
 
-class Closing(_Marker):
+class Closing(_Marker): ...
-    ...
 
 
 class AutoLoader:
@@ -928,8 +977,7 @@ class AutoLoader:
                 super().exec_module(module)
                 loader.wire_module(module)
 
-        class ExtensionFileLoader(importlib.machinery.ExtensionFileLoader):
+        class ExtensionFileLoader(importlib.machinery.ExtensionFileLoader): ...
-            ...
 
         loader_details = [
             (SourcelessFileLoader, importlib.machinery.BYTECODE_SUFFIXES),
@@ -998,6 +1046,7 @@ def _get_async_patched(fn: F, patched: PatchedCallable) -> F:
             patched.injections,
             patched.closing,
         )
+
     return _patched
 
 def _get_sync_patched(fn: F, patched: PatchedCallable) -> F:

tests/.configs/pytest.ini

@@ -2,9 +2,12 @@
 testpaths = tests/unit/
 python_files = test_*_py3*.py
 asyncio_mode = auto
+markers =
+    pydantic: Tests with Pydantic as a dependency
 filterwarnings =
     ignore:Module \"dependency_injector.ext.aiohttp\" is deprecated since version 4\.0\.0:DeprecationWarning
     ignore:Module \"dependency_injector.ext.flask\" is deprecated since version 4\.0\.0:DeprecationWarning
     ignore:Please use \`.*?\` from the \`scipy.*?\`(.*?)namespace is deprecated\.:DeprecationWarning
-    ignore:The \`scipy(.*?)\` namespace is deprecated(.*):DeprecationWarning
+    ignore:Please import \`.*?\` from the \`scipy(.*?)\` namespace(.*):DeprecationWarning
+    ignore:\`scipy(.*?)\` is deprecated(.*):DeprecationWarning
     ignore:ssl\.PROTOCOL_TLS is deprecated:DeprecationWarning:botocore.*

tests/typing/callable.py

@@ -34,7 +34,7 @@ kwargs4: Dict[str, Any] = provider4.kwargs
 
 # Test 5: to check the provided instance interface
 provider5 = providers.Callable(Animal)
-provided5: providers.ProvidedInstance = provider5.provided
+provided5: Animal = provider5.provided()
 attr_getter5: providers.AttributeGetter = provider5.provided.attr
 item_getter5: providers.ItemGetter = provider5.provided["item"]
 method_caller: providers.MethodCaller = provider5.provided.method.call(123, arg=324)

tests/typing/configuration.py

@@ -1,12 +1,13 @@
 from pathlib import Path
+from typing import Any
 
 from dependency_injector import providers
-from pydantic import BaseSettings as PydanticSettings
+from pydantic_settings import BaseSettings as PydanticSettings
 
 
 # Test 1: to check the getattr
-config1 = providers.Configuration()
+config1: providers.Configuration = providers.Configuration()
-provider1 = providers.Factory(dict, a=config1.a)
+provider1: providers.Provider[dict] = providers.Factory(dict, a=config1.a)
 
 # Test 2: to check the from_*() method
 config2 = providers.Configuration()

tests/typing/dict.py

@@ -34,7 +34,7 @@ provider5 = providers.Dict(
     a1=providers.Factory(object),
     a2=providers.Factory(object),
 )
-provided5: providers.ProvidedInstance = provider5.provided
+provided5: dict[Any, Any] = provider5.provided()
 
 
 # Test 6: to check the return type with await

tests/typing/factory.py

@@ -37,7 +37,7 @@ attributes4: Dict[str, Any] = provider4.attributes
 
 # Test 5: to check the provided instance interface
 provider5 = providers.Factory(Animal)
-provided5: providers.ProvidedInstance = provider5.provided
+provided5: Animal = provider5.provided()
 attr_getter5: providers.AttributeGetter = provider5.provided.attr
 item_getter5: providers.ItemGetter = provider5.provided["item"]
 method_caller5: providers.MethodCaller = provider5.provided.method.call(123, arg=324)

tests/typing/list.py

@@ -23,7 +23,7 @@ provider3 = providers.List(
     providers.Factory(object),
     providers.Factory(object),
 )
-provided3: providers.ProvidedInstance = provider3.provided
+provided3: List[Any] = provider3.provided()
 attr_getter3: providers.AttributeGetter = provider3.provided.attr
 item_getter3: providers.ItemGetter = provider3.provided["item"]
 method_caller3: providers.MethodCaller = provider3.provided.method.call(123, arg=324)

tests/typing/object.py

@@ -9,7 +9,7 @@ var1: int = provider1()
 
 # Test 2: to check the provided instance interface
 provider2 = providers.Object(int)
-provided2: providers.ProvidedInstance = provider2.provided
+provided2: Type[int] = provider2.provided()
 attr_getter2: providers.AttributeGetter = provider2.provided.attr
 item_getter2: providers.ItemGetter = provider2.provided["item"]
 method_caller2: providers.MethodCaller = provider2.provided.method.call(123, arg=324)

tests/typing/provider.py

@@ -3,7 +3,8 @@ from dependency_injector import providers
 
 # Test 1: to check .provided attribute
 provider1: providers.Provider[int] = providers.Object(1)
-provided: providers.ProvidedInstance = provider1.provided
+provided: int = provider1.provided()
+provider1_delegate: providers.Provider[int] = provider1.provider
 
 # Test 2: to check async mode API
 provider2: providers.Provider = providers.Provider()