h-message-bus 0.0.39__py3-none-any.whl → 0.0.40__py3-none-any.whl

h_message_bus/infrastructure/nats_client_repository.py

@@ -1,4 +1,5 @@
 import logging
+import asyncio
 from typing import Optional, Callable, Any
 
 import nats
@@ -6,37 +7,34 @@ from nats.aio.client import Client as NatsClient
 
 from ..infrastructure.nats_config import NatsConfig
 
-
 class NatsClientRepository:
     """
     Repository for managing connection and interaction with a NATS server.
-
-    This class provides methods to establish a connection with a NATS server,
-    publish and subscribe to subjects, send requests and handle responses, and
-    cleanly disconnect from the server. It abstracts the connection and ensures
-    seamless communication with the NATS server.
-
-    :ivar config: Configuration details for the NATS client, including server
-        connection parameters, timeouts, and limits.
-    :type config: NatsConfig
-    :ivar client: Instance of the NATS client used for communication. Initialized
-        as None and assigned upon connecting to a NATS server.
-    :type client: Optional[NatsClient]
-    :ivar subscriptions: List of active subscriptions for NATS subjects.
-    :type subscriptions: list
     """
 
     def __init__(self, config: NatsConfig):
         self.config = config
-        self.client: NatsClient | None = None
-
+        self.client: Optional[NatsClient] = None
         self.subscriptions = []
         self.logger = logging.getLogger(__name__)
 
     async def connect(self) -> None:
-        """Connect to NATS server."""
+        """Connect to NATS server with event handlers and logging."""
         if self.client and self.client.is_connected:
             return
+
+        async def error_cb(e):
+            self.logger.error(f"NATS client error: {e}")
+
+        async def disconnect_cb():
+            self.logger.warning("NATS client disconnected.")
+
+        async def reconnect_cb():
+            self.logger.info("NATS client reconnected.")
+
+        async def closed_cb():
+            self.logger.warning("NATS client connection closed.")
+
         self.logger.info(f"Connecting to NATS server at {self.config.server}")
 
         self.client = await nats.connect(
@@ -45,49 +43,67 @@ class NatsClientRepository:
             reconnect_time_wait=self.config.reconnect_time_wait,
             connect_timeout=self.config.connection_timeout,
             ping_interval=self.config.ping_interval,
-            max_outstanding_pings=self.config.max_outstanding_pings
-        ) #ignore client type warning
-
-    async def publish(self, subject: str, payload: bytes) -> None:
-        """Publish raw message to NATS."""
-        if not self.client or not self.client.is_connected:
-            await self.connect()
-
-        try:
-            await self.client.publish(subject, payload)
-        except Exception as e:
-            print(f"Failed to publish message: {e}")
-            return
+            max_outstanding_pings=self.config.max_outstanding_pings,
+            error_cb=error_cb,
+            disconnected_cb=disconnect_cb,
+            reconnected_cb=reconnect_cb,
+            closed_cb=closed_cb,
+        )  # type: ignore
+
+    async def _ensure_connected(self, retries: int = 5):
+        """Wait and retry until the client is connected."""
+        for attempt in range(retries):
+            if self.client and self.client.is_connected:
+                return
+            self.logger.info(f"Waiting for NATS connection (attempt {attempt+1})...")
+            await asyncio.sleep(2 ** attempt)
+        raise ConnectionError("Could not establish connection to NATS server.")
+
+    async def publish(self, subject: str, payload: bytes, retries: int = 3) -> None:
+        """Publish raw message to NATS with retries and backoff."""
+        for attempt in range(retries):
+            try:
+                await self._ensure_connected()
+                await self.client.publish(subject, payload)
+                return
+            except Exception as e:
+                self.logger.error(f"Failed to publish message (attempt {attempt+1}): {e}")
+                await asyncio.sleep(2 ** attempt)
+        self.logger.error("Giving up publishing after retries.")
 
     async def subscribe(self, subject: str, callback: Callable) -> Any:
         """Subscribe to a subject with a callback."""
-        if not self.client or not self.client.is_connected:
-            await self.connect()
-
-        subscription = await self.client.subscribe(subject, cb=callback)
-        self.subscriptions.append(subscription)
-        return subscription
-
-    async def request(self, subject: str, payload: bytes, timeout: float = 2.0) -> Optional[bytes]:
-        """Send a request and get raw response."""
-        if not self.client or not self.client.is_connected:
-            await self.connect()
-
+        await self._ensure_connected()
         try:
