jararaca 0.2.37a9__py3-none-any.whl → 0.2.37a11__py3-none-any.whl

jararaca/__init__.py

@@ -59,6 +59,7 @@ if TYPE_CHECKING:
     from .messagebus.decorators import MessageBusController, MessageHandler
     from .messagebus.interceptors.aiopika_publisher_interceptor import (
         AIOPikaConnectionFactory,
+        GenericPoolConfig,
         MessageBusPublisherInterceptor,
     )
     from .messagebus.publisher import use_publisher
@@ -192,6 +193,7 @@ if TYPE_CHECKING:
         "Put",
         "Delete",
         "use_publisher",
+        "GenericPoolConfig",
         "AIOPikaConnectionFactory",
         "MessageBusPublisherInterceptor",
         "RedisWebSocketConnectionBackend",
@@ -221,6 +223,11 @@ _dynamic_imports: "dict[str, tuple[str, str, str | None]]" = {
         "messagebus.bus_message_controller",
         None,
     ),
+    "GenericPoolConfig": (
+        __SPEC_PARENT__,
+        "messagebus.interceptors.aiopika_publisher_interceptor",
+        None,
+    ),
     "ack": (__SPEC_PARENT__, "messagebus.bus_message_controller", None),
     "nack": (__SPEC_PARENT__, "messagebus.bus_message_controller", None),
     "reject": (__SPEC_PARENT__, "messagebus.bus_message_controller", None),

jararaca/messagebus/interceptors/aiopika_publisher_interceptor.py

@@ -2,6 +2,7 @@ from contextlib import asynccontextmanager
 from typing import Any, AsyncContextManager, AsyncGenerator, Protocol
 
 import aio_pika
+from aio_pika.abc import AbstractConnection
 from pydantic import BaseModel
 
 from jararaca.messagebus.publisher import MessagePublisher, provide_message_publisher
@@ -25,6 +26,10 @@ class MessageBusPublisherInterceptor(AppInterceptor):
 
     @asynccontextmanager
     async def intercept(self, app_context: AppContext) -> AsyncGenerator[None, None]:
+        if app_context.context_type == "websocket":
+            yield
+            return
+
         async with self.connection_factory.provide_connection() as connection:
             with provide_message_publisher(self.connection_name, connection):
                 yield
@@ -48,29 +53,79 @@ class AIOPikaMessagePublisher(MessagePublisher):
         )
 
 
+class GenericPoolConfig(BaseModel):
+    max_size: int
+
+
 class AIOPikaConnectionFactory(MessageBusConnectionFactory):
 
     def __init__(
         self,
         url: str,
         exchange: str,
+        connection_pool_config: GenericPoolConfig | None = None,
+        channel_pool_config: GenericPoolConfig | None = None,
     ):
         self.url = url
         self.exchange = exchange
 
+        self.connection_pool: aio_pika.pool.Pool[AbstractConnection] | None = None
+        self.channel_pool: aio_pika.pool.Pool[aio_pika.abc.AbstractChannel] | None = (
+            None
+        )
+
+        if connection_pool_config:
+
+            async def get_connection() -> AbstractConnection:
+                return await aio_pika.connect_robust(self.url)
+
+            self.connection_pool = aio_pika.pool.Pool[AbstractConnection](
+                get_connection,
+                max_size=connection_pool_config.max_size,
+            )
+
+        if channel_pool_config:
+
+            async def get_channel() -> aio_pika.abc.AbstractChannel:
+                async with self.acquire_connection() as connection:
+                    return await connection.channel(publisher_confirms=False)
+
+            self.channel_pool = aio_pika.pool.Pool[aio_pika.abc.AbstractChannel](
+                get_channel, max_size=channel_pool_config.max_size
+            )
+
+    @asynccontextmanager
+    async def acquire_connection(self) -> AsyncGenerator[AbstractConnection, Any]:
+        if not self.connection_pool:
+            async with await aio_pika.connect_robust(self.url) as connection:
+                yield connection
+        else:
+
+            async with self.connection_pool.acquire() as connection:
+                yield connection
+
+    @asynccontextmanager
+    async def acquire_channel(
+        self,
+    ) -> AsyncGenerator[aio_pika.abc.AbstractChannel, Any]:
+        if not self.channel_pool:
+            async with self.acquire_connection() as connection:
+                yield await connection.channel(publisher_confirms=False)
+        else:
+            async with self.channel_pool.acquire() as channel:
+                yield channel
+
     @asynccontextmanager
     async def provide_connection(self) -> AsyncGenerator[AIOPikaMessagePublisher, Any]:
-        connection = await aio_pika.connect_robust(self.url)
-        async with connection:
-            async with connection.channel(publisher_confirms=False) as channel:
 
-                tx = channel.transaction()
+        async with self.acquire_channel() as channel:
+            tx = channel.transaction()
 
-                await tx.select()
+            await tx.select()
 
-                try:
-                    yield AIOPikaMessagePublisher(channel, exchange_name=self.exchange)
-                    await tx.commit()
-                except Exception as e:
-                    await tx.rollback()
-                    raise e
+            try:
+                yield AIOPikaMessagePublisher(channel, exchange_name=self.exchange)
+                await tx.commit()
+            except Exception as e:
+                await tx.rollback()
+                raise e

jararaca/presentation/decorators.py

@@ -1,5 +1,5 @@
 import inspect
-from typing import Any, Callable, Protocol, TypeVar, cast
+from typing import Any, Callable, Literal, Protocol, TypeVar, cast
 
 from fastapi import APIRouter
 from fastapi import Depends as DependsF
@@ -147,6 +147,16 @@ class RestController:
 
 Options = dict[str, Any]
 
+ResponseType = Literal[
+    "arraybuffer",
+    "blob",
+    "document",
+    "json",
+    "text",
+    "stream",
+    "formdata",
+]
+
 
 class HttpMapping:
 
@@ -154,11 +164,16 @@ class HttpMapping:
     ORDER_COUNTER = 0
 
     def __init__(
-        self, method: str, path: str = "/", options: Options | None = None
+        self,
+        method: str,
+        path: str = "/",
+        adapter_options: Options | None = None,
+        response_type: ResponseType | None = None,
     ) -> None:
         self.method = method
         self.path = path
-        self.options = options
+        self.options = adapter_options
+        self.response_type = response_type
 
         HttpMapping.ORDER_COUNTER += 1
         self.order = HttpMapping.ORDER_COUNTER
@@ -185,32 +200,57 @@ class HttpMapping:
 
 class Post(HttpMapping):
 
-    def __init__(self, path: str = "/", options: Options | None = None) -> None:
-        super().__init__("POST", path, options)
+    def __init__(
+        self,
+        path: str = "/",
+        options: Options | None = None,
+        response_type: ResponseType | None = None,
+    ) -> None:
+        super().__init__("POST", path, options, response_type)
 
 
 class Get(HttpMapping):
 
-    def __init__(self, path: str = "/", options: Options | None = None) -> None:
-        super().__init__("GET", path, options)
+    def __init__(
+        self,
+        path: str = "/",
+        options: Options | None = None,
+        response_type: ResponseType | None = None,
+    ) -> None:
+        super().__init__("GET", path, options, response_type)
 
 
 class Put(HttpMapping):
 
-    def __init__(self, path: str = "/", options: Options | None = None) -> None:
-        super().__init__("PUT", path, options)
+    def __init__(
+        self,
+        path: str = "/",
+        options: Options | None = None,
+        response_type: ResponseType | None = None,
+    ) -> None:
+        super().__init__("PUT", path, options, response_type)
 
 
 class Delete(HttpMapping):
 
-    def __init__(self, path: str = "/", options: Options | None = None) -> None:
-        super().__init__("DELETE", path, options)
+    def __init__(
+        self,
+        path: str = "/",
+        options: Options | None = None,
+        response_type: ResponseType | None = None,
+    ) -> None:
+        super().__init__("DELETE", path, options, response_type)
 
 
 class Patch(HttpMapping):
 
