python-cq 0.2.2__tar.gz → 0.3.1__tar.gz

python_cq-0.3.1/.gitignore

@@ -0,0 +1,322 @@
+# Created by https://www.toptal.com/developers/gitignore/api/python,pycharm,dotenv,macos
+# Edit at https://www.toptal.com/developers/gitignore?templates=python,pycharm,dotenv,macos
+
+### dotenv ###
+.env
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
+### PyCharm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### PyCharm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+# https://plugins.jetbrains.com/plugin/7973-sonarlint
+.idea/**/sonarlint/
+
+# SonarQube Plugin
+# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
+.idea/**/sonarIssues.xml
+
+# Markdown Navigator plugin
+# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
+.idea/**/markdown-navigator.xml
+.idea/**/markdown-navigator-enh.xml
+.idea/**/markdown-navigator/
+
+# Cache file creation bug
+# See https://youtrack.jetbrains.com/issue/JBR-2257
+.idea/$CACHE_FILE$
+
+# CodeStream plugin
+# https://plugins.jetbrains.com/plugin/12206-codestream
+.idea/codestream.xml
+
+# Azure Toolkit for IntelliJ plugin
+# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
+.idea/**/azureSettings.xml
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+# End of https://www.toptal.com/developers/gitignore/api/python,pycharm,dotenv,macos
+
+# Pyenv
+.python-version
+
+# Code editors
+.fleet/
+.idea/
+.vscode/

{python_cq-0.2.2 → python_cq-0.3.1}/PKG-INFO

@@ -1,29 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-cq
-Version: 0.2.2
+Version: 0.3.1
 Summary: Lightweight CQRS library.
-Home-page: https://github.com/100nm/python-cq
+Project-URL: Repository, https://github.com/100nm/python-cq
+Author: remimd
 License: MIT
 Keywords: cqrs
-Author: remimd
-Requires-Python: >=3.12,<4
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Dist: pydantic (>=2,<3)
+Requires-Python: <4,>=3.12
+Requires-Dist: pydantic<3,>=2
 Requires-Dist: python-injection
-Project-URL: Repository, https://github.com/100nm/python-cq
 Description-Content-Type: text/markdown
 
 # python-cq
