Add working prototype for sample 1 and 3

This commit is contained in:
Roman Mogylatov 2021-02-10 07:57:04 -05:00
parent 1c433ed0ad
commit ff3ae95482
7 changed files with 8554 additions and 7435 deletions

File diff suppressed because it is too large Load Diff

View File

@ -44,7 +44,9 @@ class Container:
def shutdown_resources(self) -> Optional[Awaitable]: ...
def apply_container_providers_overridings(self) -> None: ...
def reset_singletons(self) -> None: ...
def resolve_provider_name(self, provider: Provider) -> Optional[str]: ...
def resolve_provider_name(self, provider: Provider) -> str: ...
@property
def parent_name(self) -> str: ...
@overload
def traverse(self, types: Optional[Iterable[Type[TT]]] = None) -> _Iterator[TT]: ...
@classmethod

View File

@ -113,7 +113,7 @@ class DynamicContainer(Container):
self.providers[name] = value
if isinstance(value, providers.Dependency):
if isinstance(value, (providers.Dependency, providers.DependenciesContainer)):
value.set_parent(self)
super(DynamicContainer, self).__setattr__(name, value)
@ -300,6 +300,11 @@ class DynamicContainer(Container):
for provider in self.traverse(types=[providers.BaseSingleton]):
provider.reset()
@property
def parent_name(self):
"""Return parent name."""
return self.declarative_parent.__name__
def resolve_provider_name(self, provider):
"""Try to resolve provider name."""
# TODO: add tests

File diff suppressed because it is too large Load Diff

View File

@ -50,6 +50,7 @@ cdef class ExternalDependency(Dependency):
cdef class DependenciesContainer(Object):
cdef dict __providers
cdef object __parent
cpdef object _override_providers(self, object container)

View File

@ -120,6 +120,12 @@ class DependenciesContainer(Object):
def __getattr__(self, name: str) -> Provider: ...
@property
def providers(self) -> _Dict[str, Provider]: ...
def resolve_provider_name(self, provider: Provider) -> str: ...
@property
def parent_name(self) -> str: ...
@property
def parent(self) -> ProviderParent: ...
def set_parent(self, parent: ProviderParent) -> None: ...
class Callable(Provider[T]):

View File

@ -751,12 +751,18 @@ cdef class Dependency(Provider):
raise Error('{0} is not an instance of {1}'.format(instance, self.instance_of))
def _raise_undefined_error(self):
error_message = 'Dependency is not defined'
if is_container_instance(self.parent) and self.parent.declarative_parent is not None:
name_in_container = self.parent.resolve_provider_name(self)
name = f'{self.parent.declarative_parent.__name__}.{name_in_container}'
raise Error(f'Dependency "{name}" is not defined')
parent_name = self.parent.parent_name
error_message = f'Dependency "{parent_name}.{name_in_container}" is not defined'
elif isinstance(self.parent, DependenciesContainer):
name_in_container = self.parent.resolve_provider_name(self)
parent_name = self.parent.parent_name
error_message = f'Dependency "{parent_name}.{name_in_container}" is not defined'
raise Error('Dependency is not defined')
raise Error(error_message)
cdef class ExternalDependency(Dependency):
@ -824,6 +830,13 @@ cdef class DependenciesContainer(Object):
def __init__(self, **dependencies):
"""Initializer."""
self.__providers = dependencies
for provider in dependencies.items():
if isinstance(provider, (Dependency, DependenciesContainer)):
provider.set_parent(self)
self.__parent = None
super(DependenciesContainer, self).__init__(None)
def __deepcopy__(self, memo):
@ -835,9 +848,19 @@ cdef class DependenciesContainer(Object):
return copied
copied = self.__class__()
memo[id(self)] = copied
copied.__provides = deepcopy(self.__provides, memo)
copied.__providers = deepcopy(self.__providers, memo)
# TODO: remove duplication
copied_parent = (
deepcopy(self.__parent, memo)
if is_provider(self.parent) or is_container_instance(self.parent)
else self.parent
)
copied.set_parent(copied_parent)
self._copy_overridings(copied, memo)
return copied
@ -853,6 +876,8 @@ cdef class DependenciesContainer(Object):
provider = self.__providers.get(name)
if not provider:
provider = Dependency()
provider.set_parent(self)
self.__providers[name] = provider
container = self.__call__()
@ -912,6 +937,29 @@ cdef class DependenciesContainer(Object):
yield from self.providers.values()
yield from super().related
def resolve_provider_name(self, provider):
"""Try to resolve provider name."""
# TODO: add tests
for provider_name, container_provider in self.providers.items():
if container_provider is provider:
return provider_name
else:
raise Error(f'Can not resolve name for provider "{provider}"')
@property
def parent_name(self):
"""Return parent name."""
return f'{self.parent.parent_name}.{self.parent.resolve_provider_name(self)}'
@property
def parent(self):
"""Return parent."""
return self.__parent
def set_parent(self, parent):
"""Set parent."""
self.__parent = parent
cpdef object _override_providers(self, object container):
"""Override providers with providers from provided container."""
for name, dependency_provider in container.providers.items():