Updated discord.py

Reviewed-on: #174

cpl-workspace.json

@@ -6,7 +6,6 @@
       "cpl-core": "src/cpl_core/cpl-core.json",
       "cpl-discord": "src/cpl_discord/cpl-discord.json",
       "cpl-query": "src/cpl_query/cpl-query.json",
-      "cpl-reactive-extensions": "src/cpl_reactive_extensions/cpl-reactive-extensions.json",
       "cpl-translation": "src/cpl_translation/cpl-translation.json",
       "set-version": "tools/set_version/set-version.json",
       "set-pip-urls": "tools/set_pip_urls/set-pip-urls.json",
@@ -15,8 +14,7 @@
       "unittests_core": "unittests/unittests_core/unittests_core.json",
       "unittests_query": "unittests/unittests_query/unittests_query.json",
       "unittests_shared": "unittests/unittests_shared/unittests_shared.json",
-      "unittests_translation": "unittests/unittests_translation/unittests_translation.json",
-      "unittests_reactive_extenstions": "unittests/unittests_reactive_extenstions/unittests_reactive_extenstions.json"
+      "unittests_translation": "unittests/unittests_translation/unittests_translation.json"
     },
     "Scripts": {
       "hello-world": "echo 'Hello World'",
@@ -42,13 +40,12 @@
       "test": "cpl run unittests",
 
       "pre-build-all": "cpl sv $ARGS; cpl spu $ARGS;",
-      "build-all": "cpl build-cli; cpl build-core; cpl build-discord; cpl build-query; cpl build-reactive-extensions; cpl build-translation; cpl build-set-pip-urls; cpl build-set-version",
+      "build-all": "cpl build-cli; cpl build-core; cpl build-discord; cpl build-query; cpl build-translation; cpl build-set-pip-urls; cpl build-set-version",
       "ba": "cpl build-all $ARGS",
       "build-cli": "echo 'Build cpl-cli'; cd ./src/cpl_cli; cpl build; cd ../../;",
       "build-core": "echo 'Build cpl-core'; cd ./src/cpl_core; cpl build; cd ../../;",
       "build-discord": "echo 'Build cpl-discord'; cd ./src/cpl_discord; cpl build; cd ../../;",
       "build-query": "echo 'Build cpl-query'; cd ./src/cpl_query; cpl build; cd ../../;",
-      "build-reactive-extensions": "echo 'Build cpl-reactive-x'; cd ./src/cpl_reactive_extensions; cpl build; cd ../../;",
       "build-translation": "echo 'Build cpl-translation'; cd ./src/cpl_translation; cpl build; cd ../../;",
       "build-set-pip-urls": "echo 'Build set-pip-urls'; cd ./tools/set_pip_urls; cpl build; cd ../../;",
       "build-set-version": "echo 'Build set-version'; cd ./tools/set_version; cpl build; cd ../../;",
@@ -60,7 +57,6 @@
       "publish-core": "echo 'Publish cpl-core'; cd ./src/cpl_core; cpl publish; cd ../../;",
       "publish-discord": "echo 'Publish cpl-discord'; cd ./src/cpl_discord; cpl publish; cd ../../;",
       "publish-query": "echo 'Publish cpl-query'; cd ./src/cpl_query; cpl publish; cd ../../;",
-      "publish-reactive-extensions": "echo 'Publish cpl-reactive-x'; cd ./src/cpl_reactive_extensions; cpl publish; cd ../../;",
       "publish-translation": "echo 'Publish cpl-translation'; cd ./src/cpl_translation; cpl publish; cd ../../;",
 
       "upload-prod-cli": "echo 'PROD Upload cpl-cli'; cpl upl-prod-cli;",
@@ -75,9 +71,6 @@
       "upload-prod-query": "echo 'PROD Upload cpl-query'; cpl upl-prod-query;",
       "upl-prod-query": "twine upload -r pip.sh-edraft.de dist/cpl-query/publish/setup/*",
 
-      "upload-prod-reactive-extensions": "echo 'PROD Upload cpl-reactive-extensions'; cpl upl-prod-query;",
-      "upl-prod-reactive-extensions": "twine upload -r pip.sh-edraft.de dist/cpl-reactive-extensions/publish/setup/*",
-
       "upload-prod-translation": "echo 'PROD Upload cpl-translation'; cpl upl-prod-translation;",
       "upl-prod-translation": "twine upload -r pip.sh-edraft.de dist/cpl-translation/publish/setup/*",
 
@@ -93,9 +86,6 @@
       "upload-exp-query": "echo 'EXP Upload cpl-query'; cpl upl-exp-query;",
       "upl-exp-query": "twine upload -r pip-exp.sh-edraft.de dist/cpl-query/publish/setup/*",
 
-      "upload-exp-reactive-extensions": "echo 'EXP Upload cpl-reactive-extensions'; cpl upl-exp-query;",
-      "upl-exp-reactive-extensions": "twine upload -r pip-exp.sh-edraft.de dist/cpl-reactive-extensions/publish/setup/*",
-
       "upload-exp-translation": "echo 'EXP Upload cpl-translation'; cpl upl-exp-translation;",
       "upl-exp-translation": "twine upload -r pip-exp.sh-edraft.de dist/cpl-translation/publish/setup/*",
 
@@ -111,9 +101,6 @@
       "upload-dev-query": "echo 'DEV Upload cpl-query'; cpl upl-dev-query;",
       "upl-dev-query": "twine upload -r pip-dev.sh-edraft.de dist/cpl-query/publish/setup/*",
 
-      "upload-dev-reactive-extensions": "echo 'DEV Upload cpl-reactive-extensions'; cpl upl-dev-query;",
-      "upl-dev-reactive-extensions": "twine upload -r pip-dev.sh-edraft.de dist/cpl-reactive-extensions/publish/setup/*",
-
       "upload-dev-translation": "echo 'DEV Upload cpl-translation'; cpl upl-dev-translation;",
       "upl-dev-translation": "twine upload -r pip-dev.sh-edraft.de dist/cpl-translation/publish/setup/*",
 

src/cpl_cli/.cpl/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .main import main
 from .startup import Startup
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/_templates/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/_templates/build/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates.build"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/_templates/publish/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli._templates.publish"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/abc/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.command"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .publish_service import PublishService
 from .version_service import VersionService
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/command/update_service.py

@@ -166,10 +166,10 @@ class UpdateService(CommandABC):
         if "\r" in new_package:
             new_package = new_package.replace("\r", "")
 
-        if new_package == initial_package:
+        if new_package == old_package:
             return
 
-        index = self._project_settings.dependencies.index(old_package)
+        index = deps.index(old_package)
         deps[index] = new_package
 
     def _project_json_update_dependency(self, old_package: str, new_package: str):

src/cpl_cli/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -31,4 +31,4 @@ from .workspace_settings import WorkspaceSettings
 from .workspace_settings_name_enum import WorkspaceSettingsNameEnum
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/cpl-cli.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2023",
       "Minor": "4",
-      "Micro": "0.post1"
+      "Micro": "0.post3"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

src/cpl_cli/helper/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.helper"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/live_server/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.live_server"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/migrations/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/migrations/base/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations.base"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/migrations/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.migrations.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/publish/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.publish"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .publisher_abc import PublisherABC
 from .publisher_service import PublisherService
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/source_creator/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.source_creator"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_cli/validators/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_cli.validators"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.0.post1"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0.post1")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_core/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/application/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.application"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .startup_abc import StartupABC
 from .startup_extension_abc import StartupExtensionABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC
 from .variable_argument import VariableArgument
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/console/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.console"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum
 from .spinner_thread import SpinnerThread
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/cpl-core.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2023",
       "Minor": "4",