-            response = await self.client.request(subject, payload, timeout=timeout)
-            return response.data
+            subscription = await self.client.subscribe(subject, cb=callback)
+            self.subscriptions.append(subscription)
+            return subscription
         except Exception as e:
-            print(f"NATS request failed: {e}")
+            self.logger.error(f"Failed to subscribe to {subject}: {e}")
             return None
 
+    async def request(self, subject: str, payload: bytes, timeout: float = 2.0, retries: int = 3) -> Optional[bytes]:
+        """Send a request and get raw response with retries and backoff."""
+        for attempt in range(retries):
+            try:
+                await self._ensure_connected()
+                response = await self.client.request(subject, payload, timeout=timeout)
+                return response.data
+            except Exception as e:
+                self.logger.error(f"NATS request failed (attempt {attempt+1}): {e}")
+                await asyncio.sleep(2 ** attempt)
+        self.logger.error("Giving up request after retries.")
+        return None
+
     async def close(self) -> None:
         """Close all subscriptions and NATS connection."""
         if self.client and self.client.is_connected:
-            # Unsubscribe from all subscriptions
-            for sub in self.subscriptions:
-                await sub.unsubscribe()
-
-            # Drain and close connection
-            await self.client.drain()
-            self.client = None
-            self.subscriptions = []
+            try:
+                for sub in self.subscriptions:
+                    await sub.unsubscribe()
+                await self.client.drain()
+            except Exception as e:
+                self.logger.error(f"Error during NATS cleanup: {e}")
+            finally:
+                self.client = None
+                self.subscriptions = []

{h_message_bus-0.0.39.dist-info → h_message_bus-0.0.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: h_message_bus
-Version: 0.0.39
+Version: 0.0.40
 Summary: Message bus integration for HAI
 Author-email: shoebill <shoebill.hai@gmail.com>
 Classifier: Programming Language :: Python :: 3

{h_message_bus-0.0.39.dist-info → h_message_bus-0.0.40.dist-info}/RECORD

@@ -68,9 +68,9 @@ h_message_bus/domain/request_messages/vector_save_request_message.py,sha256=Xqrd
 h_message_bus/domain/request_messages/web_get_docs_request_message.py,sha256=MkJySkRBlQ2CacMoPCd3FwXQt1tVVFdrZKxsA6yMsrk,1576
 h_message_bus/domain/request_messages/web_search_request_message.py,sha256=ZoB4idrFEs7HQ6IRxmwKrrfHWe3GlGF4LuOK68K5NEM,1000
 h_message_bus/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-h_message_bus/infrastructure/nats_client_repository.py,sha256=bhaWRK94h2EmFIef2DALnoBJKnuTnx6-iU7IXO2S_EU,3642
+h_message_bus/infrastructure/nats_client_repository.py,sha256=crxWCGkBS-DcUm5Ii4ngCCgQR32tedCEXVk9Tdq0ErY,4501
 h_message_bus/infrastructure/nats_config.py,sha256=Yzqqd1bCfmUv_4FOnA1dvqIpakzV0BUL2_nXQcndWvo,1304
-h_message_bus-0.0.39.dist-info/METADATA,sha256=KmLu3QbSLShufr-5caSergImL_oW9vElqIRMmXM8eqo,8834
-h_message_bus-0.0.39.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-h_message_bus-0.0.39.dist-info/top_level.txt,sha256=BArjhm_lwFR9yJJEIf-LT_X64psuLkXFdbpQRJUreFE,23
-h_message_bus-0.0.39.dist-info/RECORD,,
+h_message_bus-0.0.40.dist-info/METADATA,sha256=UgqzgrRDT29K82kJkbnalFCnBq_SoHBhI0dx8OFPZ8s,8834
+h_message_bus-0.0.40.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+h_message_bus-0.0.40.dist-info/top_level.txt,sha256=BArjhm_lwFR9yJJEIf-LT_X64psuLkXFdbpQRJUreFE,23
+h_message_bus-0.0.40.dist-info/RECORD,,

{h_message_bus-0.0.39.dist-info → h_message_bus-0.0.40.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any