Added logic to handle async applicationBase
This commit is contained in:
parent
98e343a108
commit
4b829cc484
@ -35,6 +35,28 @@ class ApplicationABC(ABC):
|
|||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
Console.close()
|
Console.close()
|
||||||
|
|
||||||
|
def run(self):
|
||||||
|
r"""Entry point
|
||||||
|
|
||||||
|
Called by custom Application.main
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
self.configure()
|
||||||
|
self.main()
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
Console.close()
|
||||||
|
|
||||||
|
async def run_async(self):
|
||||||
|
r"""Entry point
|
||||||
|
|
||||||
|
Called by custom Application.main
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
await self.configure()
|
||||||
|
await self.main()
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
Console.close()
|
||||||
|
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def configure(self):
|
def configure(self):
|
||||||
r"""Configure the application
|
r"""Configure the application
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
import types
|
|
||||||
from typing import Type, Optional, Callable
|
from typing import Type, Optional, Callable
|
||||||
|
|
||||||
from cpl_core.application.application_abc import ApplicationABC
|
from cpl_core.application.application_abc import ApplicationABC
|
||||||
@ -6,7 +5,6 @@ from cpl_core.application.application_builder_abc import ApplicationBuilderABC
|
|||||||
from cpl_core.application.application_extension_abc import ApplicationExtensionABC
|
from cpl_core.application.application_extension_abc import ApplicationExtensionABC
|
||||||
from cpl_core.application.startup_abc import StartupABC
|
from cpl_core.application.startup_abc import StartupABC
|
||||||
from cpl_core.configuration.configuration import Configuration
|
from cpl_core.configuration.configuration import Configuration
|
||||||
from cpl_core.console import Console
|
|
||||||
from cpl_core.dependency_injection.service_collection import ServiceCollection
|
from cpl_core.dependency_injection.service_collection import ServiceCollection
|
||||||
|
|
||||||
|
|
||||||
@ -50,3 +48,17 @@ class ApplicationBuilder(ApplicationBuilderABC):
|
|||||||
extension.run(config, services)
|
extension.run(config, services)
|
||||||
|
|
||||||
return self._app(config, services)
|
return self._app(config, services)
|
||||||
|
|
||||||
|
async def build_async(self) -> ApplicationABC:
|
||||||
|
if self._startup is not None:
|
||||||
|
await self._startup.configure_configuration(self._configuration, self._environment)
|
||||||
|
await self._startup.configure_services(self._services, self._environment)
|
||||||
|
|
||||||
|
config = self._configuration
|
||||||
|
services = self._services.build_service_provider()
|
||||||
|
|
||||||
|
for ex in self._extensions:
|
||||||
|
extension = ex()
|
||||||
|
await extension.run(config, services)
|
||||||
|
|
||||||
|
return self._app(config, services)
|
||||||
|
@ -23,6 +23,17 @@ class ApplicationBuilderABC(ABC):
|
|||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
async def use_startup(self, startup: Type[StartupABC]):
|
||||||
|
r"""Sets the custom startup class to use async
|
||||||
|
|
||||||
|
Parameter
|
||||||
|
---------
|
||||||
|
startup: Type[:class:`cpl_core.application.startup_abc.StartupABC`]
|
||||||
|
Startup class to use
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def build(self) -> ApplicationABC:
|
def build(self) -> ApplicationABC:
|
||||||
r"""Creates custom application object
|
r"""Creates custom application object
|
||||||
@ -32,3 +43,13 @@ class ApplicationBuilderABC(ABC):
|
|||||||
Object of :class:`cpl_core.application.application_abc.ApplicationABC`
|
Object of :class:`cpl_core.application.application_abc.ApplicationABC`
|
||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
async def build_async(self) -> ApplicationABC:
|
||||||
|
r"""Creates custom application object async
|
||||||
|
|
||||||
|
Returns
|
||||||
|
-------
|
||||||
|
Object of :class:`cpl_core.application.application_abc.ApplicationABC`
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
@ -11,3 +11,6 @@ class ApplicationExtensionABC(ABC):
|
|||||||
|
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def run(self, config: ConfigurationABC, services: ServiceProviderABC): pass
|
def run(self, config: ConfigurationABC, services: ServiceProviderABC): pass
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
async def run(self, config: ConfigurationABC, services: ServiceProviderABC): pass
|
||||||
|
0
src/tests/custom/async/LICENSE
Normal file
0
src/tests/custom/async/LICENSE
Normal file
0
src/tests/custom/async/README.md
Normal file
0
src/tests/custom/async/README.md
Normal file
15
src/tests/custom/async/appsettings.json
Normal file
15
src/tests/custom/async/appsettings.json
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"TimeFormatSettings": {
|
||||||
|
"DateFormat": "%Y-%m-%d",
|
||||||
|
"TimeFormat": "%H:%M:%S",
|
||||||
|
"DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
|
||||||
|
"DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
|
||||||
|
},
|
||||||
|
|
||||||
|
"LoggingSettings": {
|
||||||
|
"Path": "logs/",
|
||||||
|
"Filename": "log_$start_time.log",
|
||||||
|
"ConsoleLogLevel": "ERROR",
|
||||||
|
"FileLogLevel": "WARN"
|
||||||
|
}
|
||||||
|
}
|
9
src/tests/custom/async/cpl-workspace.json
Normal file
9
src/tests/custom/async/cpl-workspace.json
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"WorkspaceSettings": {
|
||||||
|
"DefaultProject": "async",
|
||||||
|
"Projects": {
|
||||||
|
"async": "src/async/async.json"
|
||||||
|
},
|
||||||
|
"Scripts": {}
|
||||||
|
}
|
||||||
|
}
|
1
src/tests/custom/async/src/async/__init__.py
Normal file
1
src/tests/custom/async/src/async/__init__.py
Normal file
@ -0,0 +1 @@
|
|||||||
|
# imports:
|
16
src/tests/custom/async/src/async/application.py
Normal file
16
src/tests/custom/async/src/async/application.py
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
from cpl_core.application import ApplicationABC
|
||||||
|
from cpl_core.configuration import ConfigurationABC
|
||||||
|
from cpl_core.console import Console
|
||||||
|
from cpl_core.dependency_injection import ServiceProviderABC
|
||||||
|
|
||||||
|
|
||||||
|
class Application(ApplicationABC):
|
||||||
|
|
||||||
|
def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
|
||||||
|
ApplicationABC.__init__(self, config, services)
|
||||||
|
|
||||||
|
async def configure(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
async def main(self):
|
||||||
|
Console.write_line('Hello World')
|
43
src/tests/custom/async/src/async/async.json
Normal file
43
src/tests/custom/async/src/async/async.json
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
{
|
||||||
|
"ProjectSettings": {
|
||||||
|
"Name": "async",
|
||||||
|
"Version": {
|
||||||
|
"Major": "0",
|
||||||
|
"Minor": "0",
|
||||||
|
"Micro": "0"
|
||||||
|
},
|
||||||
|
"Author": "",
|
||||||
|
"AuthorEmail": "",
|
||||||
|
"Description": "",
|
||||||
|
"LongDescription": "",
|
||||||
|
"URL": "",
|
||||||
|
"CopyrightDate": "",
|
||||||
|
"CopyrightName": "",
|
||||||
|
"LicenseName": "",
|
||||||
|
"LicenseDescription": "",
|
||||||
|
"Dependencies": [
|
||||||
|
"sh_cpl>=2021.10.0.post1"
|
||||||
|
],
|
||||||
|
"PythonVersion": ">=3.9.2",
|
||||||
|
"PythonPath": {
|
||||||
|
"linux": ""
|
||||||
|
},
|
||||||
|
"Classifiers": []
|
||||||
|
},
|
||||||
|
"BuildSettings": {
|
||||||
|
"ProjectType": "console",
|
||||||
|
"SourcePath": "",
|
||||||
|
"OutputPath": "../../dist",
|
||||||
|
"Main": "async.main",
|
||||||
|
"EntryPoint": "async",
|
||||||
|
"IncludePackageData": false,
|
||||||
|
"Included": [],
|
||||||
|
"Excluded": [
|
||||||
|
"*/__pycache__",
|
||||||
|
"*/logs",
|
||||||
|
"*/tests"
|
||||||
|
],
|
||||||
|
"PackageData": {},
|
||||||
|
"ProjectReferences": []
|
||||||
|
}
|
||||||
|
}
|
17
src/tests/custom/async/src/async/main.py
Normal file
17
src/tests/custom/async/src/async/main.py
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
import asyncio
|
||||||
|
from cpl_core.application import ApplicationBuilder
|
||||||
|
|
||||||
|
from application import Application
|
||||||
|
from startup import Startup
|
||||||
|
|
||||||
|
|
||||||
|
async def main():
|
||||||
|
app_builder = ApplicationBuilder(Application)
|
||||||
|
app_builder.use_startup(Startup)
|
||||||
|
app = await app_builder.build_async()
|
||||||
|
await app.run_async()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
loop = asyncio.get_event_loop()
|
||||||
|
loop.run_until_complete(main())
|
16
src/tests/custom/async/src/async/startup.py
Normal file
16
src/tests/custom/async/src/async/startup.py
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
from cpl_core.application import StartupABC
|
||||||
|
from cpl_core.configuration import ConfigurationABC
|
||||||
|
from cpl_core.dependency_injection import ServiceProviderABC, ServiceCollectionABC
|
||||||
|
from cpl_core.environment import ApplicationEnvironment
|
||||||
|
|
||||||
|
|
||||||
|
class Startup(StartupABC):
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
StartupABC.__init__(self)
|
||||||
|
|
||||||
|
async def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
|
||||||
|
return configuration
|
||||||
|
|
||||||
|
async def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
|
||||||
|
return services.build_service_provider()
|
1
src/tests/custom/async/src/tests/__init__.py
Normal file
1
src/tests/custom/async/src/tests/__init__.py
Normal file
@ -0,0 +1 @@
|
|||||||
|
# imports:
|
@ -30,9 +30,9 @@ class Application(ApplicationABC):
|
|||||||
b = t.service_provider
|
b = t.service_provider
|
||||||
scope1.dispose()
|
scope1.dispose()
|
||||||
|
|
||||||
Console.write_line('Disposed:')
|
#Console.write_line('Disposed:')
|
||||||
ts1: TestService = scope1.service_provider.get_service(TestService)
|
#ts1: TestService = scope1.service_provider.get_service(TestService)
|
||||||
ts1.run()
|
#ts1.run()
|
||||||
|
|
||||||
Console.write_line('Scope2')
|
Console.write_line('Scope2')
|
||||||
scope2: Scope = self._services.create_scope()
|
scope2: Scope = self._services.create_scope()
|
||||||
|
Loading…
Reference in New Issue
Block a user