-      "Micro": "dev170"
+      "Micro": "0.post2"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

src/cpl_core/database/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.database"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings
 from .table_abc import TableABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/database/connection/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.database.connection"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection
 from .database_connection_abc import DatabaseConnectionABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/database/context/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.database.context"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_context import DatabaseContext
 from .database_context_abc import DatabaseContextABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/database/database_settings.py

@@ -9,7 +9,7 @@ class DatabaseSettings(ConfigurationModelABC):
     def __init__(
         self,
         host: str = None,
-        port: int = None,
+        port: int = 3306,
         user: str = None,
         password: str = None,
         database: str = None,

src/cpl_core/dependency_injection/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.dependency_injection"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -31,4 +31,4 @@ from .service_provider import ServiceProvider
 from .service_provider_abc import ServiceProviderABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/environment/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.environment"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum
 from .application_environment import ApplicationEnvironment
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings
 from .logging_settings_name_enum import LoggingSettingsNameEnum
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/mailing/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.mailing"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .email_client_settings import EMailClientSettings
 from .email_client_settings_name_enum import EMailClientSettingsNameEnum
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/pipes/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.pipes"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .ip_address_pipe import IPAddressPipe
 from .pipe_abc import PipeABC
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/time/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.time"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .time_format_settings import TimeFormatSettings
 from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_core/type.py

@@ -1,4 +1,3 @@
-from typing import TypeVar, Union
+from typing import TypeVar
 
 T = TypeVar("T")
-Number = Union[int, float]

src/cpl_core/utils/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_core.utils"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2020 - 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
+__version__ = "2023.4.0.post2"
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .string import String
 from .pip import Pip
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post2")

src/cpl_discord/.cpl/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post3"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post3")

src/cpl_discord/__init__.py

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

src/cpl_discord/application/__init__.py

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

src/cpl_discord/command/__init__.py

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

src/cpl_discord/configuration/__init__.py

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

src/cpl_discord/container/__init__.py

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

src/cpl_discord/container/category_channel.py

@@ -4,7 +4,7 @@ from cpl_discord.container.container import Container
 from cpl_discord.container.text_channel import TextChannel
 from cpl_discord.container.voice_channel import VoiceChannel
 from cpl_discord.helper.to_containers_converter import ToContainersConverter
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class CategoryChannel(discord.CategoryChannel, Container):

src/cpl_discord/container/guild.py

@@ -7,7 +7,7 @@ from cpl_discord.container.role import Role
 from cpl_discord.container.text_channel import TextChannel
 from cpl_discord.container.voice_channel import VoiceChannel
 from cpl_discord.helper.to_containers_converter import ToContainersConverter
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class Guild(Container, discord.Guild):

src/cpl_discord/container/text_channel.py

@@ -4,7 +4,7 @@ from cpl_discord.container.container import Container
 from cpl_discord.container.member import Member
 from cpl_discord.container.thread import Thread
 from cpl_discord.helper.to_containers_converter import ToContainersConverter
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class TextChannel(discord.TextChannel, Container):

src/cpl_discord/container/thread.py

@@ -3,7 +3,7 @@ import discord
 from cpl_discord.container.container import Container
 from cpl_discord.container.member import Member
 from cpl_discord.helper.to_containers_converter import ToContainersConverter
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class Thread(discord.Thread, Container):

src/cpl_discord/container/voice_channel.py

@@ -3,7 +3,7 @@ import discord
 from cpl_discord.container.container import Container
 from cpl_discord.container.member import Member
 from cpl_discord.helper.to_containers_converter import ToContainersConverter
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class VoiceChannel(discord.VoiceChannel, Container):

src/cpl_discord/cpl-discord.json

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

src/cpl_discord/events/__init__.py

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

src/cpl_discord/helper/__init__.py

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

src/cpl_discord/service/__init__.py

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

src/cpl_discord/service/discord_bot_service.py

@@ -56,14 +56,13 @@ class DiscordBotService(DiscordBotServiceABC):
         env_token = self._config.get_configuration("TOKEN")
         env_prefix = self._config.get_configuration("PREFIX")
 
