Added logic to load config from json & improved hosting and service providing

src/sh_edraft/hosting/__init__.py

@@ -1,4 +1,4 @@
 # imports:
 
 from .application_host import ApplicationHost
-from .hosting_environment import HostingEnvironment
+from .application_runtime import ApplicationRuntime

src/sh_edraft/hosting/application_host.py

@@ -4,8 +4,6 @@ from datetime import datetime
 from sh_edraft.configuration.configuration import Configuration
 from sh_edraft.configuration.base.configuration_base import ConfigurationBase
 from sh_edraft.hosting.base.application_runtime_base import ApplicationRuntimeBase
-from sh_edraft.hosting.base.environment_base import EnvironmentBase
-from sh_edraft.hosting.hosting_environment import HostingEnvironment
 from sh_edraft.hosting.application_runtime import ApplicationRuntime
 from sh_edraft.hosting.base.application_host_base import ApplicationHostBase
 from sh_edraft.service.service_provider import ServiceProvider
@@ -14,31 +12,19 @@ from sh_edraft.service.base.service_provider_base import ServiceProviderBase
 
 class ApplicationHost(ApplicationHostBase):
 
-    def __init__(self, name: str):
+    def __init__(self):
         ApplicationHostBase.__init__(self)
-        self._name: str = name
-        self._args: list[str] = sys.argv
-
         self._config = Configuration()
-        self._environment = HostingEnvironment()
-        self._app_runtime = ApplicationRuntime(self._config, self._environment)
+        self._app_runtime = ApplicationRuntime(self._config)
         self._services = ServiceProvider(self._app_runtime)
 
         self._start_time: datetime = datetime.now()
         self._end_time: datetime = datetime.now()
 
-    @property
-    def name(self) -> str:
-        return self._name
-
     @property
     def configuration(self) -> ConfigurationBase:
         return self._config
 
-    @property
-    def environment(self) -> EnvironmentBase:
-        return self._environment
-
     @property
     def application_runtime(self) -> ApplicationRuntimeBase:
         return self._app_runtime

src/sh_edraft/hosting/application_runtime.py

@@ -1,24 +1,18 @@
 from datetime import datetime
 
 from sh_edraft.configuration.base.configuration_base import ConfigurationBase
-from sh_edraft.hosting.base.environment_base import EnvironmentBase
 from sh_edraft.hosting.base.application_runtime_base import ApplicationRuntimeBase
 
 
 class ApplicationRuntime(ApplicationRuntimeBase):
 
-    def __init__(self, config: ConfigurationBase, environment: EnvironmentBase):
+    def __init__(self, config: ConfigurationBase):
         ApplicationRuntimeBase.__init__(self)
 
-        self._environment = environment
         self._app_configuration = config
         self._start_time: datetime = datetime.now()
         self._end_time: datetime = datetime.now()
 
-    @property
-    def environment(self) -> EnvironmentBase:
-        return self._environment
-
     @property
     def configuration(self) -> ConfigurationBase:
         return self._app_configuration

src/sh_edraft/hosting/base/__init__.py

@@ -1,4 +1,4 @@
 # imports:
-from .application_host_base import ApplicationHostBase
-from .environment_base import EnvironmentBase
 from .application_base import ApplicationBase
+from .application_host_base import ApplicationHostBase
+from .application_runtime_base import ApplicationRuntimeBase

src/sh_edraft/hosting/base/application_host_base.py

@@ -2,7 +2,6 @@ from abc import ABC, abstractmethod
 
 from sh_edraft.configuration.base.configuration_base import ConfigurationBase
 from sh_edraft.hosting.base.application_runtime_base import ApplicationRuntimeBase
-from sh_edraft.hosting.base.environment_base import EnvironmentBase
 from sh_edraft.service.base.service_provider_base import ServiceProviderBase
 
 
@@ -10,19 +9,11 @@ class ApplicationHostBase(ABC):
 
     @abstractmethod
     def __init__(self): pass
-    
-    @property
-    @abstractmethod
-    def name(self) -> str: pass
 
     @property
     @abstractmethod
     def configuration(self) -> ConfigurationBase: pass
 
-    @property
-    @abstractmethod
-    def environment(self) -> EnvironmentBase: pass
-
     @property
     @abstractmethod
     def application_runtime(self) -> ApplicationRuntimeBase: pass

src/sh_edraft/hosting/base/application_runtime_base.py

@@ -2,7 +2,6 @@ from abc import ABC, abstractmethod
 from datetime import datetime
 
 from sh_edraft.configuration.base.configuration_base import ConfigurationBase
-from sh_edraft.hosting.base.environment_base import EnvironmentBase
 
 
 class ApplicationRuntimeBase(ABC):
@@ -10,10 +9,6 @@ class ApplicationRuntimeBase(ABC):
     @abstractmethod
     def __init__(self): pass
 
-    @property
-    @abstractmethod
-    def environment(self) -> EnvironmentBase: pass
-
     @property
     @abstractmethod
     def configuration(self) -> ConfigurationBase: pass

src/sh_edraft/hosting/base/environment_base.py

@@ -1,25 +0,0 @@
-from abc import ABC, abstractmethod
-
-from sh_edraft.hosting.model.environment_name import EnvironmentName
-
-
-class EnvironmentBase(ABC):
-
-    @abstractmethod
-    def __init__(self): pass
-    
-    @property
-    @abstractmethod
-    def name(self) -> EnvironmentName: pass
-    
-    @name.setter
-    @abstractmethod
-    def name(self, name: EnvironmentName): pass
-
-    @property
-    @abstractmethod
-    def content_root_path(self) -> str: pass
-
-    @content_root_path.setter
-    @abstractmethod
-    def content_root_path(self, content_root_path: str): pass

src/sh_edraft/hosting/hosting_environment.py

@@ -1,29 +0,0 @@
-from typing import Optional
-
-from sh_edraft.hosting.base.environment_base import EnvironmentBase
-from sh_edraft.hosting.model.environment_name import EnvironmentName
-
-
-class HostingEnvironment(EnvironmentBase):
-
-    def __init__(self, name: EnvironmentName = EnvironmentName.production, crp: str = './'):
-        EnvironmentBase.__init__(self)
-
-        self._name: Optional[EnvironmentName] = name
-        self._content_root_path: Optional[str] = crp
-
-    @property
-    def name(self) -> EnvironmentName:
-        return self._name
-
-    @name.setter
-    def name(self, name: EnvironmentName):
-        self._name = name
-
-    @property
-    def content_root_path(self) -> str:
-        return self._content_root_path
-
-    @content_root_path.setter
-    def content_root_path(self, content_root_path: str):
-        self._content_root_path = content_root_path

src/sh_edraft/hosting/model/__init__.py

@@ -1,2 +1 @@
 # imports:
-from .environment_name import EnvironmentName

src/sh_edraft/hosting/model/environment_name.py

@@ -1,9 +0,0 @@
-from enum import Enum
-
-
-class EnvironmentName(Enum):
-
-    production = 'production'
-    staging = 'staging'
-    testing = 'testing'
-    development = 'development'