qena-shared-lib 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

qena_shared_lib/rabbitmq/_base.py

@@ -94,7 +94,6 @@ class RabbitMqManager(AsyncEventLoopMixin):
 
     def __init__(
         self,
-        listeners: list[Listener | type[ListenerBase]],
         logstash: BaseLogstashSender,
         parameters: Parameters | str | None = None,
         reconnect_delay: float = 5.0,
@@ -102,24 +101,7 @@ class RabbitMqManager(AsyncEventLoopMixin):
         listener_global_retry_policy: RetryPolicy | None = None,
         container: Container | None = None,
     ):
-        for index, listener in enumerate(listeners):
-            if not isinstance(listener, Listener) and (
-                not isinstance(listener, type)
-                or not issubclass(listener, ListenerBase)
-            ):
-                raise TypeError(
-                    f"listener {index} is {type(listener)}, expected instance of type or subclass of `Listener` or `type[ListenerBase]`"
-                )
-
-        self._listener_classes = [
-            listener_class
-            for listener_class in listeners
-            if isinstance(listener_class, type)
-            and issubclass(listener_class, ListenerBase)
-        ]
-        self._listeners = [
-            listener for listener in listeners if isinstance(listener, Listener)
-        ]
+        self._listeners: list[Listener] = []
 
         if isinstance(parameters, str):
             self._parameters = URLParameters(parameters)
@@ -139,8 +121,6 @@ class RabbitMqManager(AsyncEventLoopMixin):
             type[Exception], ExceptionHandlerContainer
         ] = {}
 
-        self._register_listener_classes()
-
         self.exception_handler(RabbitMQException)(handle_rabbitmq_exception)
         self.exception_handler(ValidationError)(handle_validation_error)
         self.exception_handler(ServiceException)(handle_microservice_exception)
@@ -150,26 +130,6 @@ class RabbitMqManager(AsyncEventLoopMixin):
         self._logstash = logstash
         self._logger = LoggerProvider.default().get_logger("rabbitmq")
 
-    def _register_listener_classes(self):
-        for listener_class in self._listener_classes:
-            inner_listener = getattr(listener_class, LISTENER_ATTRIBUTE, None)
-
-            if inner_listener is None:
-                raise AttributeError(
-                    "listener is possibly not with `Consumer` or `RpcWorker`"
-                )
-
-            if not isinstance(inner_listener, Listener):
-                raise TypeError(
-                    f"listener class {type(listener_class)} is not a type `Listener`, posibilly not decorated with `Consumer` or `RpcWorker`"
-                )
-
-            self._container.register(
-                service=ListenerBase,
-                factory=listener_class,
-                scope=Scope.singleton,
-            )
-
     @property
     def container(self) -> Container:
         return self._container
@@ -239,6 +199,40 @@ class RabbitMqManager(AsyncEventLoopMixin):
 
         return True, None
 
