h-message-bus 0.0.18__tar.gz → 0.0.20__tar.gz

{h_message_bus-0.0.18 → h_message_bus-0.0.20}/PKG-INFO

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

{h_message_bus-0.0.18 → h_message_bus-0.0.20}/pyproject.toml

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

h_message_bus-0.0.20/src/h_message_bus/domain/models/request_message_topic.py

@@ -0,0 +1,45 @@
+from enum import Enum
+
+
+class RequestMessageTopic(str, Enum):
+    """
+    Represents a collection of predefined topics as an enumeration.
+
+    This class is an enumeration that defines constant string values for use
+    as topic identifiers. These topics represent specific actions or messages
+    within a messaging or vector database management context. It ensures
+    consistent usage of these predefined topics across the application.
+
+    syntax: [hai].[source].[destination].[action]
+
+    """
+    # Telegram
+    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
+    VECTORS_SAVE = "hai.vectors.save"
+
+    VECTORS_QUERY = "hai.vectors.query"
+    VECTORS_QUERY_RESPONSE = "hai.vectors.query.response"
+
+    VECTORS_METADATA_READ = "hai.vectors.metadata.read"
+    VECTORS_METADATA_READ_RESPONSE = "hai.vectors.metadata.read.response"
+
+    # Twitter
+    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.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-0.0.20/src/h_message_bus/domain/request_messages/tg_message_request_message.py

@@ -0,0 +1,48 @@
+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 TelegramMessageRequestMessage(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) -> 'TelegramMessageRequestMessage':
+
+        payload = {
+            "message": message,
+            "chat_id": chat_id,
+        }
+
+        return cls.create(
+            topic=RequestMessageTopic.TG_CHAT_SEND,
+            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)
+
+    @classmethod
+    def from_hai_message(cls, message: HaiMessage) -> 'TelegramMessageRequestMessage':
+        payload = message.payload
+
+        return cls.create_message(
+            message=payload.get("message", ""),
+            chat_id=payload.get("chat_id")
+        )
+

h_message_bus-0.0.18/src/h_message_bus/domain/request_messages/tg_user_message_reply_message.py → h_message_bus-0.0.20/src/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-0.0.18 → h_message_bus-0.0.20}/src/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-0.0.18 → h_message_bus-0.0.20}/src/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-0.0.18 → h_message_bus-0.0.20}/src/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-0.0.18 → h_message_bus-0.0.20}/src/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-0.0.18 → h_message_bus-0.0.20}/src/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-0.0.18 → h_message_bus-0.0.20}/src/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-0.0.18 → h_message_bus-0.0.20}/src/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-0.0.18 → h_message_bus-0.0.20}/src/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-0.0.20/src/h_message_bus/domain/request_messages/web_get_docs_request_message.py

@@ -0,0 +1,40 @@
+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, 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,
+            },
+        )
+
+    @property
+    def twitter_user(self) -> str:
+        return self.payload.get("twitter_user", "")
+
+    @property
+    def root_url(self) -> str:
+        return self.payload.get("root_url", "")
+
+    @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", "")
+        )

h_message_bus-0.0.20/src/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.18 → h_message_bus-0.0.20}/src/h_message_bus.egg-info/PKG-INFO

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

{h_message_bus-0.0.18 → h_message_bus-0.0.20}/src/h_message_bus.egg-info/SOURCES.txt

@@ -24,7 +24,8 @@ src/h_message_bus/domain/models/request_message_topic.py
 src/h_message_bus/domain/models/vector_collection_metadata.py
 src/h_message_bus/domain/models/vector_query_answer.py
 src/h_message_bus/domain/request_messages/__init__.py
-src/h_message_bus/domain/request_messages/tg_user_message_reply_message.py
+src/h_message_bus/domain/request_messages/tg_message_request_message.py
+src/h_message_bus/domain/request_messages/tg_user_message_reply_request_message.py
 src/h_message_bus/domain/request_messages/tg_user_message_request_message.py
 src/h_message_bus/domain/request_messages/twitter_get_user_request_message.py
 src/h_message_bus/domain/request_messages/twitter_get_user_response_message.py
@@ -33,6 +34,8 @@ src/h_message_bus/domain/request_messages/vector_query_collection_response_messa
 src/h_message_bus/domain/request_messages/vector_read_metadata_request_message.py
 src/h_message_bus/domain/request_messages/vector_read_metadata_response_message.py
 src/h_message_bus/domain/request_messages/vector_save_request_message.py
+src/h_message_bus/domain/request_messages/web_get_docs_request_message.py
+src/h_message_bus/domain/request_messages/web_search_request_message.py
 src/h_message_bus/infrastructure/__init__.py
 src/h_message_bus/infrastructure/nats_client_repository.py
 src/h_message_bus/infrastructure/nats_config.py

h_message_bus-0.0.18/src/h_message_bus/domain/models/request_message_topic.py

@@ -1,35 +0,0 @@
-from enum import Enum
-
-
-class RequestMessageTopic(str, Enum):
-    """
-    Represents a collection of predefined topics as an enumeration.
-
-    This class is an enumeration that defines constant string values for use
-    as topic identifiers. These topics represent specific actions or messages
-    within a messaging or vector database management context. It ensures
-    consistent usage of these predefined topics across the application.
-
-    syntax: [hai].[source].[destination].[action]
-
-    """
-    # 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"
-
-    # vector database
-    AI_VECTORS_SAVE = "hai.ai.vectors.collection.save"
-
-    AI_VECTORS_QUERY = "hai.ai.vectors.collection.query"
-    AI_VECTORS_QUERY_RESPONSE = "hai.ai.vectors.collection.query.response"
-
-    AI_VECTORS_METADATA_READ = "hai.ai.vectors.metadata.read"
-    AI_VECTORS_METADATA_READ_RESPONSE = "hai.ai.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_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"