h-message-bus 0.0.22__py3-none-any.whl → 0.0.24__py3-none-any.whl

h_message_bus/adapters/nats_publisher_adapter.py

@@ -1,3 +1,4 @@
+import asyncio
 from typing import Optional
 
 from ..application.message_publisher import MessagePublisher
@@ -23,14 +24,14 @@ class NatsPublisherAdapter(MessagePublisher):
     def __init__(self, nats_client: NatsClientRepository):
         self.nats_client = nats_client
 
-    async def publish(self, message: HaiMessage):
+    async def publish(self, message: HaiMessage, wait_time: float = 0.1):
         """Publish a message to NATS."""
         try:
-
             await self.nats_client.publish(
                 message.topic,
                 message.to_json().encode()
             )
+            await asyncio.sleep(wait_time)
         except Exception as e:
             print(f"Failed to publish message: {e}")
             return

h_message_bus/adapters/nats_subscriber_adapter.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Dict, Any
 
 from ..adapters.nats_message_adapter import NatsMessageAdapter
 from ..application.message_processor import MessageProcessor
@@ -30,7 +30,7 @@ class NatsSubscriberAdapter(MessageSubscriber):
         self.subscriptions = []
         self.adapters: Dict[str, NatsMessageAdapter] = {}
 
-    async def subscribe(self, topic: str, processor: MessageProcessor) -> None:
+    async def subscribe(self, topic: str, processor: MessageProcessor) -> Any:
         """Subscribe to a topic with a message handler."""
         # Create an adapter for this use case
         message_adapter = NatsMessageAdapter(processor)
@@ -43,6 +43,7 @@ class NatsSubscriberAdapter(MessageSubscriber):
         )
 
         self.subscriptions.append(subscription)
+        return subscription
 
     async def unsubscribe_all(self) -> None:
         """Unsubscribe from all subscriptions."""

h_message_bus/domain/request_messages/vector_save_request_message.py

@@ -14,12 +14,13 @@ class VectorSaveRequestMessage(HaiMessage):
         return super().create(topic=topic, payload=payload)
 
     @classmethod
