h-message-bus 0.0.37__tar.gz → 0.0.39__tar.gz

{h_message_bus-0.0.37 → h_message_bus-0.0.39}/PKG-INFO

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

{h_message_bus-0.0.37 → h_message_bus-0.0.39}/pyproject.toml

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

{h_message_bus-0.0.37 → h_message_bus-0.0.39}/src/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-0.0.39/src/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-0.0.39/src/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-0.0.37 → h_message_bus-0.0.39}/src/h_message_bus/domain/request_messages/twitter_user_tweets_response_message.py

@@ -77,7 +77,7 @@ class TwitterUserTweetsResponseMessage(HaiMessage):
                 "view_count": message.view_count,
                 "retweet_count": message.retweet_count,
                 "reply_count": message.reply_count,
-                "user": message.user.to_dict() if user else None,
+                "user": message.user,
             }
 
             tweets.append(tweet_data)

{h_message_bus-0.0.37 → h_message_bus-0.0.39}/src/h_message_bus.egg-info/PKG-INFO

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

{h_message_bus-0.0.37 → h_message_bus-0.0.39}/src/h_message_bus.egg-info/SOURCES.txt

@@ -63,6 +63,8 @@ src/h_message_bus/domain/request_messages/twitter_reply_request_message.py
 src/h_message_bus/domain/request_messages/twitter_reply_response_message.py
 src/h_message_bus/domain/request_messages/twitter_retweet_request_message.py
 src/h_message_bus/domain/request_messages/twitter_retweet_response_message.py
+src/h_message_bus/domain/request_messages/twitter_search_request_message.py
+src/h_message_bus/domain/request_messages/twitter_search_response_message.py
 src/h_message_bus/domain/request_messages/twitter_user_tweets_request_message.py
 src/h_message_bus/domain/request_messages/twitter_user_tweets_response_message.py
 src/h_message_bus/domain/request_messages/vector_query_collection_request_message.py