-        new_settings.from_dict(
-            {
-                "Token": env_token if token is None or token == "" else token,
-                "Prefix": ("! " if self._is_string_invalid(env_prefix) else env_prefix)
-                if self._is_string_invalid(prefix)
-                else prefix,
-            }
+        new_settings = DiscordBotSettings(
+            env_token if token is None or token == "" else token,
+            ("! " if self._is_string_invalid(env_prefix) else env_prefix)
+            if self._is_string_invalid(prefix)
+            else prefix,
         )
+
         if new_settings.token is None or new_settings.token == "":
             raise Exception("You have to configure discord token by appsettings or environment variables")
         return new_settings

src/cpl_discord/service/discord_collection.py

@@ -5,7 +5,7 @@ from cpl_discord.command.discord_command_abc import DiscordCommandABC
 from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
 from cpl_discord.service.command_error_handler_service import CommandErrorHandlerService
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class DiscordCollection(DiscordCollectionABC):

src/cpl_discord/service/discord_collection_abc.py

@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
 from typing import Type
 
 from cpl_discord.command import DiscordCommandABC
-from cpl_query.extension import List
+from cpl_query.extension.list import List
 
 
 class DiscordCollectionABC(ABC):

src/cpl_query/__init__.py

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

src/cpl_query/base/__init__.py

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

src/cpl_query/base/ordered_queryable.py

@@ -1,14 +1,14 @@
 from collections.abc import Callable
 
+from cpl_query.base.queryable_abc import QueryableABC
 from cpl_query.base.ordered_queryable_abc import OrderedQueryableABC
 from cpl_query.exceptions import ArgumentNoneException, ExceptionArgument
-from cpl_query.iterable.iterable import Iterable
 
 
 class OrderedQueryable(OrderedQueryableABC):
     r"""Implementation of :class: `cpl_query.base.ordered_queryable_abc.OrderedQueryableABC`"""
 
-    def __init__(self, _t: type, _values: Iterable = None, _func: Callable = None):
+    def __init__(self, _t: type, _values: QueryableABC = None, _func: Callable = None):
         OrderedQueryableABC.__init__(self, _t, _values, _func)
 
     def then_by(self, _func: Callable) -> OrderedQueryableABC:

src/cpl_query/cpl-query.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2023",
       "Minor": "4",
-      "Micro": "0"
+      "Micro": "0.post1"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

src/cpl_query/enumerable/__init__.py

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

src/cpl_query/extension/__init__.py

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

src/cpl_query/iterable/__init__.py

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

src/cpl_reactive_extensions/__init__.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-cpl-reactive-extensions CPL Simple ReactiveX implementation
-~~~~~~~~~~~~~~~~~~~
-
-CPL Simple ReactiveX implementation, see RxJS and RxPy for detailed implementation.
-
-:copyright: (c) 2023 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = "cpl_reactive_extensions"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
-
-from collections import namedtuple
-
-
-# imports
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")

src/cpl_reactive_extensions/abc/__init__.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-cpl-reactive-extensions CPL Simple ReactiveX implementation
-~~~~~~~~~~~~~~~~~~~
-
-CPL Simple ReactiveX implementation, see RxJS and RxPy for detailed implementation.
-
-:copyright: (c) 2023 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = "cpl_reactive_extensions.abc"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
-
-from collections import namedtuple
-
-
-# imports
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")

src/cpl_reactive_extensions/abc/observer.py

@@ -1,20 +0,0 @@
-from abc import abstractmethod
-
-from cpl_core.type import T
-
-
-class Observer:
-    def __init__(self):
-        pass
-
-    @abstractmethod
-    def next(self, value: T):
-        pass
-
-    @abstractmethod
-    def error(self, ex: Exception):
-        pass
-
-    @abstractmethod
-    def complete(self):
-        pass

src/cpl_reactive_extensions/abc/operator.py

@@ -1,8 +0,0 @@
-from typing import Any
-
-from cpl_reactive_extensions.internal.subscriber import Subscriber
-
-
-class Operator:
-    def call(self, subscriber: Subscriber, source: Any):
-        pass

src/cpl_reactive_extensions/abc/scheduler_action.py

@@ -1,10 +0,0 @@
-from abc import ABC, abstractmethod
-
-from cpl_core.type import T, Number
-from cpl_reactive_extensions.internal.subscription import Subscription
-
-
-class SchedulerAction(ABC):
-    @abstractmethod
-    def schedule(self, state: T = None, delay: Number = None) -> Subscription:
-        pass

src/cpl_reactive_extensions/abc/scheduler_like.py

@@ -1,12 +0,0 @@
-from abc import ABC, abstractmethod
-from typing import Callable, Optional
-
-from cpl_core.type import Number, T
-from cpl_reactive_extensions.internal.subscription import Subscription
-from cpl_reactive_extensions.abc.scheduler_action import SchedulerAction
-
-
-class SchedulerLike(ABC):
-    @abstractmethod
-    def schedule(self, work: Callable[[SchedulerAction, Optional[T]], None], delay: Number, state: T) -> Subscription:
-        pass

src/cpl_reactive_extensions/abc/subscribable.py

@@ -1,16 +0,0 @@
-from abc import ABC, abstractmethod
-from typing import Union, Callable
-
-from cpl_reactive_extensions.abc.observer import Observer
-from cpl_reactive_extensions.abc.unsubscribable import Unsubscribable
-
-
-class Subscribable(ABC):
-    def __init__(self):
-        ABC.__init__(self)
-
-    @abstractmethod
-    def subscribe(
-        self, observer_or_next: Union[Callable, Observer], on_error: Callable = None, on_complete: Callable = None
-    ) -> Unsubscribable:
-        pass

src/cpl_reactive_extensions/abc/unsubscribable.py

@@ -1,10 +0,0 @@
-from abc import ABC, abstractmethod
-
-
-class Unsubscribable(ABC):
-    def __init__(self):
-        ABC.__init__(self)
-
-    @abstractmethod
-    def unsubscribe(self):
-        pass

src/cpl_reactive_extensions/cpl-reactive-extensions.json

@@ -1,44 +0,0 @@
-{
-  "ProjectSettings": {
-    "Name": "cpl-reactive-extensions",
-    "Version": {
-      "Major": "2023",
-      "Minor": "4",
-      "Micro": "dev170"
-    },
-    "Author": "Sven Heidemann",
-    "AuthorEmail": "sven.heidemann@sh-edraft.de",
-    "Description": "CPL Simple ReactiveX implementation",
-    "LongDescription": "CPL Simple ReactiveX implementation, see RxJS and RxPy for detailed implementation.",
-    "URL": "https://www.sh-edraft.de",
-    "CopyrightDate": "2023",
-    "CopyrightName": "sh-edraft.de",
-    "LicenseName": "MIT",
-    "LicenseDescription": "MIT, see LICENSE for more details.",
-    "Dependencies": [
-      "cpl-core>=2023.4.dev170"
-    ],
-    "DevDependencies": [
-      "cpl-cli>=2023.4.0"
-    ],
-    "PythonVersion": ">=3.10.4",
-    "PythonPath": {},
-    "Classifiers": []
-  },
-  "BuildSettings": {
-    "ProjectType": "library",
-    "SourcePath": "",
-    "OutputPath": "../../dist",
-    "Main": "",
-    "EntryPoint": "",
-    "IncludePackageData": false,
-    "Included": [],
-    "Excluded": [
-      "*/__pycache__",
-      "*/logs",
-      "*/tests"
-    ],
-    "PackageData": {},
-    "ProjectReferences": []
-  }
-}

src/cpl_reactive_extensions/helper/__init__.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-cpl-reactive-extensions CPL Simple ReactiveX implementation
-~~~~~~~~~~~~~~~~~~~
-
-CPL Simple ReactiveX implementation, see RxJS and RxPy for detailed implementation.
-
-:copyright: (c) 2023 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = "cpl_reactive_extensions.helper"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
-
-from collections import namedtuple
-
-
-# imports:
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")

src/cpl_reactive_extensions/helper/bind.py

@@ -1,11 +0,0 @@
-def bind(instance, func, *args, as_name=None):
-    """
-    Bind the function *func* to *instance*, with either provided name *as_name*
-    or the existing name of *func*. The provided *func* should accept the
-    instance as the first argument, i.e. "self".
-    """
-    if as_name is None:
-        as_name = func.__name__
-    bound_method = func.__get__(instance, instance.__class__)
-    setattr(instance, as_name, bound_method)
-    return bound_method

src/cpl_reactive_extensions/internal/__init__.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-cpl-reactive-extensions CPL Simple ReactiveX implementation
-~~~~~~~~~~~~~~~~~~~
-
-CPL Simple ReactiveX implementation, see RxJS and RxPy for detailed implementation.
-
-:copyright: (c) 2023 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = "cpl_reactive_extensions.internal"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
-
-from collections import namedtuple
-
-
-# imports:
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")

src/cpl_reactive_extensions/internal/action.py

@@ -1,10 +0,0 @@
-from cpl_core.type import T, Number
-from cpl_reactive_extensions.internal.subscription import Subscription
-
-
-class Action(Subscription):
-    def __init__(self, scheduler, work):
-        Subscription.__init__(self)
-
-    def schedule(self, state: T = None, delay: Number = 0) -> Subscription:
-        return self

src/cpl_reactive_extensions/internal/async_action.py

@@ -1,103 +0,0 @@
-from typing import Optional
-
-from cpl_core.type import T, Number
-from cpl_reactive_extensions.internal.action import Action
-from cpl_reactive_extensions.internal.subscription import Subscription
-from cpl_reactive_extensions.timer import Timer
-
-
-class AsyncAction(Action):
-    def __init__(self, scheduler, work):
-        from cpl_reactive_extensions.scheduler.async_scheduler import AsyncScheduler
-
-        Action.__init__(self, scheduler, work)
-
-        self._scheduler: AsyncScheduler = scheduler
-        self._work = work
-
-        self.timer = None
-        self.state: Optional[T] = None
-        self.delay: Number = 0
-        self._pending = False
-
-    def schedule(self, state: T = None, delay: Number = 0) -> Subscription:
-        if self.closed:
-            return self
-
-        self.state = state
-
-        timer = self.timer
-        scheduler = self._scheduler
-
-        if timer is not None:
-            self.timer = self.recycle_async_timer(scheduler, timer, delay)
-
-        self._pending = True
-        self.delay = delay
-        self.timer = self.timer if self.timer is not None else self.request_async_timer(scheduler, delay)
-
-        return self
-
-    def request_async_timer(self, scheduler, delay: Number = 0):
-        from cpl_reactive_extensions.scheduler.async_scheduler import AsyncScheduler
-
-        scheduler: AsyncScheduler = scheduler
-        return Timer(delay, lambda: scheduler.flush(self))
-
-    def recycle_async_timer(self, scheduler, timer=None, delay: Number = None):
-        from cpl_reactive_extensions.scheduler.async_scheduler import AsyncScheduler
-
-        scheduler: AsyncScheduler = scheduler
-        if delay is None and self.delay == delay and not self._pending:
-            return timer
-
-        if timer is not None:
-            timer.clear()
-
-        return None
-
-    def execute(self, state: T, delay: Number):
-        if self.closed:
-            return Exception("Executing cancelled action")
-
-        self._pending = False
-        error = self._execute(state, delay)
-        if error is not None:
-            return error
-        elif not self._pending and self.timer is not None:
-            self._timer = self.recycle_async_timer(self._scheduler, self.timer, None)
-
-    def _execute(self, state: T, delay: Number):
-        errored = False
-        ex = None
-        try:
-            self._work(state)
-        except Exception as e:
-            errored = True
-            ex = e
-
-        if errored:
-            self.unsubscribe()
-            return ex
-
-    def unsubscribe(self):
-        if self.closed:
-            return
-
-        timer = self.timer
-        scheduler = self._scheduler
-        actions = self._scheduler.actions
-
-        self._work = None
-        self.state = None
-        self._scheduler = None
-        self._pending = False
-        self.delay = None
-
-        if self in actions:
-            actions.remove(self)
-
-        if self.timer is not None:
-            self.timer = self.recycle_async_timer(scheduler, timer, None)
-
-        Action.unsubscribe(self)

src/cpl_reactive_extensions/internal/operator_subscriber.py

@@ -1,55 +0,0 @@
-from typing import Callable
-
-from cpl_core.type import T
-from cpl_reactive_extensions.abc.observer import Observer
-from cpl_reactive_extensions.internal.subscriber import Subscriber
-
-
-class OperatorSubscriber(Subscriber, Observer):
-    def __init__(
-        self,
-        destination: Subscriber,
-        on_next: Callable = None,
-        on_error: Callable = None,
-        on_complete: Callable = None,
-        on_finalize: Callable = None,
-        should_unsubscribe: Callable = None,
-    ):
-        Subscriber.__init__(self, destination)
-        self._on_finalize = on_finalize
-        self._should_unsubscribe = should_unsubscribe
-
-        def on_next_wrapper(value: T):
-            try:
-                on_next(value)
-            except Exception as e:
-                destination.error(e)
-
-        self._on_next = on_next_wrapper if on_next is not None else self._on_next
-
-        def on_error_wrapper(value: T):
-            try:
-                on_error(value)
-            except Exception as e:
-                destination.error(e)
-            finally:
-                self.unsubscribe()
-
-        self._on_error = on_error_wrapper if on_error is not None else self._on_error
-
-        def on_complete_wrapper(value: T):
-            try:
-                on_complete(value)
-            except Exception as e:
-                destination.error(e)
-            finally:
-                self.unsubscribe()
-
-        self._on_complete = on_complete_wrapper if on_complete is not None else self._on_complete
-
-    def unsubscribe(self):
-        if self._should_unsubscribe is not None and not self._should_unsubscribe():
-            return
-        Subscriber.unsubscribe(self)
-        if not self.closed and self._on_finalize is not None:
-            self._on_finalize()

src/cpl_reactive_extensions/internal/subscriber.py

@@ -1,65 +0,0 @@
-from typing import Callable
-
-from cpl_core.type import T
-from cpl_reactive_extensions.abc.observer import Observer
-from cpl_reactive_extensions.internal.subscription import Subscription
-from cpl_reactive_extensions.type import ObserverOrCallable
-
-
-class Subscriber(Subscription, Observer):
-    def __init__(
-        self, on_next_or_observer: ObserverOrCallable, on_error: Callable = None, on_complete: Callable = None
-    ):
-        self.is_stopped = False
-        Subscription.__init__(self)
-        if isinstance(on_next_or_observer, Observer):
-            self._on_next = on_next_or_observer.next
-            self._on_error = on_next_or_observer.error
-            self._on_complete = on_next_or_observer.complete
-        else:
-            self._on_next = on_next_or_observer
-            self._on_error = on_error
-            self._on_complete = on_complete
-
-    def _next(self, value: T):
-        self._on_next(value)
-
-    def next(self, value: T):
-        if self.is_stopped:
-            raise Exception("Observer is closed")
-
-        self._next(value)
-
-    def _error(self, ex: Exception):
-        try:
-            self._on_error(ex)
-        except TypeError:
-            pass
-        finally:
-            self.unsubscribe()
-
-    def error(self, ex: Exception):
-        self._error(ex)
-
-    def _complete(self):
-        try:
-            self._on_complete()
-        except TypeError:
-            pass
-        finally:
-            self.unsubscribe()
-
-    def complete(self):
-        if self.is_stopped:
-            return
-
-        self.is_stopped = True
-        self._complete()
-
-    def unsubscribe(self):
-        if self._closed:
-            return
-
-        self.is_stopped = True
-        Subscription.unsubscribe(self)
-        self._on_next = None

src/cpl_reactive_extensions/internal/subscription.py

@@ -1,96 +0,0 @@
-from __future__ import annotations
-
-import traceback
-from typing import Union, Callable, Optional
-
-from cpl_core.console import Console
-from cpl_reactive_extensions.abc.unsubscribable import Unsubscribable
-
-
-class Subscription(Unsubscribable):
-    @staticmethod
-    def empty():
-        empty = Subscription()
-        empty.closed = True
-        return empty
-
-    def __init__(self, initial_teardown: Optional[Callable] = None):
-        Unsubscribable.__init__(self)
-
-        self._initial_teardown = initial_teardown
-
-        self._closed = False
-
-        self._parentage: list[Subscription] = []
-        self._finalizers: list[Subscription] = []
-
-    @property
-    def closed(self) -> bool:
-        return self._closed
-
-    @closed.setter
-    def closed(self, value: bool):
-        self._closed = value
-
-    def _add_parent(self, parent: Subscription):
-        self._parentage.append(parent)
-
-    def _remove_parent(self, parent: Subscription):
-        if self == parent:
-            self._parentage.clear()
-            return
-
-        self._parentage.remove(parent)
-
-    def _has_parent(self, parent: Subscription) -> bool:
-        return parent in self._parentage
-
-    def _exec_finalizer(self, finalizer: Union[Callable, Unsubscribable]):
-        if isinstance(finalizer, Callable):
-            finalizer()
-        else:
-            finalizer.unsubscribe()
-
-    def unsubscribe(self):
-        if not self._closed:
-            self._closed = True
-
-        for parent in self._parentage:
-            parent.remove(self)
-
-        if self._initial_teardown is not None:
-            try:
-                self._initial_teardown()
-            except Exception as e:
-                Console.error(e, traceback.format_exc())
-
-        finalizers = self._finalizers
-        self._finalizers = None
-        for finalizer in finalizers:
-            try:
-                self._exec_finalizer(finalizer)
-            except Exception as e:
-                Console.error(e, traceback.format_exc())
-
-    def add(self, tear_down: Union[Subscription, Unsubscribable]):
-        if tear_down is None or tear_down == self:
-            return
-
-        if self.closed:
-            self._exec_finalizer(tear_down)
-            return
-
-        if isinstance(tear_down, Subscription):
-            if tear_down.closed or tear_down._has_parent(self):
-                return
-
-            tear_down._add_parent(self)
-
-        self._finalizers.append(tear_down)
-
-    def remove(self, tear_down: Union[Subscription, Unsubscribable]):
-        if self._finalizers is not None:
-            self._finalizers.remove(tear_down)
-
-        if isinstance(tear_down, Subscription):
-            tear_down._remove_parent(self)

src/cpl_reactive_extensions/internal/timer_provider.py

@@ -1,10 +0,0 @@
-from typing import Callable
-
-from cpl_core.type import Number
-from cpl_reactive_extensions.timer import Timer
-
-
-class TimerProvider:
-    @staticmethod
-    def set_timer(handler: Callable, timeout: Number = None, *args):
-        return Timer(timeout, handler, *args)

src/cpl_reactive_extensions/internal/utils.py

@@ -1,20 +0,0 @@
-from typing import Callable
-
-from cpl_reactive_extensions.observable import Observable
-from cpl_reactive_extensions.internal.subscriber import Subscriber
-
-
-def operate(init: Callable[[Observable, Subscriber], None]):
-    def observable(source: Observable):
-        def create(self: Subscriber, lifted_source: Observable):
-            try:
-                return init(lifted_source, self)
-            except Exception as e:
-                self.error(e)
-
-        if "lift" not in dir(source):
-            raise TypeError("Unable to lift unknown Observable type")
-
-        return source.lift(create)
-
-    return observable

src/cpl_reactive_extensions/interval.py

@@ -1,47 +0,0 @@
-import sched
-import threading
-import time
-from typing import Callable
-
-from cpl_reactive_extensions.internal.subscriber import Subscriber
-from cpl_reactive_extensions.observable import Observable
-
-
-class Interval(Observable):
-    def __init__(self, interval: float, callback: Callable = None, not_in_background=False):
-        self._interval = interval
-        callback = callback if callback is not None else self._default_callback
-
-        def schedule(x: Subscriber):
-            scheduler = sched.scheduler(time.time, time.sleep)
-            scheduler.enter(
-                self._interval,
-                1,
-                self._run,
-                (scheduler, x, callback),
-            )
-            scheduler.run()
-
-        def thread(x: Subscriber):
-            t = threading.Thread(target=schedule, args=(x,))
-            t.start()
-
-        Observable.__init__(self, schedule if not_in_background else thread)
-        self._i = 0
-
-    def _run(self, scheduler, x: Subscriber, callback: Callable):
-        if x.closed:
-            x.complete()
-            return
-
-        scheduler.enter(
-            self._interval,
-            1,
-            self._run,
-            (scheduler, x, callback),
-        )
-        callback(x)
-
-    def _default_callback(self, x: Subscriber):
-        x.next(self._i)
-        self._i += 1

src/cpl_reactive_extensions/observable.py

@@ -1,114 +0,0 @@
-from __future__ import annotations
-
-from typing import Callable, Any, Optional
-
-from cpl_core.type import T
-from cpl_reactive_extensions.abc.observer import Observer
-from cpl_reactive_extensions.abc.subscribable import Subscribable
-from cpl_reactive_extensions.internal.subscriber import Subscriber
-from cpl_reactive_extensions.internal.subscription import Subscription
-from cpl_reactive_extensions.type import ObserverOrCallable
-
-
-class Observable(Subscribable):
-    def __init__(self, subscribe: Callable = None):
-        Subscribable.__init__(self)
-        if subscribe is not None:
-            self._subscribe = subscribe
-
-        self._source: Optional[Observable] = None
-        self._operator: Optional[Callable] = None
-
-    @staticmethod
-    def from_observable(obs: Observable):
-        def inner(subscriber: Subscriber):
-            if "subscribe" not in dir(obs):
-                raise TypeError("Unable to lift unknown Observable type")
-
-            return obs.subscribe(subscriber)
-
-        return Observable(inner)
-
-    @staticmethod
-    def from_list(values: list):
-        i = 0
-
-        def callback(x: Subscriber):
-            nonlocal i
-            if i == len(values):
-                i = 0
-                x.complete()
-            else:
-                x.next(values[i])
-                i += 1
-
-                if not x.closed:
-                    callback(x)
-
-        observable = Observable(callback)
-        return observable
-
-    def lift(self, operator: Callable) -> Observable:
-        observable = Observable()
-        observable._source = self
-        observable._operator = operator
-        return observable
-
-    @staticmethod
-    def _is_observer(value: Any) -> bool:
-        return isinstance(value, Observer)
-
-    @staticmethod
-    def _is_subscription(value: Any) -> bool:
-        return isinstance(value, Subscription)
-
-    @staticmethod
-    def _is_subscriber(value: Any) -> bool:
-        return isinstance(value, Subscriber) or Observable._is_observer(value) and Observable._is_subscription(value)
-
-    def _subscribe(self, subscriber: Subscriber) -> Subscription:
-        return self._source.subscribe(subscriber)
-
-    def _try_subscribe(self, subscriber: Subscriber) -> Subscription:
-        try:
-            return self._subscribe(subscriber)
-        except Exception as e:
-            subscriber.error(e)
-
-    def subscribe(
-        self, observer_or_next: ObserverOrCallable, on_error: Callable = None, on_complete: Callable = None
-    ) -> Subscription:
-        subscriber = (
-            observer_or_next
-            if Observable._is_subscriber(observer_or_next)
-            else Subscriber(observer_or_next, on_error, on_complete)
-        )
-
-        subscriber.add(
-            self._operator(subscriber, self._source)
-            if self._operator is not None
-            else self._subscribe(subscriber)
-            if self._source is not None
-            else self._try_subscribe(subscriber)
-        )
-
-        return subscriber
-
-    def pipe(self, *args) -> Observable:
-        return self._pipe_from_array(args)(self)
-
-    def _pipe_from_array(self, args):
-        if len(args) == 0:
-            return lambda x: x
-
-        if len(args) == 1:
-            return args[0]
-
-        def piped(input: T):
-            return Observable._reduce(lambda prev, fn: fn(prev), input)
-
-        return piped
-
-    @staticmethod
-    def _reduce(func: Callable, input: T):
-        return func(input)

src/cpl_reactive_extensions/operators/__init__.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-cpl-reactive-extensions CPL Simple ReactiveX implementation
-~~~~~~~~~~~~~~~~~~~
-
-CPL Simple ReactiveX implementation, see RxJS and RxPy for detailed implementation.
-
-:copyright: (c) 2023 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = "cpl_reactive_extensions.operators"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
-
-from collections import namedtuple
-
-
-# imports:
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")

src/cpl_reactive_extensions/operators/debounce_time.py

@@ -1,62 +0,0 @@
-from typing import Optional
-
-from cpl_core.type import T, Number
-from cpl_reactive_extensions.abc.scheduler_action import SchedulerAction
-from cpl_reactive_extensions.internal.operator_subscriber import OperatorSubscriber
-from cpl_reactive_extensions.internal.subscriber import Subscriber
-from cpl_reactive_extensions.internal.subscription import Subscription
-from cpl_reactive_extensions.internal.utils import operate
-from cpl_reactive_extensions.observable import Observable
-from cpl_reactive_extensions.scheduler.async_scheduler import async_scheduler
-
-
-def debounce_time(time: Number, scheduler=async_scheduler):
-    def init(source: Observable, subscriber: Subscriber):
-        active_task: Optional[Subscription] = None
-        last_value: Optional[T] = None
-        last_time: Optional[Number] = None
-
-        def emit():
-            nonlocal active_task, last_value
-
-            if active_task is None:
-                return
-
-            active_task.unsubscribe()
-            active_task = None
-            value = last_value
-            last_value = None
-            subscriber.next(value)
-
-        def emit_when_idle(action: SchedulerAction):
-            nonlocal active_task, last_time
-            target_time = last_time + time
-            now = scheduler.now
-
-            if now < target_time:
-                active_task = action.schedule(None, target_time - now)
-                subscriber.add(active_task)
-                return
-
-            emit()
-
-        def on_next(value: T):
-            nonlocal active_task, last_value
-            last_value = value
-
-            if active_task is None:
-                active_task = scheduler.schedule(emit_when_idle, time)
-                subscriber.add(active_task)
-
-        def on_complete():
-            emit()
-            subscriber.complete()
-
-        def on_finalize():
-            nonlocal active_task, last_value
-            last_value = None
-            active_task = None
-
-        sub = source.subscribe(OperatorSubscriber(subscriber, on_next, None, on_complete, on_finalize))
-
-    return operate(init)

src/cpl_reactive_extensions/operators/take.py

@@ -1,29 +0,0 @@
-from cpl_core.type import T
-from cpl_reactive_extensions.internal.subscriber import Subscriber
-from cpl_reactive_extensions.observable import Observable
-from cpl_reactive_extensions.internal.operator_subscriber import OperatorSubscriber
-from cpl_reactive_extensions.internal.utils import operate
-
-
-def take(count: int):
-    if count <= 0:
-        return Observable()
-
-    def init(source: Observable, subscriber: Subscriber):
-        seen = 0
-
-        def on_next(value: T):
-            nonlocal seen
-
-            if seen + 1 <= count:
-                seen += 1
-                subscriber.next(value)
-
-                if count <= seen:
-                    subscriber.complete()
-            else:
-                sub.unsubscribe()
-
-        sub = source.subscribe(OperatorSubscriber(subscriber, on_next))
-
-    return operate(init)

src/cpl_reactive_extensions/operators/take_until.py

@@ -1,14 +0,0 @@
-from cpl_reactive_extensions.observable import Observable
-from cpl_reactive_extensions.internal.operator_subscriber import OperatorSubscriber
-from cpl_reactive_extensions.internal.subscriber import Subscriber
-from cpl_reactive_extensions.internal.utils import operate
-
-
-def take_until(notifier: Observable):
-    def init(source: Observable, subscriber: Subscriber):
-        Observable.from_observable(notifier).subscribe(OperatorSubscriber(subscriber, lambda: subscriber.complete()))
-
-        if not subscriber.closed:
-            source.subscribe(subscriber)
-
-    return operate(init)

src/cpl_reactive_extensions/scheduler/__init__.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-cpl-reactive-extensions CPL Simple ReactiveX implementation
-~~~~~~~~~~~~~~~~~~~
-
-CPL Simple ReactiveX implementation, see RxJS and RxPy for detailed implementation.
-
-:copyright: (c) 2023 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = "cpl_reactive_extensions.scheduler"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
-
-from collections import namedtuple
-
-
-# imports:
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")

src/cpl_reactive_extensions/scheduler/async_scheduler.py

@@ -1,36 +0,0 @@
-from typing import Type
-
-from cpl_reactive_extensions.internal.action import Action
-from cpl_reactive_extensions.internal.async_action import AsyncAction
-from cpl_reactive_extensions.scheduler.scheduler import Scheduler
-
-
-class AsyncScheduler(Scheduler):
-    def __init__(self, scheduler_action_ctor: Type[Action], now=None):
-        Scheduler.__init__(self, scheduler_action_ctor, now)
-
-        self.actions: list[AsyncAction] = []
-        self._active = False
-
-    def flush(self, action: AsyncAction):
-        if self._active:
-            self.actions.append(action)
-            return
-
-        error = None
-        self._active = True
-
-        for action in self.actions:
-            error = action.execute(action.state, action.delay)
-            if error:
-                break
-
-        self._active = False
-
-        if error is not None:
-            for action in self.actions:
-                action.unsubscribe()
-            raise error
-
-
-async_scheduler = AsyncScheduler(AsyncAction)

src/cpl_reactive_extensions/scheduler/scheduler.py

@@ -1,29 +0,0 @@
-from datetime import datetime
-from typing import Callable, Optional, Type
-
-from cpl_core.type import T, Number
-from cpl_reactive_extensions.abc.scheduler_action import SchedulerAction
-from cpl_reactive_extensions.abc.scheduler_like import SchedulerLike
-from cpl_reactive_extensions.internal.action import Action
-from cpl_reactive_extensions.internal.subscription import Subscription
-
-
-class Scheduler(SchedulerLike):
-    @staticmethod
-    @property
-    def _get_now(self=None) -> Number:
-        return int(datetime.now().strftime("%s"))
-
-    now = _get_now
-
-    def __init__(self, scheduler_action_ctor: Type[Action], now=None):
-        self.now = self._get_now if now is None else now
-        self._scheduler_action_ctor = scheduler_action_ctor
-
-    def schedule(
-        self, work: Callable[[SchedulerAction, Optional[T]], None], delay: Number, state: T = None
-    ) -> Subscription:
-        action = self._scheduler_action_ctor(self, work)
-        x = action.schedule(state, delay)
-
-        return x

src/cpl_reactive_extensions/subject/__init__.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-cpl-reactive-extensions CPL Simple ReactiveX implementation
-~~~~~~~~~~~~~~~~~~~
-
-CPL Simple ReactiveX implementation, see RxJS and RxPy for detailed implementation.
-
-:copyright: (c) 2023 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = "cpl_reactive_extensions.subject"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2023 sh-edraft.de"
-__version__ = "2023.4.dev170"
-
-from collections import namedtuple
-
-
-# imports:
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="dev170")

