Compare commits

...

22 Commits

Author SHA1 Message Date
c1e65bf0dc Set correct version 2024-07-25 17:56:25 +02:00
688381b106 Merge pull request 'py12' (#177) from py12 into master
Reviewed-on: #177
2024-07-25 17:55:07 +02:00
c3e3367264 Removed bundle project 2024-07-25 17:54:24 +02:00
c3d51e29fc Set version 2024-07-25 17:34:24 +02:00
cae2e6d92e Hopefully fixed db errors 2024-01-13 14:26:36 +01:00
347418bdc5 Added ssl_disabled option 2023-12-06 17:56:13 +01:00
153fc8922e Fixed dc collection 2023-10-13 15:20:26 +02:00
cdbfaeb013 Merge pull request 'Updated deps' (#176) from 2023.10 into master
Reviewed-on: #176
2023-10-13 15:01:06 +02:00
4062a6ebe4 Updated deps 2023-10-13 14:57:46 +02:00
46ef6b3938 Merge pull request '2023.10' (#175) from 2023.10 into master
Reviewed-on: #175
2023-10-13 14:48:39 +02:00
c1b9c0fb4a Added R as return type 2023-10-12 21:20:36 +02:00
8ede2998fe Fixed configuration typing 2023-10-12 21:14:49 +02:00
41f974fe6e Fixed cpl-discord deps 2023-10-12 21:06:10 +02:00
e7af5ce322 Fixed cpl-query typing 2023-10-12 21:05:38 +02:00
7881294554 Fixed types 2023-10-12 20:55:24 +02:00
b3fd122fcd Build cpl-discord new version 2023-10-12 20:42:24 +02:00
1dd48899d7 Improved cpl-discords service loading for commands and events 2023-10-12 20:41:34 +02:00
f357e97ce5 Build and formatted new version 2023-10-12 20:16:16 +02:00
2d8ecd424a Switched mysql package 2023-10-12 20:11:14 +02:00
affbbc822d Removed handled vars from values in JP 2023-07-19 11:34:19 +02:00
43ea732c5f Fixed config loading 2023-07-19 11:28:33 +02:00
708918464f Improved config loading 2023-07-19 11:16:04 +02:00
79 changed files with 347 additions and 346 deletions

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli" __title__ = "cpl_cli"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
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.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli" __title__ = "cpl_cli"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -28,4 +28,4 @@ from .main import main
from .startup import Startup from .startup import Startup
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli._templates" __title__ = "cpl_cli._templates"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
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.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli._templates.build" __title__ = "cpl_cli._templates.build"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
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.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -19,19 +19,19 @@ class InitTemplate:
\"\"\" \"\"\"
__title__ = '$Title' __title__ = "$Title"
__author__ = '$Author' __author__ = "$Author"
__license__ = '$LicenseName' __license__ = "$LicenseName"
__copyright__ = 'Copyright (c) $CopyrightDate $CopyrightName' __copyright__ = "Copyright (c) $CopyrightDate $CopyrightName"
__version__ = '$Version' __version__ = "$Version"
from collections import namedtuple from collections import namedtuple
$Imports $Imports
VersionInfo = namedtuple('VersionInfo', 'major minor micro') VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major='$Major', minor='$Minor', micro='$Micro') version_info = VersionInfo(major="$Major", minor="$Minor", micro="$Micro")
""" """
) )

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli._templates.publish" __title__ = "cpl_cli._templates.publish"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
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.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.abc" __title__ = "cpl_cli.abc"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
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.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.command" __title__ = "cpl_cli.command"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -29,4 +29,4 @@ from .publish_service import PublishService
from .version_service import VersionService from .version_service import VersionService
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.configuration" __title__ = "cpl_cli.configuration"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -31,4 +31,4 @@ from .workspace_settings import WorkspaceSettings
from .workspace_settings_name_enum import WorkspaceSettingsNameEnum from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -2,24 +2,24 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "cpl-cli", "Name": "cpl-cli",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "4", "Minor": "7",
"Micro": "0.post3" "Micro": "0"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de", "AuthorEmail": "sven.heidemann@sh-edraft.de",
"Description": "CPL CLI", "Description": "CPL CLI",
"LongDescription": "CPL Command Line Interface", "LongDescription": "CPL Command Line Interface",
"URL": "https://www.sh-edraft.de", "URL": "https://www.sh-edraft.de",
"CopyrightDate": "2020 - 2023", "CopyrightDate": "2020 - 2024",
"CopyrightName": "sh-edraft.de", "CopyrightName": "sh-edraft.de",
"LicenseName": "MIT", "LicenseName": "MIT",
"LicenseDescription": "MIT, see LICENSE for more details.", "LicenseDescription": "MIT, see LICENSE for more details.",
"Dependencies": [ "Dependencies": [
"cpl-core>=2023.4.0" "cpl-core>=2024.6.2024.07.0"
], ],
"DevDependencies": [], "DevDependencies": [],
"PythonVersion": ">=3.10", "PythonVersion": ">=3.12",
"PythonPath": { "PythonPath": {
"linux": "../../venv" "linux": "../../venv"
}, },

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.helper" __title__ = "cpl_cli.helper"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
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.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.live_server" __title__ = "cpl_cli.live_server"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
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.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -1,7 +1,6 @@
import importlib.metadata
from typing import Type from typing import Type
import pkg_resources
from cpl_cli.cli import CLI from cpl_cli.cli import CLI
from cpl_cli.startup import Startup from cpl_cli.startup import Startup
from cpl_cli.startup_argument_extension import StartupArgumentExtension from cpl_cli.startup_argument_extension import StartupArgumentExtension
@ -16,13 +15,12 @@ def get_startup_extensions() -> list[Type[StartupExtensionABC]]:
blacklisted_packages = ["cpl-cli"] blacklisted_packages = ["cpl-cli"]
startup_extensions = [] startup_extensions = []
installed_packages = pkg_resources.working_set installed_packages = importlib.metadata.distributions()
for p in installed_packages: for p in installed_packages:
package = str(p).split(" ")[0] if not p.name.startswith("cpl-") or p.name in blacklisted_packages:
if not package.startswith("cpl-") or package in blacklisted_packages:
continue continue
package = package.replace("-", "_") package = p.name.replace("-", "_")
loaded_package = __import__(package) loaded_package = __import__(package)
if "__cli_startup_extension__" not in dir(loaded_package): if "__cli_startup_extension__" not in dir(loaded_package):
continue continue

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.migrations" __title__ = "cpl_cli.migrations"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
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.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.migrations.base" __title__ = "cpl_cli.migrations.base"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
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.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.migrations.service" __title__ = "cpl_cli.migrations.service"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
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.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.publish" __title__ = "cpl_cli.publish"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
from collections import namedtuple from collections import namedtuple
@ -25,4 +25,4 @@ from .publisher_abc import PublisherABC
from .publisher_service import PublisherService from .publisher_service import PublisherService
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.source_creator" __title__ = "cpl_cli.source_creator"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
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.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -28,10 +28,13 @@ class StartupArgumentExtension(StartupExtensionABC):
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "add", ["a", "A"], AddService, True, validators=[WorkspaceValidator] ArgumentTypeEnum.Executable, "", "add", ["a", "A"], AddService, True, validators=[WorkspaceValidator]
).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]) ).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"])
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "build", ["b", "B"], BuildService, True, validators=[ProjectValidator] ArgumentTypeEnum.Executable, "", "build", ["b", "B"], BuildService, True, validators=[ProjectValidator]
) )
config.create_console_argument(ArgumentTypeEnum.Executable, "", "generate", ["g", "G"], GenerateService, True) config.create_console_argument(ArgumentTypeEnum.Executable, "", "generate", ["g", "G"], GenerateService, True)
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "install", ["i", "I"], InstallService, True, validators=[ProjectValidator] ArgumentTypeEnum.Executable, "", "install", ["i", "I"], InstallService, True, validators=[ProjectValidator]
).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]).add_console_argument( ).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]).add_console_argument(
@ -45,6 +48,7 @@ class StartupArgumentExtension(StartupExtensionABC):
).add_console_argument( ).add_console_argument(
ArgumentTypeEnum.Flag, "--", "cpl-dev", ["cd", "CD"] ArgumentTypeEnum.Flag, "--", "cpl-dev", ["cd", "CD"]
) )
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "new", ["n", "N"], NewService, True ArgumentTypeEnum.Executable, "", "new", ["n", "N"], NewService, True
).add_console_argument(ArgumentTypeEnum.Flag, "--", "async", ["a", "A"]).add_console_argument( ).add_console_argument(ArgumentTypeEnum.Flag, "--", "async", ["a", "A"]).add_console_argument(
@ -60,18 +64,23 @@ class StartupArgumentExtension(StartupExtensionABC):
).add_console_argument( ).add_console_argument(
ArgumentTypeEnum.Flag, "--", "base", ["b", "B"] ArgumentTypeEnum.Flag, "--", "base", ["b", "B"]
) )
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "publish", ["p", "P"], PublishService, True, validators=[ProjectValidator] ArgumentTypeEnum.Executable, "", "publish", ["p", "P"], PublishService, True, validators=[ProjectValidator]
) )
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "remove", ["r", "R"], RemoveService, True, validators=[WorkspaceValidator] ArgumentTypeEnum.Executable, "", "remove", ["r", "R"], RemoveService, True, validators=[WorkspaceValidator]
).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]) ).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"])
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "run", [], RunService, True, validators=[ProjectValidator] ArgumentTypeEnum.Executable, "", "run", [], RunService, True, validators=[ProjectValidator]
).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]) ).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"])
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "start", ["s", "S"], StartService, True, validators=[ProjectValidator] ArgumentTypeEnum.Executable, "", "start", ["s", "S"], StartService, True, validators=[ProjectValidator]
).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"]) ).add_console_argument(ArgumentTypeEnum.Flag, "--", "dev", ["d", "D"])
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, ArgumentTypeEnum.Executable,
"", "",
@ -85,6 +94,7 @@ class StartupArgumentExtension(StartupExtensionABC):
).add_console_argument( ).add_console_argument(
ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"] ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]
) )
config.create_console_argument( config.create_console_argument(
ArgumentTypeEnum.Executable, "", "update", ["u", "U"], UpdateService, True, validators=[ProjectValidator] ArgumentTypeEnum.Executable, "", "update", ["u", "U"], UpdateService, True, validators=[ProjectValidator]
).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]).add_console_argument( ).add_console_argument(ArgumentTypeEnum.Flag, "--", "simulate", ["s", "S"]).add_console_argument(
@ -94,6 +104,7 @@ class StartupArgumentExtension(StartupExtensionABC):
).add_console_argument( ).add_console_argument(
ArgumentTypeEnum.Flag, "--", "cpl-dev", ["cd", "CD"] ArgumentTypeEnum.Flag, "--", "cpl-dev", ["cd", "CD"]
) )
config.create_console_argument(ArgumentTypeEnum.Executable, "", "version", ["v", "V"], VersionService, True) config.create_console_argument(ArgumentTypeEnum.Executable, "", "version", ["v", "V"], VersionService, True)
config.for_each_argument(lambda a: a.add_console_argument(ArgumentTypeEnum.Flag, "--", "help", ["h", "H"])) config.for_each_argument(lambda a: a.add_console_argument(ArgumentTypeEnum.Flag, "--", "help", ["h", "H"]))

