h-message-bus 0.0.40__tar.gz → 0.0.41__tar.gz

{h_message_bus-0.0.40 → h_message_bus-0.0.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: h_message_bus
-Version: 0.0.40
+Version: 0.0.41
 Summary: Message bus integration for HAI
 Author-email: shoebill <shoebill.hai@gmail.com>
 Classifier: Programming Language :: Python :: 3
@@ -40,18 +40,18 @@ pip install h_message_bus
 
 ## Topics
 
-H Message Bus includes predefined topics following the convention: `hai.[source].[destination].[action]`
+H Message Bus uses topic strings for message routing. It's recommended to follow the convention: `hai.[source].[destination].[action]`
 
-Available topics:
+Example topics:
 
-| Topic Constant                  | Topic String           | Description                         |
-|---------------------------------|------------------------|-------------------------------------|
-| `Topic.AI_SEND_TG_CHAT_MESSAGE` | `hai.ai.tg.chat.send`  | AI sending message to Telegram chat |
-| `Topic.AI_VECTORS_SAVE`         | `hai.ai.vectors.save`  | AI saving data to vector database   |
-| `Topic.AI_VECTORS_QUERY`        | `hai.ai.vectors.query` | AI querying vector database         |
-| `Topic.TG_SEND_AI_CHAT_MESSAGE` | `hai.tg.ai.chat.send`  | Telegram sending message to AI      |
+| Topic String           | Description                         |
+|------------------------|-------------------------------------|
+| `hai.ai.tg.chat.send`  | AI sending message to Telegram chat |
+| `hai.ai.vectors.save`  | AI saving data to vector database   |
+| `hai.ai.vectors.query` | AI querying vector database         |
+| `hai.tg.ai.chat.send`  | Telegram sending message to AI      |
 
-You can use these predefined topics or create your own topic strings.
+You can use these example topics or create your own topic strings based on your application's needs.
 
 ## Quick Start
 
@@ -68,29 +68,31 @@ docker-compose up -d
 ```python
 import asyncio
 import uuid
-from h_message_bus import NatsConfig, NatsPublisherAdapter, HaiMessage, Topic
+from h_message_bus import NatsConfig, NatsPublisherAdapter, HaiMessage, NatsClientRepository
 
 async def main():
     # Configure NATS connection
     config = NatsConfig(server="nats://localhost:4222")
-    
+
+    # Create NATS client repository
+    client_repository = NatsClientRepository(config)
+
     # Create publisher adapter
-    publisher = NatsPublisherAdapter(config)
-    
+    publisher = NatsPublisherAdapter(client_repository)
+
     # Connect to NATS
-    await publisher.connect()
-    
-    # Create and publish a message using a predefined topic
+    await client_repository.connect()
+
+    # Create and publish a message
     message = HaiMessage(
-        message_id=str(uuid.uuid4()),
-        sender="service-a",
-        topic=Topic.TG_SEND_AI_CHAT_MESSAGE,
+        id=str(uuid.uuid4()),
+        topic="hai.tg.ai.chat.send",
         payload={"text": "Hello AI, this is a message from Telegram", "chat_id": 12345}
     )
-    
+
     # Publish message
     await publisher.publish(message)
-    
+
     # Clean up
     await publisher.close()
 
@@ -102,27 +104,34 @@ if __name__ == "__main__":
 
 ```python
 import asyncio
-from h_message_bus import NatsConfig, NatsSubscriberAdapter, HaiMessage, Topic
+from h_message_bus import NatsConfig, NatsSubscriberAdapter, HaiMessage, NatsClientRepository, MessageProcessor
 
-async def message_handler(message: HaiMessage):
-    print(f"Received message: {message.message_id}")
-    print(f"From: {message.sender}")
-    print(f"Topic: {message.topic}")
-    print(f"Payload: {message.payload}")
+class MyMessageProcessor(MessageProcessor):
+    async def process(self, message: HaiMessage):
+        print(f"Received message: {message.id}")
+        print(f"Topic: {message.topic}")
+        print(f"Payload: {message.payload}")
+        print(f"Timestamp: {message.timestamp}")
 
 async def main():
     # Configure NATS connection
     config = NatsConfig(server="nats://localhost:4222")
-    
+
+    # Create NATS client repository
+    client_repository = NatsClientRepository(config)
+
     # Create subscriber
-    subscriber = NatsSubscriberAdapter(config)
-    
+    subscriber = NatsSubscriberAdapter(client_repository)
+
     # Connect to NATS
-    await subscriber.connect()
-    
+    await client_repository.connect()
+
+    # Create message processor
+    processor = MyMessageProcessor()
+
     # Subscribe to a topic
-    await subscriber.subscribe(Topic.TG_SEND_AI_CHAT_MESSAGE, message_handler)
-    
+    await subscriber.subscribe("hai.tg.ai.chat.send", processor)
+
     # Keep the application running
     try:
         print("Subscriber running. Press Ctrl+C to exit.")
@@ -130,7 +139,7 @@ async def main():
             await asyncio.sleep(1)
     except KeyboardInterrupt:
         # Clean up
-        await subscriber.close()
+        await client_repository.close()
 
 if __name__ == "__main__":
     asyncio.run(main())
@@ -143,74 +152,91 @@ if __name__ == "__main__":
 ```python
 import asyncio
 import uuid
-from h_message_bus import NatsConfig, NatsPublisherAdapter, HaiMessage, Topic
+from h_message_bus import NatsConfig, NatsPublisherAdapter, HaiMessage, NatsClientRepository
 
 async def main():
+    # Configure NATS connection
     config = NatsConfig(server="nats://localhost:4222")
-    publisher = NatsPublisherAdapter(config)
-    
+
+    # Create NATS client repository
+    client_repository = NatsClientRepository(config)
+
+    # Create publisher adapter
+    publisher = NatsPublisherAdapter(client_repository)
+
     # Connect to NATS
-    await publisher.connect()
-    
+    await client_repository.connect()
+
     request_message = HaiMessage(
-        message_id=str(uuid.uuid4()),
-        sender="client-service",
-        topic=Topic.AI_VECTORS_QUERY,
+        id=str(uuid.uuid4()),
+        topic="hai.ai.vectors.query",
         payload={"query": "find similar documents", "limit": 10}
     )
-    
+
     # Send request and wait for response (with timeout)
     response = await publisher.request(request_message, timeout=5.0)
-    
+
     if response:
         print(f"Received response: {response.payload}")
     else:
         print("Request timed out")
-    
-    await publisher.close()
+
+    # Clean up
+    await client_repository.close()
 
 if __name__ == "__main__":
     asyncio.run(main())
 ```
 
-### Creating a Service with Request Handler
+### Creating a Service for Request-Response
 
 ```python
 import asyncio
 import uuid
-from h_message_bus import NatsConfig, NatsSubscriberAdapter, NatsPublisherAdapter, HaiMessage, Topic
-
-async def request_handler(request: HaiMessage):
-    print(f"Received request: {request.message_id}")
-    print(f"Payload: {request.payload}")
-    
-    # Process the request
-    result = {"status": "success", "data": {"result": 42}}
-    
-    # Create a response message
-    return HaiMessage(
-        message_id=str(uuid.uuid4()),
-        sender="service-b",
-        topic=f"{request.topic}.response",
-        payload=result,
-        correlation_id=request.message_id
-    )
+import json
+from h_message_bus import NatsConfig, NatsSubscriberAdapter, NatsPublisherAdapter, HaiMessage, NatsClientRepository, MessageProcessor
+
+class RequestResponseProcessor(MessageProcessor):
+    def __init__(self, publisher):
+        self.publisher = publisher
+
+    async def process(self, request: HaiMessage):
+        print(f"Received request: {request.id}")
+        print(f"Payload: {request.payload}")
+
+        # Process the request
+        result = {"status": "success", "data": {"result": 42}}
+
+        # Create a response message
+        response = HaiMessage(
+            id=str(uuid.uuid4()),
+            topic=f"{request.topic}.response",
+            payload=result
+        )
+
+        # Publish the response
+        await self.publisher.publish(response)
 
 async def main():
     # Configure NATS connection
     config = NatsConfig(server="nats://localhost:4222")
-    
-    # Create subscriber for handling requests
-    subscriber = NatsSubscriberAdapter(config)
-    publisher = NatsPublisherAdapter(config)
-    
+
+    # Create NATS client repository
+    client_repository = NatsClientRepository(config)
+
     # Connect to NATS
-    await subscriber.connect()
-    await publisher.connect()
-    
-    # Register request handler for vector database queries
-    await subscriber.subscribe_with_response(Topic.AI_VECTORS_QUERY, request_handler, publisher)
-    
+    await client_repository.connect()
+
+    # Create publisher and subscriber
+    publisher = NatsPublisherAdapter(client_repository)
+    subscriber = NatsSubscriberAdapter(client_repository)
+
+    # Create request processor that uses the publisher
+    processor = RequestResponseProcessor(publisher)
+
+    # Subscribe to the request topic
+    await subscriber.subscribe("hai.ai.vectors.query", processor)
+
     # Keep the application running
     try:
         print("Service running. Press Ctrl+C to exit.")
@@ -218,8 +244,7 @@ async def main():
             await asyncio.sleep(1)
     except KeyboardInterrupt:
         # Clean up
-        await subscriber.close()
-        await publisher.close()
+        await client_repository.close()
 
 if __name__ == "__main__":
     asyncio.run(main())
@@ -237,7 +262,6 @@ The `NatsConfig` class allows you to customize your NATS connection:
 | `connection_timeout`     | Connection timeout (seconds)                 | 2             |
 | `ping_interval`          | Interval for ping frames (seconds)           | 20            |
 | `max_outstanding_pings`  | Maximum unanswered pings before disconnect   | 5             |
-| `max_payload`            | Maximum size of the payload in bytes         | 1048576 (1MB) |
 
 ## API Reference
 
@@ -251,7 +275,6 @@ The following classes are exported directly from the package:
 - `NatsSubscriberAdapter` - Adapter for subscribing to messages
 - `MessageProcessor` - Processing incoming messages
 - `NatsClientRepository` - Low-level NATS client operations
-- `Topic` - Enumeration of predefined topic strings
 
 ### HaiMessage Structure
 
@@ -259,12 +282,10 @@ The `HaiMessage` class is the core data structure used for all messaging:
 
 ```python
 class HaiMessage:
-    message_id: str       # Unique identifier for the message
-    sender: str           # Identifier of the sender
+    id: str               # Unique identifier for the message
     topic: str            # The topic or channel for the message
     payload: dict         # Actual message data
-    correlation_id: str = None  # Optional reference to a related message
-    timestamp: float = None     # Optional message creation timestamp
+    timestamp: str = None # Optional message creation timestamp (ISO format)
 ```
 
 ## Contributing

{h_message_bus-0.0.40 → h_message_bus-0.0.41}/README.md

@@ -26,18 +26,18 @@ pip install h_message_bus
 
 ## Topics
 
-H Message Bus includes predefined topics following the convention: `hai.[source].[destination].[action]`
+H Message Bus uses topic strings for message routing. It's recommended to follow the convention: `hai.[source].[destination].[action]`
 
-Available topics:
+Example topics:
 
-| Topic Constant                  | Topic String           | Description                         |
-|---------------------------------|------------------------|-------------------------------------|
-| `Topic.AI_SEND_TG_CHAT_MESSAGE` | `hai.ai.tg.chat.send`  | AI sending message to Telegram chat |
-| `Topic.AI_VECTORS_SAVE`         | `hai.ai.vectors.save`  | AI saving data to vector database   |
-| `Topic.AI_VECTORS_QUERY`        | `hai.ai.vectors.query` | AI querying vector database         |
-| `Topic.TG_SEND_AI_CHAT_MESSAGE` | `hai.tg.ai.chat.send`  | Telegram sending message to AI      |
+| Topic String           | Description                         |
+|------------------------|-------------------------------------|
+| `hai.ai.tg.chat.send`  | AI sending message to Telegram chat |
+| `hai.ai.vectors.save`  | AI saving data to vector database   |
+| `hai.ai.vectors.query` | AI querying vector database         |
+| `hai.tg.ai.chat.send`  | Telegram sending message to AI      |
 
-You can use these predefined topics or create your own topic strings.
+You can use these example topics or create your own topic strings based on your application's needs.
 
 ## Quick Start
 
@@ -54,29 +54,31 @@ docker-compose up -d
 ```python
 import asyncio
 import uuid
-from h_message_bus import NatsConfig, NatsPublisherAdapter, HaiMessage, Topic
+from h_message_bus import NatsConfig, NatsPublisherAdapter, HaiMessage, NatsClientRepository
 
 async def main():
     # Configure NATS connection
     config = NatsConfig(server="nats://localhost:4222")
-    
+
+    # Create NATS client repository
+    client_repository = NatsClientRepository(config)
+
     # Create publisher adapter
-    publisher = NatsPublisherAdapter(config)
-    
+    publisher = NatsPublisherAdapter(client_repository)
+
     # Connect to NATS
-    await publisher.connect()
-    
-    # Create and publish a message using a predefined topic
+    await client_repository.connect()
+
+    # Create and publish a message
     message = HaiMessage(
-        message_id=str(uuid.uuid4()),
-        sender="service-a",
-        topic=Topic.TG_SEND_AI_CHAT_MESSAGE,
+        id=str(uuid.uuid4()),
+        topic="hai.tg.ai.chat.send",
         payload={"text": "Hello AI, this is a message from Telegram", "chat_id": 12345}
     )
-    
+
     # Publish message
     await publisher.publish(message)
-    
+
     # Clean up
     await publisher.close()
 
@@ -88,27 +90,34 @@ if __name__ == "__main__":
 
 ```python
 import asyncio
-from h_message_bus import NatsConfig, NatsSubscriberAdapter, HaiMessage, Topic
+from h_message_bus import NatsConfig, NatsSubscriberAdapter, HaiMessage, NatsClientRepository, MessageProcessor
 
-async def message_handler(message: HaiMessage):
-    print(f"Received message: {message.message_id}")
-    print(f"From: {message.sender}")
-    print(f"Topic: {message.topic}")
-    print(f"Payload: {message.payload}")
+class MyMessageProcessor(MessageProcessor):
+    async def process(self, message: HaiMessage):
+        print(f"Received message: {message.id}")
+        print(f"Topic: {message.topic}")
+        print(f"Payload: {message.payload}")
+        print(f"Timestamp: {message.timestamp}")
 
 async def main():
     # Configure NATS connection
     config = NatsConfig(server="nats://localhost:4222")
-    
+
+    # Create NATS client repository
+    client_repository = NatsClientRepository(config)
+
     # Create subscriber
-    subscriber = NatsSubscriberAdapter(config)
-    
+    subscriber = NatsSubscriberAdapter(client_repository)
+
     # Connect to NATS
-    await subscriber.connect()
-    
+    await client_repository.connect()
+
+    # Create message processor
+    processor = MyMessageProcessor()
+
     # Subscribe to a topic
-    await subscriber.subscribe(Topic.TG_SEND_AI_CHAT_MESSAGE, message_handler)
-    
+    await subscriber.subscribe("hai.tg.ai.chat.send", processor)
+
     # Keep the application running
     try:
         print("Subscriber running. Press Ctrl+C to exit.")
@@ -116,7 +125,7 @@ async def main():
             await asyncio.sleep(1)
     except KeyboardInterrupt:
         # Clean up
-        await subscriber.close()
+        await client_repository.close()
 
 if __name__ == "__main__":
     asyncio.run(main())
@@ -129,74 +138,91 @@ if __name__ == "__main__":
 ```python
 import asyncio
 import uuid
-from h_message_bus import NatsConfig, NatsPublisherAdapter, HaiMessage, Topic
+from h_message_bus import NatsConfig, NatsPublisherAdapter, HaiMessage, NatsClientRepository
 
 async def main():
+    # Configure NATS connection
     config = NatsConfig(server="nats://localhost:4222")
-    publisher = NatsPublisherAdapter(config)
-    
+
+    # Create NATS client repository
+    client_repository = NatsClientRepository(config)
+
+    # Create publisher adapter
+    publisher = NatsPublisherAdapter(client_repository)
+
     # Connect to NATS
-    await publisher.connect()
-    
+    await client_repository.connect()
+
     request_message = HaiMessage(
-        message_id=str(uuid.uuid4()),
-        sender="client-service",
-        topic=Topic.AI_VECTORS_QUERY,
+        id=str(uuid.uuid4()),
+        topic="hai.ai.vectors.query",
         payload={"query": "find similar documents", "limit": 10}
     )
-    
+
     # Send request and wait for response (with timeout)
     response = await publisher.request(request_message, timeout=5.0)
-    
+
     if response:
         print(f"Received response: {response.payload}")
     else:
         print("Request timed out")
-    
-    await publisher.close()
+
+    # Clean up
+    await client_repository.close()
 
 if __name__ == "__main__":
     asyncio.run(main())
 ```
 
-### Creating a Service with Request Handler
+### Creating a Service for Request-Response
 
 ```python
 import asyncio
 import uuid
-from h_message_bus import NatsConfig, NatsSubscriberAdapter, NatsPublisherAdapter, HaiMessage, Topic
-
-async def request_handler(request: HaiMessage):
-    print(f"Received request: {request.message_id}")
-    print(f"Payload: {request.payload}")
-    
-    # Process the request
-    result = {"status": "success", "data": {"result": 42}}
-    
-    # Create a response message
-    return HaiMessage(
-        message_id=str(uuid.uuid4()),
-        sender="service-b",
-        topic=f"{request.topic}.response",
-        payload=result,
-        correlation_id=request.message_id
-    )
+import json
+from h_message_bus import NatsConfig, NatsSubscriberAdapter, NatsPublisherAdapter, HaiMessage, NatsClientRepository, MessageProcessor
+
+class RequestResponseProcessor(MessageProcessor):
+    def __init__(self, publisher):
+        self.publisher = publisher
+
+    async def process(self, request: HaiMessage):
+        print(f"Received request: {request.id}")
+        print(f"Payload: {request.payload}")
+
+        # Process the request
+        result = {"status": "success", "data": {"result": 42}}
+
+        # Create a response message
+        response = HaiMessage(
+            id=str(uuid.uuid4()),
+            topic=f"{request.topic}.response",
+            payload=result
+        )
+
+        # Publish the response
+        await self.publisher.publish(response)
 
 async def main():
     # Configure NATS connection
     config = NatsConfig(server="nats://localhost:4222")
-    
-    # Create subscriber for handling requests
-    subscriber = NatsSubscriberAdapter(config)
-    publisher = NatsPublisherAdapter(config)
-    
+
+    # Create NATS client repository
+    client_repository = NatsClientRepository(config)
+
     # Connect to NATS
-    await subscriber.connect()
-    await publisher.connect()
-    
-    # Register request handler for vector database queries
-    await subscriber.subscribe_with_response(Topic.AI_VECTORS_QUERY, request_handler, publisher)
-    
+    await client_repository.connect()
+
+    # Create publisher and subscriber
+    publisher = NatsPublisherAdapter(client_repository)
+    subscriber = NatsSubscriberAdapter(client_repository)
+
+    # Create request processor that uses the publisher
+    processor = RequestResponseProcessor(publisher)
+
+    # Subscribe to the request topic
+    await subscriber.subscribe("hai.ai.vectors.query", processor)
+
     # Keep the application running
     try:
         print("Service running. Press Ctrl+C to exit.")
@@ -204,8 +230,7 @@ async def main():
             await asyncio.sleep(1)
     except KeyboardInterrupt:
         # Clean up
-        await subscriber.close()
-        await publisher.close()
+        await client_repository.close()
 
 if __name__ == "__main__":
     asyncio.run(main())
@@ -223,7 +248,6 @@ The `NatsConfig` class allows you to customize your NATS connection:
 | `connection_timeout`     | Connection timeout (seconds)                 | 2             |
 | `ping_interval`          | Interval for ping frames (seconds)           | 20            |
 | `max_outstanding_pings`  | Maximum unanswered pings before disconnect   | 5             |
-| `max_payload`            | Maximum size of the payload in bytes         | 1048576 (1MB) |
 
 ## API Reference
 
@@ -237,7 +261,6 @@ The following classes are exported directly from the package:
 - `NatsSubscriberAdapter` - Adapter for subscribing to messages
 - `MessageProcessor` - Processing incoming messages
 - `NatsClientRepository` - Low-level NATS client operations
-- `Topic` - Enumeration of predefined topic strings
 
 ### HaiMessage Structure
 
@@ -245,12 +268,10 @@ The `HaiMessage` class is the core data structure used for all messaging:
 
 ```python
 class HaiMessage:
-    message_id: str       # Unique identifier for the message
-    sender: str           # Identifier of the sender
+    id: str               # Unique identifier for the message
     topic: str            # The topic or channel for the message
     payload: dict         # Actual message data
-    correlation_id: str = None  # Optional reference to a related message
-    timestamp: float = None     # Optional message creation timestamp
+    timestamp: str = None # Optional message creation timestamp (ISO format)
 ```
 
 ## Contributing
@@ -259,4 +280,4 @@ Contributions are welcome! Please feel free to submit a Pull Request.
 
 ## License
 
-This project is licensed under the MIT License - see the LICENSE file for details.
+This project is licensed under the MIT License - see the LICENSE file for details.

{h_message_bus-0.0.40 → h_message_bus-0.0.41}/pyproject.toml

@@ -4,7 +4,7 @@
 
    [project]
    name = "h_message_bus"
-   version = "0.0.40"
+   version = "0.0.41"
    authors = [
        {name = "shoebill", email = "shoebill.hai@gmail.com"},
    ]

{h_message_bus-0.0.40 → h_message_bus-0.0.41}/src/h_message_bus/infrastructure/nats_client_repository.py

@@ -60,7 +60,7 @@ class NatsClientRepository:
         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."""
+        """Publish a raw message to NATS with retries and backoff."""
         for attempt in range(retries):
             try:
                 await self._ensure_connected()
@@ -83,7 +83,7 @@ class NatsClientRepository:
             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."""
+        """Send a request and get a raw response with retries and backoff."""
         for attempt in range(retries):
             try:
                 await self._ensure_connected()

{h_message_bus-0.0.40 → h_message_bus-0.0.41}/src/h_message_bus/infrastructure/nats_config.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 @dataclass
 class NatsConfig:
     """
-    Configuration class for NATS client.
+    Configuration class for the NATS client.
 
     This class encapsulates the configuration options required for connecting and
     interacting with a NATS (NATS.io) server. It includes options for setting