refactor: Update ScopedInjectable to use SlotKey for caching logic

Author: remimd

injection/_core/injectables.py

@@ -122,11 +122,12 @@ def unlock(self) -> None:
 class ScopedInjectable[R, T](Injectable[T], ABC):
     factory: Caller[..., R]
     scope_name: str
+    key: SlotKey[T] = field(default_factory=SlotKey)
     logic: CacheLogic[T] = field(default_factory=CacheLogic)
 
     @property
     def is_locked(self) -> bool:
-        return in_scope_cache(self, self.scope_name)
+        return in_scope_cache(self.key, self.scope_name)
 
     @abstractmethod
     async def abuild(self, scope: Scope) -> T:
@@ -139,12 +140,12 @@ def build(self, scope: Scope) -> T:
     async def aget_instance(self) -> T:
         scope = self.__get_scope()
         factory = partial(self.abuild, scope)
-        return await self.logic.aget_or_create(scope.cache, self, factory)
+        return await self.logic.aget_or_create(scope.cache, self.key, factory)
 
     def get_instance(self) -> T:
         scope = self.__get_scope()
         factory = partial(self.build, scope)
-        return self.logic.get_or_create(scope.cache, self, factory)
+        return self.logic.get_or_create(scope.cache, self.key, factory)
 
     def unlock(self) -> None:
         if self.is_locked:
@@ -187,7 +188,7 @@ def build(self, scope: Scope) -> T:
         return self.factory.call()
 
     def unlock(self) -> None:
-        remove_scoped_values(self, self.scope_name)
+        remove_scoped_values(self.key, self.scope_name)
 
 
 @dataclass(repr=False, eq=False, frozen=True, slots=True)

injection/_core/scope.py

@@ -182,11 +182,11 @@ def get_scope[T](name: str, default: T | EllipsisType = ...) -> Scope | T:
     return default
 
 
-def in_scope_cache(key: Any, scope_name: str) -> bool:
+def in_scope_cache(key: SlotKey[Any], scope_name: str) -> bool:
     return any(key in scope.cache for scope in get_active_scopes(scope_name))
 
 
-def remove_scoped_values(key: Any, scope_name: str) -> None:
+def remove_scoped_values(key: SlotKey[Any], scope_name: str) -> None:
     for scope in get_active_scopes(scope_name):
         scope.cache.pop(key, None)
 
@@ -233,7 +233,7 @@ def _bind_scope(
 class Scope(Protocol):
     __slots__ = ()
 
-    cache: MutableMapping[Any, Any]
+    cache: MutableMapping[SlotKey[Any], Any]
 
     @abstractmethod
     async def aenter[T](self, context_manager: AsyncContextManager[T]) -> T:
@@ -247,7 +247,7 @@ def enter[T](self, context_manager: ContextManager[T]) -> T:
 @dataclass(repr=False, frozen=True, slots=True)
 class BaseScope[T](Scope, ABC):
     delegate: T
-    cache: MutableMapping[Any, Any] = field(
+    cache: MutableMapping[SlotKey[Any], Any] = field(
         default_factory=dict,
         init=False,
         hash=False,