View File

@ -6,7 +6,7 @@ cpl-cli CPL CLI
CPL Command Line Interface CPL Command Line Interface
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL Command Line Interface
__title__ = "cpl_cli.validators" __title__ = "cpl_cli.validators"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2020 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2024.10.0"
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.post3") version_info = VersionInfo(major="2024", minor="10", micro="0")

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.application" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.configuration" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -24,7 +24,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.type import T from cpl_core.type import T, R
from cpl_core.utils.json_processor import JSONProcessor from cpl_core.utils.json_processor import JSONProcessor
@ -278,7 +278,9 @@ class Configuration(ConfigurationABC):
config_from_file = self._load_json_file(file_path, output) config_from_file = self._load_json_file(file_path, output)
for sub in ConfigurationModelABC.__subclasses__(): for sub in ConfigurationModelABC.__subclasses__():
for key, value in config_from_file.items(): for key, value in config_from_file.items():
if sub.__name__ == key or sub.__name__.replace("Settings", "") == key: if sub.__name__ != key and sub.__name__.replace("Settings", "") != key:
continue
configuration = sub() configuration = sub()
from_dict = getattr(configuration, "from_dict", None) from_dict = getattr(configuration, "from_dict", None)
@ -294,7 +296,7 @@ class Configuration(ConfigurationABC):
self.add_configuration(sub, configuration) self.add_configuration(sub, configuration)
def add_configuration(self, key_type: Type[T], value: any): def add_configuration(self, key_type: T, value: any):
self._config[key_type] = value self._config[key_type] = value
def create_console_argument( def create_console_argument(
@ -314,7 +316,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: T) -> Optional[T]: def get_configuration(self, search_type: T) -> Optional[R]:
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
@ -343,7 +345,7 @@ class Configuration(ConfigurationABC):
executables: list[ExecutableArgument] = [] executables: list[ExecutableArgument] = []
self._parse_arguments(executables, arg_list, self._argument_types) self._parse_arguments(executables, arg_list, self._argument_types)
except Exception as e: except Exception as e:
Console.error("An error occurred while parsing arguments.") Console.error("An error occurred while parsing arguments.", traceback.format_exc())
sys.exit() sys.exit()
try: try:
@ -355,7 +357,7 @@ class Configuration(ConfigurationABC):
if exe.validators is not None: if exe.validators is not None:
abort = False abort = False
for validator_type in exe.validators: for validator_type in exe.validators:
validator: ValidatorABC = services.get_service(validator_type) validator = services.get_service(validator_type)
result = validator.validate() result = validator.validate()
abort = not result abort = not result
if abort: if abort:
@ -364,7 +366,7 @@ class Configuration(ConfigurationABC):
if abort: if abort:
sys.exit() sys.exit()
cmd: ArgumentExecutableABC = services.get_service(exe.executable_type) cmd = services.get_service(exe.executable_type)
self._handle_pre_or_post_executables(True, exe, services) self._handle_pre_or_post_executables(True, exe, services)
self._set_variable("ACTIVE_EXECUTABLE", exe.name) self._set_variable("ACTIVE_EXECUTABLE", exe.name)
args = self.get_configuration("ARGS") args = self.get_configuration("ARGS")

View File

@ -6,7 +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.type import T from cpl_core.type import T, R
class ConfigurationABC(ABC): class ConfigurationABC(ABC):
@ -77,11 +77,11 @@ class ConfigurationABC(ABC):
pass pass
@abstractmethod @abstractmethod
def add_configuration(self, key_type: Type[T], value: any): def add_configuration(self, key_type: T, value: any):
r"""Add configuration object r"""Add configuration object
Parameter: Parameter:
key_type: Union[:class:`str`, :class:`type`] key_type: :class:`cpl_core.type.T`
Type of the value Type of the value
value: any value: any
Object of the value Object of the value
@ -124,11 +124,11 @@ class ConfigurationABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_configuration(self, search_type: Type[T]) -> Optional[T]: def get_configuration(self, search_type: T) -> Optional[R]:
r"""Returns value from configuration by given type r"""Returns value from configuration by given type
Parameter: Parameter:
search_type: Union[:class:`str`, Type[:class:`cpl_core.configuration.configuration_model_abc.ConfigurationModelABC`]] search_type: :class:`cpl_core.type.T`
Type to search for Type to search for
Returns: Returns:

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.console" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -2,31 +2,31 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "cpl-core", "Name": "cpl-core",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "4", "Minor": "7",
"Micro": "0.post2" "Micro": "0"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de", "AuthorEmail": "sven.heidemann@sh-edraft.de",
"Description": "CPL core", "Description": "CPL core",
"LongDescription": "CPL core package", "LongDescription": "CPL core package",
"URL": "https://www.sh-edraft.de", "URL": "https://www.sh-edraft.de",
"CopyrightDate": "2020 - 2023", "CopyrightDate": "2020 - 2024",
"CopyrightName": "sh-edraft.de", "CopyrightName": "sh-edraft.de",
"LicenseName": "MIT", "LicenseName": "MIT",
"LicenseDescription": "MIT, see LICENSE for more details.", "LicenseDescription": "MIT, see LICENSE for more details.",
"Dependencies": [ "Dependencies": [
"art>=5.9", "art>=6.2",
"colorama>=0.4.6", "colorama>=0.4.6",
"mysql-connector>=2.2.9", "psutil>=6.0.0",
"psutil>=5.9.4", "packaging>=24.1",
"packaging>=23.0",
"pynput>=1.7.6", "pynput>=1.7.6",
"setuptools>=67.6.1", "setuptools>=70.1.0",
"tabulate>=0.9.0", "tabulate>=0.9.0",
"termcolor>=2.2.0", "termcolor>=2.4.0",
"watchdog>=3.0.0", "watchdog>=4.0.1",
"wheel>=0.40.0" "wheel>=0.43.0",
"mysql-connector-python>=8.4.0"
], ],
"DevDependencies": [ "DevDependencies": [
"Sphinx==5.0.2", "Sphinx==5.0.2",
@ -36,7 +36,7 @@
"sphinx-markdown-builder==0.5.5", "sphinx-markdown-builder==0.5.5",
"pygount==1.5.1" "pygount==1.5.1"
], ],
"PythonVersion": ">=3.10", "PythonVersion": ">=3.12",
"PythonPath": {}, "PythonPath": {},
"Classifiers": [] "Classifiers": []
}, },

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.database" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.database.connection" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -1,11 +1,12 @@
from typing import Optional from typing import Optional
import mysql.connector as sql import mysql.connector as sql
from mysql.connector.abstracts import MySQLConnectionAbstract
from mysql.connector.cursor import MySQLCursorBuffered
from cpl_core.database.connection.database_connection_abc import DatabaseConnectionABC from cpl_core.database.connection.database_connection_abc import DatabaseConnectionABC
from cpl_core.database.database_settings import DatabaseSettings from cpl_core.database.database_settings import DatabaseSettings
from cpl_core.utils.credential_manager import CredentialManager from cpl_core.utils.credential_manager import CredentialManager
from mysql.connector.abstracts import MySQLConnectionAbstract
from mysql.connector.cursor import MySQLCursorBuffered
class DatabaseConnection(DatabaseConnectionABC): class DatabaseConnection(DatabaseConnectionABC):
@ -25,27 +26,29 @@ class DatabaseConnection(DatabaseConnectionABC):
def cursor(self) -> MySQLCursorBuffered: def cursor(self) -> MySQLCursorBuffered:
return self._cursor return self._cursor
def connect(self, database_settings: DatabaseSettings): def connect(self, settings: DatabaseSettings):
connection = sql.connect( connection = sql.connect(
host=database_settings.host, host=settings.host,
port=database_settings.port, port=settings.port,
user=database_settings.user, user=settings.user,
passwd=CredentialManager.decrypt(database_settings.password), passwd=CredentialManager.decrypt(settings.password),
charset=database_settings.charset, charset=settings.charset,
use_unicode=database_settings.use_unicode, use_unicode=settings.use_unicode,
buffered=database_settings.buffered, buffered=settings.buffered,
auth_plugin=database_settings.auth_plugin, auth_plugin=settings.auth_plugin,
ssl_disabled=settings.ssl_disabled,
) )
connection.cursor().execute(f"CREATE DATABASE IF NOT EXISTS `{database_settings.database}`;") connection.cursor().execute(f"CREATE DATABASE IF NOT EXISTS `{settings.database}`;")
self._database = sql.connect( self._database = sql.connect(
host=database_settings.host, host=settings.host,
port=database_settings.port, port=settings.port,
user=database_settings.user, user=settings.user,
passwd=CredentialManager.decrypt(database_settings.password), passwd=CredentialManager.decrypt(settings.password),
db=database_settings.database, db=settings.database,
charset=database_settings.charset, charset=settings.charset,
use_unicode=database_settings.use_unicode, use_unicode=settings.use_unicode,
buffered=database_settings.buffered, buffered=settings.buffered,
auth_plugin=database_settings.auth_plugin, auth_plugin=settings.auth_plugin,
ssl_disabled=settings.ssl_disabled,
) )
self._cursor = self._database.cursor() self._cursor = self._database.cursor()

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.database.context" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -21,7 +21,6 @@ class DatabaseContext(DatabaseContextABC):
DatabaseContextABC.__init__(self) DatabaseContextABC.__init__(self)
self._db: DatabaseConnectionABC = DatabaseConnection() self._db: DatabaseConnectionABC = DatabaseConnection()
self._tables: list[TableABC] = TableABC.__subclasses__()
self._settings: Optional[DatabaseSettings] = None self._settings: Optional[DatabaseSettings] = None
@property @property
@ -32,7 +31,7 @@ class DatabaseContext(DatabaseContextABC):
def _ping_and_reconnect(self): def _ping_and_reconnect(self):
try: try:
self._db.server.ping(reconnect=True, attempts=3, delay=5) self._db.server.ping(reconnect=True, attempts=3, delay=5)
except mysql.connector.Error as err: except Exception as err:
# reconnect your cursor as you did in __init__ or wherever # reconnect your cursor as you did in __init__ or wherever
if self._settings is None: if self._settings is None:
raise Exception("Call DatabaseContext.connect first") raise Exception("Call DatabaseContext.connect first")
@ -42,8 +41,6 @@ class DatabaseContext(DatabaseContextABC):
if self._settings is None: if self._settings is None:
self._settings = database_settings self._settings = database_settings
self._db.connect(database_settings) self._db.connect(database_settings)
for table in self._tables:
self._db.cursor.execute(table.get_create_string())
self.save_changes() self.save_changes()

