From 7c5fffd5f6a953db35b82aa131b9ef365b446671 Mon Sep 17 00:00:00 2001
From: Olivier Desenfans <desenfans.olivier@gmail.com>
Date: Mon, 10 Jul 2023 23:46:19 +0200
Subject: [PATCH] Chore: bump aleph-message to 0.4.0a3

---
 setup.cfg               |  2 +-
 src/aleph/sdk/client.py | 11 +++++------
 src/aleph/sdk/utils.py  |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 604a5d43..dc03f509 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,7 +38,7 @@ install_requires =
     eciespy>=0.3.13; python_version>="3.11"
     typing_extensions
     typer
-    aleph-message~=0.3.2
+    aleph-message==0.4.0a3
     eth_account>=0.4.0
     # Required to fix a dependency issue with parsimonious and Python3.11
     eth_abi==4.0.0b2; python_version>="3.11"
diff --git a/src/aleph/sdk/client.py b/src/aleph/sdk/client.py
index 9877d716..330e0c30 100644
--- a/src/aleph/sdk/client.py
+++ b/src/aleph/sdk/client.py
@@ -32,15 +32,14 @@
     ForgetContent,
     ForgetMessage,
     ItemType,
-    Message,
     MessageType,
     PostContent,
     PostMessage,
     ProgramMessage,
     StoreContent,
-    StoreMessage,
+    StoreMessage, parse_message, ProgramContent,
 )
-from aleph_message.models.program import Encoding, ProgramContent
+from aleph_message.models.execution.base import Encoding
 from aleph_message.status import MessageStatus
 from pydantic import ValidationError
 
@@ -713,7 +712,7 @@ async def get_messages(
             messages: List[AlephMessage] = []
             for message_raw in messages_raw:
                 try:
-                    message = Message(**message_raw)
+                    message = parse_message(message_raw)
                     messages.append(message)
                 except KeyError as e:
                     if not ignore_invalid_messages:
@@ -835,7 +834,7 @@ async def watch_messages(
                         break
                     else:
                         data = json.loads(msg.data)
-                        yield Message(**data)
+                        yield parse_message(data)
                 elif msg.type == aiohttp.WSMsgType.ERROR:
                     break
 
@@ -1387,7 +1386,7 @@ async def _prepare_aleph_message(
                 message_dict["item_type"] = ItemType.storage
 
         message_dict = await self.account.sign_message(message_dict)
-        return Message(**message_dict)
+        return parse_message(message_dict)
 
     async def submit(
         self,
diff --git a/src/aleph/sdk/utils.py b/src/aleph/sdk/utils.py
index fdbf6095..2d7fb377 100644
--- a/src/aleph/sdk/utils.py
+++ b/src/aleph/sdk/utils.py
@@ -7,7 +7,7 @@
 from zipfile import BadZipFile, ZipFile
 
 from aleph_message.models import MessageType
-from aleph_message.models.program import Encoding
+from aleph_message.models.execution.program import Encoding
 
 from aleph.sdk.conf import settings
 from aleph.sdk.types import GenericMessage