anydi 0.47.0rc0__tar.gz → 0.48.1__tar.gz

{anydi-0.47.0rc0 → anydi-0.48.1}/PKG-INFO

@@ -1,36 +1,36 @@
 Metadata-Version: 2.4
 Name: anydi
-Version: 0.47.0rc0
+Version: 0.48.1
 Summary: Dependency Injection library
-Project-URL: Repository, https://github.com/antonrh/anydi
+Keywords: dependency injection,dependencies,di,async,asyncio,application
+Author: Anton Ruhlov
 Author-email: Anton Ruhlov <antonruhlov@gmail.com>
 License-Expression: MIT
-License-File: LICENSE
-Keywords: application,async,asyncio,dependencies,dependency injection,di
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 5 - Production/Stable
+Classifier: Topic :: Internet
+Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development
+Classifier: Typing :: Typed
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Information Technology
-Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Internet
-Classifier: Topic :: Software Development
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Typing :: Typed
-Requires-Python: ~=3.9
+Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Dist: typing-extensions>=4.15.0,<5
 Requires-Dist: anyio>=3.7.1
-Requires-Dist: typing-extensions<5,>=4.14.0
-Requires-Dist: wrapt<2,>=1.17.0
+Requires-Dist: wrapt>=1.17.0,<2
+Requires-Python: ~=3.9
+Project-URL: Repository, https://github.com/antonrh/anydi
 Description-Content-Type: text/markdown
 
 # AnyDI

{anydi-0.47.0rc0 → anydi-0.48.1}/anydi/_container.py

@@ -28,7 +28,6 @@ from ._typing import (
     get_typed_annotation,
     get_typed_parameters,
     is_async_context_manager,
-    is_builtin_type,
     is_context_manager,
     is_event_type,
     is_inject_marker,
@@ -49,11 +48,9 @@ class Container:
         *,
         providers: Iterable[ProviderDef] | None = None,
         modules: Iterable[ModuleDef] | None = None,
-        default_scope: Scope = "transient",
         logger: logging.Logger | None = None,
     ) -> None:
         self._providers: dict[Any, Provider] = {}
-        self._default_scope: Scope = default_scope
         self._logger = logger or logging.getLogger(__name__)
         self._resources: dict[str, list[Any]] = defaultdict(list)
         self._singleton_context = InstanceContext()
@@ -85,11 +82,6 @@ class Container:
     # Properties
     ############################
 
-    @property
-    def default_scope(self) -> Scope:
-        """Get the default scope."""
-        return self._default_scope
-
     @property
     def providers(self) -> dict[type[Any], Provider]:
         """Get the registered providers."""
@@ -259,7 +251,7 @@ class Container:
     def _register_provider(  # noqa: C901
         self,
         call: Callable[..., Any],
-        scope: Scope | None,
+        scope: Scope,
         interface: Any = NOT_SET,
         override: bool = False,
         /,
@@ -268,11 +260,9 @@ class Container:
         """Register a provider with the specified scope."""
         name = type_repr(call)
         kind = ProviderKind.from_call(call)
-        detected_scope = scope
 
         # Validate scope if it provided
-        if scope:
-            self._validate_provider_scope(scope, name, kind)
+        self._validate_provider_scope(scope, name, kind)
 
         # Get the signature
         globalns = getattr(call, "__globals__", {})
@@ -315,6 +305,7 @@ class Container:
             )
 
         unresolved_parameter = None
+        unresolved_exc: LookupError | None = None
         parameters: list[inspect.Parameter] = []
         scopes: dict[Scope, Provider] = {}
 
@@ -335,13 +326,12 @@ class Container:
             )
 
             try:
-                sub_provider = self._get_or_register_provider(
-                    parameter.annotation, scope
-                )
-            except LookupError:
+                sub_provider = self._get_or_register_provider(parameter.annotation)
+            except LookupError as exc:
                 if self._parameter_has_default(parameter, **defaults):
                     continue
                 unresolved_parameter = parameter
+                unresolved_exc = exc
                 continue
 
             # Store first provider for each scope
@@ -350,24 +340,9 @@ class Container:
 
             parameters.append(parameter)
 