View File

@ -13,10 +13,11 @@ class DatabaseSettings(ConfigurationModelABC):
user: str = None, user: str = None,
password: str = None, password: str = None,
database: str = None, database: str = None,
charset: str = None, charset: str = "utf8mb4",
use_unicode: bool = None, use_unicode: bool = False,
buffered: bool = None, buffered: bool = False,
auth_plugin: str = None, auth_plugin: str = "caching_sha2_password",
ssl_disabled: bool = False,
): ):
ConfigurationModelABC.__init__(self) ConfigurationModelABC.__init__(self)
@ -24,11 +25,12 @@ class DatabaseSettings(ConfigurationModelABC):
self._port: Optional[int] = port self._port: Optional[int] = port
self._user: Optional[str] = user self._user: Optional[str] = user
self._password: Optional[str] = password self._password: Optional[str] = password
self._databse: Optional[str] = database self._database: Optional[str] = database
self._charset: Optional[str] = charset self._charset: Optional[str] = charset
self._use_unicode: Optional[bool] = use_unicode self._use_unicode: Optional[bool] = use_unicode
self._buffered: Optional[bool] = buffered self._buffered: Optional[bool] = buffered
self._auth_plugin: Optional[str] = auth_plugin self._auth_plugin: Optional[str] = auth_plugin
self._ssl_disabled: Optional[bool] = ssl_disabled
@property @property
def host(self) -> Optional[str]: def host(self) -> Optional[str]:
@ -48,7 +50,7 @@ class DatabaseSettings(ConfigurationModelABC):
@property @property
def database(self) -> Optional[str]: def database(self) -> Optional[str]:
return self._databse return self._database
@property @property
def charset(self) -> Optional[str]: def charset(self) -> Optional[str]:
@ -65,3 +67,7 @@ class DatabaseSettings(ConfigurationModelABC):
@property @property
def auth_plugin(self) -> Optional[str]: def auth_plugin(self) -> Optional[str]:
return self._auth_plugin return self._auth_plugin
@property
def ssl_disabled(self) -> Optional[bool]:
return self._ssl_disabled

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.dependency_injection" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -61,15 +61,15 @@ class ServiceCollection(ServiceCollectionABC):
self.add_transient(PipeABC, pipe) self.add_transient(PipeABC, pipe)
return self return self
def add_singleton(self, service_type: Type[T], service: T = None): def add_singleton(self, service_type: T, service: T = None):
self._add_descriptor_by_lifetime(service_type, ServiceLifetimeEnum.singleton, service) self._add_descriptor_by_lifetime(service_type, ServiceLifetimeEnum.singleton, service)
return self return self
def add_scoped(self, service_type: Type[T], service: Callable = None): def add_scoped(self, service_type: T, service: T = None):
self._add_descriptor_by_lifetime(service_type, ServiceLifetimeEnum.scoped, service) self._add_descriptor_by_lifetime(service_type, ServiceLifetimeEnum.scoped, service)
return self return self
def add_transient(self, service_type: Type[T], service: T = None): def add_transient(self, service_type: T, service: T = None):
self._add_descriptor_by_lifetime(service_type, ServiceLifetimeEnum.transient, service) self._add_descriptor_by_lifetime(service_type, ServiceLifetimeEnum.transient, service)
return self return self

