Improved project structure

src/sh_edraft/coding/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_edraft.source_code 
+sh_edraft.coding
 ~~~~~~~~~~~~~~~~~~~
 
 
@@ -11,7 +11,7 @@ sh_edraft.source_code
 
 """
 
-__title__ = 'sh_edraft.source_code'
+__title__ = 'sh_edraft.coding'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

src/sh_edraft/coding/model/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_edraft.source_code.model 
+sh_edraft.coding.base
 ~~~~~~~~~~~~~~~~~~~
 
 
@@ -11,7 +11,7 @@ sh_edraft.source_code.model
 
 """
 
-__title__ = 'sh_edraft.source_code.model'
+__title__ = 'sh_edraft.coding.base'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

src/sh_edraft/coding/model/version.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
-from sh_edraft.source_code.model.version_enum import VersionEnum
+from sh_edraft.coding.model.version_enum import VersionEnum
-from sh_edraft.configuration.model.configuration_model_base import ConfigurationModelBase
+from sh_edraft.configuration.base.configuration_model_base import ConfigurationModelBase
 
 
 class Version(ConfigurationModelBase):

src/sh_edraft/configuration/__init__.py

@@ -20,7 +20,6 @@ __version__ = '2020.12.5'
 from collections import namedtuple
 
 # imports:
-from .application_host import ApplicationHost
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 version_info = VersionInfo(major=2020, minor=12, micro=5)

src/sh_edraft/configuration/base/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_edraft.configuration.model 
+sh_edraft.configuration.base
 ~~~~~~~~~~~~~~~~~~~
 
 
@@ -11,7 +11,7 @@ sh_edraft.configuration.model
 
 """
 
-__title__ = 'sh_edraft.configuration.model'
+__title__ = 'sh_edraft.configuration.base'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

src/sh_edraft/configuration/base/configuration_base.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 from collections import Callable
 
-from sh_edraft.configuration.model.configuration_model_base import ConfigurationModelBase
+from sh_edraft.configuration.base.configuration_model_base import ConfigurationModelBase
 from sh_edraft.service.base.service_base import ServiceBase
 
 
@@ -14,7 +14,7 @@ class ConfigurationBase(ServiceBase):
 
     @property
     @abstractmethod
-    def config(self): pass
+    def config(self) -> dict[type, object]: pass
 
     @abstractmethod
     def add_config_by_type(self, key_type: type, value: object): pass

src/sh_edraft/configuration/configuration.py

@@ -1,7 +1,7 @@
 from collections import Callable
 
-from sh_edraft.configuration.model.configuration_model_base import ConfigurationModelBase
+from sh_edraft.configuration.base.configuration_model_base import ConfigurationModelBase
-from sh_edraft.configuration.model.configuration_base import ConfigurationBase
+from sh_edraft.configuration.base.configuration_base import ConfigurationBase
 
 
 class Configuration(ConfigurationBase):

src/sh_edraft/configuration/model/application_host_base.py

@@ -1,8 +0,0 @@
-from abc import ABC, abstractmethod
-from datetime import datetime
-
-
-class ApplicationHostBase(ABC):
-
-    @abstractmethod
-    def __init__(self): pass

src/sh_edraft/hosting/__init__.py

@@ -0,0 +1,3 @@
+# imports:
+
+from .application_host import ApplicationHost

src/sh_edraft/hosting/application_host.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from sh_edraft.configuration.model.application_host_base import ApplicationHostBase
+from sh_edraft.hosting.base.application_host_base import ApplicationHostBase
 from sh_edraft.service.service_provider import ServiceProvider
 
 
@@ -9,8 +9,8 @@ class ApplicationHost(ApplicationHostBase):
     def __init__(self):
         ApplicationHostBase.__init__(self)
         self._services = ServiceProvider()
-        self._end_time: datetime = datetime.now()
         self._start_time: datetime = datetime.now()
+        self._end_time: datetime = datetime.now()
 
     @property
     def services(self):
@@ -21,7 +21,7 @@ class ApplicationHost(ApplicationHostBase):
         return self._end_time
 
     @end_time.setter
-    def end_time(self, end_time: datetime) -> None:
+    def end_time(self, end_time: datetime):
         self._end_time = end_time
 
     @property
@@ -29,7 +29,7 @@ class ApplicationHost(ApplicationHostBase):
         return self._start_time
 
     @start_time.setter
-    def start_time(self, start_time: datetime) -> None:
+    def start_time(self, start_time: datetime):
         self._start_time = start_time
 
     @property

src/sh_edraft/hosting/base/__init__.py

@@ -0,0 +1,2 @@
+# imports:
+from .application_host_base import ApplicationHostBase

src/sh_edraft/hosting/base/application_host_base.py

@@ -0,0 +1,22 @@
+from abc import ABC, abstractmethod
+from datetime import datetime
+
+
+class ApplicationHostBase(ABC):
+
+    @abstractmethod
+    def __init__(self): pass
+
+    @property
+    @abstractmethod
+    def start_time(self) -> datetime: pass
+
+    @start_time.setter
+    def start_time(self, start_time: datetime): pass
+
+    @property
+    @abstractmethod
+    def end_time(self): pass
+
+    @end_time.setter
+    def end_time(self, end_time: datetime): pass

src/sh_edraft/logging/base/logger_base.py

@@ -1,6 +1,6 @@
 from abc import abstractmethod
 
-from sh_edraft.configuration import ApplicationHost
+from sh_edraft.hosting.application_host import ApplicationHost
 from sh_edraft.logging.model.logging_settings import LoggingSettings
 from sh_edraft.service.base.service_base import ServiceBase
 from sh_edraft.time.model.time_format_settings import TimeFormatSettings

src/sh_edraft/logging/logger.py

@@ -4,7 +4,7 @@ import traceback
 from collections import Callable
 from string import Template
 
-from sh_edraft.configuration import ApplicationHost
+from sh_edraft.hosting.application_host import ApplicationHost
 from sh_edraft.logging.base.logger_base import LoggerBase
 from sh_edraft.logging.model import LoggingSettings
 from sh_edraft.logging.model.logging_level import LoggingLevel

src/sh_edraft/logging/model/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_edraft.logging.model 
+sh_edraft.logging.base
 ~~~~~~~~~~~~~~~~~~~
 
 
@@ -11,7 +11,7 @@ sh_edraft.logging.model
 
 """
 
