| {"repo": "alice-biometrics/petisco", "pull_number": 167, "instance_id": "alice-biometrics__petisco-167", "issue_numbers": "", "base_commit": "9e680d2d654faaffa1e233f911f77a7c0b779b0e", "patch": "diff --git a/examples/notifier/slack_notifier.py b/examples/notifier/slack_notifier.py\n--- a/examples/notifier/slack_notifier.py\n+++ b/examples/notifier/slack_notifier.py\n@@ -1,10 +1,69 @@\n import os\n+import sys\n+import traceback\n \n-from petisco.legacy.notifier.domain.notifier_message import NotifierMessage\n-from petisco.legacy.notifier.infrastructure.slack.slack_notifier import SlackNotifier\n+from petisco import NotifierExceptionMessage, NotifierMessage\n+from petisco.extra.slack import (\n+ BlocksSlackNotifierMessageConverter,\n+ ExceptionBlocksSlackNotifierMessageConverter,\n+ SlackNotifier,\n+)\n \n-token = os.environ[\"SLACK_API_TOKEN\"]\n+token = os.getenv(\"SLACK_API_TOKEN\")\n \n-notifier = SlackNotifier(token)\n+if not token:\n+ raise ValueError(\"Please, configure the SLACK_API_TOKEN envvar\")\n \n-notifier.publish(NotifierMessage(\"Test\", \"Hi\"))\n+gke_accessory = {\n+ \"type\": \"button\",\n+ \"text\": {\"type\": \"plain_text\", \"text\": \"Code\", \"emoji\": True},\n+ \"value\": \"click_me_code\",\n+ \"url\": \"https://github.com/alice-biometrics/petisco\",\n+ \"action_id\": \"button-code\",\n+ \"style\": \"primary\",\n+}\n+notifier = SlackNotifier(\n+ token=token,\n+ channel=\"feed-staging\",\n+ converter=BlocksSlackNotifierMessageConverter(slack_accessory=gke_accessory),\n+ exception_converter=ExceptionBlocksSlackNotifierMessageConverter(\n+ slack_accessory=gke_accessory,\n+ repository_url=\"https://github.com/alice-biometrics/petisco/blob/master\",\n+ repository_name_button=\"Github :github:\",\n+ ),\n+)\n+meta = {\"version\": \"2.0.0\", \"petisco\": \"1.0.0b\", \"environment\": \"staging\"}\n+\n+\n+def notify():\n+ notifier_message = NotifierMessage(title=\":rocket: petisco is deployed\", meta=meta)\n+ notifier.publish(notifier_message)\n+\n+\n+def notify_exception():\n+ def _notify_exceptuon(exception):\n+ _, _, tb = sys.exc_info()\n+ tb = traceback.extract_tb(tb)[-1]\n+ filename = tb.filename if tb and hasattr(tb, \"filename\") else None\n+ lineno = tb.lineno if tb and hasattr(tb, \"lineno\") else None\n+\n+ notifier_exception_message = NotifierExceptionMessage(\n+ title=\":man-shrugging::skin-tone-6: uncontrolled exception\",\n+ executor=\"MyUseCase\",\n+ exception=exception,\n+ traceback=traceback.format_exc(),\n+ filename=filename,\n+ lineno=lineno,\n+ input_parameters={\"arg1\": 2},\n+ meta=meta,\n+ )\n+ notifier.publish_exception(notifier_exception_message)\n+\n+ try:\n+ print(1 / 0)\n+ except Exception as exception:\n+ _notify_exceptuon(exception)\n+\n+\n+notify()\n+notify_exception()\ndiff --git a/petisco/base/application/dependency_injection/dependency.py b/petisco/base/application/dependency_injection/dependency.py\n--- a/petisco/base/application/dependency_injection/dependency.py\n+++ b/petisco/base/application/dependency_injection/dependency.py\n@@ -27,7 +27,7 @@ def get_instance(self):\n return self.default_builder.build()\n \n modifier = os.getenv(self.envar_modifier)\n- if not modifier or modifier not in self.builders:\n+ if not modifier or not self.builders or modifier not in self.builders:\n return self.default_builder.build()\n else:\n instance = self.builders.get(modifier).build()\ndiff --git a/petisco/base/application/middleware/notifier_middleware.py b/petisco/base/application/middleware/notifier_middleware.py\n--- a/petisco/base/application/middleware/notifier_middleware.py\n+++ b/petisco/base/application/middleware/notifier_middleware.py\n@@ -1,20 +1,18 @@\n from meiga import Result\n-from petisco.legacy.domain.aggregate_roots.info_id import InfoId\n-from petisco.legacy.domain.errors.critical_error import CriticalError\n-from petisco.legacy.notifier.domain.interface_notifier import INotifier\n-from petisco.legacy.notifier.domain.notifier_exception_message import (\n+\n+from petisco import __version__\n+from petisco.base.application.dependency_injection.injector import Injector\n+from petisco.base.application.middleware.middleware import Middleware\n+from petisco.base.application.notifier.notifier_exception_message import (\n NotifierExceptionMessage,\n )\n-from petisco.legacy.notifier.infrastructure.not_implemented_notifier import (\n- NotImplementedNotifier,\n-)\n-from petisco.base.application.middleware.middleware import Middleware\n+from petisco.base.domain.errors.unknown_error import UnknownError\n \n \n class NotifierMiddleware(Middleware):\n- def __init__(self, info_id: InfoId, notifier: INotifier):\n- self.info_id = info_id\n- self.notifier = notifier\n+ def __init__(self, wrapped_class_name, wrapped_class_input_arguments):\n+ super().__init__(wrapped_class_name, wrapped_class_input_arguments)\n+ self.notifier = Injector.get(\"notifier\")\n \n def before(self):\n pass\n@@ -22,20 +20,11 @@ def before(self):\n def after(self, result: Result):\n if result.is_failure:\n error = result.value\n- if issubclass(error.__class__, CriticalError):\n- self.notifier.publish(\n- NotifierExceptionMessage(\n- exception=error.exception,\n- executor=error.executor,\n- input_parameters=error.input_parameters,\n- traceback=error.traceback,\n- info_id=self.info_id,\n- info_petisco={}, # Petisco.get_info(),\n+ if issubclass(error.__class__, UnknownError):\n+ notifier_exception_message = (\n+ NotifierExceptionMessage.from_unknown_error(\n+ error, title=\"Uncontrolled Exception\"\n )\n )\n-\n-\n-class NotifierMiddlewareBuilder:\n- @staticmethod\n- def not_implemented(info_id: InfoId):\n- return NotifierMiddleware(info_id=info_id, notifier=NotImplementedNotifier())\n+ notifier_exception_message.meta[\"petisco\"] = __version__\n+ self.notifier.publish_exception(notifier_exception_message)\ndiff --git a/petisco/base/application/notifier/not_implemented_notifier.py b/petisco/base/application/notifier/not_implemented_notifier.py\n--- a/petisco/base/application/notifier/not_implemented_notifier.py\n+++ b/petisco/base/application/notifier/not_implemented_notifier.py\n@@ -1,7 +1,13 @@\n from petisco.base.application.notifier.notifier import Notifier\n+from petisco.base.application.notifier.notifier_exception_message import (\n+ NotifierExceptionMessage,\n+)\n from petisco.base.application.notifier.notifier_message import NotifierMessage\n \n \n class NotImplementedNotifier(Notifier):\n def publish(self, message: NotifierMessage):\n pass\n+\n+ def publish_exception(self, notifier_exception_message: NotifierExceptionMessage):\n+ pass\ndiff --git a/petisco/base/application/notifier/notifier.py b/petisco/base/application/notifier/notifier.py\n--- a/petisco/base/application/notifier/notifier.py\n+++ b/petisco/base/application/notifier/notifier.py\n@@ -1,5 +1,8 @@\n from abc import abstractmethod\n \n+from petisco.base.application.notifier.notifier_exception_message import (\n+ NotifierExceptionMessage,\n+)\n from petisco.base.application.notifier.notifier_message import NotifierMessage\n from petisco.base.misc.interface import Interface\n \n@@ -8,3 +11,7 @@ class Notifier(Interface):\n @abstractmethod\n def publish(self, notifier_message: NotifierMessage):\n raise NotImplementedError\n+\n+ @abstractmethod\n+ def publish_exception(self, notifier_exception_message: NotifierExceptionMessage):\n+ raise NotImplementedError\ndiff --git a/petisco/base/application/notifier/notifier_exception_message.py b/petisco/base/application/notifier/notifier_exception_message.py\n--- a/petisco/base/application/notifier/notifier_exception_message.py\n+++ b/petisco/base/application/notifier/notifier_exception_message.py\n@@ -1,8 +1,45 @@\n-from petisco.legacy.notifier.domain.notifier_message import NotifierMessage\n+from petisco.base.domain.errors.unknown_error import UnknownError\n \n \n-class NotifierExceptionMessage(NotifierMessage):\n+class NotifierExceptionMessage:\n+ title: str\n executor: str\n exception: Exception\n traceback: str\n+ filename: str = None\n+ lineno: str = None\n input_parameters: dict = None\n+ meta: dict = None\n+\n+ def __init__(\n+ self,\n+ title: str,\n+ executor: str,\n+ exception: Exception,\n+ traceback: str,\n+ filename: str = None,\n+ lineno: str = None,\n+ input_parameters: dict = None,\n+ meta: dict = None,\n+ ):\n+ self.title = title\n+ self.executor = executor\n+ self.exception = exception\n+ self.traceback = traceback\n+ self.filename = filename\n+ self.lineno = lineno\n+ self.input_parameters = input_parameters\n+ self.meta = meta\n+\n+ @staticmethod\n+ def from_unknown_error(unknown_error: UnknownError, title: str):\n+ return NotifierExceptionMessage(\n+ title=title,\n+ executor=unknown_error.executor,\n+ exception=unknown_error.exception,\n+ traceback=unknown_error.traceback,\n+ filename=unknown_error.filename,\n+ lineno=unknown_error.lineno,\n+ input_parameters=unknown_error.input_parameters,\n+ meta=unknown_error.meta,\n+ )\ndiff --git a/petisco/base/application/notifier/notifier_message.py b/petisco/base/application/notifier/notifier_message.py\n--- a/petisco/base/application/notifier/notifier_message.py\n+++ b/petisco/base/application/notifier/notifier_message.py\n@@ -4,8 +4,9 @@\n \n \n class NotifierMessage(BaseModel):\n- title: Optional[str] = None\n+ title: str\n message: Optional[str] = None\n meta: Optional[Dict] = None\n files: Optional[List[Dict]] = None\n+ link: Optional[Dict[str, str]] = None\n # info_id: Optional[InfoId] = None\ndiff --git a/petisco/base/domain/errors/unknown_error.py b/petisco/base/domain/errors/unknown_error.py\nnew file mode 100644\n--- /dev/null\n+++ b/petisco/base/domain/errors/unknown_error.py\n@@ -0,0 +1,60 @@\n+from typing import Dict, List\n+\n+from meiga import Error\n+\n+\n+class UnknownError(Error):\n+ def __init__(\n+ self,\n+ exception: Exception,\n+ input_parameters=None,\n+ executor=None,\n+ traceback=None,\n+ filename=None,\n+ lineno=None,\n+ filter_parameters: List[str] = None,\n+ meta: Dict = None,\n+ ):\n+ self.message = f\"{exception.__class__.__name__}: {str(exception)}\"\n+ self.input_parameters = self._sanitize_input_params(input_parameters)\n+ self._filter_input_parameters(filter_parameters)\n+ self.exception = exception\n+ self.executor = executor\n+ self.traceback = traceback\n+ self.filename = filename\n+ self.lineno = lineno\n+ self.meta = meta if meta else {}\n+\n+ def _sanitize_input_params(self, input_parameters):\n+ if isinstance(input_parameters, tuple):\n+ return {\n+ f\"param_{i + 1}\": param if not isinstance(param, bytes) else \"bytes\"\n+ for i, param in enumerate(input_parameters)\n+ }\n+ elif isinstance(input_parameters, dict):\n+ return {\n+ k: v if not isinstance(v, bytes) else \"bytes\"\n+ for k, v in input_parameters.items()\n+ }\n+ else:\n+ return None\n+\n+ def _filter_input_parameters(self, filter_parameters: List[str] = None):\n+ if filter_parameters:\n+ self.input_parameters = {\n+ k: v\n+ for k, v in self.input_parameters.items()\n+ if k not in filter_parameters\n+ }\n+\n+ def __repr__(self):\n+ executor_str = f\" ({self.executor})\" if self.executor else \"\"\n+ traceback_str = f\"\\n{self.traceback}\" if self.traceback else \"\"\n+ input_parameters_str = (\n+ f\"\\nInput Parameters: {str(self.input_parameters)}\"\n+ if self.input_parameters\n+ else \"\"\n+ )\n+ filename_str = f\"\\n{self.filename}\" if self.filename else \"\"\n+ lineno_str = f\"\\n{self.lineno}\" if self.lineno else \"\"\n+ return f\"{self.__class__.__name__}{executor_str}: {self.message}.{traceback_str}.{input_parameters_str}{filename_str}{lineno_str}\"\ndiff --git a/petisco/base/domain/message/not_implemented_message_configurer.py b/petisco/base/domain/message/not_implemented_message_configurer.py\nnew file mode 100644\n--- /dev/null\n+++ b/petisco/base/domain/message/not_implemented_message_configurer.py\n@@ -0,0 +1,12 @@\n+from typing import List\n+\n+from petisco.base.domain.message.message_configurer import MessageConfigurer\n+from petisco.base.domain.message.message_subscriber import MessageSubscriber\n+\n+\n+class NotImplementedMessageConfigurer(MessageConfigurer):\n+ def configure_subscribers(self, subscribers: List[MessageSubscriber]):\n+ pass\n+\n+ def clear(self):\n+ pass\ndiff --git a/petisco/base/misc/wrapper.py b/petisco/base/misc/wrapper.py\n--- a/petisco/base/misc/wrapper.py\n+++ b/petisco/base/misc/wrapper.py\n@@ -1,7 +1,12 @@\n+import sys\n+import traceback\n from functools import wraps\n from inspect import signature\n-from meiga.on_failure_exception import OnFailureException\n+\n from meiga import Error, Failure\n+from meiga.on_failure_exception import OnFailureException\n+\n+from petisco.base.domain.errors.unknown_error import UnknownError\n \n \n def wrapper(execute_func, wrapped_class_name, config, mapper):\n@@ -24,6 +29,21 @@ def wrapped(*args, **kwargs):\n result = exc.result\n except Error as error:\n result = Failure(error)\n+ except Exception as exception:\n+ _, _, tb = sys.exc_info()\n+ tb = traceback.extract_tb(tb)[-1]\n+ filename = tb.filename if tb and hasattr(tb, \"filename\") else None\n+ lineno = tb.lineno if tb and hasattr(tb, \"lineno\") else None\n+\n+ unknown_error = UnknownError(\n+ exception=exception,\n+ input_parameters=arguments if len(arguments) > 0 else args,\n+ executor=wrapped_class_name,\n+ traceback=traceback.format_exc(),\n+ filename=filename,\n+ lineno=lineno,\n+ )\n+ result = Failure(unknown_error)\n \n mapped_result = mapper.map(result)\n for middleware in middlewares:\ndiff --git a/petisco/extra/rabbitmq/application/message/bus/rabbitmq_command_bus.py b/petisco/extra/rabbitmq/application/message/bus/rabbitmq_command_bus.py\n--- a/petisco/extra/rabbitmq/application/message/bus/rabbitmq_command_bus.py\n+++ b/petisco/extra/rabbitmq/application/message/bus/rabbitmq_command_bus.py\n@@ -22,7 +22,7 @@ def __init__(\n self.connector = connector\n self.exchange_name = f\"{organization}.{service}\"\n self.rabbitmq_key = f\"publisher-{self.exchange_name}\"\n- self.configurer = RabbitMqMessageConfigurer(connector, organization, service)\n+ self.configurer = RabbitMqMessageConfigurer(organization, service, connector)\n self.properties = BasicProperties(delivery_mode=2) # PERSISTENT_TEXT_PLAIN\n \n def dispatch(self, command: Command):\n@@ -34,7 +34,7 @@ def dispatch(self, command: Command):\n routing_key = RabbitMqMessageQueueNameFormatter.format(\n command, exchange_name=self.exchange_name\n )\n-\n+ channel.confirm_delivery()\n channel.basic_publish(\n exchange=self.exchange_name,\n routing_key=routing_key,\ndiff --git a/petisco/extra/rabbitmq/application/message/bus/rabbitmq_domain_event_bus.py b/petisco/extra/rabbitmq/application/message/bus/rabbitmq_domain_event_bus.py\n--- a/petisco/extra/rabbitmq/application/message/bus/rabbitmq_domain_event_bus.py\n+++ b/petisco/extra/rabbitmq/application/message/bus/rabbitmq_domain_event_bus.py\n@@ -3,7 +3,6 @@\n \n from petisco.base.domain.message.domain_event import DomainEvent\n from petisco.base.domain.message.domain_event_bus import DomainEventBus\n-from petisco.base.misc.builder import Builder\n from petisco.extra.rabbitmq.application.message.configurer.rabbitmq_message_configurer import (\n RabbitMqMessageConfigurer,\n )\n@@ -23,7 +22,7 @@ def __init__(\n self.connector = connector\n self.exchange_name = f\"{organization}.{service}\"\n self.rabbitmq_key = f\"publisher-{self.exchange_name}\"\n- self.configurer = RabbitMqMessageConfigurer(connector, organization, service)\n+ self.configurer = RabbitMqMessageConfigurer(organization, service, connector)\n self.properties = BasicProperties(delivery_mode=2) # PERSISTENT_TEXT_PLAIN\n \n def publish(self, domain_event: DomainEvent):\n@@ -35,7 +34,7 @@ def publish(self, domain_event: DomainEvent):\n routing_key = RabbitMqMessageQueueNameFormatter.format(\n domain_event, exchange_name=self.exchange_name\n )\n-\n+ channel.confirm_delivery()\n channel.basic_publish(\n exchange=self.exchange_name,\n routing_key=routing_key,\n@@ -43,9 +42,12 @@ def publish(self, domain_event: DomainEvent):\n properties=self.properties,\n )\n except ChannelClosedByBroker:\n- # If domain event queue is not configured, it will be configured and then try to publish again.\n- self.configurer.configure()\n- self.publish(domain_event)\n+ self._retry(domain_event)\n+\n+ def _retry(self, domain_event: DomainEvent):\n+ # If domain event queue is not configured, it will be configured and then try to publish again.\n+ self.configurer.configure()\n+ self.publish(domain_event)\n \n def retry_publish_only_on_store_queue(self, domain_event: DomainEvent):\n self._check_is_domain_event(domain_event)\n@@ -62,16 +64,3 @@ def retry_publish_only_on_store_queue(self, domain_event: DomainEvent):\n \n def close(self):\n self.connector.close(self.rabbitmq_key)\n-\n-\n-class RabbitMqDomainEventBusBuilder(Builder):\n- def __init__(self, organization: str, service: str):\n- self.organization = organization\n- self.service = service\n-\n- def build(self) -> RabbitMqDomainEventBus:\n- return RabbitMqDomainEventBus(\n- connector=RabbitMqConnector(),\n- organization=self.organization,\n- service=self.service,\n- )\ndiff --git a/petisco/extra/rabbitmq/application/message/configurer/rabbitmq_message_configurer.py b/petisco/extra/rabbitmq/application/message/configurer/rabbitmq_message_configurer.py\n--- a/petisco/extra/rabbitmq/application/message/configurer/rabbitmq_message_configurer.py\n+++ b/petisco/extra/rabbitmq/application/message/configurer/rabbitmq_message_configurer.py\n@@ -8,25 +8,25 @@\n from petisco.extra.rabbitmq.application.message.configurer.rabbitmq_message_subscribers_configurer import (\n RabbitMqMessageSubcribersConfigurer,\n )\n-from petisco.extra.rabbitmq.shared.rabbitmq_connector import RabbitMqConnector\n from petisco.extra.rabbitmq.shared.queue_config import QueueConfig\n+from petisco.extra.rabbitmq.shared.rabbitmq_connector import RabbitMqConnector\n \n \n class RabbitMqMessageConfigurer(MessageConfigurer):\n def __init__(\n self,\n- connector: RabbitMqConnector,\n organization: str,\n service: str,\n+ connector: RabbitMqConnector = RabbitMqConnector(),\n queue_config: QueueConfig = QueueConfig.default(),\n use_store_queues: bool = True,\n ):\n self._use_store_queues = use_store_queues\n self.subscribers_configurer = RabbitMqMessageSubcribersConfigurer(\n- connector, organization, service, queue_config\n+ organization, service, connector, queue_config\n )\n self.store_configurer = RabbitMqMessageStoreConfigurer(\n- connector, organization, service, queue_config\n+ organization, service, connector, queue_config\n )\n \n def configure(self):\ndiff --git a/petisco/extra/rabbitmq/application/message/configurer/rabbitmq_message_store_configurer.py b/petisco/extra/rabbitmq/application/message/configurer/rabbitmq_message_store_configurer.py\n--- a/petisco/extra/rabbitmq/application/message/configurer/rabbitmq_message_store_configurer.py\n+++ b/petisco/extra/rabbitmq/application/message/configurer/rabbitmq_message_store_configurer.py\n@@ -9,9 +9,9 @@\n class RabbitMqMessageStoreConfigurer:\n def __init__(\n self,\n- connector: RabbitMqConnector,\n organization: str,\n service: str,\n+ connector: RabbitMqConnector,\n queue_config: QueueConfig,\n ):\n self._connector = connector\ndiff --git a/petisco/extra/rabbitmq/application/message/configurer/rabbitmq_message_subscribers_configurer.py b/petisco/extra/rabbitmq/application/message/configurer/rabbitmq_message_subscribers_configurer.py\n--- a/petisco/extra/rabbitmq/application/message/configurer/rabbitmq_message_subscribers_configurer.py\n+++ b/petisco/extra/rabbitmq/application/message/configurer/rabbitmq_message_subscribers_configurer.py\n@@ -1,5 +1,6 @@\n from typing import List, Type\n \n+from petisco.base.domain.message.message_subscriber import MessageSubscriber\n from petisco.extra.rabbitmq.application.message.formatter.rabbitmq_message_subscriber_queue_name_formatter import (\n RabbitMqMessageSubscriberQueueNameFormatter,\n )\n@@ -9,15 +10,14 @@\n from petisco.extra.rabbitmq.shared.rabbitmq_exchange_name_formatter import (\n RabbitMqExchangeNameFormatter,\n )\n-from petisco.base.domain.message.message_subscriber import MessageSubscriber\n \n \n class RabbitMqMessageSubcribersConfigurer:\n def __init__(\n self,\n- connector: RabbitMqConnector,\n organization: str,\n service: str,\n+ connector: RabbitMqConnector,\n queue_config: QueueConfig,\n ):\n self._connector = connector\n@@ -71,11 +71,15 @@ def _delete_queues(self):\n queue_name = RabbitMqMessageSubscriberQueueNameFormatter.format(\n subscriber_info, exchange_name=self._exchange_name\n )\n- retry_queue_name = RabbitMqMessageSubscriberQueueNameFormatter.format_retry(\n- subscriber_info, exchange_name=self._exchange_name\n+ retry_queue_name = (\n+ RabbitMqMessageSubscriberQueueNameFormatter.format_retry(\n+ subscriber_info, exchange_name=self._exchange_name\n+ )\n )\n- dead_letter_queue_name = RabbitMqMessageSubscriberQueueNameFormatter.format_dead_letter(\n- subscriber_info, exchange_name=self._exchange_name\n+ dead_letter_queue_name = (\n+ RabbitMqMessageSubscriberQueueNameFormatter.format_dead_letter(\n+ subscriber_info, exchange_name=self._exchange_name\n+ )\n )\n \n suffix = subscriber.get_subscriber_name()\n@@ -105,11 +109,15 @@ def _declare_queues(\n base_queue_name = RabbitMqMessageSubscriberQueueNameFormatter.format(\n subscriber_info, exchange_name=exchange_name\n )\n- base_retry_queue_name = RabbitMqMessageSubscriberQueueNameFormatter.format_retry(\n- subscriber_info, exchange_name=exchange_name\n+ base_retry_queue_name = (\n+ RabbitMqMessageSubscriberQueueNameFormatter.format_retry(\n+ subscriber_info, exchange_name=exchange_name\n+ )\n )\n- base_dead_letter_queue_name = RabbitMqMessageSubscriberQueueNameFormatter.format_dead_letter(\n- subscriber_info, exchange_name=exchange_name\n+ base_dead_letter_queue_name = (\n+ RabbitMqMessageSubscriberQueueNameFormatter.format_dead_letter(\n+ subscriber_info, exchange_name=exchange_name\n+ )\n )\n routing_key = base_queue_name\n suffix = subscriber.get_subscriber_name()\ndiff --git a/petisco/extra/rabbitmq/application/message/consumer/rabbitmq_message_consumer.py b/petisco/extra/rabbitmq/application/message/consumer/rabbitmq_message_consumer.py\n--- a/petisco/extra/rabbitmq/application/message/consumer/rabbitmq_message_consumer.py\n+++ b/petisco/extra/rabbitmq/application/message/consumer/rabbitmq_message_consumer.py\n@@ -23,7 +23,6 @@\n MessageHandlerReturnsNoneError,\n )\n from petisco.base.domain.message.message_subscriber import MessageSubscriber\n-from petisco.base.misc.builder import Builder\n from petisco.extra.rabbitmq.application.message.bus.rabbitmq_command_bus import (\n RabbitMqCommandBus,\n )\n@@ -214,10 +213,10 @@ def rabbitmq_consumer(\n else:\n connector = RabbitMqConsumerConnector(ch)\n domain_event_bus = RabbitMqDomainEventBus(\n- connector, self.organization, self.service\n+ self.organization, self.service, connector\n )\n command_bus = RabbitMqCommandBus(\n- connector, self.organization, self.service\n+ self.organization, self.service, connector\n )\n subscriber.set_domain_event_bus(domain_event_bus)\n subscriber.set_command_bus(command_bus)\n@@ -445,18 +444,3 @@ def _await_for_thread():\n self.connector.get_connection(self.rabbitmq_key).call_later(0, _execute_action)\n \n _await_for_thread()\n-\n-\n-class RabbitMqMessageConsumerBuilder(Builder):\n- def __init__(self, organization: str, service: str, max_retries: int):\n- self.organization = organization\n- self.service = service\n- self.max_retries = max_retries\n-\n- def build(self) -> RabbitMqMessageConsumer:\n- return RabbitMqMessageConsumer(\n- connector=RabbitMqConnector(),\n- organization=self.organization,\n- service=self.service,\n- max_retries=self.max_retries,\n- )\ndiff --git a/petisco/extra/rabbitmq/dependencies.py b/petisco/extra/rabbitmq/dependencies.py\n--- a/petisco/extra/rabbitmq/dependencies.py\n+++ b/petisco/extra/rabbitmq/dependencies.py\n@@ -10,6 +10,9 @@\n from petisco.base.domain.message.not_implemented_message_comsumer import (\n NotImplementedMessageConsumer,\n )\n+from petisco.base.domain.message.not_implemented_message_configurer import (\n+ NotImplementedMessageConfigurer,\n+)\n from petisco.base.misc.builder import Builder\n \n \n@@ -27,14 +30,14 @@ def get_default_message_dependencies() -> List[Dependency]:\n envar_modifier=\"PETISCO_COMMAND_BUS_TYPE\",\n ),\n Dependency(\n- name=\"domain_event_consumer\",\n- default_builder=Builder(NotImplementedMessageConsumer),\n- envar_modifier=\"PETISCO_DOMAIN_EVENT_CONSUMER_TYPE\",\n+ name=\"message_configurer\",\n+ default_builder=Builder(NotImplementedMessageConfigurer),\n+ envar_modifier=\"PETISCO_MESSAGE_CONFIGURER_TYPE\",\n ),\n Dependency(\n- name=\"command_consumer\",\n+ name=\"message_consumer\",\n default_builder=Builder(NotImplementedMessageConsumer),\n- envar_modifier=\"PETISCO_COMMAND_CONSUMER_TYPE\",\n+ envar_modifier=\"PETISCO_MESSAGE_CONSUMER_TYPE\",\n ),\n ]\n \n@@ -48,6 +51,9 @@ def get_rabbitmq_message_dependencies(\n from petisco.extra.rabbitmq.application.message.bus.rabbitmq_domain_event_bus import (\n RabbitMqDomainEventBus,\n )\n+ from petisco.extra.rabbitmq.application.message.configurer.rabbitmq_message_configurer import (\n+ RabbitMqMessageConfigurer,\n+ )\n from petisco.extra.rabbitmq.application.message.consumer.rabbitmq_message_consumer import (\n RabbitMqMessageConsumer,\n )\n@@ -70,14 +76,24 @@ def get_rabbitmq_message_dependencies(\n builders={\"not_implemented\": Builder(NotImplementedCommandBus)},\n ),\n Dependency(\n- name=\"domain_event_consumer\",\n+ name=\"message_configurer\",\n+ default_builder=Builder(\n+ RabbitMqMessageConfigurer,\n+ organization=organization,\n+ service=service,\n+ ),\n+ envar_modifier=\"PETISCO_MESSAGE_CONFIGURER_TYPE\",\n+ builders={\"not_implemented\": Builder(NotImplementedMessageConfigurer)},\n+ ),\n+ Dependency(\n+ name=\"message_consumer\",\n default_builder=Builder(\n RabbitMqMessageConsumer,\n organization=organization,\n service=service,\n max_retries=max_retries,\n ),\n- envar_modifier=\"PETISCO_DOMAIN_EVENT_CONSUMER_TYPE\",\n+ envar_modifier=\"PETISCO_MESSAGE_CONSUMER_TYPE\",\n builders={\"not_implemented\": Builder(NotImplementedMessageConsumer)},\n ),\n ]\ndiff --git a/petisco/extra/slack/__init__.py b/petisco/extra/slack/__init__.py\n--- a/petisco/extra/slack/__init__.py\n+++ b/petisco/extra/slack/__init__.py\n@@ -1,10 +1,17 @@\n __all__ = []\n \n+\n from petisco.extra.slack.dependencies import get_default_notifier_dependencies\n from petisco.extra.slack.is_slack_available import is_slack_available\n \n __all__ = [\"get_default_notifier_dependencies\"]\n if is_slack_available():\n+ from petisco.extra.slack.application.notifier.blocks_slack_notifier_message_converter import (\n+ BlocksSlackNotifierMessageConverter,\n+ )\n+ from petisco.extra.slack.application.notifier.exception_blocks_slack_notifier_message_converter import (\n+ ExceptionBlocksSlackNotifierMessageConverter,\n+ )\n from petisco.extra.slack.application.notifier.slack_notifier import SlackNotifier\n from petisco.extra.slack.application.notifier.slack_notifier_message_converter import (\n SlackNotifierMessageConverter,\n@@ -14,5 +21,7 @@\n __all__ += [\n \"SlackNotifier\",\n \"SlackNotifierMessageConverter\",\n+ \"BlocksSlackNotifierMessageConverter\",\n+ \"ExceptionBlocksSlackNotifierMessageConverter\",\n \"get_slack_notifier_dependencies\",\n ]\ndiff --git a/petisco/extra/slack/application/notifier/blocks_slack_notifier_message_converter.py b/petisco/extra/slack/application/notifier/blocks_slack_notifier_message_converter.py\n--- a/petisco/extra/slack/application/notifier/blocks_slack_notifier_message_converter.py\n+++ b/petisco/extra/slack/application/notifier/blocks_slack_notifier_message_converter.py\n@@ -1,126 +1,49 @@\n-from typing import Dict, List, Optional\n+from typing import Dict\n \n-from petisco.base.application.notifier.notifier_exception_message import (\n- NotifierExceptionMessage,\n-)\n from petisco.base.application.notifier.notifier_message import NotifierMessage\n-from petisco.base.domain.ids.info_id import InfoId\n+from petisco.extra.slack.application.notifier.create_text_meta import create_text_meta\n from petisco.extra.slack.application.notifier.slack_notifier_message_converter import (\n SlackNotifierMessageConverter,\n )\n \n \n class BlocksSlackNotifierMessageConverter(SlackNotifierMessageConverter):\n- def __repr__(self):\n- return super().__repr__()\n+ def __init__(self, slack_accessory: Dict = None):\n+ self.slack_accessory = slack_accessory\n+\n+ def convert(self, notifier_message: NotifierMessage):\n+ header_block = self._create_header_block(notifier_message.title)\n+ message_block = self._create_message_block(notifier_message)\n+ divider_block = {\"type\": \"divider\"}\n+ return [header_block, message_block, divider_block]\n \n- def __info_petisco_block(self, info_petisco: Dict) -> Dict:\n+ def _create_header_block(self, title: str):\n return {\n- \"type\": \"section\",\n+ \"type\": \"header\",\n \"text\": {\n- \"type\": \"mrkdwn\",\n- \"text\": f\":cookie: *Message from Petisco*\\n*Application:* {info_petisco['app_name']} ({info_petisco['app_version']})\\n*Petisco:* {info_petisco['petisco_version']}\\n*Environment:* {info_petisco['environment']}\",\n+ \"type\": \"plain_text\",\n+ \"text\": title,\n+ \"emoji\": True,\n },\n }\n \n- def _info_id_block(self, info_id: InfoId) -> Optional[Dict]:\n- if not info_id:\n- return None\n- info_id_text = \":information_source: *InfoId*\\n\"\n- info_id_available = False\n- if info_id.client_id:\n- info_id_text += f\"*ClientId:* {info_id.client_id.value}\\n\"\n- info_id_available = True\n- if info_id.user_id:\n- info_id_text += f\"*UserId:* {info_id.user_id.value}\\n\"\n- info_id_available = True\n- if info_id.correlation_id:\n- info_id_text += f\"*CorrelationId:* {info_id.correlation_id.value}\\n\"\n- info_id_available = True\n- if info_id.correlation_id:\n- info_id_text += f\"*IP:* {info_id.ip}\"\n- info_id_available = True\n- if not info_id_available:\n- return None\n- return {\"type\": \"section\", \"text\": {\"type\": \"mrkdwn\", \"text\": info_id_text}}\n-\n- def __get_common_blocks(self, notifier_message: NotifierMessage) -> List[Dict]:\n- blocks = []\n- if notifier_message.info_petisco:\n- blocks.append(self.__info_petisco_block(notifier_message.info_petisco))\n- if notifier_message.info_id:\n- blocks.append(self._info_id_block(notifier_message.info_id))\n- if len(blocks) > 0:\n- blocks.append({\"type\": \"divider\"})\n- return blocks\n+ def _create_message_block(self, notifier_message: NotifierMessage):\n+ text_message = \"\"\n+ if notifier_message.message:\n+ text_message += f\"{notifier_message.message}\"\n \n- def __get_blocks_exception_message(\n- self, notifier_message: NotifierExceptionMessage\n- ) -> List[Dict]:\n- blocks = []\n-\n- exception_block = {\n- \"type\": \"section\",\n- \"text\": {\n- \"type\": \"mrkdwn\",\n- \"text\": f\":fire: *Exception* \\n*Class*: {notifier_message.exception.__class__} *Description:* {notifier_message.exception}\",\n- },\n- }\n- executor_block = {\n+ text_meta = create_text_meta(notifier_message.meta)\n+ if text_meta:\n+ text_message += text_meta\n+ message_block = {\n \"type\": \"section\",\n \"text\": {\n \"type\": \"mrkdwn\",\n- \"text\": f\":pushpin: *Executor*\\n{notifier_message.executor}\",\n+ \"text\": text_message,\n },\n }\n \n- input_parameters_block_text = \":arrow_right: *Input Parameters*\\n\"\n-\n- if notifier_message.input_parameters:\n- for k, v in notifier_message.input_parameters.items():\n- input_parameters_block_text += f\"* {k}: {v}\\n\"\n- else:\n- input_parameters_block_text += \"No data :heavy_multiplication_x:\"\n+ if self.slack_accessory:\n+ message_block[\"accessory\"] = self.slack_accessory\n \n- input_parameters_block = {\n- \"type\": \"section\",\n- \"text\": {\"type\": \"mrkdwn\", \"text\": input_parameters_block_text},\n- }\n- traceback_block = {\n- \"type\": \"section\",\n- \"text\": {\n- \"type\": \"mrkdwn\",\n- \"text\": f\":scroll: *Traceback*\\n```{notifier_message.traceback[:2500]}```\",\n- },\n- }\n- blocks += self.__get_common_blocks(notifier_message)\n- blocks.append(exception_block)\n- blocks.append(executor_block)\n- blocks.append(input_parameters_block)\n- blocks.append(traceback_block)\n- return blocks\n-\n- def convert(self, notifier_message: NotifierMessage):\n- if isinstance(notifier_message, NotifierExceptionMessage):\n- blocks = self.__get_blocks_exception_message(notifier_message)\n- else:\n- blocks = []\n- blocks += self.__get_common_blocks(notifier_message)\n- if notifier_message.title:\n- title_block = {\n- \"type\": \"section\",\n- \"text\": {\n- \"type\": \"mrkdwn\",\n- \"text\": f\":label: *{notifier_message.title}*\",\n- },\n- }\n- blocks.append(title_block)\n- message_block = {\n- \"type\": \"section\",\n- \"text\": {\n- \"type\": \"mrkdwn\",\n- \"text\": f\":envelope: *Message*\\n{notifier_message.message}\",\n- },\n- }\n- blocks.append(message_block)\n- return blocks\n+ return message_block\ndiff --git a/petisco/extra/slack/application/notifier/create_text_meta.py b/petisco/extra/slack/application/notifier/create_text_meta.py\nnew file mode 100644\n--- /dev/null\n+++ b/petisco/extra/slack/application/notifier/create_text_meta.py\n@@ -0,0 +1,10 @@\n+from typing import Dict, List\n+\n+\n+def create_text_meta(meta: Dict) -> List[Dict]:\n+ text = None\n+ if meta:\n+ text = \"\"\n+ for key, value in meta.items():\n+ text += f\"\\n>{key}: {value}\"\n+ return text\ndiff --git a/petisco/extra/slack/application/notifier/exception_blocks_slack_notifier_message_converter.py b/petisco/extra/slack/application/notifier/exception_blocks_slack_notifier_message_converter.py\nnew file mode 100644\n--- /dev/null\n+++ b/petisco/extra/slack/application/notifier/exception_blocks_slack_notifier_message_converter.py\n@@ -0,0 +1,125 @@\n+from typing import Dict\n+\n+from petisco.base.application.notifier.notifier_exception_message import (\n+ NotifierExceptionMessage,\n+)\n+from petisco.extra.slack.application.notifier.create_text_meta import create_text_meta\n+from petisco.extra.slack.application.notifier.slack_notifier_message_converter import (\n+ SlackNotifierMessageConverter,\n+)\n+\n+\n+class ExceptionBlocksSlackNotifierMessageConverter(SlackNotifierMessageConverter):\n+ def __init__(\n+ self,\n+ slack_accessory: Dict = None,\n+ repository_url: str = None,\n+ repository_name_button: str = \"Code\",\n+ ):\n+ self.slack_accessory = slack_accessory\n+ self.repository_url = repository_url\n+ self.repository_name_button = repository_name_button\n+\n+ def _create_header_block(self, title: str):\n+ return {\n+ \"type\": \"header\",\n+ \"text\": {\n+ \"type\": \"plain_text\",\n+ \"text\": title,\n+ \"emoji\": True,\n+ },\n+ }\n+\n+ def _create_message_block(\n+ self, notifier_exception_message: NotifierExceptionMessage\n+ ):\n+ text_meta = create_text_meta(notifier_exception_message.meta)\n+ message_block = None\n+ if text_meta:\n+ message_block = {\n+ \"type\": \"section\",\n+ \"text\": {\n+ \"type\": \"mrkdwn\",\n+ \"text\": text_meta,\n+ },\n+ }\n+ if self.slack_accessory:\n+ message_block[\"accessory\"] = self.slack_accessory\n+ return message_block\n+\n+ def _create_executor_block(\n+ self, notifier_exception_message: NotifierExceptionMessage\n+ ):\n+ executor_block = {\n+ \"type\": \"section\",\n+ }\n+\n+ if self.repository_url:\n+ url_error = f\"{self.repository_url}/{notifier_exception_message.filename}\"\n+ if notifier_exception_message.lineno:\n+ url_error += f\"#L{notifier_exception_message.lineno}\"\n+ executor_block[\"accessory\"] = {\n+ \"type\": \"button\",\n+ \"text\": {\n+ \"type\": \"plain_text\",\n+ \"text\": self.repository_name_button,\n+ \"emoji\": True,\n+ },\n+ \"value\": \"click_me_repository_code\",\n+ \"url\": url_error,\n+ \"action_id\": \"button-repository-code\",\n+ \"style\": \"danger\",\n+ }\n+\n+ text_executor = f\"*Executor*: {notifier_exception_message.executor}\"\n+ if notifier_exception_message.filename:\n+ text_executor += f\"\\n {notifier_exception_message.filename}\"\n+ if notifier_exception_message.lineno:\n+ text_executor += f\" | Line {notifier_exception_message.lineno}\"\n+\n+ if notifier_exception_message.input_parameters:\n+ input_parameters_text = \"\"\n+ for k, v in notifier_exception_message.input_parameters.items():\n+ input_parameters_text += f\"\\n>{k}: {v}\"\n+ text_executor += input_parameters_text\n+\n+ executor_block[\"text\"] = {\n+ \"type\": \"mrkdwn\",\n+ \"text\": text_executor,\n+ }\n+ return executor_block\n+\n+ def _create_error_block(self, notifier_exception_message: NotifierExceptionMessage):\n+ error_block = None\n+ if notifier_exception_message.exception:\n+ text_error = f\"*Class*: {notifier_exception_message.exception.__class__}\\n>{notifier_exception_message.exception}\"\n+ text_error += f\"\\n```{notifier_exception_message.traceback[:2500]}```\"\n+ error_block = {\n+ \"type\": \"section\",\n+ \"text\": {\n+ \"type\": \"mrkdwn\",\n+ \"text\": text_error,\n+ },\n+ }\n+ return error_block\n+\n+ def convert(self, notifier_exception_message: NotifierExceptionMessage):\n+\n+ blocks = []\n+ header_block = self._create_header_block(notifier_exception_message.title)\n+ message_block = self._create_message_block(notifier_exception_message)\n+ executor_block = self._create_executor_block(notifier_exception_message)\n+ error_block = self._create_error_block(notifier_exception_message)\n+\n+ blocks.append(header_block)\n+ if message_block:\n+ blocks.append(message_block)\n+ blocks.append(executor_block)\n+\n+ if error_block:\n+ blocks.append(error_block)\n+\n+ divider_block = {\"type\": \"divider\"}\n+ blocks.append(divider_block)\n+\n+ return blocks\ndiff --git a/petisco/extra/slack/application/notifier/slack_notifier.py b/petisco/extra/slack/application/notifier/slack_notifier.py\n--- a/petisco/extra/slack/application/notifier/slack_notifier.py\n+++ b/petisco/extra/slack/application/notifier/slack_notifier.py\n@@ -1,15 +1,21 @@\n from typing import Optional\n \n-from slack import WebClient\n-from slack.errors import SlackApiError\n+from slack_sdk import WebClient\n+from slack_sdk.errors import SlackApiError\n \n from petisco.base.application.notifier.notifier import Notifier\n+from petisco.base.application.notifier.notifier_exception_message import (\n+ NotifierExceptionMessage,\n+)\n from petisco.base.application.notifier.notifier_message import NotifierMessage\n from petisco.base.domain.errors.domain_error import DomainError\n from petisco.extra.slack.application.notifier.blocks_slack_notifier_message_converter import (\n BlocksSlackNotifierMessageConverter,\n SlackNotifierMessageConverter,\n )\n+from petisco.extra.slack.application.notifier.exception_blocks_slack_notifier_message_converter import (\n+ ExceptionBlocksSlackNotifierMessageConverter,\n+)\n \n \n class SlackError(DomainError):\n@@ -24,19 +30,31 @@ def __init__(\n converter: Optional[\n SlackNotifierMessageConverter\n ] = BlocksSlackNotifierMessageConverter(),\n+ exception_converter: Optional[\n+ SlackNotifierMessageConverter\n+ ] = ExceptionBlocksSlackNotifierMessageConverter(),\n ):\n- self.token = token\n self.channel = channel\n self.converter = converter\n+ self.exception_converter = exception_converter\n+ self.client = WebClient(token=token)\n \n def publish(self, notifier_message: NotifierMessage):\n+ try:\n+ self.client.chat_postMessage(\n+ channel=self.channel,\n+ blocks=self.converter.convert(notifier_message),\n+ text=notifier_message.title,\n+ )\n+ except SlackApiError as e:\n+ raise SlackError(e.response[\"error\"])\n \n- client = WebClient(token=self.token)\n-\n+ def publish_exception(self, notifier_exception_message: NotifierExceptionMessage):\n try:\n- client.chat_postMessage(\n+ self.client.chat_postMessage(\n channel=self.channel,\n- blocks=self.converter.convert(notifier_message=notifier_message),\n+ blocks=self.exception_converter.convert(notifier_exception_message),\n+ text=notifier_exception_message.title,\n )\n except SlackApiError as e:\n raise SlackError(e.response[\"error\"])\ndiff --git a/petisco/extra/slack/application/notifier/slack_notifier_message_converter.py b/petisco/extra/slack/application/notifier/slack_notifier_message_converter.py\n--- a/petisco/extra/slack/application/notifier/slack_notifier_message_converter.py\n+++ b/petisco/extra/slack/application/notifier/slack_notifier_message_converter.py\n@@ -1,13 +1,18 @@\n from abc import abstractmethod\n-from typing import List, Dict\n+from typing import Dict, List, Union\n \n+from petisco.base.application.notifier.notifier_exception_message import (\n+ NotifierExceptionMessage,\n+)\n+from petisco.base.application.notifier.notifier_message import NotifierMessage\n from petisco.base.misc.interface import Interface\n-from petisco.legacy.notifier.domain.notifier_message import NotifierMessage\n \n \n class SlackNotifierMessageConverter(Interface):\n @abstractmethod\n- def convert(self, notifier_message: NotifierMessage) -> List[Dict]:\n+ def convert(\n+ self, notifier_message: Union[NotifierMessage, NotifierExceptionMessage]\n+ ) -> List[Dict]:\n \"\"\"\n Should return a list of blocks. See: https://api.slack.com/reference/block-kit/blocks\n \"\"\"\ndiff --git a/petisco/extra/slack/is_slack_available.py b/petisco/extra/slack/is_slack_available.py\n--- a/petisco/extra/slack/is_slack_available.py\n+++ b/petisco/extra/slack/is_slack_available.py\n@@ -1,6 +1,6 @@\n def is_slack_available() -> bool:\n try:\n- import slack # noqa\n+ import slack_sdk # noqa\n except (RuntimeError, ImportError):\n return False\n return True\ndiff --git a/petisco/legacy/event/configurer/infrastructure/rabbitmq_event_subscribers_configurer.py b/petisco/legacy/event/configurer/infrastructure/rabbitmq_event_subscribers_configurer.py\n--- a/petisco/legacy/event/configurer/infrastructure/rabbitmq_event_subscribers_configurer.py\n+++ b/petisco/legacy/event/configurer/infrastructure/rabbitmq_event_subscribers_configurer.py\n@@ -5,14 +5,14 @@\n )\n from petisco.legacy.event.queue.domain.queue_config import QueueConfig\n from petisco.legacy.event.shared.domain.event_subscriber import EventSubscriber\n-from petisco.legacy.event.shared.infrastructure.rabbitmq.rabbitmq_exchange_name_formatter import (\n- RabbitMqExchangeNameFormatter,\n+from petisco.legacy.event.shared.infrastructure.rabbitmq.rabbitmq_connector import (\n+ RabbitMqConnector,\n )\n from petisco.legacy.event.shared.infrastructure.rabbitmq.rabbitmq_event_subscriber_queue_name_formatter import (\n RabbitMqEventSubscriberQueueNameFormatter,\n )\n-from petisco.legacy.event.shared.infrastructure.rabbitmq.rabbitmq_connector import (\n- RabbitMqConnector,\n+from petisco.legacy.event.shared.infrastructure.rabbitmq.rabbitmq_exchange_name_formatter import (\n+ RabbitMqExchangeNameFormatter,\n )\n \n \n@@ -68,11 +68,15 @@ def _delete_queues(self):\n queue_name = RabbitMqEventSubscriberQueueNameFormatter.format(\n subscriber, exchange_name=self._exchange_name\n )\n- retry_queue_name = RabbitMqEventSubscriberQueueNameFormatter.format_retry(\n- subscriber, exchange_name=self._exchange_name\n+ retry_queue_name = (\n+ RabbitMqEventSubscriberQueueNameFormatter.format_retry(\n+ subscriber, exchange_name=self._exchange_name\n+ )\n )\n- dead_letter_queue_name = RabbitMqEventSubscriberQueueNameFormatter.format_dead_letter(\n- subscriber, exchange_name=self._exchange_name\n+ dead_letter_queue_name = (\n+ RabbitMqEventSubscriberQueueNameFormatter.format_dead_letter(\n+ subscriber, exchange_name=self._exchange_name\n+ )\n )\n for suffix in subscriber.get_handlers_names():\n name = f\"{queue_name}.{suffix}\"\n@@ -94,11 +98,15 @@ def _declare_queues(\n base_queue_name = RabbitMqEventSubscriberQueueNameFormatter.format(\n subscriber, exchange_name=exchange_name\n )\n- base_retry_queue_name = RabbitMqEventSubscriberQueueNameFormatter.format_retry(\n- subscriber, exchange_name=exchange_name\n+ base_retry_queue_name = (\n+ RabbitMqEventSubscriberQueueNameFormatter.format_retry(\n+ subscriber, exchange_name=exchange_name\n+ )\n )\n- base_dead_letter_queue_name = RabbitMqEventSubscriberQueueNameFormatter.format_dead_letter(\n- subscriber, exchange_name=exchange_name\n+ base_dead_letter_queue_name = (\n+ RabbitMqEventSubscriberQueueNameFormatter.format_dead_letter(\n+ subscriber, exchange_name=exchange_name\n+ )\n )\n routing_key = base_queue_name\n \ndiff --git a/petisco/legacy/event/legacy/routing_key.py b/petisco/legacy/event/legacy/routing_key.py\n--- a/petisco/legacy/event/legacy/routing_key.py\n+++ b/petisco/legacy/event/legacy/routing_key.py\n@@ -1,6 +1,6 @@\n from typing import Any\n \n-from meiga import Result, Error, Success\n+from meiga import Error, Result, Success\n \n from petisco.legacy.domain.value_objects.value_object import ValueObject\n \n@@ -10,11 +10,12 @@ def __init__(self, value: str):\n self.value = None if value == \"None\" else value\n if self.value:\n try:\n- self.organization, self.service, self.version, self.type_routing_key = self.value.split(\n- \".\"\n- )[\n- :4\n- ]\n+ (\n+ self.organization,\n+ self.service,\n+ self.version,\n+ self.type_routing_key,\n+ ) = self.value.split(\".\")[:4]\n self.event_name = \".\".join(self.value.split(\".\")[4:])\n self.version = int(self.version)\n except ValueError:\ndiff --git a/petisco/legacy/notifier/infrastructure/slack/slack_notifier.py b/petisco/legacy/notifier/infrastructure/slack/slack_notifier.py\n--- a/petisco/legacy/notifier/infrastructure/slack/slack_notifier.py\n+++ b/petisco/legacy/notifier/infrastructure/slack/slack_notifier.py\n@@ -1,5 +1,5 @@\n-from slack import WebClient\n-from slack.errors import SlackApiError\n+from slack_sdk import WebClient\n+from slack_sdk.errors import SlackApiError\n \n from petisco.legacy.notifier.domain.interface_notifier import INotifier\n from petisco.legacy.notifier.domain.notifier_message import NotifierMessage\ndiff --git a/petisco/public_api.py b/petisco/public_api.py\n--- a/petisco/public_api.py\n+++ b/petisco/public_api.py\n@@ -10,6 +10,11 @@\n from petisco.base.application.middleware.middleware import Middleware\n from petisco.base.application.middleware.notifier_middleware import NotifierMiddleware\n from petisco.base.application.middleware.print_middleware import PrintMiddleware\n+from petisco.base.application.notifier.notifier import Notifier\n+from petisco.base.application.notifier.notifier_exception_message import (\n+ NotifierExceptionMessage,\n+)\n+from petisco.base.application.notifier.notifier_message import NotifierMessage\n from petisco.base.application.patterns.app_service import AppService\n from petisco.base.application.patterns.repository import Repository\n from petisco.base.application.use_case.use_case import UseCase\n@@ -31,6 +36,7 @@\n UserNotFound,\n )\n from petisco.base.domain.errors.domain_error import DomainError\n+from petisco.base.domain.errors.unknown_error import UnknownError\n from petisco.base.domain.message.all_message_subscriber import AllMessageSubscriber\n from petisco.base.domain.message.command import Command\n from petisco.base.domain.message.command_bus import CommandBus\n@@ -54,6 +60,9 @@\n from petisco.base.domain.message.not_implemented_message_comsumer import (\n NotImplementedMessageConsumer,\n )\n+from petisco.base.domain.message.not_implemented_message_configurer import (\n+ NotImplementedMessageConfigurer,\n+)\n from petisco.base.domain.model.aggregate_root import AggregateRoot\n from petisco.base.domain.model.uuid import Uuid\n from petisco.base.domain.model.value_object import ValueObject\n@@ -69,12 +78,16 @@\n \"ResultMapper\",\n \"Middleware\",\n \"NotifierMiddleware\",\n+ \"Notifier\",\n+ \"NotifierMessage\",\n+ \"NotifierExceptionMessage\",\n \"PrintMiddleware\",\n \"UseCase\",\n \"UseCaseUncontrolledError\",\n \"DEFAULT_HTTP_ERROR_MAP\",\n \"assert_http\",\n \"DomainError\",\n+ \"UnknownError\",\n \"NotFound\",\n \"AlreadyExists\",\n \"ClientNotFound\",\n@@ -91,6 +104,7 @@\n \"MessageBus\",\n \"NotImplementedMessageBus\",\n \"NotImplementedMessageConsumer\",\n+ \"NotImplementedMessageConfigurer\",\n \"DomainEventBus\",\n \"CommandBus\",\n \"NotImplementedDomainEventBus\",\n", "test_patch": "diff --git a/tests/end2end/test_flask_application.py b/tests/end2end/test_flask_application.py\n--- a/tests/end2end/test_flask_application.py\n+++ b/tests/end2end/test_flask_application.py\n@@ -41,7 +41,7 @@ def test_should_return_200_when_call_environment_with_happy_path_with_apikey(\n not flask_extension_is_installed(), reason=\"Flask extension is not installed\"\n )\n def test_should_return_401_when_call_environment_with_happy_path_without_apikey(\n- client_app\n+ client_app,\n ):\n headers = {\"Accept\": \"application/json\"}\n response = client_app.get(\"/petisco/environment\", headers=headers)\n@@ -74,7 +74,7 @@ def test_should_return_200_when_call_sum_with_valid_values(client_app):\n not flask_extension_is_installed(), reason=\"Flask extension is not installed\"\n )\n def test_should_return_200_when_call_sum_with_valid_values_with_external_headers(\n- client_app\n+ client_app,\n ):\n headers = {\n \"Content-Type\": \"multipart/form-data\",\ndiff --git a/tests/modules/base/application/controller/unit/test_controller.py b/tests/modules/base/application/controller/unit/test_controller.py\n--- a/tests/modules/base/application/controller/unit/test_controller.py\n+++ b/tests/modules/base/application/controller/unit/test_controller.py\n@@ -1,8 +1,8 @@\n import pytest\n-from meiga import isSuccess, BoolResult, isFailure, Error, Failure\n-from meiga.assertions import assert_success, assert_failure\n+from meiga import BoolResult, Error, Failure, Success, isFailure, isSuccess\n+from meiga.assertions import assert_failure, assert_success\n \n-from petisco import Controller, PrintMiddleware\n+from petisco import Controller, PrintMiddleware, UnknownError\n \n \n class MyError(Error):\n@@ -67,7 +67,7 @@ def execute(self) -> BoolResult:\n [[], [PrintMiddleware], [PrintMiddleware, PrintMiddleware]],\n )\n def test_controller_should_return_success_result_with_middlewares(\n- configured_middlewares\n+ configured_middlewares,\n ):\n class MyController(Controller):\n class Config:\n@@ -113,3 +113,15 @@ class MyController(Controller):\n excinfo.value.message\n == \"Petisco Controller must implement an execute method\"\n )\n+\n+\n+@pytest.mark.unit\n+def test_controller_should_return_unknown_error():\n+ class MyController(Controller):\n+ def execute(self, num: int) -> BoolResult:\n+ result = num / 0\n+ return Success(result)\n+\n+ result = MyController().execute(2)\n+\n+ assert_failure(result, value_is_instance_of=UnknownError)\ndiff --git a/tests/modules/base/application/dependency_injection/unit/test_dependency.py b/tests/modules/base/application/dependency_injection/unit/test_dependency.py\n--- a/tests/modules/base/application/dependency_injection/unit/test_dependency.py\n+++ b/tests/modules/base/application/dependency_injection/unit/test_dependency.py\n@@ -62,3 +62,18 @@ def test_dependency_should_return_default_when_optional_parameters_are_not_used(\n dependency = Dependency(name=\"repo\", default_builder=Builder(MyRepo))\n \n assert isinstance(dependency.get_instance(), MyRepo)\n+\n+\n+@pytest.mark.unit\n+def test_dependency_should_return_default_when_optional_parameters_are_used_but_no_backup_builders_are_defined(\n+ monkeypatch,\n+):\n+\n+ monkeypatch.setenv(\"REPOSITORY\", \"other\")\n+ dependency = Dependency(\n+ name=\"repo\", envar_modifier=\"REPOSITORY\", default_builder=Builder(MyRepo)\n+ )\n+\n+ assert isinstance(dependency.get_instance(), MyRepo)\n+\n+ monkeypatch.undo()\ndiff --git a/tests/modules/base/application/test_application.py b/tests/modules/base/application/test_application.py\n--- a/tests/modules/base/application/test_application.py\n+++ b/tests/modules/base/application/test_application.py\n@@ -21,8 +21,8 @@ def wrapper(*args, **kwargs):\n DEFAULT_AVAILABLE_DEPENDENCIES = [\n \"domain_event_bus\",\n \"command_bus\",\n- \"domain_event_consumer\",\n- \"command_consumer\",\n+ \"message_configurer\",\n+ \"message_consumer\",\n \"notifier\",\n ]\n \n@@ -43,8 +43,8 @@ def test_application_should_construct_from_required_variables():\n \"dependencies\": {\n \"domain_event_bus\": {\"name\": \"NotImplementedDomainEventBus\"},\n \"command_bus\": {\"name\": \"NotImplementedCommandBus\"},\n- \"domain_event_consumer\": {\"name\": \"NotImplementedMessageConsumer\"},\n- \"command_consumer\": {\"name\": \"NotImplementedMessageConsumer\"},\n+ \"message_configurer\": {\"name\": \"NotImplementedMessageConfigurer\"},\n+ \"message_consumer\": {\"name\": \"NotImplementedMessageConsumer\"},\n \"notifier\": {\"name\": \"NotImplementedNotifier\"},\n },\n } == application.info()\ndiff --git a/tests/modules/base/domain/messages/unit/test_message_subscriber.py b/tests/modules/base/domain/messages/unit/test_message_subscriber.py\n--- a/tests/modules/base/domain/messages/unit/test_message_subscriber.py\n+++ b/tests/modules/base/domain/messages/unit/test_message_subscriber.py\n@@ -1,10 +1,10 @@\n from typing import List, Type\n \n import pytest\n-from meiga import BoolResult, isSuccess, isFailure\n-from meiga.assertions import assert_success, assert_failure\n+from meiga import BoolResult, isFailure, isSuccess\n+from meiga.assertions import assert_failure, assert_success\n \n-from petisco import MessageSubscriber, Message, PrintMiddleware\n+from petisco import Message, MessageSubscriber, PrintMiddleware\n from tests.modules.base.mothers.message_mother import MessageMother\n \n \n@@ -47,7 +47,7 @@ def handle(self, message: Message) -> BoolResult:\n [[PrintMiddleware]],\n )\n def test_message_subscriber_should_create_command_input_and_output(\n- configured_middlewares\n+ configured_middlewares,\n ):\n class MyMessageSubscriber(MessageSubscriber):\n class Config:\ndiff --git a/tests/modules/extra/fastapi/controller/integration/test_fastapi_app_with_controller.py b/tests/modules/extra/fastapi/controller/integration/test_fastapi_app_with_controller.py\n--- a/tests/modules/extra/fastapi/controller/integration/test_fastapi_app_with_controller.py\n+++ b/tests/modules/extra/fastapi/controller/integration/test_fastapi_app_with_controller.py\n@@ -4,6 +4,7 @@\n from fastapi import FastAPI, Header\n from fastapi.testclient import TestClient\n from meiga import BoolResult, Failure, isFailure, isSuccess\n+\n from petisco import NotFound, assert_http\n from petisco.extra.fastapi import FastAPIController\n \n@@ -22,7 +23,7 @@ def execute(self, expected_behavior: str) -> BoolResult:\n \n \n @app.get(\"/test\")\n-def test_entry_point(x_behavior: Optional[str] = Header(\"success\")):\n+def entry_point(x_behavior: Optional[str] = Header(\"success\")):\n return MyController().execute(x_behavior)\n \n \ndiff --git a/tests/modules/extra/fastapi/controller/integration/test_fastapi_app_with_controller_force_unknown_error.py b/tests/modules/extra/fastapi/controller/integration/test_fastapi_app_with_controller_force_unknown_error.py\nnew file mode 100644\n--- /dev/null\n+++ b/tests/modules/extra/fastapi/controller/integration/test_fastapi_app_with_controller_force_unknown_error.py\n@@ -0,0 +1,31 @@\n+import pytest\n+from fastapi import FastAPI\n+from fastapi.testclient import TestClient\n+from meiga import Error, Result, Success\n+\n+from petisco import assert_http\n+from petisco.extra.fastapi import FastAPIController\n+\n+app = FastAPI(title=\"test-app\")\n+\n+\n+class MyController(FastAPIController):\n+\n+ # class Config:\n+ # middlewares = [NotifierMiddleware]\n+\n+ def execute(self, num: int) -> Result[int, Error]:\n+ result = num / 0\n+ return Success(result)\n+\n+\n+@app.get(\"/test\")\n+def entry_point():\n+ return MyController().execute(5)\n+\n+\n+@pytest.mark.unit\n+def test_fastapi_app_with_controller_raise_unknown_error():\n+ with TestClient(app) as client:\n+ response = client.get(\"/test\")\n+ assert_http(response, 500)\ndiff --git a/tests/modules/extra/rabbitmq/application/message/chaos/test_rabbitmq_message_chaos.py b/tests/modules/extra/rabbitmq/application/message/chaos/test_rabbitmq_message_chaos.py\n--- a/tests/modules/extra/rabbitmq/application/message/chaos/test_rabbitmq_message_chaos.py\n+++ b/tests/modules/extra/rabbitmq/application/message/chaos/test_rabbitmq_message_chaos.py\n@@ -38,7 +38,7 @@ def test_rabbitmq_message_should_create_default_rabbitmq_event_chaos():\n \n @pytest.mark.integration\n def test_rabbitmq_message_should_create_default_rabbitmq_event_chaos_with_env_percentage_simulate_nack_1(\n- monkeypatch\n+ monkeypatch,\n ):\n monkeypatch.setenv(\"MESSAGE_CHAOS_PERCENTAGE_SIMULATE_NACK\", \"1.0\")\n \n@@ -58,7 +58,7 @@ def test_rabbitmq_message_should_create_default_rabbitmq_event_chaos_with_env_pe\n \n @pytest.mark.integration\n def test_rabbitmq_message_should_create_default_rabbitmq_event_chaos_with_env_percentage_simulate_failures_1(\n- monkeypatch\n+ monkeypatch,\n ):\n monkeypatch.setenv(\"MESSAGE_CHAOS_PERCENTAGE_SIMULATE_FAILURES\", \"1.0\")\n monkeypatch.setenv(\"MESSAGE_CHAOS_DELAY_BEFORE_EVENT_HANDLER_SECONDS\", \"0.2\")\ndiff --git a/tests/modules/extra/rabbitmq/mother/rabbitmq_command_bus_mother.py b/tests/modules/extra/rabbitmq/mother/rabbitmq_command_bus_mother.py\n--- a/tests/modules/extra/rabbitmq/mother/rabbitmq_command_bus_mother.py\n+++ b/tests/modules/extra/rabbitmq/mother/rabbitmq_command_bus_mother.py\n@@ -1,4 +1,4 @@\n-from petisco.extra.rabbitmq import RabbitMqConnector, RabbitMqCommandBus\n+from petisco.extra.rabbitmq import RabbitMqCommandBus, RabbitMqConnector\n from tests.modules.base.mothers.message_meta_mother import MessageMetaMother\n from tests.modules.extra.rabbitmq.mother.defaults import (\n DEFAULT_ORGANIZATION,\n@@ -10,16 +10,16 @@ class RabbitMqCommandBusMother:\n @staticmethod\n def default(connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n- return RabbitMqCommandBus(connector, DEFAULT_ORGANIZATION, DEFAULT_SERVICE)\n+ return RabbitMqCommandBus(DEFAULT_ORGANIZATION, DEFAULT_SERVICE, connector)\n \n @staticmethod\n def with_service(service: str, connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n- return RabbitMqCommandBus(connector, DEFAULT_ORGANIZATION, service)\n+ return RabbitMqCommandBus(DEFAULT_ORGANIZATION, service, connector)\n \n @staticmethod\n def with_info_id(connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqCommandBus(\n- connector, DEFAULT_ORGANIZATION, DEFAULT_SERVICE\n+ DEFAULT_ORGANIZATION, DEFAULT_SERVICE, connector\n ).with_meta(MessageMetaMother.with_meta_with_info())\ndiff --git a/tests/modules/extra/rabbitmq/mother/rabbitmq_domain_event_bus_mother.py b/tests/modules/extra/rabbitmq/mother/rabbitmq_domain_event_bus_mother.py\n--- a/tests/modules/extra/rabbitmq/mother/rabbitmq_domain_event_bus_mother.py\n+++ b/tests/modules/extra/rabbitmq/mother/rabbitmq_domain_event_bus_mother.py\n@@ -10,16 +10,16 @@ class RabbitMqDomainEventBusMother:\n @staticmethod\n def default(connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n- return RabbitMqDomainEventBus(connector, DEFAULT_ORGANIZATION, DEFAULT_SERVICE)\n+ return RabbitMqDomainEventBus(DEFAULT_ORGANIZATION, DEFAULT_SERVICE, connector)\n \n @staticmethod\n def with_service(service: str, connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n- return RabbitMqDomainEventBus(connector, DEFAULT_ORGANIZATION, service)\n+ return RabbitMqDomainEventBus(DEFAULT_ORGANIZATION, service, connector)\n \n @staticmethod\n def with_info_id(connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqDomainEventBus(\n- connector, DEFAULT_ORGANIZATION, DEFAULT_SERVICE\n+ DEFAULT_ORGANIZATION, DEFAULT_SERVICE, connector\n ).with_meta(MessageMetaMother.with_meta_with_info())\ndiff --git a/tests/modules/extra/rabbitmq/mother/rabbitmq_message_configurer_mother.py b/tests/modules/extra/rabbitmq/mother/rabbitmq_message_configurer_mother.py\n--- a/tests/modules/extra/rabbitmq/mother/rabbitmq_message_configurer_mother.py\n+++ b/tests/modules/extra/rabbitmq/mother/rabbitmq_message_configurer_mother.py\n@@ -1,7 +1,7 @@\n from petisco.extra.rabbitmq import (\n+ QueueConfig,\n RabbitMqConnector,\n RabbitMqMessageConfigurer,\n- QueueConfig,\n )\n from tests.modules.extra.rabbitmq.mother.defaults import (\n DEFAULT_ORGANIZATION,\n@@ -14,16 +14,16 @@ class RabbitMqMessageConfigurerMother:\n def default(connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqMessageConfigurer(\n- connector, DEFAULT_ORGANIZATION, DEFAULT_SERVICE\n+ DEFAULT_ORGANIZATION, DEFAULT_SERVICE, connector\n )\n \n @staticmethod\n def with_retry_ttl_10ms(connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqMessageConfigurer(\n- connector,\n DEFAULT_ORGANIZATION,\n DEFAULT_SERVICE,\n+ connector,\n QueueConfig.default(default_retry_ttl=10),\n )\n \n@@ -31,9 +31,9 @@ def with_retry_ttl_10ms(connector: RabbitMqConnector = None):\n def with_main_and_retry_ttl_10ms(connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqMessageConfigurer(\n- connector,\n DEFAULT_ORGANIZATION,\n DEFAULT_SERVICE,\n+ connector,\n QueueConfig.default(default_retry_ttl=10, default_main_ttl=10),\n )\n \n@@ -41,9 +41,9 @@ def with_main_and_retry_ttl_10ms(connector: RabbitMqConnector = None):\n def with_main_and_retry_ttl_100ms(connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqMessageConfigurer(\n- connector,\n DEFAULT_ORGANIZATION,\n DEFAULT_SERVICE,\n+ connector,\n QueueConfig.default(default_retry_ttl=100, default_main_ttl=100),\n )\n \n@@ -51,9 +51,9 @@ def with_main_and_retry_ttl_100ms(connector: RabbitMqConnector = None):\n def with_service(service: str, connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqMessageConfigurer(\n- connector,\n DEFAULT_ORGANIZATION,\n service,\n+ connector,\n QueueConfig.default(default_retry_ttl=10),\n )\n \n@@ -61,9 +61,9 @@ def with_service(service: str, connector: RabbitMqConnector = None):\n def with_ttl_1s(connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqMessageConfigurer(\n- connector,\n DEFAULT_ORGANIZATION,\n DEFAULT_SERVICE,\n+ connector,\n QueueConfig.default(default_retry_ttl=1000),\n )\n \n@@ -73,5 +73,5 @@ def with_queue_config(\n ):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqMessageConfigurer(\n- connector, DEFAULT_ORGANIZATION, DEFAULT_SERVICE, queue_config\n+ DEFAULT_ORGANIZATION, DEFAULT_SERVICE, connector, queue_config\n )\ndiff --git a/tests/modules/extra/rabbitmq/mother/rabbitmq_message_consumer_mother.py b/tests/modules/extra/rabbitmq/mother/rabbitmq_message_consumer_mother.py\n--- a/tests/modules/extra/rabbitmq/mother/rabbitmq_message_consumer_mother.py\n+++ b/tests/modules/extra/rabbitmq/mother/rabbitmq_message_consumer_mother.py\n@@ -1,13 +1,12 @@\n from petisco.base.domain.message.chaos.message_chaos import MessageChaos\n from petisco.extra.rabbitmq import RabbitMqMessageConsumer\n from petisco.legacy import RabbitMqConnector\n-\n from petisco.legacy.logger.interface_logger import ILogger\n from petisco.legacy.logger.not_implemented_logger import NotImplementedLogger\n from tests.modules.extra.rabbitmq.mother.defaults import (\n+ DEFAULT_MAX_RETRIES,\n DEFAULT_ORGANIZATION,\n DEFAULT_SERVICE,\n- DEFAULT_MAX_RETRIES,\n DEFAULT_VERBOSE,\n )\n \n@@ -17,10 +16,10 @@ class RabbitMqMessageConsumerMother:\n def default(connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqMessageConsumer(\n- connector,\n DEFAULT_ORGANIZATION,\n DEFAULT_SERVICE,\n DEFAULT_MAX_RETRIES,\n+ connector,\n DEFAULT_VERBOSE,\n )\n \n@@ -28,10 +27,10 @@ def default(connector: RabbitMqConnector = None):\n def with_service(service: str, connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqMessageConsumer(\n- connector,\n DEFAULT_ORGANIZATION,\n service,\n DEFAULT_MAX_RETRIES,\n+ connector,\n DEFAULT_VERBOSE,\n )\n \n@@ -39,10 +38,10 @@ def with_service(service: str, connector: RabbitMqConnector = None):\n def with_max_retries(max_retries: int, connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqMessageConsumer(\n- connector,\n DEFAULT_ORGANIZATION,\n DEFAULT_SERVICE,\n max_retries,\n+ connector,\n DEFAULT_VERBOSE,\n )\n \n@@ -50,7 +49,7 @@ def with_max_retries(max_retries: int, connector: RabbitMqConnector = None):\n def without_retry(connector: RabbitMqConnector = None):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqMessageConsumer(\n- connector, DEFAULT_ORGANIZATION, DEFAULT_SERVICE, 0, DEFAULT_VERBOSE\n+ DEFAULT_ORGANIZATION, DEFAULT_SERVICE, 0, connector, DEFAULT_VERBOSE\n )\n \n @staticmethod\n@@ -62,10 +61,10 @@ def with_chaos(\n ):\n connector = RabbitMqConnector() if not connector else connector\n return RabbitMqMessageConsumer(\n- connector,\n DEFAULT_ORGANIZATION,\n DEFAULT_SERVICE,\n max_retries,\n+ connector,\n DEFAULT_VERBOSE,\n chaos,\n logger,\ndiff --git a/tests/modules/legacy/event/integration/test_rabbitmq_event_chaos.py b/tests/modules/legacy/event/integration/test_rabbitmq_event_chaos.py\n--- a/tests/modules/legacy/event/integration/test_rabbitmq_event_chaos.py\n+++ b/tests/modules/legacy/event/integration/test_rabbitmq_event_chaos.py\n@@ -38,7 +38,7 @@ def test_should_create_default_rabbitmq_event_chaos():\n \n @pytest.mark.integration\n def test_should_create_default_rabbitmq_event_chaos_with_env_percentage_simulate_nack_1(\n- monkeypatch\n+ monkeypatch,\n ):\n monkeypatch.setenv(\"EVENT_CHAOS_PERCENTAGE_SIMULATE_NACK\", \"1.0\")\n \n@@ -58,7 +58,7 @@ def test_should_create_default_rabbitmq_event_chaos_with_env_percentage_simulate\n \n @pytest.mark.integration\n def test_should_create_default_rabbitmq_event_chaos_with_env_percentage_simulate_failures_1(\n- monkeypatch\n+ monkeypatch,\n ):\n monkeypatch.setenv(\"EVENT_CHAOS_PERCENTAGE_SIMULATE_FAILURES\", \"1.0\")\n monkeypatch.setenv(\"EVENT_CHAOS_DELAY_BEFORE_EVENT_HANDLER_SECONDS\", \"0.2\")\ndiff --git a/tests/modules/legacy/event/integration/test_rabbitmq_event_consumer_with_event_handler_decorator.py b/tests/modules/legacy/event/integration/test_rabbitmq_event_consumer_with_event_handler_decorator.py\n--- a/tests/modules/legacy/event/integration/test_rabbitmq_event_consumer_with_event_handler_decorator.py\n+++ b/tests/modules/legacy/event/integration/test_rabbitmq_event_consumer_with_event_handler_decorator.py\n@@ -1,12 +1,11 @@\n from time import sleep\n \n import pytest\n-from meiga import isFailure, Result, Error, isSuccess, Failure\n+from meiga import Error, Failure, Result, isFailure, isSuccess\n \n-from petisco.legacy import Event, event_handler, DEBUG\n+from petisco.legacy import DEBUG, Event, event_handler\n from petisco.legacy.domain.errors.critical_error import CriticalError\n from petisco.legacy.event.shared.domain.event_subscriber import EventSubscriber\n-\n from petisco.legacy.fixtures.testing_decorators import testing_with_rabbitmq\n from tests.modules.legacy.event.mothers.event_user_created_mother import (\n EventUserCreatedMother,\n@@ -78,7 +77,7 @@ def assert_consumer(event: Event) -> Result[bool, Error]:\n @pytest.mark.integration\n @testing_with_rabbitmq\n def test_should_publish_consume_with_event_handler_with_default_parameters_when_success_consumer(\n- given_any_petisco\n+ given_any_petisco,\n ):\n spy = SpyEvents()\n \n@@ -268,7 +267,7 @@ def assert_consumer(event: Event) -> Result[bool, Error]:\n @pytest.mark.integration\n @testing_with_rabbitmq\n def test_should_publish_consume_with_event_handler_notify_when_fail_consumer_with_critical_error(\n- given_any_petisco\n+ given_any_petisco,\n ):\n spy = SpyEvents()\n logger = FakeLogger()\ndiff --git a/tests/modules/legacy/event/legacy/integration/test_rabbitmq_event_publisher.py b/tests/modules/legacy/event/legacy/integration/test_rabbitmq_event_publisher.py\n--- a/tests/modules/legacy/event/legacy/integration/test_rabbitmq_event_publisher.py\n+++ b/tests/modules/legacy/event/legacy/integration/test_rabbitmq_event_publisher.py\n@@ -18,7 +18,7 @@\n not rabbitmq_is_running_locally(), reason=\"RabbitMQ is not running locally\"\n )\n def test_should_create_a_rabbitmq_event_publisher_and_publish_a_event(\n- make_user_created_event\n+ make_user_created_event,\n ):\n rabbitmq_connector = RabbitMqConnector()\n event = make_user_created_event()\n@@ -49,7 +49,7 @@ def test_should_fail_publisher_when_connection_parameter_are_not_valid():\n not rabbitmq_is_running_locally(), reason=\"RabbitMQ is not running locally\"\n )\n def test_should_create_a_rabbitmq_event_publisher_and_publish_a_event_after_heartbeat(\n- make_user_created_event\n+ make_user_created_event,\n ):\n event = make_user_created_event()\n rabbitmq_connector = RabbitMqConnector()\ndiff --git a/tests/modules/legacy/event/legacy/integration/test_rabbitmq_event_subscriber.py b/tests/modules/legacy/event/legacy/integration/test_rabbitmq_event_subscriber.py\n--- a/tests/modules/legacy/event/legacy/integration/test_rabbitmq_event_subscriber.py\n+++ b/tests/modules/legacy/event/legacy/integration/test_rabbitmq_event_subscriber.py\n@@ -1,32 +1,29 @@\n-from typing import Callable\n-\n+import os\n from time import sleep\n+from typing import Callable\n \n import pytest\n-import os\n+from meiga import isSuccess\n \n from petisco.legacy.event.legacy.publisher.infrastructure.rabbitmq_event_publisher import (\n RabbitMQEventPublisher,\n )\n-from petisco.legacy.event.shared.infrastructure.rabbitmq.rabbitmq_connector import (\n- RabbitMqConnector,\n-)\n from petisco.legacy.event.legacy.subscriber.domain.config_event_subscriber import (\n ConfigEventSubscriber,\n )\n-\n-from petisco.legacy.event.shared.infrastructure.rabbitmq.rabbitmq_is_running_locally import (\n- rabbitmq_is_running_locally,\n-)\n from petisco.legacy.event.legacy.subscriber.domain.subscriber_handler import (\n subscriber_handler,\n )\n from petisco.legacy.event.legacy.subscriber.infrastructure.rabbitmq_event_subscriber import (\n RabbitMQEventSubscriber,\n )\n-\n from petisco.legacy.event.shared.domain.event import Event\n-from meiga import isSuccess\n+from petisco.legacy.event.shared.infrastructure.rabbitmq.rabbitmq_connector import (\n+ RabbitMqConnector,\n+)\n+from petisco.legacy.event.shared.infrastructure.rabbitmq.rabbitmq_is_running_locally import (\n+ rabbitmq_is_running_locally,\n+)\n \n \n def await_for_it(seconds: float = 1.5):\n@@ -55,7 +52,7 @@ def _given_any_config_event_subscriber(\n not rabbitmq_is_running_locally(), reason=\"RabbitMQ is not running locally\"\n )\n def test_should_create_a_rabbitmq_event_subscriber_and_then_close_it(\n- given_any_config_event_subscriber\n+ given_any_config_event_subscriber,\n ):\n subscriber = RabbitMQEventSubscriber(\n connector=RabbitMqConnector(),\n@@ -81,7 +78,7 @@ def test_should_create_a_rabbitmq_event_subscriber_and_then_close_it(\n not rabbitmq_is_running_locally(), reason=\"RabbitMQ is not running locally\"\n )\n def test_should_create_a_rabbitmq_event_subscriber_and_try_to_delete_twice(\n- given_any_config_event_subscriber\n+ given_any_config_event_subscriber,\n ):\n subscriber = RabbitMQEventSubscriber(\n connector=RabbitMqConnector(),\n@@ -98,7 +95,7 @@ def test_should_create_a_rabbitmq_event_subscriber_and_try_to_delete_twice(\n not rabbitmq_is_running_locally(), reason=\"RabbitMQ is not running locally\"\n )\n def test_should_create_a_rabbitmq_event_subscriber_and_then_unsubscribe_all_when_not_subscribe_all_before(\n- given_any_config_event_subscriber\n+ given_any_config_event_subscriber,\n ):\n subscriber = RabbitMQEventSubscriber(\n connector=RabbitMqConnector(),\n@@ -109,7 +106,7 @@ def test_should_create_a_rabbitmq_event_subscriber_and_then_unsubscribe_all_when\n \n @pytest.mark.integration\n def test_should_fail_subscriber_when_connection_parameter_are_not_valid(\n- given_any_config_event_subscriber\n+ given_any_config_event_subscriber,\n ):\n with pytest.raises(TypeError):\n _ = RabbitMQEventSubscriber(\n@@ -122,7 +119,7 @@ def test_should_fail_subscriber_when_connection_parameter_are_not_valid(\n not rabbitmq_is_running_locally(), reason=\"RabbitMQ is not running locally\"\n )\n def test_should_create_a_rabbitmq_event_subscriber_and_check_info(\n- given_any_config_event_subscriber\n+ given_any_config_event_subscriber,\n ):\n subscriber = RabbitMQEventSubscriber(\n connector=RabbitMqConnector(),\n@@ -156,7 +153,7 @@ def test_should_throw_a_exception_if_try_to_start_a_subscriber_with_no_subscribe\n not rabbitmq_is_running_locally(), reason=\"RabbitMQ is not running locally\"\n )\n def test_should_create_two_rabbitmq_event_subscriber_and_then_close_one_without_altering_the_other(\n- given_any_config_event_subscriber\n+ given_any_config_event_subscriber,\n ):\n subscriber = RabbitMQEventSubscriber(\n connector=RabbitMqConnector(),\ndiff --git a/tests/modules/legacy/event/unit/test_config_events.py b/tests/modules/legacy/event/unit/test_config_events.py\n--- a/tests/modules/legacy/event/unit/test_config_events.py\n+++ b/tests/modules/legacy/event/unit/test_config_events.py\n@@ -89,7 +89,7 @@ def test_should_load_config_event_from_valid_dictionary(given_valid_event_config\n \n @pytest.mark.unit\n def test_should_load_config_event_from_valid_dictionary_with_queue_subscribers(\n- given_valid_event_config_with_queue_subscribers\n+ given_valid_event_config_with_queue_subscribers,\n ):\n config_events = ConfigEvents.from_dict(\n given_valid_event_config_with_queue_subscribers\n@@ -100,7 +100,7 @@ def test_should_load_config_event_from_valid_dictionary_with_queue_subscribers(\n \n @pytest.mark.unit\n def test_should_raise_an_error_given_invalid_handlers_on_event_config(\n- given_invalid_handlers_on_event_config\n+ given_invalid_handlers_on_event_config,\n ):\n \n with pytest.raises(TypeError):\ndiff --git a/tests/modules/legacy/event/unit/test_event.py b/tests/modules/legacy/event/unit/test_event.py\n--- a/tests/modules/legacy/event/unit/test_event.py\n+++ b/tests/modules/legacy/event/unit/test_event.py\n@@ -167,7 +167,7 @@ def test_should_update_event_with_info_id_without_deleting_meta_info(\n \n @pytest.mark.unit\n def test_should_load_json_when_there_is_not_attribute(\n- given_json_event_data_without_attributes\n+ given_json_event_data_without_attributes,\n ):\n \n event = Event.from_json(given_json_event_data_without_attributes)\ndiff --git a/tests/modules/legacy/integration/notifier/test_slack_notifier.py b/tests/modules/legacy/integration/notifier/test_slack_notifier.py\n--- a/tests/modules/legacy/integration/notifier/test_slack_notifier.py\n+++ b/tests/modules/legacy/integration/notifier/test_slack_notifier.py\n@@ -1,8 +1,8 @@\n import json\n-from unittest.mock import patch, MagicMock\n+from unittest.mock import MagicMock, patch\n \n import pytest\n-from slack import WebClient\n+from slack_sdk import WebClient\n \n from petisco.legacy.notifier.domain.notifier_message import NotifierMessage\n from petisco.legacy.notifier.infrastructure.slack.slack_notifier import SlackNotifier\ndiff --git a/tests/modules/legacy/unit/controller/test_controller_handler.py b/tests/modules/legacy/unit/controller/test_controller_handler.py\n--- a/tests/modules/legacy/unit/controller/test_controller_handler.py\n+++ b/tests/modules/legacy/unit/controller/test_controller_handler.py\n@@ -1,10 +1,10 @@\n from unittest.mock import Mock\n \n import pytest\n-from meiga import Success, isFailure, Failure\n+from meiga import Failure, Success, isFailure\n \n from petisco import __version__\n-from petisco.legacy import controller_handler, ERROR, DEBUG, IEventBus\n+from petisco.legacy import DEBUG, ERROR, IEventBus, controller_handler\n from petisco.legacy.domain.errors.critical_error import CriticalError\n from petisco.legacy.event.shared.domain.request_responded import RequestResponded\n from tests.modules.legacy.unit.mocks.fake_logger import FakeLogger\n@@ -194,7 +194,7 @@ def my_controller(headers=None):\n \n @pytest.mark.unit\n def test_should_execute_successfully_a_empty_controller_with_default_parameters(\n- given_any_petisco\n+ given_any_petisco,\n ):\n @controller_handler()\n def my_controller(headers=None):\ndiff --git a/tests/modules/legacy/unit/controller/test_controller_handler_signature_inputs.py b/tests/modules/legacy/unit/controller/test_controller_handler_signature_inputs.py\n--- a/tests/modules/legacy/unit/controller/test_controller_handler_signature_inputs.py\n+++ b/tests/modules/legacy/unit/controller/test_controller_handler_signature_inputs.py\n@@ -1,7 +1,7 @@\n import pytest\n from meiga import Success\n \n-from petisco.legacy import controller_handler, TokenManager, InfoId, Petisco\n+from petisco.legacy import InfoId, Petisco, TokenManager, controller_handler\n from petisco.legacy.security.token_manager.accepted_token import AcceptedToken\n \n \n@@ -29,7 +29,9 @@ def my_controller(param: str):\n \n \n @pytest.mark.unit\n-def test_should_execute_a_controller_with_default_headers_parameter(given_any_petisco,):\n+def test_should_execute_a_controller_with_default_headers_parameter(\n+ given_any_petisco,\n+):\n @controller_handler()\n def my_controller(headers):\n assert isinstance(headers, dict)\ndiff --git a/tests/modules/legacy/unit/domain/aggregate_roots/test_info_id_aggregate_root.py b/tests/modules/legacy/unit/domain/aggregate_roots/test_info_id_aggregate_root.py\n--- a/tests/modules/legacy/unit/domain/aggregate_roots/test_info_id_aggregate_root.py\n+++ b/tests/modules/legacy/unit/domain/aggregate_roots/test_info_id_aggregate_root.py\n@@ -69,7 +69,7 @@ def test_should_create_info_id_from_headers_none():\n \n @pytest.mark.unit\n def test_should_create_info_id_from_headers_with_only_correlation_id(\n- given_any_correlation_id\n+ given_any_correlation_id,\n ):\n \n headers = {\"X-Correlation-Id\": given_any_correlation_id.value}\ndiff --git a/tests/modules/legacy/unit/tools/test_pool_executor.py b/tests/modules/legacy/unit/tools/test_pool_executor.py\n--- a/tests/modules/legacy/unit/tools/test_pool_executor.py\n+++ b/tests/modules/legacy/unit/tools/test_pool_executor.py\n@@ -1,5 +1,5 @@\n import pytest\n-from meiga import Success, Result, Error, isFailure\n+from meiga import Error, Result, Success, isFailure\n \n from petisco.legacy import Executable, PoolExecutor\n \n@@ -43,7 +43,7 @@ def mul(param_1, param_2) -> Result[int, Error]:\n @pytest.mark.unit\n @pytest.mark.parametrize(\"use_multi_threading\", [True, False])\n def test_pool_executor_should_fail_when_executable_returns_a_failure(\n- use_multi_threading\n+ use_multi_threading,\n ):\n def sum(param_1, param_2) -> Result[int, Error]:\n return isFailure\ndiff --git a/tests/modules/legacy/unit/use_case/test_use_case.py b/tests/modules/legacy/unit/use_case/test_use_case.py\n--- a/tests/modules/legacy/unit/use_case/test_use_case.py\n+++ b/tests/modules/legacy/unit/use_case/test_use_case.py\n@@ -1,18 +1,17 @@\n from typing import NamedTuple\n \n import pytest\n+from meiga import Error, Failure, Success, isFailure, isSuccess\n from meiga.assertions import assert_failure, assert_success\n \n-from petisco.legacy import UseCase, use_case_handler, ERROR, DEBUG, UnknownError\n-from meiga import Success, Failure, isFailure, isSuccess, Error\n-\n+from petisco.legacy import DEBUG, ERROR, UnknownError, UseCase, use_case_handler\n from tests.modules.legacy.unit.mocks.fake_logger import FakeLogger\n from tests.modules.legacy.unit.mocks.log_message_mother import LogMessageMother\n \n \n @pytest.mark.unit\n def test_should_log_successfully_a_non_error_use_case_without_input_parameters_and_returning_a_string_result(\n- given_any_petisco\n+ given_any_petisco,\n ):\n \n logger = FakeLogger()\n@@ -43,7 +42,7 @@ def execute(self):\n \n @pytest.mark.unit\n def test_should_log_successfully_a_non_error_use_case_with_input_parameters_but_not_in_the_whitelist(\n- given_any_petisco\n+ given_any_petisco,\n ):\n \n logger = FakeLogger()\n@@ -74,7 +73,7 @@ def execute(self, client_id: str, user_id: str):\n \n @pytest.mark.unit\n def test_should_log_successfully_a_non_error_use_case_with_input_parameters(\n- given_any_petisco\n+ given_any_petisco,\n ):\n \n logger = FakeLogger()\n@@ -117,7 +116,7 @@ def execute(self, client_id: str, user_id: str):\n \n @pytest.mark.unit\n def test_should_log_successfully_a_filtered_object_by_blacklist_with_python_type_bytes(\n- given_any_petisco\n+ given_any_petisco,\n ):\n \n logger = FakeLogger()\n@@ -150,7 +149,7 @@ def execute(self):\n \n @pytest.mark.unit\n def test_should_log_successfully_a_filtered_object_by_blacklist_with_own_named_tuple(\n- given_any_petisco\n+ given_any_petisco,\n ):\n \n logger = FakeLogger()\n@@ -188,7 +187,7 @@ def execute(self):\n \n @pytest.mark.unit\n def test_should_log_successfully_a_filtered_object_by_blacklist_with_a_tuple(\n- given_any_petisco\n+ given_any_petisco,\n ):\n \n logger = FakeLogger()\n@@ -328,7 +327,7 @@ def execute(self):\n \n @pytest.mark.unit\n def test_should_use_case_handler_return_a_failure_with_unknown_error_when_raise_an_uncontrolled_exception(\n- given_any_petisco\n+ given_any_petisco,\n ):\n \n logger = FakeLogger()\n@@ -364,7 +363,7 @@ def execute(self):\n \n @pytest.mark.unit\n def test_should_use_case_handler_return_a_failure_with_unknown_error_when_raise_an_uncontrolled_exception_with_input_parameters(\n- given_any_petisco\n+ given_any_petisco,\n ):\n \n logger = FakeLogger()\n@@ -404,7 +403,7 @@ def execute(self, text: str, verbose: bool):\n \n @pytest.mark.unit\n def test_should_use_case_handler_return_a_failure_with_unknown_error_when_raise_an_uncontrolled_exception_with_non_defined_input_parameters(\n- given_any_petisco\n+ given_any_petisco,\n ):\n \n logger = FakeLogger()\n@@ -444,7 +443,7 @@ def execute(self, text: str, verbose: bool):\n \n @pytest.mark.unit\n def test_should_log_successfully_a_non_error_use_case_with_default_parameters(\n- given_any_petisco\n+ given_any_petisco,\n ):\n @use_case_handler()\n class MyUseCase(UseCase):\n", "problem_statement": "", "hints_text": "", "created_at": "2021-07-21T08:00:23Z"} | |