View File

@ -46,7 +46,7 @@ class ServiceCollectionABC(ABC):
pass pass
@abstractmethod @abstractmethod
def add_transient(self, service_type: Type[T], service: T = None) -> "ServiceCollectionABC": def add_transient(self, service_type: T, service: T = None) -> "ServiceCollectionABC":
r"""Adds a service with transient lifetime r"""Adds a service with transient lifetime
Parameter: Parameter:
@ -61,7 +61,7 @@ class ServiceCollectionABC(ABC):
pass pass
@abstractmethod @abstractmethod
def add_scoped(self, service_type: Type[T], service: T = None) -> "ServiceCollectionABC": def add_scoped(self, service_type: T, service: T = None) -> "ServiceCollectionABC":
r"""Adds a service with scoped lifetime r"""Adds a service with scoped lifetime
Parameter: Parameter:
@ -76,7 +76,7 @@ class ServiceCollectionABC(ABC):
pass pass
@abstractmethod @abstractmethod
def add_singleton(self, service_type: Type[T], service: T = None) -> "ServiceCollectionABC": def add_singleton(self, service_type: T, service: T = None) -> "ServiceCollectionABC":
r"""Adds a service with singleton lifetime r"""Adds a service with singleton lifetime
Parameter: Parameter:

View File

@ -12,7 +12,7 @@ from cpl_core.dependency_injection.service_descriptor import ServiceDescriptor
from cpl_core.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum from cpl_core.dependency_injection.service_lifetime_enum import ServiceLifetimeEnum
from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC from cpl_core.dependency_injection.service_provider_abc import ServiceProviderABC
from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC from cpl_core.environment.application_environment_abc import ApplicationEnvironmentABC
from cpl_core.type import T from cpl_core.type import T, R
class ServiceProvider(ServiceProviderABC): class ServiceProvider(ServiceProviderABC):
@ -80,7 +80,7 @@ class ServiceProvider(ServiceProviderABC):
return implementations return implementations
def build_by_signature(self, sig: Signature) -> list[T]: def build_by_signature(self, sig: Signature) -> list[R]:
params = [] params = []
for param in sig.parameters.items(): for param in sig.parameters.items():
parameter = param[1] parameter = param[1]
@ -138,7 +138,7 @@ class ServiceProvider(ServiceProviderABC):
sb = ScopeBuilder(ServiceProvider(descriptors, self._configuration, self._database_context)) sb = ScopeBuilder(ServiceProvider(descriptors, self._configuration, self._database_context))
return sb.build() return sb.build()
def get_service(self, service_type: typing.Type[T], *args, **kwargs) -> Optional[T]: def get_service(self, service_type: T, *args, **kwargs) -> Optional[R]:
result = self._find_service(service_type) result = self._find_service(service_type)
if result is None: if result is None:
@ -157,12 +157,12 @@ class ServiceProvider(ServiceProviderABC):
return implementation return implementation
def get_services(self, service_type: typing.Type[T], *args, **kwargs) -> list[Optional[T]]: def get_services(self, service_type: T, *args, **kwargs) -> list[Optional[R]]:
implementations = [] implementations = []
if typing.get_origin(service_type) != list: if typing.get_origin(service_type) == list:
raise Exception(f"Invalid type {service_type}! Expected list of type") raise Exception(f"Invalid type {service_type}! Expected single type not list of type")
implementations.extend(self._get_services(typing.get_args(service_type)[0])) implementations.extend(self._get_services(service_type))
return implementations return implementations

