fix merge conflicts on message_types

Author: MHHukiewitz

Diff for: src/aleph/sdk/base.py

@@ -166,6 +166,7 @@ async def get_messages(
         pagination: int = DEFAULT_PAGE_SIZE,
         page: int = 1,
         message_type: Optional[MessageType] = None,
+        message_types: Optional[Iterable[MessageType]] = None,
         content_types: Optional[Iterable[str]] = None,
         content_keys: Optional[Iterable[str]] = None,
         refs: Optional[Iterable[str]] = None,
@@ -184,7 +185,8 @@ async def get_messages(
 
         :param pagination: Number of items to fetch (Default: 200)
         :param page: Page to fetch, begins at 1 (Default: 1)
-        :param message_type: Filter by message type, can be "AGGREGATE", "POST", "PROGRAM", "VM", "STORE" or "FORGET"
+        :param message_type: [DEPRECATED] Filter by message type, can be "AGGREGATE", "POST", "PROGRAM", "VM", "STORE" or "FORGET"
+        :param message_types: Filter by message types, can be any combination of "AGGREGATE", "POST", "PROGRAM", "VM", "STORE" or "FORGET"
         :param content_types: Filter by content type
         :param content_keys: Filter by aggregate key
         :param refs: If set, only fetch posts that reference these hashes (in the "refs" field)
@@ -271,6 +273,7 @@ async def get_message(
     def watch_messages(
         self,
         message_type: Optional[MessageType] = None,
+        message_types: Optional[Iterable[MessageType]] = None,
         content_types: Optional[Iterable[str]] = None,
         content_keys: Optional[Iterable[str]] = None,
         refs: Optional[Iterable[str]] = None,
@@ -285,7 +288,8 @@ def watch_messages(
         """
         Iterate over current and future matching messages asynchronously.
 
-        :param message_type: Type of message to watch
+        :param message_type: [DEPRECATED] Type of message to watch
+        :param message_types: Types of messages to watch
         :param content_types: Content types to watch
         :param content_keys: Filter by aggregate key
         :param refs: References to watch

Diff for: src/aleph/sdk/client.py

@@ -141,6 +141,7 @@ def get_messages(
         pagination: int = 200,
         page: int = 1,
         message_type: Optional[MessageType] = None,
+        message_types: Optional[List[MessageType]] = None,
         content_types: Optional[Iterable[str]] = None,
         content_keys: Optional[Iterable[str]] = None,
         refs: Optional[Iterable[str]] = None,
@@ -159,6 +160,7 @@ def get_messages(
             pagination=pagination,
             page=page,
             message_type=message_type,
+            message_types=message_types,
             content_types=content_types,
             content_keys=content_keys,
             refs=refs,
@@ -753,6 +755,7 @@ async def get_messages(
             params["msgType"] = message_type.value
         if message_types is not None:
             params["msgTypes"] = ",".join([t.value for t in message_types])
+            print(params["msgTypes"])
         if content_types is not None:
             params["contentTypes"] = ",".join(content_types)
         if content_keys is not None:

Diff for: tests/unit/test_synchronous_get.py

@@ -6,6 +6,7 @@
 
 def test_get_post_messages():
     with AlephClient(api_server=settings.API_HOST) as session:
+        # TODO: Remove deprecated message_type parameter after message_types changes on pyaleph are deployed
         response: MessagesResponse = session.get_messages(
             pagination=2,
             message_type=MessageType.post,