-        # Set detected scope
-        if detected_scope is None:
-            if "transient" in scopes:
-                detected_scope = "transient"
-            elif "request" in scopes:
-                detected_scope = "request"
-            elif "singleton" in scopes:
-                detected_scope = "singleton"
-            else:
-                detected_scope = self.default_scope
-
-        # Validate the provider scope after detection
-        if scope is None:
-            self._validate_provider_scope(detected_scope, name, kind)
-
         # Check for unresolved parameters
         if unresolved_parameter:
-            if detected_scope not in ("singleton", "transient"):
+            if scope not in ("singleton", "transient"):
                 self._unresolved_interfaces.add(interface)
             else:
                 raise LookupError(
@@ -376,20 +351,20 @@ class Container:
                     "which has not been registered or set. To resolve this, ensure "
                     f"that `{unresolved_parameter.name}` is registered before "
                     f"attempting to use it."
-                ) from None
+                ) from unresolved_exc
 
         # Check scope compatibility
         for sub_provider in scopes.values():
-            if sub_provider.scope not in ALLOWED_SCOPES.get(detected_scope, []):
+            if sub_provider.scope not in ALLOWED_SCOPES.get(scope, []):
                 raise ValueError(
-                    f"The provider `{name}` with a `{detected_scope}` scope cannot "
+                    f"The provider `{name}` with a `{scope}` scope cannot "
                     f"depend on `{sub_provider}` with a `{sub_provider.scope}` scope. "
                     "Please ensure all providers are registered with matching scopes."
                 )
 
         provider = Provider(
             call=call,
-            scope=detected_scope,
+            scope=scope,
             interface=interface,
             name=name,
             kind=kind,
@@ -425,20 +400,18 @@ class Container:
                 "properly registered before attempting to use it."
             ) from exc
 
-    def _get_or_register_provider(
-        self, interface: Any, parent_scope: Scope | None, /, **defaults: Any
-    ) -> Provider:
+    def _get_or_register_provider(self, interface: Any, /, **defaults: Any) -> Provider:
         """Get or register a provider by interface."""
         try:
             return self._providers[interface]
         except KeyError:
-            if inspect.isclass(interface) and not is_builtin_type(interface):
-                # Try to get defined scope
-                if is_provided(interface):
-                    scope = interface.__provided__["scope"]
-                else:
-                    scope = parent_scope
-                return self._register_provider(interface, scope, interface, **defaults)
+            if inspect.isclass(interface) and is_provided(interface):
+                return self._register_provider(
+                    interface,
+                    interface.__provided__["scope"],
+                    NOT_SET,
+                    **defaults,
+                )
             raise LookupError(
                 f"The provider interface `{type_repr(interface)}` is either not "
                 "registered, not provided, or not set in the scoped context. "
@@ -533,7 +506,7 @@ class Container:
         self, interface: Any, create: bool, /, **defaults: Any
     ) -> Any:
         """Internal method to handle instance resolution and creation."""
-        provider = self._get_or_register_provider(interface, None, **defaults)
+        provider = self._get_or_register_provider(interface, **defaults)
         if provider.scope == "transient":
             return self._create_instance(provider, None, **defaults)
         context = self._get_instance_context(provider.scope)
@@ -548,7 +521,7 @@ class Container:
         self, interface: Any, create: bool, /, **defaults: Any
     ) -> Any:
         """Internal method to handle instance resolution and creation asynchronously."""
-        provider = self._get_or_register_provider(interface, None, **defaults)
+        provider = self._get_or_register_provider(interface, **defaults)
         if provider.scope == "transient":
             return await self._acreate_instance(provider, None, **defaults)
         context = self._get_instance_context(provider.scope)
@@ -884,3 +857,16 @@ class Container:
         self, /, packages: PackageOrIterable, *, tags: Iterable[str] | None = None
     ) -> None:
         self._scanner.scan(packages=packages, tags=tags)
+
+    ############################
+    # Testing
+    ############################
+
+    @contextlib.contextmanager
+    def override(self, interface: Any, instance: Any) -> Iterator[None]:
+        raise RuntimeError(
+            "Dependency overriding is not supported in this container.\n"
+            "Wrap your container with `anydi.testing.Container` instead.\n"
+            "Example:\n\n"
+            "    container = TestContainer.from_container(container)"
+        )