View File

@ -4,7 +4,7 @@ from inspect import Signature, signature
from typing import Optional, Type from typing import Optional, Type
from cpl_core.dependency_injection.scope_abc import ScopeABC from cpl_core.dependency_injection.scope_abc import ScopeABC
from cpl_core.type import T from cpl_core.type import T, R
class ServiceProviderABC(ABC): class ServiceProviderABC(ABC):
@ -21,7 +21,7 @@ class ServiceProviderABC(ABC):
cls._provider = provider cls._provider = provider
@abstractmethod @abstractmethod
def build_by_signature(self, sig: Signature) -> list[T]: def build_by_signature(self, sig: Signature) -> list[R]:
pass pass
@abstractmethod @abstractmethod
@ -61,7 +61,7 @@ class ServiceProviderABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_service(self, instance_type: Type[T], *args, **kwargs) -> Optional[T]: def get_service(self, instance_type: T, *args, **kwargs) -> Optional[R]:
r"""Returns instance of given type r"""Returns instance of given type
Parameter Parameter
@ -76,12 +76,12 @@ class ServiceProviderABC(ABC):
pass pass
@abstractmethod @abstractmethod
def get_services(self, service_type: Type[T], *args, **kwargs) -> list[Optional[T]]: def get_services(self, service_type: T, *args, **kwargs) -> list[Optional[R]]:
r"""Returns instance of given type r"""Returns instance of given type
Parameter Parameter
--------- ---------
instance_type: :class:`cpl_core.type.T` service_type: :class:`cpl_core.type.T`
The type of the searched instance The type of the searched instance
Returns Returns

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.environment" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.logging" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.mailing" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.pipes" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.time" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -1,3 +1,4 @@
from typing import TypeVar from typing import TypeVar
T = TypeVar("T") T = TypeVar("T")
R = TypeVar("R")

View File

@ -6,7 +6,7 @@ cpl-core CPL core
CPL core package CPL core package
:copyright: (c) 2020 - 2023 sh-edraft.de :copyright: (c) 2020 - 2024 sh-edraft.de
:license: MIT, see LICENSE for more details. :license: MIT, see LICENSE for more details.
""" """
@ -14,8 +14,8 @@ CPL core package
__title__ = "cpl_core.utils" __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 - 2024 sh-edraft.de"
__version__ = "2023.4.0.post2" __version__ = "2024.6.0"
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.post2") version_info = VersionInfo(major="2024", minor="6", micro="0")

View File

@ -8,6 +8,7 @@ class JSONProcessor:
@staticmethod @staticmethod
def process(_t: type, values: dict) -> object: def process(_t: type, values: dict) -> object:
args = [] args = []
kwargs = {}
sig = signature(_t.__init__) sig = signature(_t.__init__)
for param in sig.parameters.items(): for param in sig.parameters.items():
@ -21,10 +22,13 @@ class JSONProcessor:
value = "" value = ""
if name in values: if name in values:
value = values[name] value = values[name]
values.pop(name)
elif name_first_lower in values: elif name_first_lower in values:
value = values[name_first_lower] value = values[name_first_lower]
values.pop(name_first_lower)
else: else:
value = values[name.upper()] value = values[name.upper()]
values.pop(name.upper())
if isinstance(value, dict) and not issubclass(parameter.annotation, dict): if isinstance(value, dict) and not issubclass(parameter.annotation, dict):
value = JSONProcessor.process(parameter.annotation, value) value = JSONProcessor.process(parameter.annotation, value)
@ -37,10 +41,13 @@ class JSONProcessor:
args.append(value) args.append(value)
elif parameter.name == "kwargs" and parameter.annotation == dict:
kwargs = values
elif parameter.default != Parameter.empty: elif parameter.default != Parameter.empty:
args.append(parameter.default) args.append(parameter.default)
else: else:
args.append(None) args.append(None)
return _t(*args) return _t(*args, **kwargs)

View File

@ -15,7 +15,7 @@ __title__ = "cpl_discord"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2023.10.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.post3") version_info = VersionInfo(major="2023", minor="10", micro="0.post1")

View File

@ -15,7 +15,7 @@ __title__ = "cpl_discord"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2023.10.0.post1"
from collections import namedtuple from collections import namedtuple
@ -59,4 +59,4 @@ def get_discord_collection(services: "ServiceCollectionABC") -> "DiscordCollecti
# build-ignore-end # build-ignore-end
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post3") version_info = VersionInfo(major="2023", minor="10", micro="0.post1")

View File

@ -15,7 +15,7 @@ __title__ = "cpl_discord.application"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2023.10.0.post1"
from collections import namedtuple from collections import namedtuple
@ -24,4 +24,4 @@ from collections import namedtuple
from .discord_bot_application_abc import DiscordBotApplicationABC from .discord_bot_application_abc import DiscordBotApplicationABC
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post3") version_info = VersionInfo(major="2023", minor="10", micro="0.post1")

View File

@ -15,7 +15,7 @@ __title__ = "cpl_discord.command"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2023.10.0.post1"
from collections import namedtuple from collections import namedtuple
@ -25,4 +25,4 @@ from .discord_command_abc import DiscordCommandABC
from .discord_commands_meta import DiscordCogMeta from .discord_commands_meta import DiscordCogMeta
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post3") version_info = VersionInfo(major="2023", minor="10", micro="0.post1")

View File

@ -15,7 +15,7 @@ __title__ = "cpl_discord.configuration"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2023.10.0.post1"
from collections import namedtuple from collections import namedtuple
@ -24,4 +24,4 @@ from collections import namedtuple
from .discord_bot_settings import DiscordBotSettings from .discord_bot_settings import DiscordBotSettings
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post3") version_info = VersionInfo(major="2023", minor="10", micro="0.post1")

View File

@ -15,7 +15,7 @@ __title__ = "cpl_discord.container"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2023.10.0.post1"
from collections import namedtuple from collections import namedtuple
@ -31,4 +31,4 @@ from .thread import Thread
from .voice_channel import VoiceChannel from .voice_channel import VoiceChannel
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post3") version_info = VersionInfo(major="2023", minor="10", micro="0.post1")