-__title__ = 'sh_edraft.logging.model'
+__title__ = 'sh_edraft.logging.base'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

src/sh_edraft/logging/model/logging_settings.py

@@ -1,7 +1,7 @@
 import traceback
 from typing import Optional
 
-from sh_edraft.configuration.model.configuration_model_base import ConfigurationModelBase
+from sh_edraft.configuration.base.configuration_model_base import ConfigurationModelBase
 from sh_edraft.logging.model.logging_settings_name import LogSettingsName
 from sh_edraft.utils.console import Console
 from sh_edraft.logging.model.logging_level import LoggingLevel

src/sh_edraft/publishing/model/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_edraft.publishing.model
+sh_edraft.publishing.base
 ~~~~~~~~~~~~~~~~~~~
 
 
@@ -11,7 +11,7 @@ sh_edraft.publishing.model
 
 """
 
-__title__ = 'sh_edraft.publishing.model'
+__title__ = 'sh_edraft.publishing.base'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

src/sh_edraft/publishing/model/publish_settings_model.py

@@ -1,7 +1,7 @@
 import traceback
 from typing import Optional
 
-from sh_edraft.configuration.model import ConfigurationModelBase
+from sh_edraft.configuration.base.configuration_model_base import ConfigurationModelBase
 from sh_edraft.publishing.model import Template
 from sh_edraft.publishing.model.publish_settings_name import PublishSettingsName
 from sh_edraft.utils import Console

src/sh_edraft/publishing/model/template.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
-from sh_edraft.source_code.model.version import Version
+from sh_edraft.coding.model.version import Version
-from sh_edraft.configuration.model import ConfigurationModelBase
+from sh_edraft.configuration.base.configuration_model_base import ConfigurationModelBase
 from sh_edraft.publishing.model.template_enum import TemplateEnum
 
 

src/sh_edraft/service/model/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_edraft.service.model 
+sh_edraft.service.base
 ~~~~~~~~~~~~~~~~~~~
 
 
@@ -11,7 +11,7 @@ sh_edraft.service.model
 
 """
 