+    def include_listener(self, listener: Listener | type[ListenerBase]):
+        if isinstance(listener, Listener):
+            self._listeners.append(listener)
+
+            return
+
+        if isinstance(listener, type) and issubclass(listener, ListenerBase):
+            self._register_listener_classes(listener)
+
+            return
+
+        raise TypeError(
+            f"listener is {type(listener)}, expected instance of type or subclass of `Listener` or `type[ListenerBase]`"
+        )
+
+    def _register_listener_classes(self, listener_class: type):
+        inner_listener = getattr(listener_class, LISTENER_ATTRIBUTE, None)
+
+        if inner_listener is None:
+            raise AttributeError(
+                "listener is possibly not with `Consumer` or `RpcWorker`"
+            )
+
+        if not isinstance(inner_listener, Listener):
+            raise TypeError(
+                f"listener class {type(listener_class)} is not a type `Listener`, posibilly not decorated with `Consumer` or `RpcWorker`"
+            )
+
+        self._container.register(
+            service=ListenerBase,
+            factory=listener_class,
+            scope=Scope.singleton,
+        )
+
     def include_service(
         self,
         rabbit_mq_service: AbstractRabbitMQService
@@ -407,9 +401,7 @@ class RabbitMqManager(AsyncEventLoopMixin):
         exception = task.exception()
 
         if exception is not None:
-            if not self._disconnected and not isinstance(
-                exception, (ConnectionClosedByClient, ChannelClosedByClient)
-            ):
+            if self._can_reconnect(exception):
                 self._logstash.error(
                     message="couldn't drain the channel pool",
                     exception=exception,
@@ -462,13 +454,7 @@ class RabbitMqManager(AsyncEventLoopMixin):
         if exception is not None:
             if not self._connected and not self._connected_future.done():
                 self._connected_future.set_exception(exception)
-            elif (
-                self._connected
-                and not self._disconnected
-                and not isinstance(
-                    exception, (ConnectionClosedByClient, ChannelClosedByClient)
-                )
-            ):
+            elif self._can_reconnect(exception):
                 self._logstash.error(
                     message="couldn't fill the channel pool",
                     exception=exception,
@@ -538,13 +524,7 @@ class RabbitMqManager(AsyncEventLoopMixin):
         if exception is not None:
             if not self._connected and not self._connected_future.done():
                 self._connected_future.set_exception(exception)
-            elif (
-                self._connected
-                and not self._disconnected
-                and not isinstance(
-                    exception, (ConnectionClosedByClient, ChannelClosedByClient)
-                )
-            ):
+            elif self._can_reconnect(exception):
                 self._logstash.error(
                     message="couldn't configure and initialize all listeners and services",
                     exception=exception,
@@ -671,13 +651,7 @@ class RabbitMqManager(AsyncEventLoopMixin):
 
             return
 
-        if (
-            self._connected
-            and not self._disconnected
-            and not isinstance(
-                exception, (ConnectionClosedByClient, ChannelClosedByClient)
-            )
-        ):
+        if self._can_reconnect(exception):
             self._logstash.error(
                 message="connection to rabbitmq closed unexpectedly, attempting to reconnect",
                 exception=exception,
@@ -696,13 +670,7 @@ class RabbitMqManager(AsyncEventLoopMixin):
         try:
             connected_future = self.connect()
         except Exception as e:
-            if (
-                self._connected
-                and not self._disconnected
-                and not isinstance(
-                    e, (ConnectionClosedByClient, ChannelClosedByClient)
-                )
-            ):
+            if self._can_reconnect(e):
                 if not self._connected_future.done():
                     self._connected_future.set_result(None)
 
@@ -727,15 +695,18 @@ class RabbitMqManager(AsyncEventLoopMixin):
         if exception is None:
             return
 
-        if (
-            self._connected
-            and not self._disconnected
-            and not isinstance(
-                exception, (ConnectionClosedByClient, ChannelClosedByClient)
-            )
-        ):
+        if self._can_reconnect(exception):
             self._logstash.error(
                 message="couldn't reconnect to rabbitmq, attempting to reconnect",
                 exception=exception,
             )
             self._reconnect()
+
+    def _can_reconnect(self, exception: BaseException) -> bool:
+        return (
+            self._connected
+            and not self._disconnected
+            and not isinstance(
+                exception, (ConnectionClosedByClient, ChannelClosedByClient)
+            )
+        )

qena_shared_lib/scheduler.py

@@ -181,33 +181,34 @@ class ScheduleManager(AsyncEventLoopMixin):
 
     def __init__(
         self,
-        schedulers: list[Scheduler | type[SchedulerBase]],
         logstash: BaseLogstashSender,
         container: Container | None = None,
     ):
         self._container = container or Container()
         self._logstash = logstash
         self._scheduled_tasks: list[ScheduledTask] = []
-
-        for index, scheduler in enumerate(schedulers):
-            if isinstance(scheduler, Scheduler):
-                self._scheduled_tasks.extend(scheduler.scheduled_tasks)
-            elif isinstance(scheduler, type) and issubclass(
-                scheduler, SchedulerBase
-            ):
-                self._container.register(
-                    service=SchedulerBase,
-                    factory=scheduler,
-                    scope=Scope.singleton,
-                )
-            else:
-                raise TypeError(
-                    f"scheduler {index} is {type(scheduler)}, expected instance of type or subclass of `Scheduler` or `type[SchedulerBase]`"
-                )
-
         self._next_run_in = None
         self._logger = LoggerProvider.default().get_logger("schedule_manager")
 
+    def include_scheduler(self, scheduler: Scheduler | type[SchedulerBase]):
+        if isinstance(scheduler, Scheduler):
+            self._scheduled_tasks.extend(scheduler.scheduled_tasks)
+
+            return
+
+        if isinstance(scheduler, type) and issubclass(scheduler, SchedulerBase):
+            self._container.register(
+                service=SchedulerBase,
+                factory=scheduler,
+                scope=Scope.singleton,
+            )
+
+            return
+
+        raise TypeError(
+            f"scheduler is {type(scheduler)}, expected instance of type or subclass of `Scheduler` or `type[SchedulerBase]`"
+        )
+
     @property
     def container(self) -> Container:
         return self._container

qena_shared_lib/security.py

@@ -26,14 +26,14 @@ __all__ = [
 ]
 
 
-MESSAGE = "you are not authorized to access request resouce"
+MESSAGE = "you are not authorized to access requested resouce"
 RESPONSE_CODE = int(environ.get("UNAUTHORIZED_RESPONSE_CODE") or 0)
 
 
 class PasswordHasher(AsyncEventLoopMixin):
-    def __init__(self):
+    def __init__(self, schemes=None):
         self._crypt_context = CryptContext(
-            schemes=["bcrypt"], deprecated="auto"
+            schemes=schemes or ["bcrypt"], deprecated="auto"
         )
 
     def hash(self, password: str) -> Future[str]:

{qena_shared_lib-0.1.1.dist-info → qena_shared_lib-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qena-shared-lib
-Version: 0.1.1
+Version: 0.1.2
 Summary: A shared tools for other services
 Requires-Python: >=3.10
 Requires-Dist: cronsim~=2.0
@@ -224,13 +224,11 @@ def main() -> FastAPI:
     ...
 
     rabbitmq = RabbitMqManager(
-        listeners=[
-            UserConsumer
-        ],
         logstash=logstash,
         container=builder.container,
     )
 
+    rabbitmq.include_listener(UserConsumer)
     builder.add_singleton(
         service=RabbitMqManager,
         instance=rabbitmq,
@@ -314,13 +312,11 @@ def main() -> FastAPI:
     ...
 
     schedule_manager = ScheduleManager(
-        schedulers=[
-            TaskScheduler
-        ],
         logstash=logstash,
         container=builder.container
     )
 
+    schedule_manager.include_scheduler(TaskScheduler)
     builder.with_singleton(
         service=ScheduleManager,
         instance=schedule_manager,

{qena_shared_lib-0.1.1.dist-info → qena_shared_lib-0.1.2.dist-info}/RECORD

@@ -6,8 +6,8 @@ qena_shared_lib/exceptions.py,sha256=cNeksC8ZavKgoqKLBik1NR-lCcdLZzITHMXww5deY5Y
 qena_shared_lib/http.py,sha256=90bmDfs522KxKBj2o0vO-MgmDqa3EZOfaNUFp1DuUdQ,23864
 qena_shared_lib/logging.py,sha256=JL6bAmkK1BJA84rZNpvDEmrec3dogQRpSug4fj1Omkw,1618
 qena_shared_lib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-qena_shared_lib/scheduler.py,sha256=Y1pSIU8P7_-tuesqpvAKm_DPRCqFB8o0srhXOF_r5BU,11965
-qena_shared_lib/security.py,sha256=mDozOTcazVz6QPN3Np8-IM2g9REqo_UCcQDE9HKlUEw,6005
+qena_shared_lib/scheduler.py,sha256=MAYc566aW1y0nm7oq8g7GTtjN9PhATwLP7VF4cQVUHA,11855
+qena_shared_lib/security.py,sha256=BR03IzEzFw2Zgtg3gYz1-hdsyBOB5A304G0I1y1KrrQ,6032
 qena_shared_lib/utils.py,sha256=bvPnjaFx7npVGSUO6IKdpiAHfUECsGRCeDW8UOjVckU,845
 qena_shared_lib/dependencies/__init__.py,sha256=W12RgJbhqZ9GiSV1nLlHmpwPzvQv8t7f4JEoazM_WYg,350
 qena_shared_lib/dependencies/http.py,sha256=3KopQjq05qbYROMPZjji2Zz7qQLU6_2u3qKisLrjLks,1469
@@ -17,7 +17,7 @@ qena_shared_lib/logstash/_base.py,sha256=b_wWbdIpl9aIqGdnNI-oYuZmiiUhx5rWXIbZzUR
 qena_shared_lib/logstash/_http_sender.py,sha256=Sq3bJOXuOafqloROGblnmyUd0RuU3zF0QLpQDYjiy-g,1765
 qena_shared_lib/logstash/_tcp_sender.py,sha256=ncvc3wYxOJPkB7c_0W8vboaxMRJ_1UYGdA8LN2NXUpo,2306
 qena_shared_lib/rabbitmq/__init__.py,sha256=WKAcKpRXXX9kqfHVEkyX6p2yIWzB07TMsBBWbV8nrKA,1209
-qena_shared_lib/rabbitmq/_base.py,sha256=2_HYL5zHIl201H8O2Vu_R3aNC2S1SHstEU6ttHvtj3c,24224
+qena_shared_lib/rabbitmq/_base.py,sha256=rOUpYK3FJu3U5rU4vF--31c_Ycpnt4FL9qGkZNGLnYY,23068
 qena_shared_lib/rabbitmq/_channel.py,sha256=R0xzZvLkeE4YWsyLhx8bPDramsTFDZIcCgfsDyFmSB4,5429
 qena_shared_lib/rabbitmq/_exception_handlers.py,sha256=bhz-oteXcIEvYA-f4Mj6nFy66z-iVqk5rOARSx_8zSg,4733
 qena_shared_lib/rabbitmq/_exceptions.py,sha256=Mg56Uk4eBEwTnWC91_WPS3_8d-yaqNkbb_32IpX_R-c,1208
@@ -26,6 +26,6 @@ qena_shared_lib/rabbitmq/_pool.py,sha256=1_ftW0D3sPHI6v5c72oA03s05up4-1QqZ7d8icn
 qena_shared_lib/rabbitmq/_publisher.py,sha256=48JdpvNzFaw3Bw5LhunFxcjm3qNWz3AXKyXtcpzcohQ,2380
 qena_shared_lib/rabbitmq/_rpc_client.py,sha256=E-J5PIfA1T3j1y9KoxjNTzSLdK95MbaePulNxiqGb-M,8724
 qena_shared_lib/rabbitmq/_utils.py,sha256=5WZjYm4MdDrjL1dsrZuT8eKKiWfUef29_FJ262-hfSM,438
-qena_shared_lib-0.1.1.dist-info/METADATA,sha256=Y2ORNfT5rd26iuX5v_CTqN9pWYC7Ilg2llwV1y6i0Ow,7809
-qena_shared_lib-0.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qena_shared_lib-0.1.1.dist-info/RECORD,,
+qena_shared_lib-0.1.2.dist-info/METADATA,sha256=GovQUH1CKBUrgBKkduLdtgSku8znAVAGjgMfyzqdZAU,7793
+qena_shared_lib-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qena_shared_lib-0.1.2.dist-info/RECORD,,