src/cpl_reactive_extensions/subject/behavior_subject.py

@@ -1,24 +0,0 @@
-from typing import Type
-
-from cpl_core.type import T
-from cpl_reactive_extensions.subject.subject import Subject
-
-
-class BehaviorSubject(Subject):
-    def __init__(self, _t: Type[T], value: T):
-        Subject.__init__(self, _t)
-
-        if not isinstance(value, _t):
-            raise TypeError(f"Expected {_t.__name__} not {type(value).__name__}")
-
-        self._t = _t
-        self._value = value
-
-    @property
-    def value(self) -> T:
-        return self._value
-
-    def next(self, value: T):
-        super().next(value)
-
-        self._value = value

src/cpl_reactive_extensions/subject/subject.py

@@ -1,101 +0,0 @@
-from types import NoneType
-from typing import Any, Optional, Type
-
-from cpl_core.type import T
-from cpl_reactive_extensions.abc.observer import Observer
-from cpl_reactive_extensions.observable import Observable
-from cpl_reactive_extensions.internal.subscriber import Subscriber
-from cpl_reactive_extensions.internal.subscription import Subscription
-
-
-class Subject(Observable, Observer):
-    def __init__(self, _t: Type[T]):
-        Observable.__init__(self)
-
-        self.is_closed = False
-        self._t = _t if _t is not None else NoneType
-        self._current_observers: Optional[list[Observer]] = None
-
-        self.closed = False
-        self.observers: list[Observer] = []
-        self.is_stopped = False
-        self.has_error = False
-        self.raised_error: Any = None
-
-    @property
-    def observed(self) -> bool:
-        return len(self.observers) > 0
-
-    def _raise_if_closed(self):
-        if not self.closed:
-            return
-        raise Exception("Subject is unsubscribed!")
-
-    def next(self, value: T):
-        self._raise_if_closed()
-
-        if not isinstance(value, self._t):
-            raise TypeError(f"Expected {self._t.__name__} not {type(value).__name__}")
-
-        if self.is_stopped:
-            return
-
-        if self._current_observers is None:
-            self._current_observers = self.observers
-
-        for observer in self._current_observers:
-            observer.next(value)
-
-    def error(self, error: Exception):
-        self._raise_if_closed()
-        if self.is_stopped:
-            return
-
-        self.is_stopped = True
-        self.has_error = self.is_stopped
-        for observer in self.observers:
-            observer.error(error)
-
-    def complete(self):
-        self._raise_if_closed()
-
-        if self.is_stopped:
-            return
-
-        self.is_stopped = True
-        for observer in self.observers:
-            observer.complete()
-
-    def unsubscribe(self):
-        self.is_stopped = True
-        self.is_closed = True
-        self._current_observers = None
-        self.observers = []
-
-    def _try_subscribe(self, subscriber: Subscriber):
-        self._raise_if_closed()
-        return super()._try_subscribe(subscriber)
-
-    def _subscribe(self, subscriber: Subscriber) -> Subscription:
-        self._raise_if_closed()
-        self._check_finalized_statuses(subscriber)
-        return self._inner_subscribe(subscriber)
-
-    def _check_finalized_statuses(self, subscriber: Subscriber):
-        if self.has_error:
-            subscriber.error(self.raised_error)
-        elif self.is_stopped:
-            subscriber.complete()
-
-    def _inner_subscribe(self, subscriber: Subscriber) -> Optional[Subscription]:
-        if self.has_error or self.is_stopped:
-            return Subscription.empty()
-
-        self._current_observers = None
-        self.observers.append(subscriber)
-
-        def _initial():
-            self._current_observers = None
-            self.observers.remove(subscriber)
-
-        return Subscription(_initial)

