jararaca 0.2.37a9__tar.gz → 0.2.37a11__tar.gz

{jararaca-0.2.37a9 → jararaca-0.2.37a11}/PKG-INFO

@@ -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 → jararaca-0.2.37a11}/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"

{jararaca-0.2.37a9 → jararaca-0.2.37a11}/src/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-0.2.37a11/src/jararaca/messagebus/interceptors/aiopika_publisher_interceptor.py

@@ -0,0 +1,131 @@
+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
+from jararaca.microservice import AppContext, AppInterceptor
+
+
+class MessageBusConnectionFactory(Protocol):
+
+    def provide_connection(self) -> AsyncContextManager[MessagePublisher]: ...
+
+
+class MessageBusPublisherInterceptor(AppInterceptor):
+
+    def __init__(
+        self,
+        connection_factory: MessageBusConnectionFactory,
+        connection_name: str = "default",
+    ):
+        self.connection_factory = connection_factory
+        self.connection_name = connection_name
+
+    @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
+
+
+class AIOPikaMessagePublisher(MessagePublisher):
+
+    def __init__(self, channel: aio_pika.abc.AbstractChannel, exchange_name: str):
+        self.channel = channel
+        self.exchange_name = exchange_name
+
+    async def publish(self, message: BaseModel, topic: str) -> None:
+        exchange = await self.channel.declare_exchange(
+            self.exchange_name,
+            type=aio_pika.ExchangeType.TOPIC,
+        )
+        routing_key = f"{self.exchange_name}.{topic}."
+        await exchange.publish(
+            aio_pika.Message(body=message.model_dump_json().encode()),
+            routing_key=routing_key,
+        )
+
+
+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]:
+
+        async with self.acquire_channel() as channel:
+            tx = channel.transaction()
+
+            await tx.select()
+
+            try:
+                yield AIOPikaMessagePublisher(channel, exchange_name=self.exchange)
+                await tx.commit()
+            except Exception as e:
+                await tx.rollback()
+                raise e

{jararaca-0.2.37a9 → jararaca-0.2.37a11}/src/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-0.2.37a9 → jararaca-0.2.37a11}/src/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/src/jararaca/messagebus/interceptors/aiopika_publisher_interceptor.py

@@ -1,76 +0,0 @@
-from contextlib import asynccontextmanager
-from typing import Any, AsyncContextManager, AsyncGenerator, Protocol
-
-import aio_pika
-from pydantic import BaseModel
-
-from jararaca.messagebus.publisher import MessagePublisher, provide_message_publisher
-from jararaca.microservice import AppContext, AppInterceptor
-
-
-class MessageBusConnectionFactory(Protocol):
-
-    def provide_connection(self) -> AsyncContextManager[MessagePublisher]: ...
-
-
-class MessageBusPublisherInterceptor(AppInterceptor):
-
-    def __init__(
-        self,
-        connection_factory: MessageBusConnectionFactory,
-        connection_name: str = "default",
-    ):
-        self.connection_factory = connection_factory
-        self.connection_name = connection_name
-
-    @asynccontextmanager
-    async def intercept(self, app_context: AppContext) -> AsyncGenerator[None, None]:
-        async with self.connection_factory.provide_connection() as connection:
-            with provide_message_publisher(self.connection_name, connection):
-                yield
-
-
-class AIOPikaMessagePublisher(MessagePublisher):
-
-    def __init__(self, channel: aio_pika.abc.AbstractChannel, exchange_name: str):
-        self.channel = channel
-        self.exchange_name = exchange_name
-
-    async def publish(self, message: BaseModel, topic: str) -> None:
-        exchange = await self.channel.declare_exchange(
-            self.exchange_name,
-            type=aio_pika.ExchangeType.TOPIC,
-        )
-        routing_key = f"{self.exchange_name}.{topic}."
-        await exchange.publish(
-            aio_pika.Message(body=message.model_dump_json().encode()),
-            routing_key=routing_key,
-        )
-
-
-class AIOPikaConnectionFactory(MessageBusConnectionFactory):
-
-    def __init__(
-        self,
-        url: str,
-        exchange: str,
-    ):
-        self.url = url
-        self.exchange = exchange
-
-    @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()
-
-                await tx.select()
-
-                try:
-                    yield AIOPikaMessagePublisher(channel, exchange_name=self.exchange)
-                    await tx.commit()
-                except Exception as e:
-                    await tx.rollback()
-                    raise e