View File

@ -2,9 +2,9 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "cpl-discord", "Name": "cpl-discord",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "4", "Minor": "7",
"Micro": "0.post3" "Micro": "0"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de", "AuthorEmail": "sven.heidemann@sh-edraft.de",
@ -16,12 +16,12 @@
"LicenseName": "MIT", "LicenseName": "MIT",
"LicenseDescription": "MIT, see LICENSE for more details.", "LicenseDescription": "MIT, see LICENSE for more details.",
"Dependencies": [ "Dependencies": [
"cpl-core>=2023.4.0.post2", "cpl-core>=2024.6.2024.07.0",
"discord.py>=2.3.0", "discord.py>=2.3.2",
"cpl-query>=2023.4.0.post1" "cpl-query>=2024.6.2024.07.0"
], ],
"DevDependencies": [ "DevDependencies": [
"cpl-cli>=2023.4.0.post3" "cpl-cli>=2024.6.2024.07.0"
], ],
"PythonVersion": ">=3.10", "PythonVersion": ">=3.10",
"PythonPath": {}, "PythonPath": {},

View File

@ -15,7 +15,7 @@ __title__ = "cpl_discord.events"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2023.10.0.post1"
from collections import namedtuple from collections import namedtuple
@ -69,4 +69,4 @@ from .on_voice_state_update_abc import OnVoiceStateUpdateABC
from .on_webhooks_update_abc import OnWebhooksUpdateABC from .on_webhooks_update_abc import OnWebhooksUpdateABC
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post3") version_info = VersionInfo(major="2023", minor="10", micro="0.post1")

View File

@ -15,7 +15,7 @@ __title__ = "cpl_discord.helper"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2023.10.0.post1"
from collections import namedtuple from collections import namedtuple
@ -24,4 +24,4 @@ from collections import namedtuple
from .to_containers_converter import ToContainersConverter from .to_containers_converter import ToContainersConverter
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post3") version_info = VersionInfo(major="2023", minor="10", micro="0.post1")

View File

@ -15,7 +15,7 @@ __title__ = "cpl_discord.service"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post3" __version__ = "2023.10.0.post1"
from collections import namedtuple from collections import namedtuple
@ -29,4 +29,4 @@ from .discord_service import DiscordService
from .discord_service_abc import DiscordServiceABC from .discord_service_abc import DiscordServiceABC
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post3") version_info = VersionInfo(major="2023", minor="10", micro="0.post1")

View File

@ -1,11 +1,11 @@
from typing import Type, Optional from typing import Type
from cpl_core.console import Console, ForegroundColorEnum
from cpl_core.dependency_injection import ServiceCollectionABC from cpl_core.dependency_injection import ServiceCollectionABC
from cpl_discord.command.discord_command_abc import DiscordCommandABC from cpl_discord.command.discord_command_abc import DiscordCommandABC
from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
from cpl_discord.service.command_error_handler_service import CommandErrorHandlerService from cpl_discord.service.command_error_handler_service import CommandErrorHandlerService
from cpl_discord.service.discord_collection_abc import DiscordCollectionABC from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
from cpl_query.extension.list import List
class DiscordCollection(DiscordCollectionABC): class DiscordCollection(DiscordCollectionABC):
@ -13,26 +13,21 @@ class DiscordCollection(DiscordCollectionABC):
DiscordCollectionABC.__init__(self) DiscordCollectionABC.__init__(self)
self._services = service_collection self._services = service_collection
self._events: dict[str, List] = {}
self._commands = List(type(DiscordCommandABC))
self.add_event(DiscordEventTypesEnum.on_command_error.value, CommandErrorHandlerService) self._services.add_transient(DiscordEventTypesEnum.on_command_error.value, CommandErrorHandlerService)
def add_command(self, _t: Type[DiscordCommandABC]): def add_command(self, _t: Type[DiscordCommandABC]):
Console.set_foreground_color(ForegroundColorEnum.yellow)
Console.write_line(
f"{type(self).__name__}.add_command is deprecated. Instead, use ServiceCollection.add_transient directly!"
)
Console.color_reset()
self._services.add_transient(DiscordCommandABC, _t) self._services.add_transient(DiscordCommandABC, _t)
self._commands.append(_t)
def get_commands(self) -> List[DiscordCommandABC]:
return self._commands
def add_event(self, _t_event: Type, _t: Type): def add_event(self, _t_event: Type, _t: Type):
Console.set_foreground_color(ForegroundColorEnum.yellow)
Console.write_line(
f"{type(self).__name__}.add_event is deprecated. Instead, use ServiceCollection.add_transient directly!"
)
Console.color_reset()
self._services.add_transient(_t_event, _t) self._services.add_transient(_t_event, _t)
if _t_event not in self._events:
self._events[_t_event] = List(type(_t_event))
self._events[_t_event].append(_t)
def get_events_by_base(self, _t_event: Type) -> Optional[List]:
if _t_event not in self._events:
return None
return self._events[_t_event]

View File

@ -13,14 +13,6 @@ class DiscordCollectionABC(ABC):
def add_command(self, _t: Type[DiscordCommandABC]): def add_command(self, _t: Type[DiscordCommandABC]):
pass pass
@abstractmethod
def get_commands(self) -> List[DiscordCommandABC]:
pass
@abstractmethod @abstractmethod
def add_event(self, _t_event: Type, _t: Type): def add_event(self, _t_event: Type, _t: Type):
pass pass
@abstractmethod
def get_events_by_base(self, _t_event: Type):
pass

View File

