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

h_message_bus/domain/models/request_message_topic.py

@@ -59,6 +59,9 @@ class RequestMessageTopic(str, Enum):
     TWITTER_GET_TWEET= "hai.twitter.get.tweet"
     TWITTER_GET_TWEET_RESPONSE = "hai.twitter.get.tweet.response"
 
+    TWITTER_SEARCH= "hai.twitter.search"
+    TWITTER_SEARCH_RESPONSE = "hai.twitter.search.response"
+
     # tools
     WEB_SEARCH = "hai.tools.web.search"
     WEB_SEARCH_RESPONSE = "hai.tools.web.search.response"

h_message_bus/domain/request_messages/twitter_search_request_message.py

@@ -0,0 +1,73 @@
+from typing import Dict, Any, Type, TypeVar, Optional, Literal, cast
+
+from ..models.request_message_topic import RequestMessageTopic
+from ...domain.models.hai_message import HaiMessage
+
+T = TypeVar('T', bound='HaiMessage')
+
+
+class TwitterSearchRequestMessage(HaiMessage):
+    """Message to request Twitter search"""
+
+    @classmethod
+    def create(cls: Type[T], topic: str, payload: Dict[Any, Any]) -> T:
+        """Create a message - inherited from HaiMessage"""
+        return super().create(topic=topic, payload=payload)
+
+    @classmethod
+    def create_message(
+            cls,
+            query: str,
+            max_results: int = 10,
+            min_view_count: int = 50,
+            sort_order: Literal["relevancy", "recency"] = "relevancy"
+    ) -> 'TwitterSearchRequestMessage':
+        """Create a message requesting Twitter search"""
+        return cls.create(
+            topic=RequestMessageTopic.TWITTER_SEARCH,
+            payload={
+                "query": query,
+                "max_results": max_results,
+                "min_view_count": min_view_count,
+                "sort_order": sort_order
+            },
+        )
+
+    @property
+    def query(self) -> str:
+        """Get the search query from the payload"""
+        return self.payload.get("query", "")
+
+    @property
+    def max_results(self) -> int:
+        """Get the maximum number of results from the payload"""
+        return self.payload.get("max_results", 10)
+
+    @property
+    def min_view_count(self) -> int:
+        """Get the minimum view count from the payload"""
+        return self.payload.get("min_view_count", 50)
+
+    @property
+    def sort_order(self) -> Literal["relevancy", "recency"]:
+        """Get the sort order from the payload"""
+        sort_order_str = self.payload.get("sort_order", "relevancy")
+        if sort_order_str not in ("relevancy", "recency"):
+            sort_order_str = "relevancy"
+        return cast(Literal["relevancy", "recency"], sort_order_str)
+
+    @classmethod
+    def from_hai_message(cls, message: HaiMessage) -> 'TwitterSearchRequestMessage':
+        """Create a TwitterSearchRequestMessage from a HaiMessage"""
+        payload = message.payload
+        query = payload.get("query", "")
+        max_results = payload.get("max_results", 10)
+        min_view_count = payload.get("min_view_count", 50)
+        sort_order = payload.get("sort_order", "relevancy")
+
+        return cls.create_message(
+            query=query,
+            max_results=max_results,
+            min_view_count=min_view_count,
+            sort_order=sort_order
+        )

h_message_bus/domain/request_messages/twitter_search_response_message.py

@@ -0,0 +1,73 @@
+from typing import Dict, Any, Type, TypeVar, List, Optional
+import json
+
+from ..models.request_message_topic import RequestMessageTopic
+from ...domain.models.hai_message import HaiMessage
+
+T = TypeVar('T', bound='HaiMessage')
+
+
+class TwitterSearchResponseMessage(HaiMessage):
+    """Message containing Twitter search results"""
+
+    @classmethod
+    def create(cls: Type[T], topic: str, payload: Dict[Any, Any]) -> T:
+        """Create a message - inherited from HaiMessage"""
+        return super().create(topic=topic, payload=payload)
+
+    @classmethod
+    def create_message(
+            cls,
+            query: str,
+            results: List[Dict[str, Any]],
+            result_count: int,
+            request_id: str
+    ) -> 'TwitterSearchResponseMessage':
+        """Create a message containing Twitter search results"""
+        return cls.create(
+            topic=RequestMessageTopic.TWITTER_SEARCH_RESPONSE,
+            payload={
+                "query": query,
+                "results": json.dumps(results),
+                "result_count": result_count,
+                "request_id": request_id
+            },
+        )
+
+    @property
+    def query(self) -> str:
+        """Get the search query from the payload"""
+        return self.payload.get("query", "")
+
+    @property
+    def result_count(self) -> int:
+        """Get the number of results from the payload"""
+        return self.payload.get("result_count", 0)
+
+    @property
+    def request_id(self) -> str:
+        """Get the original request ID from the payload"""
+        return self.payload.get("request_id", "")
+
+    @property
+    def results(self) -> List[Dict[str, Any]]:
+        """Get the search results from the payload"""
+        results_json = self.payload.get("results", "[]")
+        return json.loads(results_json)
+
+    @classmethod
+    def from_hai_message(cls, message: HaiMessage) -> 'TwitterSearchResponseMessage':
+        """Create a TwitterSearchResponseMessage from a HaiMessage"""
+        payload = message.payload
+        query = payload.get("query", "")
+        results_json = payload.get("results", "[]")
+        results = json.loads(results_json)
+        result_count = payload.get("result_count", 0)
+        request_id = payload.get("request_id", "")
+
+        return cls.create_message(
+            query=query,
+            results=results,
+            result_count=result_count,
+            request_id=request_id
+        )

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.38.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.38
+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.38.dist-info → h_message_bus-0.0.40.dist-info}/RECORD

