|
32 | 32 | ForgetContent, |
33 | 33 | ForgetMessage, |
34 | 34 | ItemType, |
35 | | - Message, |
36 | 35 | MessageType, |
37 | 36 | PostContent, |
38 | 37 | PostMessage, |
39 | 38 | ProgramMessage, |
40 | 39 | StoreContent, |
41 | 40 | StoreMessage, |
| 41 | + parse_message, |
| 42 | + ProgramContent, |
42 | 43 | ) |
43 | | -from aleph_message.models.program import Encoding, ProgramContent |
| 44 | +from aleph_message.models.execution.base import Encoding |
44 | 45 | from aleph_message.status import MessageStatus |
45 | 46 | from pydantic import ValidationError |
46 | 47 |
|
47 | 48 | from aleph.sdk.types import Account, GenericMessage, StorageEnum |
48 | | - |
49 | 49 | from .conf import settings |
50 | 50 | from .exceptions import ( |
51 | 51 | BroadcastError, |
@@ -713,7 +713,7 @@ async def get_messages( |
713 | 713 | messages: List[AlephMessage] = [] |
714 | 714 | for message_raw in messages_raw: |
715 | 715 | try: |
716 | | - message = Message(**message_raw) |
| 716 | + message = parse_message(message_raw) |
717 | 717 | messages.append(message) |
718 | 718 | except KeyError as e: |
719 | 719 | if not ignore_invalid_messages: |
@@ -835,7 +835,7 @@ async def watch_messages( |
835 | 835 | break |
836 | 836 | else: |
837 | 837 | data = json.loads(msg.data) |
838 | | - yield Message(**data) |
| 838 | + yield parse_message(data) |
839 | 839 | elif msg.type == aiohttp.WSMsgType.ERROR: |
840 | 840 | break |
841 | 841 |
|
@@ -1387,7 +1387,7 @@ async def _prepare_aleph_message( |
1387 | 1387 | message_dict["item_type"] = ItemType.storage |
1388 | 1388 |
|
1389 | 1389 | message_dict = await self.account.sign_message(message_dict) |
1390 | | - return Message(**message_dict) |
| 1390 | + return parse_message(message_dict) |
1391 | 1391 |
|
1392 | 1392 | async def submit( |
1393 | 1393 | self, |
|
0 commit comments