h-message-bus 0.0.17__py3-none-any.whl → 0.0.18__py3-none-any.whl

h_message_bus/domain/models/request_message_topic.py

@@ -14,9 +14,9 @@ class RequestMessageTopic(str, Enum):
 
     """
     # Telegram
-    AI_SEND_TG_CHAT_SEND = "hai.ai.tg.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"
+    AI_TG_CHAT_SEND = "hai.ai.tg.chat.send"
+    TG_AI_USER_CHAT_SEND = "hai.tg.ai.user.chat.send"
+    AI_TG_CHAT_REPLY = "hai.ai.tg.chat.reply"
 
     # vector database
     AI_VECTORS_SAVE = "hai.ai.vectors.collection.save"

h_message_bus/domain/request_messages/tg_user_message_reply_message.py

@@ -0,0 +1,56 @@
+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 TelegramUserMessageReplyRequestMessage(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, chat_id: int,
+                       message_id: int) -> 'TelegramUserMessageReplyRequestMessage':
+
+        payload = {
+            "message": message,
+            "chat_id": chat_id,
+            "message_id": message_id,
+        }
+
+        return cls.create(
+            topic=RequestMessageTopic.AI_TG_CHAT_REPLY,
+            payload=payload
+        )
+
+    @property
+    def message(self) -> str:
+        """Get the message content from the payload"""
+        return self.payload.get("message", "")
+
+    @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) -> 'TelegramUserMessageReplyRequestMessage':
+        payload = message.payload
+
+        return cls.create_message(
+            message=payload.get("message", ""),
+            chat_id=payload.get("chat_id"),
+            message_id=payload.get("message_id")
+        )
+

h_message_bus/domain/request_messages/tg_user_message_request_message.py

@@ -50,7 +50,7 @@ class TelegramUserMessageRequestMessage(HaiMessage):
             payload["message_id"] = message_id
 
         return cls.create(
-            topic=RequestMessageTopic.TG_USER_SEND_AI_CHAT_SEND,
+            topic=RequestMessageTopic.TG_AI_USER_CHAT_SEND,
             payload=payload
         )
 
@@ -91,7 +91,6 @@ class TelegramUserMessageRequestMessage(HaiMessage):
 
     @classmethod
     def from_hai_message(cls, message: HaiMessage) -> 'TelegramUserMessageRequestMessage':
-        """Create a TelegramUserMessageRequestMessage from a generic HaiMessage"""
         payload = message.payload
 
         return cls.create_message(

h_message_bus/domain/request_messages/vector_query_collection_response_message.py

@@ -1,5 +1,5 @@
 import json
-from typing import Type, TypeVar, Dict, Any, List
+from typing import Type, TypeVar, Dict, Any
 
 from ..models.request_message_topic import RequestMessageTopic
 from ..models.vector_query_answer import VectorQueryAnswer

{h_message_bus-0.0.17.dist-info → h_message_bus-0.0.18.dist-info}/METADATA

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

{h_message_bus-0.0.17.dist-info → h_message_bus-0.0.18.dist-info}/RECORD

@@ -13,22 +13,23 @@ 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=bnq2TH9h8dVwGVN6VgeF_9m9hHHzYS8NSRgA7s5BbRI,1380
+h_message_bus/domain/models/request_message_topic.py,sha256=bg1frk2_X3SHQoTFK-9qzfTgXMh1Tv5U-tqpdqzcdjk,1339
 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/tg_user_message_reply_message.py,sha256=UQRByX4tDEJSoYfVLzbG0vnaVvzx3-_hLjG1eBq9wpg,1780
+h_message_bus/domain/request_messages/tg_user_message_request_message.py,sha256=xg6GBjMYw6FfPC08UBaLulQMxmoqJj6UNjdtFS1Dqtk,3539
 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=CzPweQBwSOrdn0I3qwdmsq7ryZJ07oqYUUVZMS3k798,1776
+h_message_bus/domain/request_messages/vector_query_collection_response_message.py,sha256=j-7RaiZb9i8WI0VIeoAnhzxP0iXaxGUisucaHTcIVtE,1770
 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.17.dist-info/METADATA,sha256=su2iIMFZcqs9z3jTYO3W4f1ivC2ObUAwJhYPNmv1EmQ,8834
-h_message_bus-0.0.17.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-h_message_bus-0.0.17.dist-info/top_level.txt,sha256=BArjhm_lwFR9yJJEIf-LT_X64psuLkXFdbpQRJUreFE,23
-h_message_bus-0.0.17.dist-info/RECORD,,
+h_message_bus-0.0.18.dist-info/METADATA,sha256=p498dQ-mFhEqyoyk-gUUcIylRZ3Lz8Pqs_qfVkaw6xY,8834
+h_message_bus-0.0.18.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+h_message_bus-0.0.18.dist-info/top_level.txt,sha256=BArjhm_lwFR9yJJEIf-LT_X64psuLkXFdbpQRJUreFE,23
+h_message_bus-0.0.18.dist-info/RECORD,,