src/cpl_reactive_extensions/timer.py

@@ -1,24 +0,0 @@
-import threading
-import time
-from typing import Callable
-
-from cpl_core.type import Number
-
-
-class Timer:
-    def __init__(self, interval: Number, action: Callable, *args):
-        self._interval = interval / 1000
-        self._action = action
-        self._args = args
-        self.stop_event = threading.Event()
-        thread = threading.Thread(target=self.__set_interval)
-        thread.start()
-
-    def __set_interval(self):
-        next_time = time.time() + self._interval
-        while not self.stop_event.wait(next_time - time.time()):
-            next_time += self._interval
-            self._action(*self._args)
-
-    def clear(self):
-        self.stop_event.set()

src/cpl_reactive_extensions/type.py

@@ -1,5 +0,0 @@
-from typing import Callable, Union
-
-from cpl_reactive_extensions.abc.observer import Observer
-
-ObserverOrCallable = Union[Callable, Observer]

src/cpl_translation/__init__.py

@@ -15,7 +15,7 @@ __title__ = "cpl_translation"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "2023.4.0"
+__version__ = "2023.4.0.post1"
 
 from collections import namedtuple
 
@@ -53,4 +53,4 @@ init()
 # build-ignore-end
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="2023", minor="4", micro="0")
+version_info = VersionInfo(major="2023", minor="4", micro="0.post1")

