sh-edraft.de/sh_cpl
1
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

Merge branch '2022.12' into #139

Browse Source
This commit is contained in:
Sven Heidemann 2022-12-07 15:41:56 +01:00
commit db7a0786a9
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpl_core/configuration/configuration.py
View File

@ -22,6 +22,7 @@ from cpl_core.dependency_injection.service_provider_abc import ServiceProviderAB
from cpl_core.environment.application_environment import ApplicationEnvironment from cpl_core.environment.application_environment import ApplicationEnvironment
from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
from cpl_core.environment.environment_name_enum import EnvironmentNameEnum from cpl_core.environment.environment_name_enum import EnvironmentNameEnum
from cpl_core.typing import T
class Configuration(ConfigurationABC): class Configuration(ConfigurationABC):
@ -267,7 +268,7 @@ class Configuration(ConfigurationABC):
configuration.from_dict(value) configuration.from_dict(value)
self.add_configuration(sub, configuration) self.add_configuration(sub, configuration)
def add_configuration(self, key_type: Union[str, type], value: Union[str, ConfigurationModelABC]): def add_configuration(self, key_type: Union[str, type], value: any):
self._config[key_type] = value self._config[key_type] = value
def create_console_argument(self, arg_type: ArgumentTypeEnum, token: str, name: str, aliases: list[str], def create_console_argument(self, arg_type: ArgumentTypeEnum, token: str, name: str, aliases: list[str],
@ -280,8 +281,7 @@ class Configuration(ConfigurationABC):
for arg in self._argument_types: for arg in self._argument_types:
call(arg) call(arg)
def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> \ def get_configuration(self, search_type: Type[T]) -> Optional[T]:
Optional[Union[str, ConfigurationModelABC]]:
if type(search_type) is str: if type(search_type) is str:
if search_type == ConfigurationVariableNameEnum.environment.value: if search_type == ConfigurationVariableNameEnum.environment.value:
return self._application_environment.environment_name return self._application_environment.environment_name

8
src/cpl_core/configuration/configuration_abc.py
View File

@ -6,6 +6,7 @@ from cpl_core.configuration.configuration_model_abc import ConfigurationModelABC
from cpl_core.configuration.argument_abc import ArgumentABC from cpl_core.configuration.argument_abc import ArgumentABC
from cpl_core.configuration.argument_type_enum import ArgumentTypeEnum from cpl_core.configuration.argument_type_enum import ArgumentTypeEnum
from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
from cpl_core.typing import T
class ConfigurationABC(ABC): class ConfigurationABC(ABC):
@ -75,14 +76,14 @@ class ConfigurationABC(ABC):
pass pass
@abstractmethod @abstractmethod
def add_configuration(self, key_type: Union[str, type], value: Union[str, ConfigurationModelABC]): def add_configuration(self, key_type: Union[str, type], value: any):
r"""Add configuration object r"""Add configuration object
Parameter Parameter
--------- ---------
key_type: Union[:class:`str`, :class:`type`] key_type: Union[:class:`str`, :class:`type`]
Type of the value Type of the value
value: Union[:class:`str`, :class:`cpl_core.configuration.configuration_model_abc.ConfigurationModelABC`] value: any
Object of the value Object of the value
""" """
pass pass
@ -125,8 +126,7 @@ class ConfigurationABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> Union[ def get_configuration(self, search_type: Union[str, Type[ConfigurationModelABC]]) -> Optional[T]:
str, ConfigurationModelABC]:
r"""Returns value from configuration by given type r"""Returns value from configuration by given type
Parameter Parameter

3
src/cpl_core/typing.py Normal file
View File

@ -0,0 +1,3 @@
from typing import TypeVar
T = TypeVar('T')