zenbroker 1.2.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

zenbroker/client.py

@@ -1,7 +1,8 @@
 import json
 import threading
+import asyncio
 import httpx
-from typing import Dict, Any, Set
+from typing import Dict, Any, Set, Callable, List
 from pydantic import BaseModel, Field, HttpUrl
 import socketio
 import time
@@ -21,6 +22,7 @@ class ZenBrokerIncommingMessage(BaseModel):
     createdAt: str = Field(..., description="Created at timestamp")
     data: str = Field(..., description="Data of the message")
 
+
 class ZenbrokerClient:
     def __init__(self, base_url: HttpUrl, application_id: str) -> None:
         self._url: str = str(base_url)
@@ -28,51 +30,52 @@ class ZenbrokerClient:
 
         self._api = httpx.Client(base_url=self._url)
 
-        # Socket.IO client
         self._sio = socketio.Client(logger=True)
         self._sio.connect(f"{self._url}?applicationId={self._application_id}", socketio_path="/ws")
         self._sio.on("message", self._on_socket_message)
         
-        # Channels
         self._channels: Set[str] = set()
-
-        # Callbacks
-        self._callbacks: list[callable] = []
+        self._callbacks: List[Callable] = []
 
     def _on_socket_message(self, data):
         _message = ZenBrokerIncommingMessage.model_validate(json.loads(data))
         for callback in self._callbacks:
             callback(_message)
     
-
-    def on_message(self, callback: callable) -> callable:
+    def on_message(self, callback: Callable) -> Callable:
         self._callbacks.append(callback)
-        
+
         def unsubscribe():
             if callback in self._callbacks:
                 self._callbacks.remove(callback)
-        
+
         return unsubscribe
 
     def subscribe(self, channel: str) -> bool:
         if channel in self._channels:
             return False
-
         self._sio.emit("subscribe", channel)
         self._channels.add(channel)
-
         return True
-    
+
     def unsubscribe(self, channel: str) -> bool:
         if channel not in self._channels:
             return False
-
         self._sio.emit("unsubscribe", channel)
         self._channels.remove(channel)
         return True
 
+    def publish_ws(self, channel: str, data: Dict[str, Any]) -> bool:
+        post_data = PostPublishEventPayload(
+            applicationId=self._application_id,
+            channel=channel,
+            data=data
+        )
+        self._sio.emit("message", data=post_data.model_dump())
+        return True
+
     def publish(self, channel: str, data: Dict[str, Any]) -> PostPublishEventResponse:
-        post_data: PostPublishEventPayload = PostPublishEventPayload(
+        post_data = PostPublishEventPayload(
             applicationId=self._application_id,
             channel=channel,
             data=data
@@ -90,12 +93,8 @@ class ZenbrokerClient:
             id=result['id'],
             message=result['message']
         )
-    
+
     def listen(self):
-        """
-        Keeps the Socket.IO client running and listening for messages.
-        This method will not block the main thread.
-        """
         def _listen():
             try:
                 while True:
@@ -105,4 +104,93 @@ class ZenbrokerClient:
 
         thread = threading.Thread(target=_listen)
         thread.start()
-    
+
+
+# ------------------------------
+# Async Version of the Client
+# ------------------------------
+
+class AsyncZenbrokerClient:
+    def __init__(self, base_url: HttpUrl, application_id: str) -> None:
+        self._url: str = str(base_url)
+        self._application_id: str = str(application_id)
+
+        self._api = httpx.AsyncClient(base_url=self._url)
+
+        self._sio = socketio.AsyncClient(logger=True)
+        self._callbacks: List[Callable] = []
+        self._channels: Set[str] = set()
+
+    async def connect(self):
+        await self._sio.connect(f"{self._url}?applicationId={self._application_id}", socketio_path="/ws")
+        self._sio.on("message", self._on_socket_message)
+
+    async def disconnect(self):
+        await self._sio.disconnect()
+
+    def _on_socket_message(self, data):
+        _message = ZenBrokerIncommingMessage.model_validate(json.loads(data))
+        for callback in self._callbacks:
+            callback(_message)
+
+    def on_message(self, callback: Callable) -> Callable:
+        self._callbacks.append(callback)
+
+        def unsubscribe():
+            if callback in self._callbacks:
+                self._callbacks.remove(callback)
+
+        return unsubscribe
+
+    async def subscribe(self, channel: str) -> bool:
+        if channel in self._channels:
+            return False
+        await self._sio.emit("subscribe", channel)
+        self._channels.add(channel)
+        return True
+
+    async def unsubscribe(self, channel: str) -> bool:
+        if channel not in self._channels:
+            return False
+        await self._sio.emit("unsubscribe", channel)
+        self._channels.remove(channel)
+        return True
+
+    async def publish_ws(self, channel: str, data: Dict[str, Any]) -> bool:
+        post_data = PostPublishEventPayload(
+            applicationId=self._application_id,
+            channel=channel,
+            data=data
+        )
+        await self._sio.emit("message", data=post_data.model_dump())
+        return True
+
+    async def publish(self, channel: str, data: Dict[str, Any]) -> PostPublishEventResponse:
+        post_data = PostPublishEventPayload(
+            applicationId=self._application_id,
+            channel=channel,
+            data=data
+        )
+
+        response = await self._api.post(
+            url="/producer/emit",
+            json=post_data.model_dump()
+        )
+
+        response.raise_for_status()
+        result = response.json()
+
+        return PostPublishEventResponse(
+            id=result['id'],
+            message=result['message']
+        )
+
+    async def listen(self):
+        """
+        Keeps the Socket.IO client running and listening for messages.
+        """
+        try:
+            while True:
+                await asyncio.sleep(1)
+        except asyncio.CancelledError:
+            await self._sio.disconnect()

{zenbroker-1.2.0.dist-info → zenbroker-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zenbroker
-Version: 1.2.0
+Version: 1.4.0
 Summary: Zenbroker client
 Home-page: UNKNOWN
 License: UNKNOWN
@@ -9,6 +9,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pydantic<3.0.0,>=2.0.0
 Requires-Dist: httpx<1.0.0,>=0.28.0
 Requires-Dist: python-socketio<6.0.0,>=5.0.0
+Requires-Dist: websocket-client<2.0.0,>=1.8.0
 
 # Zenbroker Client Example
 

zenbroker-1.4.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+zenbroker/__init__.py,sha256=1FVuCI5MNs_uk5hukwIlkHiPhXVhLtc4DUYXNYh5WIY,190
+zenbroker/client.py,sha256=GN65TsFKYQEeOpDmOVtogT74klRaKY7XAPR7DVildh4,6224
+zenbroker-1.4.0.dist-info/METADATA,sha256=Gk8_8i6uq5xGrtECwZCrTxbsdS8fdNQWzImztlMuKJ8,1103
+zenbroker-1.4.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+zenbroker-1.4.0.dist-info/top_level.txt,sha256=u-V5a1mTLsnD3DQb01LQo8WtbYc75BIZ6jSWrZ7vDkY,10
+zenbroker-1.4.0.dist-info/RECORD,,

zenbroker-1.2.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-zenbroker/__init__.py,sha256=1FVuCI5MNs_uk5hukwIlkHiPhXVhLtc4DUYXNYh5WIY,190
-zenbroker/client.py,sha256=aDBlva_EZrASO0h2LuEDU4-rxUEGiOGYiCsraeoHWDI,3337
-zenbroker-1.2.0.dist-info/METADATA,sha256=UvuRqxD7lp_WX8s7C-yv9YQRPps6gkgtsdtpTaHrqBg,1057
-zenbroker-1.2.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-zenbroker-1.2.0.dist-info/top_level.txt,sha256=u-V5a1mTLsnD3DQb01LQo8WtbYc75BIZ6jSWrZ7vDkY,10
-zenbroker-1.2.0.dist-info/RECORD,,