-    def create_message(cls, collection_name: str, document_id: str, content: str, metadata: dict[str,str]) -> 'VectorSaveRequestMessage':
+    def create_message(cls, collection_name: str, collection_metadata: dict[str,str], document_id: str, content: str, metadata: dict[str,str]) -> 'VectorSaveRequestMessage':
         """Create a message requesting Twitter user data"""
         return cls.create(
             topic=RequestMessageTopic.VECTORS_SAVE,
             payload={
                 "collection_name": collection_name,
+                "collection_metadata": collection_metadata,
                 "document_id": document_id,
                 "content": content,
                 "metadata": metadata
@@ -31,6 +32,11 @@ class VectorSaveRequestMessage(HaiMessage):
         """Get the collection name from the payload"""
         return self.payload.get("collection_name")
 
+    @property
+    def collection_metadata(self) -> str:
+        """Get the collection name from the payload"""
+        return self.payload.get("collection_metadata")
+
     @property
     def document_id(self) -> str:
         """Get the document ID from the payload"""
@@ -53,6 +59,7 @@ class VectorSaveRequestMessage(HaiMessage):
 
         return cls.create_message(
             collection_name=payload.get("collection_name", ''),
+            collection_metadata=payload.get("collection_metadata", {}),
             document_id=payload.get("document_id", ''),
             content=payload.get("content", ''),
             metadata=payload.get("metadata", {})

h_message_bus/infrastructure/nats_client_repository.py

@@ -1,3 +1,4 @@
+import logging
 from typing import Optional, Callable, Any
 
 import nats
@@ -30,11 +31,13 @@ class NatsClientRepository:
         self.client: NatsClient | None = None
 
         self.subscriptions = []
+        self.logger = logging.getLogger(__name__)
 
     async def connect(self) -> None:
         """Connect to NATS server."""
         if self.client and self.client.is_connected:
             return
+        self.logger.info(f"Connecting to NATS server at {self.config.server}")
 
         self.client = await nats.connect(
             servers=self.config.server,
@@ -50,7 +53,11 @@ class NatsClientRepository:
         if not self.client or not self.client.is_connected:
             await self.connect()
 
-        await self.client.publish(subject, payload)
+        try:
+            await self.client.publish(subject, payload)
+        except Exception as e:
+            print(f"Failed to publish message: {e}")
+            return
 
     async def subscribe(self, subject: str, callback: Callable) -> Any:
         """Subscribe to a subject with a callback."""

{h_message_bus-0.0.22.dist-info → h_message_bus-0.0.24.dist-info}/METADATA

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

{h_message_bus-0.0.22.dist-info → h_message_bus-0.0.24.dist-info}/RECORD

@@ -2,8 +2,8 @@ __init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 h_message_bus/__init__.py,sha256=T_07sHtXLlRuLwK-BRVfFIIOGc48TKbtVLvKtIw2K5U,516
 h_message_bus/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 h_message_bus/adapters/nats_message_adapter.py,sha256=-hzx0UJmKJT4VWfRA_zVT68hddl9dejvUiSdLU1rY-w,1378
-h_message_bus/adapters/nats_publisher_adapter.py,sha256=kIh7J-eS-MPvfGsnmdGwsWYfLgepBC99v5d04KXyOaE,1900
-h_message_bus/adapters/nats_subscriber_adapter.py,sha256=WX7xvJhVJVa24CRpWGG3SE8CLP7AXcO6ky-qhMTICCY,2072
+h_message_bus/adapters/nats_publisher_adapter.py,sha256=EgrGioGuZfLpJsb5wiialMGMe8E4oUktS8zMdGri3Lc,1982
+h_message_bus/adapters/nats_subscriber_adapter.py,sha256=UJN2Es7hokbO5YsSUAf0KQ2B15QcGzGtQx-G1S3iQWQ,2105
 h_message_bus/application/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 h_message_bus/application/message_processor.py,sha256=1vdVfPn1BUDmswJ-Y5aS-YDbLSizrjX6_CMIBa5SGjc,734
 h_message_bus/application/message_publisher.py,sha256=pYX4JzJLe7L_59gKVYBLqT6iTwFB73zhbzxd7yv2TqI,834
@@ -26,13 +26,13 @@ h_message_bus/domain/request_messages/vector_query_collection_request_message.py
 h_message_bus/domain/request_messages/vector_query_collection_response_message.py,sha256=Q589JT_QE-oVsTh1GEmK__3Hct7ijfM1UTcPi0YTGn8,1767
 h_message_bus/domain/request_messages/vector_read_metadata_request_message.py,sha256=P9t6pcynS112F9_Jmbvw8wlfXhs5NOnV48SUVq92xt8,873
 h_message_bus/domain/request_messages/vector_read_metadata_response_message.py,sha256=G2TDV_lbUM7RVrvEaYQAP-3I36J0pqLXqxnqwVBMWhk,1648
-h_message_bus/domain/request_messages/vector_save_request_message.py,sha256=NvRdSUtE-X3sQTfJg7_QLic3PtbpgYUH2lQrNSC1ggg,2115
+h_message_bus/domain/request_messages/vector_save_request_message.py,sha256=Omq0zzUUDz7bp1-3shsTrVn_V45Tt43rq_QqRNaE0FM,2457
 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=lAapNaL0rqBr-9KaHcexuo5XLmSWRWspkJWXS9dMqPU,3371
+h_message_bus/infrastructure/nats_client_repository.py,sha256=bhaWRK94h2EmFIef2DALnoBJKnuTnx6-iU7IXO2S_EU,3642
 h_message_bus/infrastructure/nats_config.py,sha256=Yzqqd1bCfmUv_4FOnA1dvqIpakzV0BUL2_nXQcndWvo,1304
-h_message_bus-0.0.22.dist-info/METADATA,sha256=EwONbFsl__2n8Yv_5q2_Qyx7JguhaTqt4yrp2Yghb_M,8834
-h_message_bus-0.0.22.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-h_message_bus-0.0.22.dist-info/top_level.txt,sha256=BArjhm_lwFR9yJJEIf-LT_X64psuLkXFdbpQRJUreFE,23
-h_message_bus-0.0.22.dist-info/RECORD,,
+h_message_bus-0.0.24.dist-info/METADATA,sha256=mmaUjeM70bJVT5s3W1MRp1cvqvPYuN7T-aXPqOlyZFs,8834
+h_message_bus-0.0.24.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+h_message_bus-0.0.24.dist-info/top_level.txt,sha256=BArjhm_lwFR9yJJEIf-LT_X64psuLkXFdbpQRJUreFE,23
+h_message_bus-0.0.24.dist-info/RECORD,,

{h_message_bus-0.0.22.dist-info → h_message_bus-0.0.24.dist-info}/WHEEL

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