jararaca 0.3.9__py3-none-any.whl → 0.3.11a0__py3-none-any.whl

jararaca/messagebus/interceptors/aiopika_publisher_interceptor.py

@@ -15,6 +15,8 @@ from jararaca.messagebus.interceptors.publisher_interceptor import (
 from jararaca.messagebus.publisher import IMessage, MessagePublisher
 from jararaca.scheduler.types import DelayedMessageData
 
+logger = logging.getLogger(__name__)
+
 
 class AIOPikaMessagePublisher(MessagePublisher):
 
@@ -28,8 +30,13 @@ class AIOPikaMessagePublisher(MessagePublisher):
         self.channel = channel
         self.exchange_name = exchange_name
         self.message_broker_backend = message_broker_backend
+        self.staged_delayed_messages: list[DelayedMessageData] = []
+        self.staged_messages: list[IMessage] = []
 
     async def publish(self, message: IMessage, topic: str) -> None:
+        self.staged_messages.append(message)
+
+    async def _publish(self, message: IMessage, topic: str) -> None:
         exchange = await self.channel.get_exchange(self.exchange_name, ensure=False)
         if not exchange:
             logging.warning(f"Exchange {self.exchange_name} not found")
@@ -45,7 +52,7 @@ class AIOPikaMessagePublisher(MessagePublisher):
             raise NotImplementedError(
                 "Delay is not implemented for AIOPikaMessagePublisher"
             )
-        await self.message_broker_backend.enqueue_delayed_message(
+        self.staged_delayed_messages.append(
             DelayedMessageData(
                 message_topic=message.MESSAGE_TOPIC,
                 payload=message.model_dump_json().encode(),
@@ -60,7 +67,7 @@ class AIOPikaMessagePublisher(MessagePublisher):
             raise NotImplementedError(
                 "Schedule is not implemented for AIOPikaMessagePublisher"
             )
-        await self.message_broker_backend.enqueue_delayed_message(
+        self.staged_delayed_messages.append(
             DelayedMessageData(
                 message_topic=message.MESSAGE_TOPIC,
                 payload=message.model_dump_json().encode(),
@@ -68,6 +75,28 @@ class AIOPikaMessagePublisher(MessagePublisher):
             )
         )
 
+    async def flush(self) -> None:
+        print("Flushing messages to AIOPika channel")
+        for message in self.staged_messages:
+            logger.debug(
+                f"Publishing message {message.MESSAGE_TOPIC} with payload: {message.model_dump_json()}"
+            )
+            await self._publish(message, message.MESSAGE_TOPIC)
+
+        if len(self.staged_delayed_messages) > 0:
+            if not self.message_broker_backend:
+                raise NotImplementedError(
+                    "MessageBrokerBackend is required to publish delayed messages"
+                )
+
+            for delayed_message in self.staged_delayed_messages:
+                logger.debug(
+                    f"Scheduling delayed message {delayed_message.message_topic} with payload: {delayed_message.payload.decode()}"
+                )
+                await self.message_broker_backend.enqueue_delayed_message(
+                    delayed_message
+                )
+
 
 class GenericPoolConfig(BaseModel):
     max_size: int

jararaca/messagebus/interceptors/publisher_interceptor.py

@@ -32,3 +32,5 @@ class MessageBusPublisherInterceptor(AppInterceptor):
         async with self.connection_factory.provide_connection() as connection:
             with provide_message_publisher(self.connection_name, connection):
                 yield
+
+                await connection.flush()

jararaca/messagebus/publisher.py

@@ -1,7 +1,8 @@
+from abc import ABC, abstractmethod
 from contextlib import contextmanager, suppress
 from contextvars import ContextVar
 from datetime import datetime, tzinfo
-from typing import Any, ClassVar, Generator, Literal, Protocol
+from typing import Any, ClassVar, Generator, Literal
 
 from pydantic import BaseModel
 
@@ -19,24 +20,31 @@ class IMessage(BaseModel):
     MESSAGE_TYPE: ClassVar[Literal["task", "event"]] = "task"
 
 
-class MessagePublisher(Protocol):
+class MessagePublisher(ABC):
+    @abstractmethod
     async def publish(self, message: IMessage, topic: str) -> None:
-        raise NotImplementedError()
+        pass
 
+    @abstractmethod
     async def delay(self, message: IMessage, seconds: int) -> None:
         """
         Delay the message for a given number of seconds.
         """
 
-        raise NotImplementedError()
-
+    @abstractmethod
     async def schedule(
         self, message: IMessage, when: datetime, timezone: tzinfo
     ) -> None:
         """
         Schedule the message for a given datetime.
         """
-        raise NotImplementedError()
+
+    @abstractmethod
+    async def flush(self) -> None:
+        """
+        Publish all messages that have been delayed or scheduled.
+        This is typically called at the end of a request or task processing.
+        """
 
 
 message_publishers_ctx = ContextVar[dict[str, MessagePublisher]](

jararaca/persistence/interceptors/aiosqa_interceptor.py

@@ -58,6 +58,7 @@ class AIOSqlAlchemySessionInterceptor(AppInterceptor):
             with provide_session(self.config.connection_name, session):
                 try:
                     yield
+                    print("Committing session")
                     await session.commit()
                 except Exception as e:
                     await session.rollback()

jararaca/persistence/utilities.py

@@ -213,7 +213,7 @@ class CRUDOperations(Generic[IDENTIFIABLE_T]):
 # region PaginatedFilter
 class PaginatedFilter(BaseModel):
     page: Annotated[int, Field(gt=-1)] = 0
-    page_size: int = 10
+    page_size: Annotated[int, Field(gt=0)] = 10
     sort_models: list[SortModel] = []
     filter_models: list[FilterModel] = []
 
@@ -307,51 +307,63 @@ class QueryOperations(Generic[QUERY_FILTER_T, QUERY_ENTITY_T]):
             Callable[[Select[Tuple[QUERY_ENTITY_T]]], Select[Tuple[QUERY_ENTITY_T]]]
         ] = [],
     ) -> "Paginated[QUERY_ENTITY_T]":
+        """
+        Executes a query with the provided filter and interceptors.
+        Args:
+            filter: The filter to apply to the query.
+            interceptors: A list of functions that can modify the query before execution.
+        Returns:
+            Paginated[QUERY_ENTITY_T]: A paginated result containing the items and metadata.
+        """
+
+        tier_one_filtered_query = self.generate_filtered_query(
+            filter, select(self.entity_type)
+        )
 
-        query = reduce(
+        tier_two_filtered_query = reduce(
             lambda query, interceptor: interceptor(query),
             interceptors,
-            select(self.entity_type),
+            tier_one_filtered_query,
         )
 
         if self.sort_rule_applier:
-            query = self.sort_rule_applier.create_query_for_sorting_list(
-                query, filter.sort_models
+            tier_two_filtered_query = (
+                self.sort_rule_applier.create_query_for_sorting_list(
+                    tier_two_filtered_query, filter.sort_models
+                )
             )
 
         if self.filter_rule_applier:
-            query = self.filter_rule_applier.create_query_for_filter_list(
-                query, filter.filter_models
+            tier_two_filtered_query = (
+                self.filter_rule_applier.create_query_for_filter_list(
+                    tier_two_filtered_query, filter.filter_models
+                )
             )
 
         unpaginated_total = (
             await self.session.execute(
-                select(func.count()).select_from(query.subquery())
+                select(func.count()).select_from(tier_two_filtered_query.subquery())
             )
         ).scalar_one()
 
-        filtered_query = self.generate_filtered_query(filter, query)
-
-        paginated_query = filtered_query.limit(filter.page_size).offset(
+        paginated_query = tier_two_filtered_query.limit(filter.page_size).offset(
             (filter.page) * filter.page_size
         )
 
-        filtered_total = (
+        paginated_total = (
             await self.session.execute(
                 select(func.count()).select_from(paginated_query.subquery())
             )
         ).scalar_one()
 
+        result = await self.session.execute(paginated_query)
+        result_scalars = list(self.judge_unique(result).scalars().all())
+
         return Paginated(
-            items=[
-                e
-                for e in self.judge_unique(
-                    await self.session.execute(paginated_query)
-                ).scalars()
-            ],
-            total=filtered_total,
+            items=result_scalars,
+            total=paginated_total,
             unpaginated_total=unpaginated_total,
-            total_pages=int(filtered_total / filter.page_size) + 1,
+            total_pages=int(unpaginated_total / filter.page_size) + 1,
         )
 
     def judge_unique(

jararaca/presentation/websocket/context.py

@@ -16,12 +16,12 @@ class WebSocketConnectionManager(Protocol):
     async def remove_websocket(self, websocket: WebSocket) -> None: ...
 
 
-_ws_manage_ctx = ContextVar[WebSocketConnectionManager]("ws_manage_ctx")
+_ws_conn_manager_ctx = ContextVar[WebSocketConnectionManager]("ws_manage_ctx")
 
 
 def use_ws_manager() -> WebSocketConnectionManager:
     try:
-        return _ws_manage_ctx.get()
+        return _ws_conn_manager_ctx.get()
     except LookupError:
         raise RuntimeError("No WebSocketConnectionManager found")
 
@@ -30,9 +30,35 @@ def use_ws_manager() -> WebSocketConnectionManager:
 def provide_ws_manager(
     ws_manager: WebSocketConnectionManager,
 ) -> Generator[None, None, None]:
-    token = _ws_manage_ctx.set(ws_manager)
+    token = _ws_conn_manager_ctx.set(ws_manager)
     try:
         yield
     finally:
         with suppress(ValueError):
-            _ws_manage_ctx.reset(token)
+            _ws_conn_manager_ctx.reset(token)
+
+
+class WebSocketMessageSender(Protocol):
+    async def send(self, rooms: list[str], message: WebSocketMessageBase) -> None: ...
+
+
+_ws_msg_sender_ctx = ContextVar[WebSocketMessageSender]("ws_msg_sender_ctx")
+
+
+def use_ws_message_sender() -> WebSocketMessageSender:
+    try:
+        return _ws_msg_sender_ctx.get()
+    except LookupError:
+        raise RuntimeError("No WebSocketMessageSender found")
+
+
+@contextmanager
+def provide_ws_message_sender(
+    ws_message_sender: WebSocketMessageSender,
+) -> Generator[None, None, None]:
+    token = _ws_msg_sender_ctx.set(ws_message_sender)
+    try:
+        yield
+    finally:
+        with suppress(ValueError):
+            _ws_msg_sender_ctx.reset(token)

jararaca/presentation/websocket/types.py

@@ -1,8 +1,8 @@
 from jararaca.presentation.websocket.base_types import WebSocketMessageBase
-from jararaca.presentation.websocket.context import use_ws_manager
+from jararaca.presentation.websocket.context import use_ws_message_sender
 
 
 class WebSocketMessage(WebSocketMessageBase):
 
     async def send(self, *rooms: str) -> None:
-        await use_ws_manager().send(list(rooms), self)
+        await use_ws_message_sender().send(list(rooms), self)

jararaca/presentation/websocket/websocket_interceptor.py

@@ -25,7 +25,9 @@ from jararaca.presentation.decorators import (
 )
 from jararaca.presentation.websocket.context import (
     WebSocketConnectionManager,
+    WebSocketMessageSender,
     provide_ws_manager,
+    provide_ws_message_sender,
 )
 from jararaca.presentation.websocket.decorators import (
     INHERITS_WS_MESSAGE,
@@ -127,9 +129,23 @@ class WebSocketConnectionManagerImpl(WebSocketConnectionManager):
     # async def setup_consumer(self, websocket: WebSocket) -> None: ...
 
 
+class StagingWebSocketMessageSender(WebSocketMessageSender):
+
+    def __init__(self, connection: WebSocketConnectionManager) -> None:
+        self.connection = connection
+        self.staged_messages: list[tuple[list[str], WebSocketMessageBase]] = []
+
+    async def send(self, rooms: list[str], message: WebSocketMessageBase) -> None:
+        self.staged_messages.append((rooms, message))
+
+    async def flush(self) -> None:
+        for rooms, message in self.staged_messages:
+            await self.connection.send(rooms, message)
+        self.staged_messages.clear()
+
+
 class WebSocketInterceptor(AppInterceptor, AppInterceptorWithLifecycle):
     """
-    @Deprecated
     WebSocketInterceptor is responsible for managing WebSocket connections and
     intercepting WebSocket requests within the application. It integrates with
     the application's lifecycle and provides a router for WebSocket endpoints.
@@ -171,8 +187,14 @@ class WebSocketInterceptor(AppInterceptor, AppInterceptorWithLifecycle):
     @asynccontextmanager
     async def intercept(self, app_context: AppContext) -> AsyncGenerator[None, None]:
 
-        with provide_ws_manager(self.connection_manager):
+        staging_ws_messages_sender = StagingWebSocketMessageSender(
+            self.connection_manager
+        )
+        with provide_ws_manager(self.connection_manager), provide_ws_message_sender(
+            staging_ws_messages_sender
+        ):
             yield
+            await staging_ws_messages_sender.flush()
 
     # def __wrap_with_uow_context_provider(
     #     self, uow: UnitOfWorkContextProvider, func: Callable[..., Any]

{jararaca-0.3.9.dist-info → jararaca-0.3.11a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jararaca
-Version: 0.3.9
+Version: 0.3.11a0
 Summary: A simple and fast API framework for Python
 Author: Lucas S
 Author-email: me@luscasleo.dev

{jararaca-0.3.9.dist-info → jararaca-0.3.11a0.dist-info}/RECORD

@@ -16,10 +16,10 @@ jararaca/messagebus/bus_message_controller.py,sha256=Xd_qwnX5jUvgBTCarHR36fvtol9
 jararaca/messagebus/consumers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/messagebus/decorators.py,sha256=y-w4dWbP9ZW3ZJ4mE9iIaxw01ZC5snEbOuBY5NC-Bn0,5626
 jararaca/messagebus/interceptors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jararaca/messagebus/interceptors/aiopika_publisher_interceptor.py,sha256=Aex87wopB34sMNzXBgi4KucVHjL2wYog3-IH75DAfDk,5387
-jararaca/messagebus/interceptors/publisher_interceptor.py,sha256=fQFFW9hH6ZU3UOyR7kMPrNp9wA71qEy5XlgrBQdBMS4,1230
+jararaca/messagebus/interceptors/aiopika_publisher_interceptor.py,sha256=WBHf8DKcuCeH4kBZq9fx_qsryhU7yWplJNLF16LpqMk,6574
+jararaca/messagebus/interceptors/publisher_interceptor.py,sha256=wkIDoa__Q7o74cv89PXdBJFbe-ijxH8Xc_-hBEgxYjM,1272
 jararaca/messagebus/message.py,sha256=U6cyd2XknX8mtm0333slz5fanky2PFLWCmokAO56vvU,819
-jararaca/messagebus/publisher.py,sha256=K7WsOMVTyLmdms3ZKEshqrQc_DhNreiFK-HnmOT9Ce0,1965
+jararaca/messagebus/publisher.py,sha256=JTkxdKbvxvDWT8nK8PVEyyX061vYYbKQMxRHXrZtcEY,2173
 jararaca/messagebus/worker.py,sha256=2jReCepgMQktdLh4A3OqmOmx6KNgqUGpXIOXoBUtXSg,13778
 jararaca/messagebus/worker_v2.py,sha256=Ey9HPgVSuIYJUggJGPKmgymZHz7-2TUSYgDB52u9T10,20683
 jararaca/microservice.py,sha256=C_Txqm3xSmdHIghJigKk6TOycL5eTJv9PF6XP7TA8j4,6638
@@ -30,10 +30,10 @@ jararaca/observability/providers/otel.py,sha256=LgfoITdoQTCxKebfLcEfwMiG992wlWY_
 jararaca/persistence/base.py,sha256=Xfnpvj3yeLdpVBifH5W6AwPCLwL2ot0dpLzbPg1zwkQ,966
 jararaca/persistence/exports.py,sha256=Ghx4yoFaB4QVTb9WxrFYgmcSATXMNvrOvT8ybPNKXCA,62
 jararaca/persistence/interceptors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jararaca/persistence/interceptors/aiosqa_interceptor.py,sha256=H6ZjOdosYGCZUzKjugiXQwJkAbnsL4HnkZLOEQhULEc,1986
+jararaca/persistence/interceptors/aiosqa_interceptor.py,sha256=EZz80PZVb80DrM1rOLRkKMDO-93by6xp97G7o_LzziE,2034
 jararaca/persistence/session.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/persistence/sort_filter.py,sha256=agggpN0YvNjUr6wJjy69NkaqxoDDW13ys9B3r85OujA,9226
-jararaca/persistence/utilities.py,sha256=0v1YrK-toTCgtw8aROtrDMNfjo3qWWNAb5qQcCOdSUU,13681
+jararaca/persistence/utilities.py,sha256=imcV4Oi5kXNk6m9QF2-OsnFpcTRY4w5mBYLdEx5XTSQ,14296
 jararaca/presentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/presentation/decorators.py,sha256=EErRZtLZDoZZj1ZVlDkGQbvqpoQkBaoU70KAUwWIufs,9146
 jararaca/presentation/hooks.py,sha256=WBbU5DG3-MAm2Ro2YraQyYG_HENfizYfyShL2ktHi6k,1980
@@ -41,11 +41,11 @@ jararaca/presentation/http_microservice.py,sha256=g771JosV6jTY3hQtG-HkLOo-T0e-r3
 jararaca/presentation/server.py,sha256=JuEatLFhD_NFnszwXDSgtcCXNOwvQYyxoxxQ33hnAEc,3731
 jararaca/presentation/websocket/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/presentation/websocket/base_types.py,sha256=AvUeeZ1TFhSiRMcYqZU1HaQNqSrcgTkC5R0ArP5dGmA,146
-jararaca/presentation/websocket/context.py,sha256=090vJmO4bWt0Hr7MI-ZtRlVHTD2JW5JvZRJTFI9XGKs,1180
+jararaca/presentation/websocket/context.py,sha256=A6K5W3kqo9Hgeh1m6JiI7Cdz5SfbXcaICSVX7u1ARZo,1903
 jararaca/presentation/websocket/decorators.py,sha256=ZNd5aoA9UkyfHOt1C8D2Ffy2gQUNDEsusVnQuTgExgs,2157
 jararaca/presentation/websocket/redis.py,sha256=6wD4zGHftJXNDW3VfS65WJt2cnOgTI0zmQOfjZ_CEXE,4726
-jararaca/presentation/websocket/types.py,sha256=Crz88c1670YLtIhDvbeuyBV1SN-z9RtEGZxaonGvapY,294
-jararaca/presentation/websocket/websocket_interceptor.py,sha256=R_DfIMhi1ngFfCGy33b6yv_6LxCM-Dipkr12z6evfyk,8297
+jararaca/presentation/websocket/types.py,sha256=M8snAMSdaQlKrwEM2qOgF2qrefo5Meio_oOw620Joc8,308
+jararaca/presentation/websocket/websocket_interceptor.py,sha256=OET9Dv8CVJn6bkjnmMXqT_yRWr9HTyd7E-dtN7zfeQ4,9155
 jararaca/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/rpc/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -66,8 +66,8 @@ jararaca/tools/metadata.py,sha256=7nlCDYgItNybentPSSCc2MLqN7IpBd0VyQzfjfQycVI,14
 jararaca/tools/typescript/interface_parser.py,sha256=35xbOrZDQDyTXdMrVZQ8nnFw79f28lJuLYNHAspIqi8,30492
 jararaca/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jararaca/utils/rabbitmq_utils.py,sha256=FPDP8ZVgvitZXV-oK73D7EIANsqUzXTW7HdpEKsIsyI,2811
-jararaca-0.3.9.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-jararaca-0.3.9.dist-info/METADATA,sha256=QUd0KvFdDWQNVvIzaVfGRWXzttqzP_AqAo7HbjzZ0pc,4951
-jararaca-0.3.9.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-jararaca-0.3.9.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
-jararaca-0.3.9.dist-info/RECORD,,
+jararaca-0.3.11a0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+jararaca-0.3.11a0.dist-info/METADATA,sha256=XbMVjGqVYheva2VT-YGJoMx_DalQbkjx7t3PfkFACrI,4954
+jararaca-0.3.11a0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+jararaca-0.3.11a0.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
+jararaca-0.3.11a0.dist-info/RECORD,,

{jararaca-0.3.9.dist-info → jararaca-0.3.11a0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any