Fixed config type
This commit is contained in:
parent
315b8e631a
commit
8dee4d8f70
@ -15,7 +15,7 @@ __title__ = "cpl_core"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -23,4 +23,4 @@ from collections import namedtuple
|
|||||||
# imports:
|
# imports:
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.application"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -29,4 +29,4 @@ from .startup_abc import StartupABC
|
|||||||
from .startup_extension_abc import StartupExtensionABC
|
from .startup_extension_abc import StartupExtensionABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.configuration"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC
|
|||||||
from .variable_argument import VariableArgument
|
from .variable_argument import VariableArgument
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -124,7 +124,7 @@ class ConfigurationABC(ABC):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def get_configuration(self, search_type: T) -> Optional[T]:
|
def get_configuration(self, search_type: Type[T]) -> Optional[T]:
|
||||||
r"""Returns value from configuration by given type
|
r"""Returns value from configuration by given type
|
||||||
|
|
||||||
Parameter:
|
Parameter:
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.console"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum
|
|||||||
from .spinner_thread import SpinnerThread
|
from .spinner_thread import SpinnerThread
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
"Version": {
|
"Version": {
|
||||||
"Major": "2023",
|
"Major": "2023",
|
||||||
"Minor": "4",
|
"Minor": "4",
|
||||||
"Micro": "0"
|
"Micro": "0.post1"
|
||||||
},
|
},
|
||||||
"Author": "Sven Heidemann",
|
"Author": "Sven Heidemann",
|
||||||
"AuthorEmail": "sven.heidemann@sh-edraft.de",
|
"AuthorEmail": "sven.heidemann@sh-edraft.de",
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.database"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings
|
|||||||
from .table_abc import TableABC
|
from .table_abc import TableABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.database.connection"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection
|
|||||||
from .database_connection_abc import DatabaseConnectionABC
|
from .database_connection_abc import DatabaseConnectionABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.database.context"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -25,4 +25,4 @@ from .database_context import DatabaseContext
|
|||||||
from .database_context_abc import DatabaseContextABC
|
from .database_context_abc import DatabaseContextABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.dependency_injection"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -31,4 +31,4 @@ from .service_provider import ServiceProvider
|
|||||||
from .service_provider_abc import ServiceProviderABC
|
from .service_provider_abc import ServiceProviderABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.environment"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum
|
|||||||
from .application_environment import ApplicationEnvironment
|
from .application_environment import ApplicationEnvironment
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.logging"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings
|
|||||||
from .logging_settings_name_enum import LoggingSettingsNameEnum
|
from .logging_settings_name_enum import LoggingSettingsNameEnum
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.mailing"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -28,4 +28,4 @@ from .email_client_settings import EMailClientSettings
|
|||||||
from .email_client_settings_name_enum import EMailClientSettingsNameEnum
|
from .email_client_settings_name_enum import EMailClientSettingsNameEnum
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.pipes"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -26,4 +26,4 @@ from .ip_address_pipe import IPAddressPipe
|
|||||||
from .pipe_abc import PipeABC
|
from .pipe_abc import PipeABC
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.time"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -25,4 +25,4 @@ from .time_format_settings import TimeFormatSettings
|
|||||||
from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
|
from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -15,7 +15,7 @@ __title__ = "cpl_core.utils"
|
|||||||
__author__ = "Sven Heidemann"
|
__author__ = "Sven Heidemann"
|
||||||
__license__ = "MIT"
|
__license__ = "MIT"
|
||||||
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
|
||||||
__version__ = "2023.4.0"
|
__version__ = "2023.4.0.post1"
|
||||||
|
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
@ -26,4 +26,4 @@ from .string import String
|
|||||||
from .pip import Pip
|
from .pip import Pip
|
||||||
|
|
||||||
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
VersionInfo = namedtuple("VersionInfo", "major minor micro")
|
||||||
version_info = VersionInfo(major="2023", minor="4", micro="0")
|
version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
|
||||||
|
@ -8,6 +8,7 @@ from cpl_core.dependency_injection import ServiceProviderABC
|
|||||||
from cpl_core.logging import LoggerABC
|
from cpl_core.logging import LoggerABC
|
||||||
from cpl_core.mailing import EMailClientABC, EMail
|
from cpl_core.mailing import EMailClientABC, EMail
|
||||||
from cpl_core.pipes import IPAddressPipe
|
from cpl_core.pipes import IPAddressPipe
|
||||||
|
from general.test_settings import TestSettings
|
||||||
from test_service import TestService
|
from test_service import TestService
|
||||||
|
|
||||||
|
|
||||||
@ -57,4 +58,13 @@ class Application(ApplicationABC):
|
|||||||
Console.write_line("scope", scope)
|
Console.write_line("scope", scope)
|
||||||
with self._services.create_scope() as s:
|
with self._services.create_scope() as s:
|
||||||
Console.write_line("with scope", s)
|
Console.write_line("with scope", s)
|
||||||
|
|
||||||
|
test_settings = self._configuration.get_configuration(TestSettings)
|
||||||
|
Console.write_line(test_settings.value)
|
||||||
|
Console.write_line("reload config")
|
||||||
|
self._configuration.add_json_file(f"appsettings.json")
|
||||||
|
self._configuration.add_json_file(f"appsettings.{self._environment.environment_name}.json")
|
||||||
|
self._configuration.add_json_file(f"appsettings.{self._environment.host_name}.json", optional=True)
|
||||||
|
test_settings1 = self._configuration.get_configuration(TestSettings)
|
||||||
|
Console.write_line(test_settings1.value)
|
||||||
# self.test_send_mail()
|
# self.test_send_mail()
|
||||||
|
@ -29,5 +29,9 @@
|
|||||||
"UseUnicode": "true",
|
"UseUnicode": "true",
|
||||||
"Buffered": "true",
|
"Buffered": "true",
|
||||||
"AuthPlugin": "mysql_native_password"
|
"AuthPlugin": "mysql_native_password"
|
||||||
|
},
|
||||||
|
|
||||||
|
"TestSettings": {
|
||||||
|
"Value": 20
|
||||||
}
|
}
|
||||||
}
|
}
|
6
tests/custom/general/src/general/test_settings.py
Normal file
6
tests/custom/general/src/general/test_settings.py
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
from cpl_core.configuration import ConfigurationModelABC
|
||||||
|
|
||||||
|
|
||||||
|
class TestSettings(ConfigurationModelABC):
|
||||||
|
def __init__(self, value: int = None):
|
||||||
|
self.value = value
|
Loading…
Reference in New Issue
Block a user