ashka-lifecycle 0.2.1__tar.gz → 0.2.2__tar.gz

{ashka_lifecycle-0.2.1 → ashka_lifecycle-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ashka-lifecycle
-Version: 0.2.1
+Version: 0.2.2
 Summary: dishka lifecycle support
 Author: handsome-Druid
 Author-email: handsome-Druid <102826168@qq.com>

{ashka_lifecycle-0.2.1 → ashka_lifecycle-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ashka-lifecycle"
-version = "0.2.1"
+version = "0.2.2"
 description = "dishka lifecycle support"
 readme = "README.md"
 requires-python = ">=3.10,<3.15"

{ashka_lifecycle-0.2.1 → ashka_lifecycle-0.2.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "ashka-lifecycle"
-version = "0.2.1"
+version = "0.2.2"
 description = "dishka lifecycle support"
 readme = "README.md"
 authors = [

{ashka_lifecycle-0.2.1 → ashka_lifecycle-0.2.2}/src/ashka_lifecycle/async_container.py

@@ -23,6 +23,7 @@ async def __aenter__(self: AsyncContainer) -> AsyncContainer:
     aenter: AsyncContainer = await _aenter(self)
 
     if self.scope is Scope.APP:
+        _logger.debug("Initiating bootstrap factories.")
         await gather(
             *(
                 self.get(key.type_hint, key.component)
@@ -30,6 +31,10 @@ async def __aenter__(self: AsyncContainer) -> AsyncContainer:
                 if key.type_hint in bootstrap_types
             )
         )
+    else:
+        _logger.debug(
+            f"'<dishka_container>.scope': {self.scope!r} is not 'Scope.APP', skipping bootstrap"
+        )
 
     return aenter
 
@@ -37,7 +42,7 @@ async def __aenter__(self: AsyncContainer) -> AsyncContainer:
 async def init(self: AsyncContainer) -> None:
     if not self.scope is Scope.APP:
         _logger.warning(
-            f"With scope = {self.scope}, container.init() won't do any bootstrap."
+            f"'<dishka_container>.scope': {self.scope!r} is not 'Scope.APP', 'container.init()' won't do any bootstrap."
         )
     await self.__aenter__()
 

{ashka_lifecycle-0.2.1 → ashka_lifecycle-0.2.2}/src/ashka_lifecycle/container.py

@@ -20,9 +20,14 @@ def __enter__(self: Container) -> Container:
     enter: Container = _enter(self)
 
     if self.scope is Scope.APP:
+        _logger.debug("Initiating bootstrap factories.")
         for key in self.registry.factories:
             if key.type_hint in bootstrap_types:
                 self.get(key.type_hint, key.component)
+    else:
+        _logger.debug(
+            f"'<dishka_container>.scope': {self.scope!r} is not 'Scope.APP', skipping bootstrap"
+        )
 
     return enter
 
@@ -30,7 +35,7 @@ def __enter__(self: Container) -> Container:
 def init(self: Container) -> None:
     if not self.scope is Scope.APP:
         _logger.warning(
-            f"With scope = {self.scope}, container.init() won't do any bootstrap."
+            f"'<dishka_container>.scope': {self.scope!r} is not 'Scope.APP', 'container.init()' won't do any bootstrap."
         )
     self.__enter__()
 

{ashka_lifecycle-0.2.1 → ashka_lifecycle-0.2.2}/src/ashka_lifecycle/provider/make_factory.py

@@ -1,5 +1,6 @@
 from collections.abc import Callable
 from inspect import isbuiltin, isclass, isfunction
+from logging import getLogger
 from typing import Any, NewType, get_origin, get_type_hints, overload
 
 from ashka_lifecycle.entities.bootstrap import (
@@ -20,6 +21,8 @@ from dishka.provider.make_factory import (
 
 __all__: list[str] = ["provide"]
 
+_logger = getLogger(__name__)
+
 
 def activate(): ...
 
@@ -55,6 +58,14 @@ def provide(
         return _provide(source, scope=scope, **kwargs)
 
     def scoped(source: ProvideSource) -> CompositeDependencySource:  # pyright: ignore[reportUnknownParameterType]
+        _logger.debug(
+            f"Adding {getattr(source, '__name__', source)!r} to bootstrap list..."  # pyright: ignore[reportUnknownArgumentType]
+        )
+        bootstrap_types.add(
+            new_type := NewType(
+                "ashka_lifecycle.provider.make_factory.provide", AshkaScope
+            )
+        )
         try:
             return (
                 _provide(
@@ -65,8 +76,7 @@ def provide(
                     ],
                     **_kwargs,
                 )
-                if bootstrap_types.add(new_type := NewType("_", object)) is None
-                and (provides := "provides") in kwargs
+                if (provides := "provides") in kwargs
                 else _provide(
                     source,
                     scope=Scope.APP,
@@ -94,6 +104,7 @@ def provide(
                 )
             )
         except KeyError as e:
+            bootstrap_types.remove(new_type)
             raise MissingReturnHintError(source) from e
 
     return scoped if source is None else scoped(source)  # pyright: ignore[reportUnknownVariableType]