@ -4,11 +4,12 @@ from typing import Optional, Sequence, Union, Type
import discord import discord
from discord import RawReactionActionEvent from discord import RawReactionActionEvent
from discord.ext import commands from discord.ext import commands
from discord.ext.commands import Context, CommandError, Cog, Command from discord.ext.commands import Context, CommandError, Cog
from cpl_core.dependency_injection import ServiceProviderABC from cpl_core.dependency_injection import ServiceProviderABC
from cpl_core.logging import LoggerABC from cpl_core.logging import LoggerABC
from cpl_core.utils import String from cpl_core.utils import String
from cpl_discord.command import DiscordCommandABC
from cpl_discord.command.discord_commands_meta import DiscordCogMeta from cpl_discord.command.discord_commands_meta import DiscordCogMeta
from cpl_discord.events.on_bulk_message_delete_abc import OnBulkMessageDeleteABC from cpl_discord.events.on_bulk_message_delete_abc import OnBulkMessageDeleteABC
from cpl_discord.events.on_command_abc import OnCommandABC from cpl_discord.events.on_command_abc import OnCommandABC
@ -66,25 +67,17 @@ from cpl_discord.events.on_typing_abc import OnTypingABC
from cpl_discord.events.on_user_update_abc import OnUserUpdateABC from cpl_discord.events.on_user_update_abc import OnUserUpdateABC
from cpl_discord.events.on_voice_state_update_abc import OnVoiceStateUpdateABC from cpl_discord.events.on_voice_state_update_abc import OnVoiceStateUpdateABC
from cpl_discord.events.on_webhooks_update_abc import OnWebhooksUpdateABC from cpl_discord.events.on_webhooks_update_abc import OnWebhooksUpdateABC
from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
from cpl_discord.service.discord_service_abc import DiscordServiceABC from cpl_discord.service.discord_service_abc import DiscordServiceABC
class DiscordService(DiscordServiceABC, commands.Cog, metaclass=DiscordCogMeta): class DiscordService(DiscordServiceABC, commands.Cog, metaclass=DiscordCogMeta):
def __init__(self, logger: LoggerABC, dc_collection: DiscordCollectionABC, services: ServiceProviderABC): def __init__(self, logger: LoggerABC, services: ServiceProviderABC):
DiscordServiceABC.__init__(self) DiscordServiceABC.__init__(self)
self._logger = logger self._logger = logger
self._collection = dc_collection
self._services = services self._services = services
async def _handle_event(self, event: Type, *args, **kwargs): async def _handle_event(self, event: Type, *args, **kwargs):
event_collection = self._collection.get_events_by_base(event) for event_instance in self._services.get_services(event):
if event_collection is None:
return
for event_type in event_collection:
event_instance = self._services.get_service(event_type)
func_name = event.__name__ func_name = event.__name__
if func_name.endswith("ABC"): if func_name.endswith("ABC"):
func_name = func_name.replace("ABC", "") func_name = func_name.replace("ABC", "")
@ -104,11 +97,10 @@ class DiscordService(DiscordServiceABC, commands.Cog, metaclass=DiscordCogMeta):
self._logger.error(__name__, f"{type(self).__name__} initialization failed", e) self._logger.error(__name__, f"{type(self).__name__} initialization failed", e)
try: try:
for command_type in self._collection.get_commands(): for command in self._services.get_services(DiscordCommandABC):
self._logger.trace(__name__, f"Register command {command_type.__name__}") self._logger.trace(__name__, f"Register command {type(command).__name__}")
command: Cog = self._services.get_service(command_type)
if command is None: if command is None:
self._logger.warn(__name__, f"Instance of {command_type.__name__} not found") self._logger.warn(__name__, f"Instance of {type(command).__name__} not found")
continue continue
await bot.add_cog(command) await bot.add_cog(command)
except Exception as e: except Exception as e:

View File

@ -15,7 +15,7 @@ __title__ = "cpl_query"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post1" __version__ = "2023.10.0"
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.post1") version_info = VersionInfo(major="2023", minor="10", micro="0")

View File

@ -15,7 +15,7 @@ __title__ = "cpl_query.base"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post1" __version__ = "2023.10.0"
from collections import namedtuple from collections import namedtuple
@ -28,4 +28,4 @@ from .queryable_abc import QueryableABC
from .sequence import Sequence from .sequence import Sequence
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post1") version_info = VersionInfo(major="2023", minor="10", micro="0")

View File

@ -2,9 +2,9 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "cpl-query", "Name": "cpl-query",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "4", "Minor": "7",
"Micro": "0.post1" "Micro": "0"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de", "AuthorEmail": "sven.heidemann@sh-edraft.de",

View File

@ -15,7 +15,7 @@ __title__ = "cpl_query.enumerable"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post1" __version__ = "2023.10.0"
from collections import namedtuple from collections import namedtuple
@ -25,4 +25,4 @@ from .enumerable import Enumerable
from .enumerable_abc import EnumerableABC from .enumerable_abc import EnumerableABC
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post1") version_info = VersionInfo(major="2023", minor="10", micro="0")

View File

@ -15,7 +15,7 @@ __title__ = "cpl_query.extension"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post1" __version__ = "2023.10.0"
from collections import namedtuple from collections import namedtuple
@ -24,4 +24,4 @@ from collections import namedtuple
from .list import List from .list import List
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post1") version_info = VersionInfo(major="2023", minor="10", micro="0")

View File

@ -1,12 +1,10 @@
from typing import Iterator
from cpl_query.iterable.iterable import Iterable from cpl_query.iterable.iterable import Iterable
class List(Iterable): class List(Iterable):
r"""Implementation of :class: `cpl_query.extension.iterable.Iterable`""" r"""Implementation of :class: `cpl_query.extension.iterable.Iterable`"""
def __init__(self, t: type = None, values: Iterator = None): def __init__(self, t: type = None, values: Iterable = None):
Iterable.__init__(self, t, values) Iterable.__init__(self, t, values)
def __getitem__(self, *args): def __getitem__(self, *args):

View File

@ -15,7 +15,7 @@ __title__ = "cpl_query.iterable"
__author__ = "Sven Heidemann" __author__ = "Sven Heidemann"
__license__ = "MIT" __license__ = "MIT"
__copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de" __copyright__ = "Copyright (c) 2021 - 2023 sh-edraft.de"
__version__ = "2023.4.0.post1" __version__ = "2023.10.0"
from collections import namedtuple from collections import namedtuple
@ -25,4 +25,4 @@ from .iterable_abc import IterableABC
from .iterable import Iterable from .iterable import Iterable
VersionInfo = namedtuple("VersionInfo", "major minor micro") VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="2023", minor="4", micro="0.post1") version_info = VersionInfo(major="2023", minor="10", micro="0")

View File

@ -2,9 +2,9 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "cpl-translation", "Name": "cpl-translation",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "4", "Minor": "7",
"Micro": "0.post1" "Micro": "0"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de", "AuthorEmail": "sven.heidemann@sh-edraft.de",
@ -16,10 +16,10 @@
"LicenseName": "MIT", "LicenseName": "MIT",
"LicenseDescription": "MIT, see LICENSE for more details.", "LicenseDescription": "MIT, see LICENSE for more details.",
"Dependencies": [ "Dependencies": [
"cpl-core>=2023.4.0" "cpl-core>=2024.6.2024.07.0"
], ],
"DevDependencies": [ "DevDependencies": [
"cpl-cli>=2023.4.0" "cpl-cli>=2024.6.2024.07.0"
], ],
"PythonVersion": ">=3.10", "PythonVersion": ">=3.10",
"PythonPath": {}, "PythonPath": {},

View File

@ -20,7 +20,6 @@
"Database": "sh_cpl", "Database": "sh_cpl",
"Charset": "utf8mb4", "Charset": "utf8mb4",
"UseUnicode": "true", "UseUnicode": "true",
"Buffered": "true", "Buffered": "true"
"AuthPlugin": "mysql_native_password"
} }
} }

View File

@ -3,5 +3,5 @@ from cpl_core.database.context import DatabaseContext
class DBContext(DatabaseContext): class DBContext(DatabaseContext):
def __init__(self, db_settings: DatabaseSettings): def __init__(self):
DatabaseContext.__init__(self, db_settings) DatabaseContext.__init__(self)