src/cpl_translation/cpl-translation.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2023",
       "Minor": "4",
-      "Micro": "0"
+      "Micro": "0.post1"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

src/cpl_translation/translation_settings.py

@@ -5,12 +5,12 @@ class TranslationSettings(ConfigurationModelABC):
     def __init__(
         self,
         languages: list = None,
-        default_lang: str = None,
+        default_language: str = None,
     ):
         ConfigurationModelABC.__init__(self)
 
         self._languages = [] if languages is None else languages
-        self._default_lang = default_lang
+        self._default_lang = default_language
 
     @property
     def languages(self) -> list[str]:

unittests/unittests/application.py

@@ -6,7 +6,6 @@ from cpl_core.dependency_injection import ServiceProviderABC
 from unittests_cli.cli_test_suite import CLITestSuite
 from unittests_core.core_test_suite import CoreTestSuite
 from unittests_query.query_test_suite import QueryTestSuite
-from unittests_reactive_extenstions.reactive_test_suite import ReactiveTestSuite
 from unittests_translation.translation_test_suite import TranslationTestSuite
 
 
@@ -22,5 +21,4 @@ class Application(ApplicationABC):
         runner.run(CoreTestSuite())
         runner.run(CLITestSuite())
         runner.run(QueryTestSuite())
-        runner.run(ReactiveTestSuite())
         runner.run(TranslationTestSuite())