-__title__ = 'sh_edraft.service.model'
+__title__ = 'sh_edraft.service.base'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

src/sh_edraft/service/service_provider.py

@@ -3,11 +3,10 @@ from inspect import signature, Parameter
 from typing import Type
 
 from sh_edraft.configuration.configuration import Configuration
-from sh_edraft.configuration.model.application_host_base import ApplicationHostBase
+from sh_edraft.hosting.base.application_host_base import ApplicationHostBase
-from sh_edraft.configuration.model.configuration_model_base import ConfigurationModelBase
+from sh_edraft.configuration.base.configuration_model_base import ConfigurationModelBase
 from sh_edraft.service.base.service_provider_base import ServiceProviderBase
 from sh_edraft.service.base.service_base import ServiceBase
-from sh_edraft.service.model.provide_state import ProvideState
 
 
 class ServiceProvider(ServiceProviderBase):

src/sh_edraft/time/model/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-sh_edraft.time.model 
+sh_edraft.time.base
 ~~~~~~~~~~~~~~~~~~~
 
 
@@ -11,7 +11,7 @@ sh_edraft.time.model
 
 """
 
-__title__ = 'sh_edraft.time.model'
+__title__ = 'sh_edraft.time.base'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 sh-edraft.de'

src/sh_edraft/time/model/time_format_settings.py

@@ -1,7 +1,7 @@
 import traceback
 from typing import Optional
 
-from sh_edraft.configuration.model import ConfigurationModelBase
+from sh_edraft.configuration.base.configuration_model_base import ConfigurationModelBase
 from sh_edraft.time.model.time_format_settings_names import TimeFormatSettingsNames
 from sh_edraft.utils.console import Console
 

src/tests/logging/logger.py

@@ -4,9 +4,8 @@ import unittest
 from datetime import datetime
 from string import Template
 
-from sh_edraft.configuration import ApplicationHost
+from sh_edraft.hosting import ApplicationHost
 from sh_edraft.logging import Logger
-from sh_edraft.logging.base import LoggerBase
 from sh_edraft.logging.model import LoggingSettings
 from sh_edraft.time.model import TimeFormatSettings
 

src/tests/publisher.py

@@ -3,7 +3,7 @@ import os
 from sh_edraft.logging.base.logger_base import LoggerBase
 from sh_edraft.publishing.base import PublisherBase
 from sh_edraft.service.base import ServiceProviderBase
-from sh_edraft.source_code.model import Version
+from sh_edraft.coding.model import Version
 from sh_edraft.publishing import Publisher
 from sh_edraft.publishing.model import Template
 

src/tests/publishing/publisher.py

@@ -2,7 +2,7 @@ import os
 import shutil
 import unittest
 
-from sh_edraft.configuration import ApplicationHost
+from sh_edraft.hosting import ApplicationHost
 from sh_edraft.logging import Logger
 from sh_edraft.logging.base import LoggerBase
 from sh_edraft.logging.model import LoggingSettings
@@ -10,7 +10,7 @@ from sh_edraft.publishing import Publisher
 from sh_edraft.publishing.base import PublisherBase
 from sh_edraft.publishing.model import Template
 from sh_edraft.publishing.model.publish_settings_model import PublishSettingsModel
-from sh_edraft.source_code.model import Version
+from sh_edraft.coding.model import Version
 from sh_edraft.time.model import TimeFormatSettings
 
 

src/tests/service_providing/service_provider.py

@@ -1,7 +1,6 @@
 import unittest
 
-from sh_edraft.configuration import ApplicationHost
+from sh_edraft.hosting import ApplicationHost
-from sh_edraft.configuration.model.application_host_base import ApplicationHostBase
 from sh_edraft.logging import Logger
 from sh_edraft.logging.base import LoggerBase
 from sh_edraft.logging.model import LoggingSettings