@@ -51,4 +47,3 @@ pip install python-cq
 * [**Writing Application Layer**](https://github.com/100nm/python-cq/tree/prod/documentation/writing-application-layer.md)
 * [**Pipeline**](https://github.com/100nm/python-cq/tree/prod/documentation/pipeline.md)
 * [**FastAPI Example**](https://github.com/100nm/python-cq/tree/prod/documentation/fastapi-example.md)
-

{python_cq-0.2.2 → python_cq-0.3.1}/cq/__init__.py

@@ -12,9 +12,9 @@ from ._core.message import (
     QueryBus,
     command_handler,
     event_handler,
-    find_command_bus,
-    find_event_bus,
-    find_query_bus,
+    get_command_bus,
+    get_event_bus,
+    get_query_bus,
     query_handler,
 )
 from ._core.middleware import Middleware, MiddlewareResult
@@ -35,8 +35,8 @@ __all__ = (
     "QueryBus",
     "command_handler",
     "event_handler",
-    "find_command_bus",
-    "find_event_bus",
-    "find_query_bus",
+    "get_command_bus",
+    "get_event_bus",
+    "get_query_bus",
     "query_handler",
 )

{python_cq-0.2.2 → python_cq-0.3.1}/cq/_core/dispatcher/bus.py

@@ -1,18 +1,20 @@
 import asyncio
-from abc import abstractmethod
+from abc import ABC, abstractmethod
 from collections import defaultdict
-from collections.abc import Callable
+from collections.abc import Awaitable, Callable
 from dataclasses import dataclass, field
 from inspect import isclass
 from types import GenericAlias
-from typing import Protocol, Self, TypeAliasType, runtime_checkable
+from typing import Any, Protocol, Self, TypeAliasType, runtime_checkable
 
 import injection
 
 from cq._core.dispatcher.base import BaseDispatcher, Dispatcher
 
 type HandlerType[**P, T] = type[Handler[P, T]]
-type HandlerFactory[**P, T] = Callable[..., Handler[P, T]]
+type HandlerFactory[**P, T] = Callable[..., Awaitable[Handler[P, T]]]
+
+type Listener[T] = Callable[[T], Awaitable[Any]]
 
 type BusType[I, O] = type[Bus[I, O]]
 
@@ -34,32 +36,56 @@ class Bus[I, O](Dispatcher[I, O], Protocol):
     def subscribe(self, input_type: type[I], factory: HandlerFactory[[I], O]) -> Self:
         raise NotImplementedError
 
+    @abstractmethod
+    def add_listeners(self, *listeners: Listener[I]) -> Self:
+        raise NotImplementedError
+
 
 @dataclass(eq=False, frozen=True, slots=True)
 class SubscriberDecorator[I, O]:
     bus_type: BusType[I, O] | TypeAliasType | GenericAlias
     injection_module: injection.Module = field(default_factory=injection.mod)
 
-    def __call__(self, first_input_type: type[I], /, *input_types: type[I]):  # type: ignore[no-untyped-def]
-        def decorator(wrapped):  # type: ignore[no-untyped-def]
+    def __call__(self, first_input_type: type[I], /, *input_types: type[I]) -> Any:
+        def decorator(wrapped: type[Handler[[I], O]]) -> type[Handler[[I], O]]:
             if not isclass(wrapped) or not issubclass(wrapped, Handler):
                 raise TypeError(f"`{wrapped}` isn't a valid handler.")
 
-            bus = self.__find_bus()
-            factory = self.injection_module.make_injected_function(wrapped)
+            bus = self.injection_module.find_instance(self.bus_type)
+            lazy_instance = self.injection_module.aget_lazy_instance(
+                wrapped,
+                default=NotImplemented,
+            )
+
+            async def getter() -> Handler[[I], O]:
+                return await lazy_instance
 
             for input_type in (first_input_type, *input_types):
-                bus.subscribe(input_type, factory)
+                bus.subscribe(input_type, getter)
 
-            return wrapped
+            return self.injection_module.injectable(wrapped)
 
         return decorator
 
-    def __find_bus(self) -> Bus[I, O]:
-        return self.injection_module.find_instance(self.bus_type)
 
+class BaseBus[I, O](BaseDispatcher[I, O], Bus[I, O], ABC):
+    __slots__ = ("__listeners",)
+
+    __listeners: list[Listener[I]]
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.__listeners = []
+
+    def add_listeners(self, *listeners: Listener[I]) -> Self:
+        self.__listeners.extend(listeners)
+        return self
 
-class SimpleBus[I, O](BaseDispatcher[I, O], Bus[I, O]):
+    async def _trigger_listeners(self, input_value: I, /) -> None:
+        await asyncio.gather(*(listener(input_value) for listener in self.__listeners))
+
+
+class SimpleBus[I, O](BaseBus[I, O]):
     __slots__ = ("__handlers",)
 
     __handlers: dict[type[I], HandlerFactory[[I], O]]
@@ -69,6 +95,7 @@ class SimpleBus[I, O](BaseDispatcher[I, O], Bus[I, O]):
         self.__handlers = {}
 
     async def dispatch(self, input_value: I, /) -> O:
+        await self._trigger_listeners(input_value)
         input_type = type(input_value)
 
         try:
@@ -76,10 +103,8 @@ class SimpleBus[I, O](BaseDispatcher[I, O], Bus[I, O]):
         except KeyError:
             return NotImplemented
 
-        return await self._invoke_with_middlewares(
-            handler_factory().handle,
-            input_value,
-        )
+        handler = await handler_factory()
+        return await self._invoke_with_middlewares(handler.handle, input_value)
 
     def subscribe(self, input_type: type[I], factory: HandlerFactory[[I], O]) -> Self:
         if input_type in self.__handlers:
@@ -91,7 +116,7 @@ class SimpleBus[I, O](BaseDispatcher[I, O], Bus[I, O]):
         return self
 
 
-class TaskBus[I](BaseDispatcher[I, None], Bus[I, None]):
+class TaskBus[I](BaseBus[I, None]):
     __slots__ = ("__handlers",)
 
     __handlers: dict[type[I], list[HandlerFactory[[I], None]]]
@@ -101,19 +126,20 @@ class TaskBus[I](BaseDispatcher[I, None], Bus[I, None]):
         self.__handlers = defaultdict(list)
 
     async def dispatch(self, input_value: I, /) -> None:
+        await self._trigger_listeners(input_value)
         handler_factories = self.__handlers.get(type(input_value))
 
         if not handler_factories:
             return
 
         await asyncio.gather(
-            *(
+            *[
                 self._invoke_with_middlewares(
-                    handler_factory().handle,
+                    (await handler_factory()).handle,
                     input_value,
                 )
                 for handler_factory in handler_factories
-            )
+            ]
         )
 
     def subscribe(

{python_cq-0.2.2 → python_cq-0.3.1}/cq/_core/message.py

@@ -39,13 +39,16 @@ injection.set_constant(TaskBus(), EventBus, alias=True)
 injection.set_constant(SimpleBus(), QueryBus, alias=True)
 
 
-def find_command_bus[T]() -> CommandBus[T]:
-    return injection.find_instance(CommandBus)
+@injection.inject
+def get_command_bus[T](bus: CommandBus[T] = NotImplemented, /) -> CommandBus[T]:
+    return bus
 
 
-def find_event_bus() -> EventBus:
-    return injection.find_instance(EventBus)
+@injection.inject
+def get_event_bus(bus: EventBus = NotImplemented, /) -> EventBus:
+    return bus
 
 
-def find_query_bus[T]() -> QueryBus[T]:
-    return injection.find_instance(QueryBus)
+@injection.inject
+def get_query_bus[T](bus: QueryBus[T] = NotImplemented, /) -> QueryBus[T]:
+    return bus

{python_cq-0.2.2 → python_cq-0.3.1}/pyproject.toml

@@ -1,11 +1,30 @@
-[tool.poetry]
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[dependency-groups]
+dev = [
+    "hatch",
+    "mypy",
+    "ruff",
+]
+example = [
+    "fastapi",
+]
+test = [
+    "pytest",
+    "pytest-asyncio",
+    "pytest-cov",
+]
+
+[project]
 name = "python-cq"
-version = "0.2.2"
+version = "0.3.1"
 description = "Lightweight CQRS library."
-license = "MIT"
-authors = ["remimd"]
+license = { text = "MIT" }
 readme = "README.md"
-repository = "https://github.com/100nm/python-cq"
+requires-python = ">=3.12, <4"
+authors = [{ name = "remimd" }]
 keywords = ["cqrs"]
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -20,24 +39,13 @@ classifiers = [
     "Natural Language :: English",
     "Typing :: Typed",
 ]
-packages = [{ include = "cq" }]
-
-[tool.poetry.dependencies]
-python = ">=3.12, <4"
-pydantic = ">=2, <3"
-python-injection = "*"
-
-[tool.poetry.group.dev.dependencies]
-mypy = "*"
-ruff = "*"
-
-[tool.poetry.group.example.dependencies]
-fastapi = "*"
+dependencies = [
+    "pydantic (>=2, <3)",
+    "python-injection",
+]
 
-[tool.poetry.group.test.dependencies]
-pytest = "*"
-pytest-asyncio = "*"
-pytest-cov = "*"
+[project.urls]
+Repository = "https://github.com/100nm/python-cq"
 
 [tool.coverage.report]
 exclude_lines = [
@@ -46,6 +54,15 @@ exclude_lines = [
     "raise NotImplementedError",
 ]
 
+[tool.hatch.build]
+skip-excluded-dirs = true
+
+[tool.hatch.build.targets.sdist]
+include = ["cq"]
+
+[tool.hatch.build.targets.wheel]
+packages = ["cq"]
+
 [tool.mypy]
 check_untyped_defs = true
 disallow_any_generics = true
@@ -70,7 +87,6 @@ asyncio_mode = "auto"
 testpaths = "**/tests/"
 
 [tool.ruff]
-target-version = "py312"
 line-length = 88
 indent-width = 4
 
@@ -84,6 +100,6 @@ line-ending = "auto"
 extend-select = ["F", "I", "N"]
 fixable = ["ALL"]
 
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+[tool.uv]
+default-groups = ["dev", "test"]
+package = true