{anydi-0.47.0rc0 → anydi-0.48.1}/anydi/_typing.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import builtins
 import inspect
 import re
 import sys
@@ -44,11 +43,6 @@ def type_repr(obj: Any) -> str:
     )
 
 
-def is_builtin_type(tp: type[Any]) -> bool:
-    """Check if the given type is a built-in type."""
-    return tp.__module__ == builtins.__name__
-
-
 def is_context_manager(obj: Any) -> bool:
     """Check if the given object is a context manager."""
     return hasattr(obj, "__enter__") and hasattr(obj, "__exit__")

{anydi-0.47.0rc0 → anydi-0.48.1}/anydi/ext/django/apps.py

@@ -9,6 +9,7 @@ from django.core.exceptions import ImproperlyConfigured
 from django.utils.module_loading import import_string
 
 import anydi
+from anydi.testing import TestContainer
 
 from ._settings import get_settings
 from ._utils import inject_urlpatterns, register_components, register_settings
@@ -32,9 +33,16 @@ class ContainerConfig(AppConfig):
                 raise ImproperlyConfigured(
                     f"Cannot import container factory '{container_factory_path}'."
                 ) from exc
-            self.container = container_factory()
+            container = container_factory()
         else:
-            self.container = anydi.Container()
+            container = anydi.Container()
+
+        # Use test container
+        testing = getattr(settings, "ANYDI_TESTING", False)
+        if testing:
+            container = TestContainer.from_container(container)
+
+        self.container = container
 
     def ready(self) -> None:  # noqa: C901
         # Register Django settings

{anydi-0.47.0rc0 → anydi-0.48.1}/anydi/testing.py

@@ -28,12 +28,7 @@ class TestContainer(Container):
         default_scope: Scope = "transient",
         logger: logging.Logger | None = None,
     ) -> None:
-        super().__init__(
-            providers=providers,
-            modules=modules,
-            default_scope=default_scope,
-            logger=logger,
-        )
+        super().__init__(providers=providers, modules=modules, logger=logger)
         self._override_instances: dict[Any, Any] = {}
 
     @classmethod
@@ -47,7 +42,6 @@ class TestContainer(Container):
                 )
                 for provider in container.providers.values()
             ],
-            default_scope=container.default_scope,
             logger=container.logger,
         )
 

