jararaca 0.2.19a1__tar.gz → 0.2.21__tar.gz

{jararaca-0.2.19a1 → jararaca-0.2.21}/PKG-INFO

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

{jararaca-0.2.19a1 → jararaca-0.2.21}/pyproject.toml

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

{jararaca-0.2.19a1 → jararaca-0.2.21}/src/jararaca/presentation/websocket/decorators.py

@@ -37,14 +37,14 @@ class WebSocketEndpoint:
         return cls
 
 
-INHERITS_MESSAGE = TypeVar("INHERITS_MESSAGE", bound=WebSocketMessageBase)
+INHERITS_WS_MESSAGE = TypeVar("INHERITS_WS_MESSAGE", bound=WebSocketMessageBase)
 
 
 class RegisterWebSocketMessage:
 
     REGISTER_WEBSOCKET_MESSAGE_ATTR = "__register_websocket_message__"
 
-    def __init__(self, *message_types: type[INHERITS_MESSAGE]) -> None:
+    def __init__(self, *message_types: type[INHERITS_WS_MESSAGE]) -> None:
         self.message_types = message_types
 
     @staticmethod

{jararaca-0.2.19a1 → jararaca-0.2.21}/src/jararaca/presentation/websocket/websocket_interceptor.py

@@ -1,13 +1,14 @@
 import asyncio
 import inspect
 from contextlib import asynccontextmanager
-from typing import Any, AsyncGenerator, Protocol
+from typing import Any, AsyncGenerator, Generic, Protocol
 
 from fastapi import APIRouter
 from fastapi import Depends as DependsF
 from fastapi import WebSocketDisconnect
 from fastapi.params import Depends
 from fastapi.websockets import WebSocket, WebSocketState
+from pydantic import BaseModel
 
 from jararaca.core.uow import UnitOfWorkContextProvider
 from jararaca.di import Container
@@ -26,11 +27,20 @@ from jararaca.presentation.websocket.context import (
     WebSocketConnectionManager,
     provide_ws_manager,
 )
-from jararaca.presentation.websocket.decorators import WebSocketEndpoint
+from jararaca.presentation.websocket.decorators import (
+    INHERITS_WS_MESSAGE,
+    WebSocketEndpoint,
+)
 
 from .base_types import WebSocketMessageBase
 
 
+class WebSocketMessageWrapper(BaseModel, Generic[INHERITS_WS_MESSAGE]):
+
+    MESSAGE_ID: str
+    message: INHERITS_WS_MESSAGE
+
+
 class BroadcastFunc(Protocol):
     async def __call__(self, message: bytes) -> None: ...
 
@@ -70,9 +80,6 @@ class WebSocketConnectionManagerImpl(WebSocketConnectionManager):
 
     async def broadcast(self, message: bytes) -> None:
 
-        # for websocket in self.all_websockets:
-        #     await websocket.send_bytes(message)
-
         await self.backend.broadcast(message)
 
     async def _broadcast_from_backend(self, message: bytes) -> None:
@@ -86,7 +93,12 @@ class WebSocketConnectionManagerImpl(WebSocketConnectionManager):
 
     async def send(self, rooms: list[str], message: WebSocketMessageBase) -> None:
 
-        await self.backend.send(rooms, message.model_dump_json().encode())
+        await self.backend.send(
+            rooms,
+            WebSocketMessageWrapper(MESSAGE_ID=message.MESSAGE_ID, message=message)
+            .model_dump_json()
+            .encode(),
+        )
 
     async def _send_from_backend(self, rooms: list[str], message: bytes) -> None:
         async with self.lock:

{jararaca-0.2.19a1 → jararaca-0.2.21}/src/jararaca/tools/typescript/interface_parser.py

@@ -31,6 +31,9 @@ from pydantic import BaseModel, PlainValidator
 from jararaca.microservice import Microservice
 from jararaca.presentation.decorators import HttpMapping, RestController
 from jararaca.presentation.websocket.decorators import RegisterWebSocketMessage
+from jararaca.presentation.websocket.websocket_interceptor import (
+    WebSocketMessageWrapper,
+)
 
 CONSTANT_PATTERN = re.compile(r"^[A-Z_]+$")
 
@@ -248,15 +251,16 @@ def parse_type_to_typescript_interface(
         )
 
     if hasattr(basemodel_type, "__annotations__"):
-        for field_name in (f for f in dir(basemodel_type) if is_constant(f)):
-            field = getattr(basemodel_type, field_name)
-            if field is None:
-                continue
-            string_builder.write(f"  {field_name}: {parse_literal_value(field)};\n")
+        # for field_name in (f for f in dir(basemodel_type) if is_constant(f)):
+        #     field = getattr(basemodel_type, field_name)
+        #     if field is None:
+        #         continue
+        #     string_builder.write(f"  {field_name}: {parse_literal_value(field)};\n")
         for field_name, field in basemodel_type.__annotations__.items():
-
+            if field_name in cls_consts:
+                continue
             string_builder.write(
-                f"  {snake_to_camel(field_name)}: {get_field_type_for_ts(field)};\n"
+                f"  {snake_to_camel(field_name) if not is_constant(field_name) else field_name}: {get_field_type_for_ts(field)};\n"
             )
             mapped_types.update(extract_all_envolved_types(field))
             mapped_types.add(field)
@@ -308,6 +312,7 @@ def write_microservice_to_typescript_interface(
     mapped_types_set: set[Any] = set()
 
     websocket_registries: set[RegisterWebSocketMessage] = set()
+    mapped_types_set.add(WebSocketMessageWrapper)
 
     for controller in microservice.controllers:
         rest_controller = RestController.get_controller(controller)