h-message-bus 0.0.14__py3-none-any.whl → 0.0.16__py3-none-any.whl

h_message_bus/domain/models/request_message_topic.py

@@ -15,7 +15,8 @@ class RequestMessageTopic(str, Enum):
     """
     # Telegram
     AI_SEND_TG_CHAT_SEND = "hai.ai.tg.chat.send"
-    TG_SEND_AI_CHAT_SEND = "hai.tg.ai.chat.send"
+    TG_USER_SEND_AI_CHAT_SEND = "hai.tg.user.ai.chat.send"
+    TG_USER_SEND_AI_CHAT_SEND_RESPONSE = "hai.tg.user.ai.chat.send.response"
 
     # vector database
     AI_VECTORS_SAVE = "hai.ai.vectors.collection.save"
@@ -28,4 +29,7 @@ class RequestMessageTopic(str, Enum):
 
     # Twitter
     AI_TWITTER_GET_USER = "hai.ai.twitter.get.user"
-    AI_TWITTER_GET_USER_RESPONSE = "hai.ai.twitter.get.user.response"
+    AI_TWITTER_GET_USER_RESPONSE = "hai.ai.twitter.get.user.response"
+
+    TWITTER_USER_SEND_AI_CHAT_SEND = "hai.twitter.user.ai.chat.send"
+    TWITTER_USER_SEND_AI_CHAT_SEND_RESPONSE = "hai.twitter.user.ai.chat.send.response"

h_message_bus/domain/request_messages/tg_user_message_request_message.py

@@ -0,0 +1,106 @@
+from typing import Type, TypeVar, Dict, Any, Optional
+
+from ..models.request_message_topic import RequestMessageTopic
+from ...domain.models.hai_message import HaiMessage
+
+T = TypeVar('T', bound='HaiMessage')
+
+
+class TelegramUserMessageRequestMessage(HaiMessage):
+    """Message containing user message data"""
+
+    @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, message: str, user_id: str, username: str,
+                       source: str = "", replied_to_text: Optional[str] = None,
+                       chat_id: Optional[int] = None,
+                       message_id: Optional[int] = None) -> 'TelegramUserMessageRequestMessage':
+        """Create a message with user message data
+
+        Args:
+            message: The cleaned message content
+            user_id: The ID of the user
+            username: The username of the user
+            source: The source of the message
+            replied_to_text: The text being replied to, if any
+            chat_id: The Telegram chat ID
+            message_id: The Telegram message ID
+
+        Returns:
+            A new TelegramUserMessageRequestMessage instance
+        """
+        payload = {
+            "message": message,
+            "user_id": user_id,
+            "username": username,
+            "source": source
+        }
+
+        if replied_to_text:
+            payload["replied_to_text"] = replied_to_text
+
+        if chat_id is not None:
+            payload["chat_id"] = chat_id
+
+        if message_id is not None:
+            payload["message_id"] = message_id
+
+        return cls.create(
+            topic=RequestMessageTopic.TG_USER_SEND_AI_CHAT_SEND,
+            payload=payload
+        )
+
+    @property
+    def message(self) -> str:
+        """Get the message content from the payload"""
+        return self.payload.get("message", "")
+
+    @property
+    def user_id(self) -> str:
+        """Get the user ID from the payload"""
+        return self.payload.get("user_id", "")
+
+    @property
+    def username(self) -> str:
+        """Get the username from the payload"""
+        return self.payload.get("username", "")
+
+    @property
+    def source(self) -> str:
+        """Get the message source from the payload"""
+        return self.payload.get("source", "")
+
+    @property
+    def replied_to_text(self) -> str:
+        """Get the replied to text from the payload"""
+        return self.payload.get("replied_to_text", "")
+
+    @property
+    def chat_id(self) -> int:
+        """Get the Telegram chat ID from the payload"""
+        return self.payload.get("chat_id", 0)
+
+    @property
+    def message_id(self) -> int:
+        """Get the Telegram message ID from the payload"""
+        return self.payload.get("message_id", 0)
+
+    @classmethod
+    def from_hai_message(cls, message: HaiMessage) -> 'TelegramUserMessageRequestMessage':
+        """Create a TelegramUserMessageRequestMessage from a generic HaiMessage"""
+        payload = message.payload
+
+        return cls.create_message(
+            message=payload.get("message", ""),
+            user_id=payload.get("user_id", ""),
+            username=payload.get("username", ""),
+            source=payload.get("source", ""),
+            replied_to_text=payload.get("replied_to_text", ""),
+            chat_id=payload.get("chat_id"),
+            message_id=payload.get("message_id")
+        )
+

h_message_bus/domain/request_messages/vector_query_collection_response_message.py

@@ -16,7 +16,7 @@ class VectorQueryCollectionResponseMessage(HaiMessage):
         return super().create(topic=topic, payload=payload)
 
     @classmethod
-    def create_message(cls, result: List[dict[str, str]]) -> 'VectorQueryCollectionResponseMessage':
+    def create_message(cls, result: dict[int, dict[str, str]]) -> 'VectorQueryCollectionResponseMessage':
         """Create a message requesting Twitter user data"""
         result_list = json.dumps(result)
         return cls.create(

h_message_bus/domain/request_messages/vector_read_metadata_request_message.py

@@ -21,5 +21,5 @@ class VectorReadMetaDataRequestMessage(HaiMessage):
         )
 
     @classmethod
-    def from_hai_message(cls, message: HaiMessage) -> 'VectorReadMetaDataRequestMessage':
+    def from_hai_message(cls) -> 'VectorReadMetaDataRequestMessage':
         return cls.create_message()

{h_message_bus-0.0.14.dist-info → h_message_bus-0.0.16.dist-info}/METADATA

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

{h_message_bus-0.0.14.dist-info → h_message_bus-0.0.16.dist-info}/RECORD

@@ -13,21 +13,22 @@ 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=5wCJzOFQjHG5bwlNbQzmMAFpVLZYPdPcKTXQMsAjC5M,1132
+h_message_bus/domain/models/request_message_topic.py,sha256=bnq2TH9h8dVwGVN6VgeF_9m9hHHzYS8NSRgA7s5BbRI,1380
 h_message_bus/domain/models/vector_collection_metadata.py,sha256=fSy3ZQ-zkYISTpc-_M6XWf1JkufVAlzlS2ZT60TzA2s,891
 h_message_bus/domain/models/vector_query_answer.py,sha256=V1JR5Di7kIVbRF_eq2uPOhDnkZpQvo9pxD41V7MNV7Q,551
 h_message_bus/domain/request_messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+h_message_bus/domain/request_messages/tg_user_message_request_message.py,sha256=2ZQarcQEBWk2miDhgGx-p7htJ4vrqbsWtxuU6RRyf6U,3628
 h_message_bus/domain/request_messages/twitter_get_user_request_message.py,sha256=BX-ytvnEzL9u1Yks5iXIx60Hmv3UP7asOG2uYA0mfgE,1212
 h_message_bus/domain/request_messages/twitter_get_user_response_message.py,sha256=qO1cLtEmZyddv5pXHNgpnpO5t3Oex8cOG0hjGhOfru8,3302
 h_message_bus/domain/request_messages/vector_query_collection_request_message.py,sha256=6zne_IFs4aHZ_hJqbXGAaNU8PMilSVKSAg5G_jzane0,1803
-h_message_bus/domain/request_messages/vector_query_collection_response_message.py,sha256=8TtLrgxnQj3w7OqEzegykCfk2aobGVJySxiWRgbIfeQ,1771
-h_message_bus/domain/request_messages/vector_read_metadata_request_message.py,sha256=l321y6ffLOvGESRDalBXtzcOG4qq_iy3a_j4uZ_R5KY,897
+h_message_bus/domain/request_messages/vector_query_collection_response_message.py,sha256=CzPweQBwSOrdn0I3qwdmsq7ryZJ07oqYUUVZMS3k798,1776
+h_message_bus/domain/request_messages/vector_read_metadata_request_message.py,sha256=uDC6ANcGRvLzGYzEGGoGA6OLDJuHGnxCwvvCUEk4mUs,876
 h_message_bus/domain/request_messages/vector_read_metadata_response_message.py,sha256=ecsSiE-0Uar3tqDtwvPGyu352nuW9FDIqwAjQvnPHDI,1651
 h_message_bus/domain/request_messages/vector_save_request_message.py,sha256=Jd52Kc0OLsPLphfZtTesK6J1KqctC7Vm_0lmVxd99Ss,2098
 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_config.py,sha256=Yzqqd1bCfmUv_4FOnA1dvqIpakzV0BUL2_nXQcndWvo,1304
-h_message_bus-0.0.14.dist-info/METADATA,sha256=JZp3eFWrSFtJ7GVTvRQPKjEFw6WV5b5cWgkIuucwjsE,8834
-h_message_bus-0.0.14.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-h_message_bus-0.0.14.dist-info/top_level.txt,sha256=BArjhm_lwFR9yJJEIf-LT_X64psuLkXFdbpQRJUreFE,23
-h_message_bus-0.0.14.dist-info/RECORD,,
+h_message_bus-0.0.16.dist-info/METADATA,sha256=yAyZcq0lCykyUwLOiGhi1l5zDDo7X_A7RAnMZbknUfg,8834
+h_message_bus-0.0.16.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+h_message_bus-0.0.16.dist-info/top_level.txt,sha256=BArjhm_lwFR9yJJEIf-LT_X64psuLkXFdbpQRJUreFE,23
+h_message_bus-0.0.16.dist-info/RECORD,,