{anydi-0.47.0rc0 → anydi-0.48.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "anydi"
-version = "0.47.0rc0"
+version = "0.48.1"
 description = "Dependency Injection library"
 authors = [{ name = "Anton Ruhlov", email = "antonruhlov@gmail.com" }]
 requires-python = "~=3.9"
@@ -37,7 +37,7 @@ classifiers = [
     "Programming Language :: Python :: 3 :: Only",
 ]
 dependencies = [
-    "typing-extensions>=4.14.0,<5",
+    "typing-extensions>=4.15.0,<5",
     "anyio>=3.7.1",
     "wrapt>=1.17.0,<2",
 ]
@@ -50,7 +50,7 @@ anydi = "anydi.ext.pytest_plugin"
 
 [dependency-groups]
 dev = [
-    "ruff>=0.11.10,<1.0",
+    "ruff>=0.13.0",
     "pytest>=8.4.0,<9",
     "pytest-cov>=6.0.0,<7",
     "starlette>=0.37.2",
@@ -64,7 +64,7 @@ dev = [
     "redis>=5.0.4,<6",
     "pydantic-settings>=2.4.0,<3",
     "bump-my-version>=1.1.4",
-    "pyright>=1.1.401",
+    "pyright>=1.1.405",
     "pytest-mock>=3.14.1",
 ]
 docs = [
@@ -73,8 +73,12 @@ docs = [
 ]
 
 [build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
+requires = ["uv_build>=0.8.17,<0.9.0"]
+build-backend = "uv_build"
+
+[tool.uv.build-backend]
+module-name = "anydi"
+module-root = "."
 
 [tool.ruff]
 line-length = 88
@@ -137,7 +141,7 @@ omit = [
 ]
 
 [tool.bumpversion]
-current_version = "0.47.0rc0"
+current_version = "0.48.1"
 parse = """(?x)
     (?P<major>0|[1-9]\\d*)\\.
     (?P<minor>0|[1-9]\\d*)\\.
@@ -164,3 +168,4 @@ replace = "version = \"{new_version}\""
 [tool.bumpversion.parts.pre_l]
 values = ["rc", "final"]
 optional_value = "final"
+

anydi-0.47.0rc0/.editorconfig

@@ -1,26 +0,0 @@
-# https://editorconfig.org/
-
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-insert_final_newline = true
-trim_trailing_whitespace = true
-end_of_line = lf
-charset = utf-8
-
-# Docstrings and comments use max_line_length = 88
-[*.py]
-max_line_length = 88
-
-[Makefile]
-indent_style = tab
-
-# Use 2 spaces for the HTML files
-[*.html]
-indent_size = 2
-
-# The JSON/YAML files contain newlines inconsistently
-[*.{json,yml,yaml}]
-indent_size = 2

anydi-0.47.0rc0/.github/workflows/ci.yml

@@ -1,61 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  lint:
-    name: Code quality
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-        with:
-          python-version: '3.10'
-          enable-cache: true
-      - name: Set up Python
-        run: uv python install
-      - name: Install dependencies
-        run: uv sync --all-extras --dev
-      - name: Static type checking
-        run: uv run pyright
-      - name: Code formatting
-        run: uv run ruff check && uv run ruff format --check
-
-  tests:
-    name: Run unit tests ${{ matrix.name }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - {name: '3.13', python: '3.13', os: ubuntu-latest}
-          - {name: '3.12', python: '3.12', os: ubuntu-latest}
-          - {name: '3.11', python: '3.11', os: ubuntu-latest}
-          - {name: '3.10', python: '3.10', os: ubuntu-latest}
-          - {name: '3.9', python: '3.9', os: ubuntu-latest}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Install uv and set the python version
-        uses: astral-sh/setup-uv@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-          enable-cache: true
-      - name: Install dependencies
-        run: uv sync --all-extras --dev
-      - name: Run tests
-        run: |
-          uv run pytest -vv tests --ignore=tests/ext/test_pytest_plugin.py --cov=anydi -p no:anydi
-          uv run pytest -vv tests/ext/test_pytest_plugin.py --cov=anydi --cov-append --cov-report=xml
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        if: matrix.python == '3.10'

anydi-0.47.0rc0/.gitignore

@@ -1,83 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-.pytest_cache
-.mypy_cache
-.ruff_cache
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-env/
-.venv
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*,cover
-.hypothesis/
-pyunit.xml
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-#Ipython Notebook
-.ipynb_checkpoints
-*.ipynb
-
-# OS-X thumbnails
-.DS_Store
-
-# vi swap files
-*.swp
-
-# PyCharm project settings
-.idea
-
-# dotenv file
-.env
-
-
-/app

anydi-0.47.0rc0/.readthedocs.yaml

@@ -1,20 +0,0 @@
-version: 2
-
-build:
-  os: ubuntu-24.04
-  tools:
-    python: "3.13"
-  jobs:
-    create_environment:
-      - asdf plugin add uv
-      - asdf install uv latest
-      - asdf global uv latest
-      - uv venv
-    install:
-      - uv sync --frozen --group docs
-    build:
-       html:
-          - NO_COLOR=1 uv run mkdocs build --strict --site-dir $READTHEDOCS_OUTPUT/html
-
-mkdocs:
-  configuration: mkdocs.yml

anydi-0.47.0rc0/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Anton Ruhlov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

anydi-0.47.0rc0/Makefile

@@ -1,18 +0,0 @@
-.PHONY: help lint fmt test
-.DEFAULT_GOAL := help
-
-help:
-	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
-lint: ## Run code linters
-	uv run pyright
-	uv run ruff format --check
-	uv run ruff check
-
-fmt: ## Run code formatters
-	uv run ruff format
-	uv run ruff check --fix
-
-test:  ## Run unit tests
-	uv run pytest -vv tests --ignore=tests/ext/test_pytest_plugin.py --cov=anydi -p no:anydi -p no:testanydi
-	uv run pytest -vv tests/ext/test_pytest_plugin.py --cov=anydi --cov-append