Merge pull request #298 from reagento/fix/optimize_container

Optimize context entrance by using const container key
reagento · Nov 5, 2024 · 6be79f6 · 6be79f6
2 parents 6b4ba0e + fb0936b
commit 6be79f6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/dishka/async_container.py b/src/dishka/async_container.py
@@ -51,7 +51,7 @@ def __init__(
     ):
         self.registry = registry
         self.child_registries = child_registries
-        self._context = {DependencyKey(type(self), DEFAULT_COMPONENT): self}
+        self._context = {CONTAINER_KEY: self}
         if context:
             for key, value in context.items():
                 if not isinstance(key, DependencyKey):
@@ -227,7 +227,7 @@ def make_async_container(
 ) -> AsyncContainer:
     registries = RegistryBuilder(
         scopes=scopes,
-        container_type=AsyncContainer,
+        container_key=CONTAINER_KEY,
         providers=providers,
         skip_validation=skip_validation,
         validation_settings=validation_settings,
@@ -257,3 +257,6 @@ def make_async_container(
                 close_parent=True,
             )
     return container
+
+
+CONTAINER_KEY = DependencyKey(AsyncContainer, DEFAULT_COMPONENT)
diff --git a/src/dishka/container.py b/src/dishka/container.py
@@ -51,7 +51,7 @@ def __init__(
     ):
         self.registry = registry
         self.child_registries = child_registries
-        self._context = {DependencyKey(type(self), DEFAULT_COMPONENT): self}
+        self._context = {CONTAINER_KEY: self}
         if context:
             for key, value in context.items():
                 if not isinstance(key, DependencyKey):
@@ -223,7 +223,7 @@ def make_container(
 ) -> Container:
     registries = RegistryBuilder(
         scopes=scopes,
-        container_type=Container,
+        container_key=CONTAINER_KEY,
         providers=providers,
         skip_validation=skip_validation,
         validation_settings=validation_settings,
@@ -252,3 +252,6 @@ def make_container(
                 close_parent=True,
             )
     return container
+
+
+CONTAINER_KEY = DependencyKey(Container, DEFAULT_COMPONENT)
diff --git a/src/dishka/registry_builder.py b/src/dishka/registry_builder.py
@@ -120,7 +120,7 @@ def __init__(
             *,
             scopes: type[BaseScope],
             providers: Sequence[BaseProvider],
-            container_type: type,
+            container_key: DependencyKey,
             skip_validation: bool,
             validation_settings: ValidationSettings,
     ) -> None:
@@ -131,7 +131,7 @@ def __init__(
         self.components: set[Component] = {DEFAULT_COMPONENT}
         self.alias_sources: dict[DependencyKey, Any] = {}
         self.aliases: dict[DependencyKey, Alias] = {}
-        self.container_type = container_type
+        self.container_key = container_key
         self.decorator_depth: dict[DependencyKey, int] = defaultdict(int)
         self.skip_validation = skip_validation
         self.validation_settings = validation_settings
@@ -174,7 +174,7 @@ def _init_registries(self) -> None:
         for scope in self.scopes:
             registry = Registry(scope, has_fallback=has_fallback)
             context_var = ContextVariable(
-                provides=DependencyKey(self.container_type, DEFAULT_COMPONENT),
+                provides=self.container_key,
                 scope=scope,
                 override=False,
             )