@@ -13,7 +13,7 @@ h_message_bus/domain/event_messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 h_message_bus/domain/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 h_message_bus/domain/models/event_message_topic.py,sha256=fSjRMBwMD2RE9GBUud38XMrgLZcngURERrbuoAhQ0Hk,717
 h_message_bus/domain/models/hai_message.py,sha256=b5CfX7hi5uNq77IVnZzEi9iotc4b_U2MNYwV6JY7JcU,2146
-h_message_bus/domain/models/request_message_topic.py,sha256=JuSCMlm1hc6lrw-zu7oR5RuOGAOKsI-4NThO4BUiiwo,4000
+h_message_bus/domain/models/request_message_topic.py,sha256=a4V_D5tZX6iWUwl9hdfcplxvTzqK1GkKDDlhfN-4wE8,4105
 h_message_bus/domain/models/twitter_message_metadata.py,sha256=Cj0dSVQi0Com9nPlJeEM0c-ZAQKGqIq_txvdzYg0myw,1203
 h_message_bus/domain/models/twitter_user_metadata.py,sha256=N7GVyn2txmlMQ19aatNh7lvzO6FNSj4dKVujestha9o,2827
 h_message_bus/domain/models/vector_collection_metadata.py,sha256=fSy3ZQ-zkYISTpc-_M6XWf1JkufVAlzlS2ZT60TzA2s,891
@@ -56,6 +56,8 @@ h_message_bus/domain/request_messages/twitter_reply_request_message.py,sha256=7m
 h_message_bus/domain/request_messages/twitter_reply_response_message.py,sha256=6_yQzPSnbueYM3aDsh5GNPr_QRSonY4VA5LqB5ZpCtQ,2061
 h_message_bus/domain/request_messages/twitter_retweet_request_message.py,sha256=UHnLrgnqgZixb2q5ugFEHcCJxNkuTzrToGCEVoXm4gU,1423
 h_message_bus/domain/request_messages/twitter_retweet_response_message.py,sha256=OGanRbX7AcKJ35H01wvp0XvuL-Chhm7f5J6NSpGq7uQ,1616
+h_message_bus/domain/request_messages/twitter_search_request_message.py,sha256=9gKYMAO0CFVY3aS6Il2iQ5VLFo8GMXeuVdcVutJf-dk,2651
+h_message_bus/domain/request_messages/twitter_search_response_message.py,sha256=P0MagAKNIXQrhT68oeOFoogY1p5IbDYkKloguX4O9vg,2493
 h_message_bus/domain/request_messages/twitter_user_tweets_request_message.py,sha256=9vAhRxbCCDTqQNNKgp5cDIkiGIsnHwRSOwc6PK6TmcA,2397
 h_message_bus/domain/request_messages/twitter_user_tweets_response_message.py,sha256=1oMoefXWq8C3_3xEQ3FBWQU-ATiUTYxEzOmqDuidtDU,3171
 h_message_bus/domain/request_messages/vector_query_collection_request_message.py,sha256=x1J8SLVBlNS4TFzVJY9UG7mo94l9i4azndwzAlyktZw,1800
@@ -66,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.38.dist-info/METADATA,sha256=CsXjqU0K8-Qim6OXmf56dnlgCNg04BlFWgr4itL-wd4,8834
-h_message_bus-0.0.38.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-h_message_bus-0.0.38.dist-info/top_level.txt,sha256=BArjhm_lwFR9yJJEIf-LT_X64psuLkXFdbpQRJUreFE,23
-h_message_bus-0.0.38.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.38.dist-info → h_message_bus-0.0.40.dist-info}/WHEEL

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