View File

@ -21,7 +21,6 @@ class Startup(StartupABC):
) -> ConfigurationABC: ) -> ConfigurationABC:
configuration.add_environment_variables("PYTHON_") configuration.add_environment_variables("PYTHON_")
configuration.add_environment_variables("CPL_") configuration.add_environment_variables("CPL_")
configuration.parse_console_arguments()
configuration.add_json_file(f"appsettings.json") configuration.add_json_file(f"appsettings.json")
configuration.add_json_file(f"appsettings.{configuration.environment.environment_name}.json") configuration.add_json_file(f"appsettings.{configuration.environment.environment_name}.json")
configuration.add_json_file(f"appsettings.{configuration.environment.host_name}.json", optional=True) configuration.add_json_file(f"appsettings.{configuration.environment.host_name}.json", optional=True)
@ -34,6 +33,7 @@ class Startup(StartupABC):
self, services: ServiceCollectionABC, environment: ApplicationEnvironmentABC self, services: ServiceCollectionABC, environment: ApplicationEnvironmentABC
) -> ServiceProviderABC: ) -> ServiceProviderABC:
# Create and connect to database # Create and connect to database
self._configuration.parse_console_arguments(services)
db_settings: DatabaseSettings = self._configuration.get_configuration(DatabaseSettings) db_settings: DatabaseSettings = self._configuration.get_configuration(DatabaseSettings)
services.add_db_context(DBContext, db_settings) services.add_db_context(DBContext, db_settings)

View File

@ -8,7 +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_settings import TestSettings
from test_service import TestService from test_service import TestService

View File

@ -2,8 +2,8 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "set-pip-urls", "Name": "set-pip-urls",
"Version": { "Version": {
"Major": "2022", "Major": "2024",
"Minor": "12", "Minor": "7",
"Micro": "0" "Micro": "0"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",

View File

@ -2,8 +2,8 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "set-version", "Name": "set-version",
"Version": { "Version": {
"Major": "2022", "Major": "2024",
"Minor": "12", "Minor": "7",
"Micro": "0" "Micro": "0"
}, },
"Author": "Sven Heidemann", "Author": "Sven Heidemann",
@ -16,7 +16,7 @@
"LicenseName": "MIT", "LicenseName": "MIT",
"LicenseDescription": "MIT, see LICENSE for more details.", "LicenseDescription": "MIT, see LICENSE for more details.",
"Dependencies": [ "Dependencies": [
"cpl-core>=2022.12.0", "cpl-core>=2024.6.2024.07.0",
"GitPython>=3.1.29" "GitPython>=3.1.29"
], ],
"DevDependencies": [], "DevDependencies": [],

View File

@ -2,8 +2,8 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "unittests", "Name": "unittests",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "2", "Minor": "7",
"Micro": "0" "Micro": "0"
}, },
"Author": "", "Author": "",
@ -16,7 +16,7 @@
"LicenseName": "", "LicenseName": "",
"LicenseDescription": "", "LicenseDescription": "",
"Dependencies": [ "Dependencies": [
"cpl-core>=2023.2.0" "cpl-core>=2024.6.2024.07.0"
], ],
"PythonVersion": ">=3.10.4", "PythonVersion": ">=3.10.4",
"PythonPath": {}, "PythonPath": {},

View File

@ -2,8 +2,8 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "unittest_cli", "Name": "unittest_cli",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "2", "Minor": "7",
"Micro": "0" "Micro": "0"
}, },
"Author": "", "Author": "",
@ -16,8 +16,8 @@
"LicenseName": "", "LicenseName": "",
"LicenseDescription": "", "LicenseDescription": "",
"Dependencies": [ "Dependencies": [
"cpl-core>=2023.2.0", "cpl-core>=2024.6.2024.07.0",
"cpl-cli>=2023.2.0" "cpl-cli>=2024.6.2024.07.0"
], ],
"PythonVersion": ">=3.10.4", "PythonVersion": ">=3.10.4",
"PythonPath": {}, "PythonPath": {},

View File

@ -2,8 +2,8 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "unittest_core", "Name": "unittest_core",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "2", "Minor": "7",
"Micro": "0" "Micro": "0"
}, },
"Author": "", "Author": "",
@ -16,7 +16,7 @@
"LicenseName": "", "LicenseName": "",
"LicenseDescription": "", "LicenseDescription": "",
"Dependencies": [ "Dependencies": [
"cpl-core>=2023.2.0" "cpl-core>=2024.6.2024.07.0"
], ],
"PythonVersion": ">=3.10.4", "PythonVersion": ">=3.10.4",
"PythonPath": {}, "PythonPath": {},

View File

@ -2,8 +2,8 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "unittest_query", "Name": "unittest_query",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "2", "Minor": "7",
"Micro": "0" "Micro": "0"
}, },
"Author": "", "Author": "",
@ -16,8 +16,8 @@
"LicenseName": "", "LicenseName": "",
"LicenseDescription": "", "LicenseDescription": "",
"Dependencies": [ "Dependencies": [
"cpl-core>=2023.2.0", "cpl-core>=2024.6.2024.07.0",
"cpl-query>=2023.2.0" "cpl-query>=2024.6.2024.07.0"
], ],
"PythonVersion": ">=3.10.4", "PythonVersion": ">=3.10.4",
"PythonPath": {}, "PythonPath": {},

View File

@ -2,8 +2,8 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "unittest_shared", "Name": "unittest_shared",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "2", "Minor": "7",
"Micro": "0" "Micro": "0"
}, },
"Author": "", "Author": "",
@ -16,7 +16,7 @@
"LicenseName": "", "LicenseName": "",
"LicenseDescription": "", "LicenseDescription": "",
"Dependencies": [ "Dependencies": [
"cpl-core>=2023.2.0" "cpl-core>=2024.6.2024.07.0"
], ],
"PythonVersion": ">=3.10.4", "PythonVersion": ">=3.10.4",
"PythonPath": {}, "PythonPath": {},

View File

@ -2,8 +2,8 @@
"ProjectSettings": { "ProjectSettings": {
"Name": "unittests_translation", "Name": "unittests_translation",
"Version": { "Version": {
"Major": "2023", "Major": "2024",
"Minor": "2", "Minor": "7",
"Micro": "0" "Micro": "0"
}, },
"Author": "", "Author": "",
@ -16,11 +16,11 @@
"LicenseName": "", "LicenseName": "",
"LicenseDescription": "", "LicenseDescription": "",
"Dependencies": [ "Dependencies": [
"cpl-core>=2023.2.0", "cpl-core>=2024.6.2024.07.0",
"cpl-translation>=2023.2.0" "cpl-translation>=2024.6.2024.07.0"
], ],
"DevDependencies": [ "DevDependencies": [
"cpl-cli>=2023.2.0" "cpl-cli>=2024.6.2024.07.0"
], ],
"PythonVersion": ">=3.10.4", "PythonVersion": ">=3.10.4",
"PythonPath": {}, "PythonPath": {},