h-message-bus 0.0.19__py3-none-any.whl → 0.0.21__py3-none-any.whl

h_message_bus/domain/models/request_message_topic.py

@@ -14,22 +14,32 @@ class RequestMessageTopic(str, Enum):
 
     """
     # Telegram
-    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"
+    TG_CHAT_SEND = "hai.tg.chat.send"
+    TG_USER_CHAT_SEND = "hai.tg.user.chat.send"
+    TG_CHAT_REPLY = "hai.tg.chat.reply"
 
     # vector database
-    AI_VECTORS_SAVE = "hai.ai.vectors.collection.save"
+    VECTORS_SAVE = "hai.vectors.save"
 
-    AI_VECTORS_QUERY = "hai.ai.vectors.collection.query"
-    AI_VECTORS_QUERY_RESPONSE = "hai.ai.vectors.collection.query.response"
+    VECTORS_QUERY = "hai.vectors.query"
+    VECTORS_QUERY_RESPONSE = "hai.vectors.query.response"
 
-    AI_VECTORS_METADATA_READ = "hai.ai.vectors.metadata.read"
-    AI_VECTORS_METADATA_READ_RESPONSE = "hai.ai.vectors.metadata.read.response"
+    VECTORS_METADATA_READ = "hai.vectors.metadata.read"
+    VECTORS_METADATA_READ_RESPONSE = "hai.vectors.metadata.read.response"
 
     # Twitter
-    AI_TWITTER_GET_USER = "hai.ai.twitter.get.user"
-    AI_TWITTER_GET_USER_RESPONSE = "hai.ai.twitter.get.user.response"
+    TWITTER_GET_USER = "hai.twitter.get.user"
+    TWITTER_GET_USER_RESPONSE = "hai.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"
+    TWITTER_USER_SEND_AI_CHAT_SEND = "hai.twitter.user.chat.send"
+    TWITTER_USER_SEND_AI_CHAT_SEND_RESPONSE = "hai.twitter.user.chat.send.response"
+
+    # tools
+    WEB_SEARCH = "hai.tools.web.search"
+    WEB_SEARCH_RESPONSE = "hai.tools.web.search.response"
+
+    WEB_GET_DOCS = "hai.tools.web.get.docs"
+    WEB_GET_DOCS_RESPONSE = "hai.tools.web.get.docs.response"
+
+    WEB_FIND_RELATED = "hai.tools.web.find.related"
+    WEB_FIND_RELATED_RESPONSE = "hai.tools.web.find.related.response"

h_message_bus/domain/request_messages/tg_message_request_message.py

@@ -23,7 +23,7 @@ class TelegramMessageRequestMessage(HaiMessage):
         }
 
         return cls.create(
-            topic=RequestMessageTopic.AI_TG_CHAT_SEND,
+            topic=RequestMessageTopic.TG_CHAT_SEND,
             payload=payload
         )
 

h_message_bus/domain/request_messages/tg_user_message_reply_request_message.py

@@ -25,7 +25,7 @@ class TelegramUserMessageReplyRequestMessage(HaiMessage):
         }
 
         return cls.create(
-            topic=RequestMessageTopic.AI_TG_CHAT_REPLY,
+            topic=RequestMessageTopic.TG_CHAT_REPLY,
             payload=payload
         )
 

h_message_bus/domain/request_messages/tg_user_message_request_message.py

@@ -16,16 +16,15 @@ class TelegramUserMessageRequestMessage(HaiMessage):
 
     @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':
+                       chat_id: str,
+                       message_id: str,
+                       replied_to_text: Optional[str] = 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
@@ -37,20 +36,15 @@ class TelegramUserMessageRequestMessage(HaiMessage):
             "message": message,
             "user_id": user_id,
             "username": username,
-            "source": source
+            "chat_id" : chat_id,
+            "message_id" : message_id
         }
 
         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_AI_USER_CHAT_SEND,
+            topic=RequestMessageTopic.TG_USER_CHAT_SEND,
             payload=payload
         )
 
@@ -69,11 +63,6 @@ class TelegramUserMessageRequestMessage(HaiMessage):
         """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"""
@@ -97,7 +86,6 @@ class TelegramUserMessageRequestMessage(HaiMessage):
             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/twitter_get_user_request_message.py

@@ -17,7 +17,7 @@ class TwitterGetUserRequestMessage(HaiMessage):
     def create_message(cls, username: str) -> 'TwitterGetUserRequestMessage':
         """Create a message requesting Twitter user data"""
         return cls.create(
-            topic=RequestMessageTopic.AI_TWITTER_GET_USER,
+            topic=RequestMessageTopic.TWITTER_GET_USER,
             payload={"username": username},
         )
 

h_message_bus/domain/request_messages/twitter_get_user_response_message.py

@@ -17,7 +17,7 @@ class TwitterGetUserResponseMessage(HaiMessage):
     def create_message(cls, user_id: str, screen_name: str, description: str, followers_count: str, like_count: str, is_verified: str, url: str, bio_urls: [str]) -> 'TwitterGetUserResponseMessage':
         """Create a response message from Twitter user information"""
         return cls.create(
-            topic=RequestMessageTopic.AI_TWITTER_GET_USER_RESPONSE,
+            topic=RequestMessageTopic.TWITTER_GET_USER_RESPONSE,
             payload={
                 'id': user_id,
                 'screen_name': screen_name,

h_message_bus/domain/request_messages/vector_query_collection_request_message.py

@@ -17,7 +17,7 @@ class VectorQueryCollectionRequestMessage(HaiMessage):
     def create_message(cls, collection_name: str, query: str, top_n: str) -> 'VectorQueryCollectionRequestMessage':
         """Create a message requesting Twitter user data"""
         return cls.create(
-            topic=RequestMessageTopic.AI_VECTORS_QUERY,
+            topic=RequestMessageTopic.VECTORS_QUERY,
             payload={
                 "collection_name": collection_name,
                 "query": query,

h_message_bus/domain/request_messages/vector_query_collection_response_message.py

@@ -20,7 +20,7 @@ class VectorQueryCollectionResponseMessage(HaiMessage):
         """Create a message requesting Twitter user data"""
         result_list = json.dumps(result)
         return cls.create(
-            topic=RequestMessageTopic.AI_VECTORS_QUERY_RESPONSE,
+            topic=RequestMessageTopic.VECTORS_QUERY_RESPONSE,
             payload={
                 "result": result_list,
             },

h_message_bus/domain/request_messages/vector_read_metadata_request_message.py

@@ -16,7 +16,7 @@ class VectorReadMetaDataRequestMessage(HaiMessage):
     def create_message(cls) -> 'VectorReadMetaDataRequestMessage':
         """Create a message requesting Twitter user data"""
         return cls.create(
-            topic=RequestMessageTopic.AI_VECTORS_METADATA_READ,
+            topic=RequestMessageTopic.VECTORS_METADATA_READ,
             payload={},
         )
 

h_message_bus/domain/request_messages/vector_read_metadata_response_message.py

@@ -19,7 +19,7 @@ class VectorReadMetaDataResponseMessage(HaiMessage):
     def create_message(cls, metadata: List[dict[str, str]]) -> 'VectorReadMetaDataResponseMessage':
         metadata_result = json.dumps(metadata)
         return cls.create(
-            topic=RequestMessageTopic.AI_VECTORS_METADATA_READ_RESPONSE,
+            topic=RequestMessageTopic.VECTORS_METADATA_READ_RESPONSE,
             payload={
                 "metadata": metadata_result,
             },

h_message_bus/domain/request_messages/vector_save_request_message.py

@@ -17,7 +17,7 @@ class VectorSaveRequestMessage(HaiMessage):
     def create_message(cls, collection_name: str, document_id: str, content: str, metadata: dict[str,str]) -> 'VectorSaveRequestMessage':
         """Create a message requesting Twitter user data"""
         return cls.create(
-            topic=RequestMessageTopic.AI_VECTORS_SAVE,
+            topic=RequestMessageTopic.VECTORS_SAVE,
             payload={
                 "collection_name": collection_name,
                 "document_id": document_id,
@@ -28,27 +28,27 @@ class VectorSaveRequestMessage(HaiMessage):
 
     @property
     def collection_name(self) -> str:
-        """Get the collection name from payload"""
+        """Get the collection name from the payload"""
         return self.payload.get("collection_name")
 
     @property
     def document_id(self) -> str:
-        """Get the document ID from payload"""
+        """Get the document ID from the payload"""
         return self.payload.get("document_id")
 
     @property
     def content(self) -> str:
-        """Get the content from payload"""
+        """Get the content from the payload"""
         return self.payload.get("content")
 
     @property
     def metadata(self) -> dict[str, str]:
-        """Get the metadata from payload"""
+        """Get the metadata from the payload"""
         return self.payload.get("metadata")
 
     @classmethod
     def from_hai_message(cls, message: HaiMessage) -> 'VectorSaveRequestMessage':
-        # Extract necessary fields from the message payload
+        # Extract the necessary fields from the message payload
         payload = message.payload
 
         return cls.create_message(

h_message_bus/domain/request_messages/web_get_docs_request_message.py

@@ -0,0 +1,46 @@
+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 WebGetDocsRequestMessage(HaiMessage):
+
+    @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, collection_name: str, twitter_user: Optional[str], root_url: Optional[str]) -> 'WebGetDocsRequestMessage':
+        return cls.create(
+            topic=RequestMessageTopic.WEB_GET_DOCS,
+            payload={
+                "twitter_user": twitter_user,
+                "root_url": root_url,
+                "collection_name": collection_name,
+            },
+        )
+
+    @property
+    def twitter_user(self) -> str:
+        return self.payload.get("twitter_user", "")
+
+    @property
+    def root_url(self) -> str:
+        return self.payload.get("root_url", "")
+
+    @property
+    def collection_name(self) -> str:
+        return self.payload.get("collection_name", "")
+
+    @classmethod
+    def from_hai_message(cls, message: HaiMessage) -> 'WebGetDocsRequestMessage':
+        payload = message.payload
+
+        return cls.create_message(
+            twitter_user=payload.get("twitter_user", ""),
+            root_url=payload.get("root_url", ""),
+            collection_name=payload.get("collection_name", "")
+        )

h_message_bus/domain/request_messages/web_search_request_message.py

@@ -0,0 +1,32 @@
+from typing import Type, TypeVar, Dict, Any
+
+from ..models.request_message_topic import RequestMessageTopic
+from ...domain.models.hai_message import HaiMessage
+
+T = TypeVar('T', bound='HaiMessage')
+
+class WebSearchRequestMessage(HaiMessage):
+
+    @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) -> 'WebSearchRequestMessage':
+        return cls.create(
+            topic=RequestMessageTopic.WEB_SEARCH,
+            payload={"query": query},
+        )
+
+    @property
+    def query(self) -> str:
+        return self.payload.get("query", "")
+
+    @classmethod
+    def from_hai_message(cls, message: HaiMessage) -> 'WebSearchRequestMessage':
+        payload = message.payload
+
+        return cls.create_message(
+        query=payload.get("query", "")
+        )

{h_message_bus-0.0.19.dist-info → h_message_bus-0.0.21.dist-info}/METADATA

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

{h_message_bus-0.0.19.dist-info → h_message_bus-0.0.21.dist-info}/RECORD

@@ -13,24 +13,26 @@ 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=bg1frk2_X3SHQoTFK-9qzfTgXMh1Tv5U-tqpdqzcdjk,1339
+h_message_bus/domain/models/request_message_topic.py,sha256=u83SNRAi0yEuCP4yx9a0rlINjrZtgakzO3jyM3qH9Tk,1591
 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_message_request_message.py,sha256=J0q0u5kWWXuEeKx3dptDfO53rXczZYn-52_BPwwjOtg,1460
-h_message_bus/domain/request_messages/tg_user_message_reply_request_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=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/domain/request_messages/tg_message_request_message.py,sha256=0J_PUA9wr0wZEjVBwgAA5YN-RiNEE54bnzyCvheLkmc,1457
+h_message_bus/domain/request_messages/tg_user_message_reply_request_message.py,sha256=XQ4IfaPVaKoagCASxuDHvsqH4nIWE0mAKan_Z6_kba8,1777
+h_message_bus/domain/request_messages/tg_user_message_request_message.py,sha256=pHmmGJpMEnwzbTVVvoD6UOMflQOuQKgErZA9MyRwWt8,3121
+h_message_bus/domain/request_messages/twitter_get_user_request_message.py,sha256=OfC93X1M0vgMU26BBrpA7AdlY32IFdVG_vRT8BdhQOc,1209
+h_message_bus/domain/request_messages/twitter_get_user_response_message.py,sha256=dXhK_JN3Sz6hN8EpDcj7gq6htJ8Yu5G-Cal73XXcEng,3299
+h_message_bus/domain/request_messages/vector_query_collection_request_message.py,sha256=x1J8SLVBlNS4TFzVJY9UG7mo94l9i4azndwzAlyktZw,1800
+h_message_bus/domain/request_messages/vector_query_collection_response_message.py,sha256=Q589JT_QE-oVsTh1GEmK__3Hct7ijfM1UTcPi0YTGn8,1767
+h_message_bus/domain/request_messages/vector_read_metadata_request_message.py,sha256=P9t6pcynS112F9_Jmbvw8wlfXhs5NOnV48SUVq92xt8,873
+h_message_bus/domain/request_messages/vector_read_metadata_response_message.py,sha256=G2TDV_lbUM7RVrvEaYQAP-3I36J0pqLXqxnqwVBMWhk,1648
+h_message_bus/domain/request_messages/vector_save_request_message.py,sha256=NvRdSUtE-X3sQTfJg7_QLic3PtbpgYUH2lQrNSC1ggg,2115
+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=lAapNaL0rqBr-9KaHcexuo5XLmSWRWspkJWXS9dMqPU,3371
 h_message_bus/infrastructure/nats_config.py,sha256=Yzqqd1bCfmUv_4FOnA1dvqIpakzV0BUL2_nXQcndWvo,1304
-h_message_bus-0.0.19.dist-info/METADATA,sha256=PlyIETAeGDKQrTjz9ie2h76YJ8bV7RoIIpP9O9wcfeM,8834
-h_message_bus-0.0.19.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-h_message_bus-0.0.19.dist-info/top_level.txt,sha256=BArjhm_lwFR9yJJEIf-LT_X64psuLkXFdbpQRJUreFE,23
-h_message_bus-0.0.19.dist-info/RECORD,,
+h_message_bus-0.0.21.dist-info/METADATA,sha256=rCEt6dni8N0eYbhjxkcJy57eGY98-ZIMS3uffWDqdzE,8834
+h_message_bus-0.0.21.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+h_message_bus-0.0.21.dist-info/top_level.txt,sha256=BArjhm_lwFR9yJJEIf-LT_X64psuLkXFdbpQRJUreFE,23
+h_message_bus-0.0.21.dist-info/RECORD,,

{h_message_bus-0.0.19.dist-info → h_message_bus-0.0.21.dist-info}/WHEEL

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