Merge branch 'main' into 177-upgrade-pydantic-version

Author: Antonyjin

.github/workflows/build-wheels.yml

@@ -27,7 +27,7 @@ jobs:
         if: startsWith(matrix.os, 'macos')
         uses: actions/setup-python@v2
         with:
-          python-version: 3.11
+          python-version: 3.12
 
       - name: Cache dependencies
         uses: actions/cache@v4
@@ -64,9 +64,8 @@ jobs:
         run: |
           /tmp/venv/bin/python3 -m pip install dist/aleph_sdk_python-*.whl
 
-      - name: Install `setuptools` on systems where it is missing by default
+      - name: Install/upgrade `setuptools`
         run: /tmp/venv/bin/python3 -m pip install --upgrade setuptools
-        if: matrix.os == 'ubuntu-24.04'
 
       - name: Import and use the package
         run: |

.github/workflows/pytest.yml

@@ -16,18 +16,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.9", "3.10", "3.11" ]
-        # An issue with secp256k1 prevents Python 3.12 from working
-        # See https://github.com/baking-bad/pytezos/issues/370
-    runs-on: ubuntu-latest
+        python-version: [ "3.9", "3.10", "3.11", "3.12" ]
+        os: [ubuntu-22.04, ubuntu-24.04]
+    runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
-      - run: sudo apt-get install -y python3-pip libsecp256k1-dev
+      - run: |
+          sudo apt-get update
+          sudo apt-get install -y python3-pip libsodium-dev
 
       - run: |
           python3 -m venv /tmp/venv
@@ -37,13 +38,10 @@ jobs:
           /tmp/venv/bin/pip freeze
           /tmp/venv/bin/hatch run testing:pip freeze
           /tmp/venv/bin/hatch run testing:test
-        if: matrix.python-version != '3.11'
 
       - run: /tmp/venv/bin/hatch run testing:cov
-        if: matrix.python-version == '3.11'
 
       - uses: codecov/[email protected]
-        if: matrix.python-version == '3.11'
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: aleph-im/aleph-sdk-python

pyproject.toml