-    def __init__(self, path: str = "/", options: Options | None = None) -> None:
-        super().__init__("PATCH", path, options)
+    def __init__(
+        self,
+        path: str = "/",
+        options: Options | None = None,
+        response_type: ResponseType | None = None,
+    ) -> None:
+        super().__init__("PATCH", path, options, response_type)
 
 
 class UseMiddleware:

jararaca/tools/typescript/interface_parser.py

@@ -85,6 +85,8 @@ def parse_literal_value(value: Any) -> str:
 
 
 def get_field_type_for_ts(field_type: Any) -> Any:
+    if field_type is Response:
+        return "unknown"
     if field_type is Any:
         return "any"
     if field_type == UploadFile:
@@ -367,12 +369,23 @@ export type WebSocketMessageMap = {
 
     final_buffer.write(
         """
+export type ResponseType =
+    | "arraybuffer"
+    | "blob"
+    | "document"
+    | "json"
+    | "text"
+    | "stream"
+    | "formdata";
+
+
 export interface HttpBackendRequest {
   method: string;
   path: string;
   headers: { [key: string]: string };
   query: { [key: string]: unknown };
   body: unknown;
+  responseType?: ResponseType;
 }
 
 export interface HttpBackend {
@@ -491,6 +504,8 @@ def write_rest_controller_to_typescript_interface(
                 "const response = await this.httpBackend.request<%s>({ \n"
                 % return_value_repr
             )
+            if mapping.response_type is not None:
+                class_buffer.write(f'\t\t\tresponseType: "{mapping.response_type}",\n')
             class_buffer.write(f'\t\t\tmethod: "{mapping.method}",\n')
 
             endpoint_path = parse_path_with_params(mapping.path, arg_params_spec)

{jararaca-0.2.37a9.dist-info → jararaca-0.2.37a11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jararaca
-Version: 0.2.37a9
+Version: 0.2.37a11
 Summary: A simple and fast API framework for Python
 Home-page: https://github.com/LuscasLeo/jararaca
 Author: Lucas S

{jararaca-0.2.37a9.dist-info → jararaca-0.2.37a11.dist-info}/RECORD

@@ -1,7 +1,7 @@
 LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 README.md,sha256=mte30I-ZEJJp-Oax-OganNgl6G9GaCZPL6JVFAvZGz4,7034
-pyproject.toml,sha256=2UOhWHtsEocbNG2dLDU2dLKDKluERP8cFYHdnh8L990,1839
-jararaca/__init__.py,sha256=gDCvrIhIu5_IkKjmZmhWZ2khOi8WGiw2AidFFe-BnWU,15118
+pyproject.toml,sha256=6qmtrXrdw7bJZOL_-RGgWJtkCmz7b42Xbc-NwubeGTQ,1840
+jararaca/__init__.py,sha256=VBrN25GHJ3gDG95CcJWe3dmGcA-X2agzOCIBbjzc1Iw,15312
 jararaca/__main__.py,sha256=-O3vsB5lHdqNFjUtoELDF81IYFtR-DSiiFMzRaiSsv4,67
 jararaca/cli.py,sha256=JKk4xrRbtX2fM8yYw794lbxvJFH73bWw3GGIvrpAkeE,5706
 jararaca/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -15,7 +15,7 @@ jararaca/messagebus/__init__.py,sha256=Zdl74HcS9K0FW6XUt7bVvaHEyxL8pWsqqakeRENIn
 jararaca/messagebus/bus_message_controller.py,sha256=Xd_qwnX5jUvgBTCarHR36fvtol9lPTsYp2IIGKyQQaE,1487
 jararaca/messagebus/decorators.py,sha256=GHlaXRuHtrz6R0HgcG2gJybpGYtdts9meDVSRPwN74I,4245
 jararaca/messagebus/interceptors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jararaca/messagebus/interceptors/aiopika_publisher_interceptor.py,sha256=rqAX644-VHarg6kPPsXGTmxYd79PpJXiJ1N1gIooJTo,2470
+jararaca/messagebus/interceptors/aiopika_publisher_interceptor.py,sha256=BPH5wOlj_CyHtJ7W4NWF2h0gYMwzOPNzFhGADk618N4,4373
 jararaca/messagebus/publisher.py,sha256=5ay9Znwybqt981OOykdWkFisSvGiTeTpPXDFLMnaiqg,1109
 jararaca/messagebus/types.py,sha256=iYLyLxWqOHkDadxyMqQPWy3itLNQfvD6oQe8jcq9nzo,887
 jararaca/messagebus/worker.py,sha256=hKACTyrIMHcuaySpmI3UhDCja6va1gGkFRoZJ7kYfoA,13613
@@ -32,7 +32,7 @@ jararaca/persistence/session.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 jararaca/persistence/sort_filter.py,sha256=agggpN0YvNjUr6wJjy69NkaqxoDDW13ys9B3r85OujA,9226
 jararaca/persistence/utilities.py,sha256=0v1YrK-toTCgtw8aROtrDMNfjo3qWWNAb5qQcCOdSUU,13681
 jararaca/presentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jararaca/presentation/decorators.py,sha256=eL2YCgMSr19m4YCri5PQU46NRxf0QxsqDnz6MqKu0YQ,8389
+jararaca/presentation/decorators.py,sha256=EErRZtLZDoZZj1ZVlDkGQbvqpoQkBaoU70KAUwWIufs,9146
 jararaca/presentation/hooks.py,sha256=WBbU5DG3-MAm2Ro2YraQyYG_HENfizYfyShL2ktHi6k,1980
 jararaca/presentation/http_microservice.py,sha256=g771JosV6jTY3hQtG-HkLOo-T0e-r3b3rp1ddt99Qf0,533
 jararaca/presentation/server.py,sha256=JuEatLFhD_NFnszwXDSgtcCXNOwvQYyxoxxQ33hnAEc,3731
@@ -58,9 +58,9 @@ jararaca/tools/app_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 jararaca/tools/app_config/decorators.py,sha256=-ckkMZ1dswOmECdo1rFrZ15UAku--txaNXMp8fd1Ndk,941
 jararaca/tools/app_config/interceptor.py,sha256=nfFZiS80hrbnL7-XEYrwmp2rwaVYBqxvqu3Y-6o_ov4,2575
 jararaca/tools/metadata.py,sha256=7nlCDYgItNybentPSSCc2MLqN7IpBd0VyQzfjfQycVI,1402
-jararaca/tools/typescript/interface_parser.py,sha256=l-QyPVntATcbL4JYm48xq2gNWfV1y2iArvOuIueFi8w,28829
-jararaca-0.2.37a9.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-jararaca-0.2.37a9.dist-info/METADATA,sha256=RkVCVzBHDnAGBl11qdhtmRoYnQcE4AOEKrF6I0Oip3U,8554
-jararaca-0.2.37a9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-jararaca-0.2.37a9.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
-jararaca-0.2.37a9.dist-info/RECORD,,
+jararaca/tools/typescript/interface_parser.py,sha256=4SHt094P-QawMFHSyMCiujQf8Niw7xACIO1RHBM8-w4,29192
+jararaca-0.2.37a11.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+jararaca-0.2.37a11.dist-info/METADATA,sha256=o0sSsRaTx6-ySotULbIhDQtza302CTjxCc9jdAJxbJ8,8555
+jararaca-0.2.37a11.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+jararaca-0.2.37a11.dist-info/entry_points.txt,sha256=WIh3aIvz8LwUJZIDfs4EeH3VoFyCGEk7cWJurW38q0I,45
+jararaca-0.2.37a11.dist-info/RECORD,,

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "jararaca"
-version = "0.2.37a9"
+version = "0.2.37a11"
 description = "A simple and fast API framework for Python"
 authors = ["Lucas S <me@luscasleo.dev>"]
 readme = "README.md"