Dependencies: Update to aleph-message 0.3.1

Author: hoh

docker/python-3.10.dockerfile

@@ -20,7 +20,7 @@ RUN pip install --upgrade pip wheel twine
 
 # Preinstall dependencies for faster steps
 RUN pip install --upgrade secp256k1 coincurve aiohttp eciespy python-magic typer
-RUN pip install --upgrade 'aleph-message~=0.3.0' eth_account pynacl base58
+RUN pip install --upgrade 'aleph-message~=0.3.1' eth_account pynacl base58
 RUN pip install --upgrade pytest pytest-cov pytest-asyncio mypy types-setuptools pytest-asyncio fastapi httpx requests
 
 WORKDIR /opt/aleph-sdk-python/

docker/python-3.11.dockerfile

@@ -20,7 +20,7 @@ RUN pip install --upgrade pip wheel twine
 
 # Preinstall dependencies for faster steps
 RUN pip install --upgrade secp256k1 coincurve aiohttp eciespy python-magic typer
-RUN pip install --upgrade 'aleph-message~=0.3.0' eth_account pynacl base58
+RUN pip install --upgrade 'aleph-message~=0.3.1' eth_account pynacl base58
 RUN pip install --upgrade pytest pytest-cov pytest-asyncio mypy types-setuptools pytest-asyncio fastapi httpx requests
 
 WORKDIR /opt/aleph-sdk-python/

docker/python-3.9.dockerfile

@@ -20,7 +20,7 @@ RUN pip install --upgrade pip wheel twine
 
 # Preinstall dependencies for faster steps
 RUN pip install --upgrade secp256k1 coincurve aiohttp eciespy python-magic typer
-RUN pip install --upgrade 'aleph-message~=0.3.0' eth_account pynacl base58
+RUN pip install --upgrade 'aleph-message~=0.3.1' eth_account pynacl base58
 RUN pip install --upgrade pytest pytest-cov pytest-asyncio mypy types-setuptools pytest-asyncio fastapi httpx requests
 
 WORKDIR /opt/aleph-sdk-python/

docker/ubuntu-20.04.dockerfile

@@ -25,7 +25,7 @@ RUN pip install --upgrade pip wheel twine
 
 # Preinstall dependencies for faster steps
 RUN pip install --upgrade secp256k1 coincurve aiohttp eciespy python-magic typer
-RUN pip install --upgrade 'aleph-message~=0.3.0' eth_account pynacl base58
+RUN pip install --upgrade 'aleph-message~=0.3.1' eth_account pynacl base58
 RUN pip install --upgrade pytest pytest-cov pytest-asyncio mypy types-setuptools pytest-asyncio fastapi httpx requests
 
 WORKDIR /opt/aleph-sdk-python/

docker/ubuntu-22.04.dockerfile

@@ -25,7 +25,7 @@ RUN pip install --upgrade pip wheel twine
 
 # Preinstall dependencies for faster steps
 RUN pip install --upgrade secp256k1 coincurve aiohttp eciespy python-magic typer
-RUN pip install --upgrade 'aleph-message~=0.3.0' eth_account pynacl base58
+RUN pip install --upgrade 'aleph-message~=0.3.1' eth_account pynacl base58
 RUN pip install --upgrade pytest pytest-cov pytest-asyncio mypy types-setuptools pytest-asyncio fastapi httpx requests
 
 WORKDIR /opt/aleph-sdk-python/

examples/metrics.py

@@ -9,11 +9,11 @@
 
 import psutil
 from aleph_message.models import AlephMessage
+from aleph_message.status import MessageStatus
 
 from aleph.sdk.chains.ethereum import get_fallback_account
 from aleph.sdk.client import AuthenticatedAlephClient, AuthenticatedUserSessionSync
 from aleph.sdk.conf import settings
-from aleph.sdk.types import MessageStatus
 
 
 def get_sysinfo():

examples/store.py

@@ -2,12 +2,12 @@
 
 import click
 from aleph_message.models import StoreMessage
+from aleph_message.status import MessageStatus
 
 from aleph.sdk.chains.common import get_fallback_private_key
 from aleph.sdk.chains.ethereum import ETHAccount
 from aleph.sdk.client import AuthenticatedAlephClient
 from aleph.sdk.conf import settings
-from aleph.sdk.types import MessageStatus
 
 DEFAULT_SERVER = "https://api2.aleph.im"
 

setup.cfg

@@ -36,7 +36,7 @@ install_requires =
     eciespy
     typing_extensions
     typer
-    aleph-message~=0.3.0
+    aleph-message~=0.3.1
     eth_account>=0.4.0
     python-magic
 # The usage of test_requires is discouraged, see `Dependency Management` docs

src/aleph/sdk/client.py

@@ -41,9 +41,10 @@
     StoreMessage,
 )
 from aleph_message.models.program import Encoding, ProgramContent
+from aleph_message.status import MessageStatus
 from pydantic import ValidationError
 
-from aleph.sdk.types import Account, GenericMessage, MessageStatus, StorageEnum
+from aleph.sdk.types import Account, GenericMessage, StorageEnum
 
 from .conf import settings
 from .exceptions import (

src/aleph/sdk/types.py

@@ -12,14 +12,6 @@ class StorageEnum(str, Enum):
     storage = "storage"
 
 
-# TODO: this class is duplicated in pyaleph. Move it to aleph-message.
-class MessageStatus(str, Enum):
-    PENDING = "pending"
-    PROCESSED = "processed"
-    REJECTED = "rejected"
-    FORGOTTEN = "forgotten"
-
-
 # Use a protocol to avoid importing crypto libraries
 class Account(Protocol):
     CHAIN: str