unittests/unittests_reactive_extenstions/__init__.py

@@ -1 +0,0 @@
-# imports

unittests/unittests_reactive_extenstions/observable_operator_test_case.py

@@ -1,88 +0,0 @@
-import time
-import traceback
-import unittest
-
-from cpl_core.console import Console
-from cpl_reactive_extensions.observable import Observable
-from cpl_reactive_extensions.operators.debounce_time import debounce_time
-from cpl_reactive_extensions.subject.subject import Subject
-from cpl_reactive_extensions.interval import Interval
-from cpl_reactive_extensions.operators.take import take
-from cpl_reactive_extensions.operators.take_until import take_until
-
-
-class ObservableOperatorTestCase(unittest.TestCase):
-    def setUp(self):
-        self._error = False
-        self._completed = False
-
-    def _on_error(self, ex: Exception):
-        tb = traceback.format_exc()
-        Console.error(f"Got error from observable: {ex}", tb)
-        self._error = True
-
-    def _on_complete(self):
-        self._completed = True
-
-    def test_take_two(self):
-        count = 0
-
-        def sub(x):
-            nonlocal count
-
-            count += 1
-
-        observable = Interval(0.1)
-        sub = observable.pipe(take(2)).subscribe(sub)
-        time.sleep(0.5)
-        self.assertEqual(count, 2)
-        sub.unsubscribe()
-
-    def test_take_five(self):
-        count = 0
-
-        def sub(x):
-            nonlocal count
-
-            count += 1
-
-        observable = Interval(0.1)
-        sub = observable.pipe(take(5)).subscribe(sub)
-        time.sleep(1)
-        self.assertEqual(count, 5)
-        sub.unsubscribe()
-
-    def test_take_until(self):
-        count = 0
-        unsubscriber = Subject(None)
-
-        def sub(x):
-            nonlocal count
-
-            count += 1
-
-        observable = Interval(0.1)
-        observable.pipe(take_until(unsubscriber)).subscribe(sub)
-
-        timer = 2
-        time.sleep(timer)
-        unsubscriber.next(None)
-        unsubscriber.complete()
-        self.assertEqual(count, timer * 10 - 1)
-
-    # def test_debounce_time(self):
-    #     def call(x):
-    #         x.next(1)
-    #         x.next(2)
-    #         x.next(3)
-    #         x.next(4)
-    #         x.next(5)
-    #         x.next(6)
-    #         x.complete()
-    #
-    #     observable = Observable(call)
-    #
-    #     sub = observable.pipe(debounce_time(600)).subscribe(lambda x: Console.write_line("Hey", x))
-    #
-    #     time.sleep(2)
-    #     sub.unsubscribe()