qena-shared-lib 0.1.5__tar.gz → 0.1.7__tar.gz

{qena_shared_lib-0.1.5 → qena_shared_lib-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qena-shared-lib
-Version: 0.1.5
+Version: 0.1.7
 Summary: A shared tools for other services
 Requires-Python: >=3.10
 Requires-Dist: cronsim~=2.0

{qena_shared_lib-0.1.5 → qena_shared_lib-0.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qena-shared-lib"
-version = "0.1.5"
+version = "0.1.7"
 description = "A shared tools for other services"
 readme = "README.md"
 requires-python = ">=3.10"

{qena_shared_lib-0.1.5 → qena_shared_lib-0.1.7}/src/qena_shared_lib/exception_handlers.py

@@ -1,9 +1,10 @@
+from collections.abc import Iterable
 from typing import Any
 
 from fastapi import Request, Response, status
-from fastapi.encoders import jsonable_encoder
 from fastapi.exceptions import RequestValidationError
 from fastapi.responses import JSONResponse
+from pydantic_core import to_jsonable_python
 
 from .dependencies.http import get_service
 from .exceptions import ServiceException, Severity
@@ -93,7 +94,19 @@ def handle_service_exception(
         content["correctiveAction"] = exception.corrective_action
 
     if exception.body is not None:
-        content.update(dict(exception.body))
+        extra_body = to_jsonable_python(exception.body)
+        is_updated = False
+
+        try:
+            if isinstance(extra_body, Iterable):
+                content.update(extra_body)
+
+                is_updated = True
+        except:
+            pass
+
+        if not is_updated:
+            content["data"] = extra_body
 
     return JSONResponse(
         content=content,
@@ -117,7 +130,7 @@ def handle_request_validation_error(
             "severity": Severity.MEDIUM.name,
             "message": message,
             "code": 100,
-            "detail": jsonable_encoder(error.errors()),
+            "detail": to_jsonable_python(error.errors()),
         },
         status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
     )

{qena_shared_lib-0.1.5 → qena_shared_lib-0.1.7}/src/qena_shared_lib/rabbitmq/_base.py

@@ -381,7 +381,7 @@ class RabbitMqManager(AsyncEventLoopMixin):
         )
 
         if self._connected:
-            self.loop.create_task(self._channel_pool.dain()).add_done_callback(
+            self.loop.create_task(self._channel_pool.drain()).add_done_callback(
                 self._channel_pool_drained
             )
 

{qena_shared_lib-0.1.5 → qena_shared_lib-0.1.7}/src/qena_shared_lib/rabbitmq/_listener.py

@@ -21,11 +21,10 @@ from pydantic_core import from_json, to_json
 from ..dependencies.miscellaneous import validate_annotation
 from ..logging import LoggerProvider
 from ..logstash import BaseLogstashSender
-from ..utils import AsyncEventLoopMixin
+from ..utils import AsyncEventLoopMixin, TypeAdapterCache
 from ._channel import BaseChannel
 from ._exceptions import RabbitMQException
 from ._pool import ChannelPool
-from ._utils import TypeAdapterCache
 
 __all__ = [
     "BackoffRetryDelay",

{qena_shared_lib-0.1.5 → qena_shared_lib-0.1.7}/src/qena_shared_lib/rabbitmq/_pool.py

@@ -28,7 +28,7 @@ class ChannelPool(AsyncEventLoopMixin):
             for _ in range(self._initial_pool_size):
                 await self._add_new_channel()
 
-    async def dain(self):
+    async def drain(self):
         async with self._pool_lock:
             for channel_base in self._pool.values():
                 with channel_base as channel:

{qena_shared_lib-0.1.5 → qena_shared_lib-0.1.7}/src/qena_shared_lib/rabbitmq/_rpc_client.py

@@ -13,10 +13,9 @@ from prometheus_client import Counter, Summary
 from pydantic_core import from_json, to_json
 
 from ..logging import LoggerProvider
-from ..utils import AsyncEventLoopMixin
+from ..utils import AsyncEventLoopMixin, TypeAdapterCache
 from ._exceptions import RabbitMQException
 from ._pool import ChannelPool
-from ._utils import TypeAdapterCache
 
 __all__ = ["RpcClient"]
 

{qena_shared_lib-0.1.5 → qena_shared_lib-0.1.7}/src/qena_shared_lib/utils.py

@@ -1,6 +1,8 @@
 from asyncio import AbstractEventLoop, get_running_loop
 
-__all__ = ["AsyncEventLoopMixin"]
+from pydantic import TypeAdapter
+
+__all__ = ["AsyncEventLoopMixin", "TypeAdapterCache"]
 
 ABSTRACT_EVENT_LOOP_ATTRIBUTE = "__abstract_event_loop__"
 
@@ -26,3 +28,18 @@ class AsyncEventLoopMixin:
             setattr(self, ABSTRACT_EVENT_LOOP_ATTRIBUTE, current_running_loop)
 
         return getattr(self, ABSTRACT_EVENT_LOOP_ATTRIBUTE)
+
+
+class TypeAdapterCache:
+    _cache = {}
+
+    @classmethod
+    def cache_annotation(cls, annotation: type):
+        if annotation not in cls._cache:
+            cls._cache[annotation] = TypeAdapter(annotation)
+
+    @classmethod
+    def get_type_adapter(cls, annotation: type) -> TypeAdapter:
+        cls.cache_annotation(annotation)
+
+        return cls._cache[annotation]

qena_shared_lib-0.1.5/src/qena_shared_lib/rabbitmq/_utils.py

@@ -1,18 +0,0 @@
-from pydantic import TypeAdapter
-
-__all__ = ["TypeAdapterCache"]
-
-
-class TypeAdapterCache:
-    _cache = {}
-
-    @classmethod
-    def cache_annotation(cls, annotation: type):
-        if annotation not in cls._cache:
-            cls._cache[annotation] = TypeAdapter(annotation)
-
-    @classmethod
-    def get_type_adapter(cls, annotation: type) -> TypeAdapter:
-        cls.cache_annotation(annotation)
-
-        return cls._cache[annotation]

{qena_shared_lib-0.1.5 → qena_shared_lib-0.1.7}/src/qena_shared_lib/logstash/_base.py

@@ -228,7 +228,6 @@ class BaseLogstashSender(AsyncEventLoopMixin):
         self._max_log_retry = max_log_retry
         self._started = False
         self._closed = False
-        self._close_future = self.loop.create_future()
         self._log_queue: Queue[LogstashLogRecord | EndOfLogMarker] = Queue(
             log_queue_size
         )
@@ -246,6 +245,7 @@ class BaseLogstashSender(AsyncEventLoopMixin):
 
         self._started = True
         self._closed = False
+        self._close_future = self.loop.create_future()
         _, _ = await gather(
             self.loop.run_in_executor(executor=None, func=self._hook_on_start),
             self._hook_on_start_async(),