@@ -62,7 +62,7 @@ optional-dependencies.encryption = [
   "eciespy>=0.3.13; python_version>='3.11'",
 ]
 optional-dependencies.ledger = [
-  "ledgereth==0.9.1",
+  "ledgereth==0.10",
 ]
 optional-dependencies.mqtt = [
   "aiomqtt<=0.1.3",
@@ -81,7 +81,7 @@ optional-dependencies.substrate = [
   "substrate-interface",
 ]
 optional-dependencies.tezos = [
-  "aleph-pytezos==0.1.1",
+  "aleph-pytezos==3.13.4",
   "pynacl",
 ]
 urls.Documentation = "https://aleph.im/"

src/aleph/sdk/client/abstract.py

@@ -430,7 +430,7 @@ async def create_instance(
         :param channel: Channel to use (Default: "TEST")
         :param address: Address to use (Default: account.get_address())
         :param sync: If true, waits for the message to be processed by the API server
-        :param memory: Memory in MB for the VM to be allocated (Default: 128)
+        :param memory: Memory in MB for the VM to be allocated (Default: 2048)
         :param vcpus: Number of vCPUs to allocate (Default: 1)
         :param timeout_seconds: Timeout in seconds (Default: 30.0)
         :param allow_amend: Whether the deployed VM image may be changed (Default: False)

src/aleph/sdk/client/http.py

@@ -20,7 +20,7 @@
 import aiohttp
 from aiohttp.web import HTTPNotFound
 from aleph_message import parse_message
-from aleph_message.models import AlephMessage, ItemHash, ItemType
+from aleph_message.models import AlephMessage, ItemHash, ItemType, MessageType
 from aleph_message.status import MessageStatus
 from pydantic import ValidationError
 
@@ -33,13 +33,14 @@
 )
 from ..query.filters import MessageFilter, PostFilter
 from ..query.responses import MessagesResponse, Post, PostsResponse, PriceResponse
-from ..types import GenericMessage
+from ..types import GenericMessage, StoredContent
 from ..utils import (
     Writable,
     check_unix_socket_valid,
     copy_async_readable_to_buffer,
     extended_json_encoder,
     get_message_type_value,
+    safe_getattr,
 )
 from .abstract import AlephClient
 
@@ -469,3 +470,36 @@ async def get_message_status(self, item_hash: str) -> MessageStatus:
             resp.raise_for_status()
             result = await resp.json()
             return MessageStatus(result["status"])
+
+    async def get_stored_content(
+        self,
+        item_hash: str,
+    ) -> StoredContent:
+        """return the underlying content for a store message"""
+
+        result, resp = None, None
+        try:
+            message: AlephMessage
+            message, status = await self.get_message(
+                item_hash=ItemHash(item_hash), with_status=True
+            )
+            if status != MessageStatus.PROCESSED:
+                resp = f"Invalid message status: {status}"
+            elif message.type != MessageType.store:
+                resp = f"Invalid message type: {message.type}"
+            elif not message.content.item_hash:
+                resp = f"Invalid CID: {message.content.item_hash}"
+            else:
+                filename = safe_getattr(message.content, "metadata.name")
+                hash = message.content.item_hash
+                url = (
+                    f"{self.api_server}/api/v0/storage/raw/"
+                    if len(hash) == 64
+                    else settings.IPFS_GATEWAY
+                ) + hash
+                result = StoredContent(filename=filename, hash=hash, url=url)
+        except MessageNotFoundError:
+            resp = f"Message not found: {item_hash}"
+        except ForgottenMessageError:
+            resp = f"Message forgotten: {item_hash}"
+        return result if result else StoredContent(error=resp)

src/aleph/sdk/client/vm_client.py

@@ -5,6 +5,7 @@
 from urllib.parse import urlparse
 
 import aiohttp
+from aiohttp.client import _RequestContextManager
 from aleph_message.models import Chain, ItemHash
 from eth_account.messages import encode_defunct
 from jwcrypto import jwk
@@ -127,6 +128,32 @@ async def perform_operation(
             logger.error(f"HTTP error during operation {operation}: {str(e)}")
             return None, str(e)
 
+    def operate(
+        self, vm_id: ItemHash, operation: str, method: str = "POST"
+    ) -> _RequestContextManager:
+        """Request a CRN an operation for a VM (eg reboot, logs)
+
+        This operation is authenticated via the user wallet.
+        Use as an async context manager.
+        e.g  `async with client.operate(vm_id=item_hash, operation="logs", method="GET") as response:`
+        """
+
+        async def authenticated_request():
+            if not self.pubkey_signature_header:
+                self.pubkey_signature_header = (
+                    await self._generate_pubkey_signature_header()
+                )
+
+            url, header = await self._generate_header(
+                vm_id=vm_id, operation=operation, method=method
+            )
+            resp = await self.session._request(
+                method=method, str_or_url=url, headers=header
+            )
+            return resp
+
+        return _RequestContextManager(authenticated_request())
+
     async def get_logs(self, vm_id: ItemHash) -> AsyncGenerator[str, None]:
         if not self.pubkey_signature_header:
             self.pubkey_signature_header = (

src/aleph/sdk/conf.py

@@ -86,6 +86,7 @@ class Settings(BaseSettings):
 
     VM_URL_PATH: ClassVar[str] = "https://aleph.sh/vm/{hash}"
     VM_URL_HOST: ClassVar[str] = "https://{hash_base32}.aleph.sh"
+    IPFS_GATEWAY = "https://ipfs.aleph.cloud/ipfs/"
 
     # Web3Provider settings
     TOKEN_DECIMALS: ClassVar[int] = 18

src/aleph/sdk/types.py

@@ -80,3 +80,10 @@ class ChainInfo(BaseModel):
     token: Optional[str] = None
     super_token: Optional[str] = None
     active: bool = True
+
+
+class StoredContent(BaseModel):
+    filename: Optional[str]
+    hash: Optional[str]
+    url: Optional[str]
+    error: Optional[str]

src/aleph/sdk/utils.py

@@ -389,3 +389,11 @@ def make_packet_header(
     header[20:52] = h.digest()
 
     return header
+
+
+def safe_getattr(obj, attr, default=None):
+    for part in attr.split("."):
+        obj = getattr(obj, part, default)
+        if obj is default:
+            break
+    return obj

tests/unit/test_chain_tezos.py

@@ -31,7 +31,7 @@ async def test_tezos_account(tezos_account: TezosAccount):
     message = Message("TEZOS", tezos_account.get_address(), "SomeType", "ItemHash")
     signed = await tezos_account.sign_message(asdict(message))
     assert signed["signature"]
-    assert len(signed["signature"]) == 188
+    assert len(signed["signature"]) == 187
 
     address = tezos_account.get_address()
     assert address is not None
@@ -40,7 +40,7 @@ async def test_tezos_account(tezos_account: TezosAccount):
 
     pubkey = tezos_account.get_public_key()
     assert isinstance(pubkey, str)
-    assert len(pubkey) == 55
+    assert len(pubkey) == 54
 
 
 @pytest.mark.asyncio