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

Author: Antonyjin

src/aleph/sdk/client/abstract.py

@@ -364,6 +364,7 @@ async def create_program(
         runtime: str,
         metadata: Optional[dict[str, Any]] = None,
         address: Optional[str] = None,
+        payment: Optional[Payment] = None,
         vcpus: Optional[int] = None,
         memory: Optional[int] = None,
         timeout_seconds: Optional[float] = None,
@@ -387,6 +388,7 @@ async def create_program(
         :param runtime: Runtime to use
         :param metadata: Metadata to attach to the message
         :param address: Address to use (Default: account.get_address())
+        :param payment: Payment method used to pay for the program (Default: None)
         :param vcpus: Number of vCPUs to allocate (Default: 1)
         :param memory: Memory in MB for the VM to be allocated (Default: 128)
         :param timeout_seconds: Timeout in seconds (Default: 30.0)

src/aleph/sdk/client/authenticated_http.py

@@ -410,6 +410,7 @@ async def create_program(
         runtime: str,
         metadata: Optional[dict[str, Any]] = None,
         address: Optional[str] = None,
+        payment: Optional[Payment] = None,
         vcpus: Optional[int] = None,
         memory: Optional[int] = None,
         timeout_seconds: Optional[float] = None,
@@ -433,6 +434,7 @@ async def create_program(
             runtime=runtime,
             metadata=metadata,
             address=address,
+            payment=payment,
             vcpus=vcpus,
             memory=memory,
             timeout_seconds=timeout_seconds,

src/aleph/sdk/types.py

@@ -100,7 +100,3 @@ class TokenType(str, Enum):
 
     GAS = "GAS"
     ALEPH = "ALEPH"
-    filename: Optional[str] = Field(default=None)
-    hash: Optional[str] = Field(default=None)
-    url: Optional[str] = Field(default=None)
-    error: Optional[str] = Field(default=None)

src/aleph/sdk/utils.py

@@ -27,8 +27,8 @@
 )
 from uuid import UUID
 from zipfile import BadZipFile, ZipFile
-
 import pydantic_core
+
 from aleph_message.models import (
     Chain,
     InstanceContent,
@@ -206,8 +206,6 @@ def extended_json_encoder(obj: Any) -> Any:
 
 
 def parse_volume(volume_dict: Union[Mapping, MachineVolume]) -> MachineVolume:
-    # Python 3.9 does not support `isinstance(volume_dict, MachineVolume)`,
-    # so we need to iterate over all types.
     if any(
         isinstance(volume_dict, volume_type) for volume_type in get_args(MachineVolume)
     ):

tests/unit/test_price.py

@@ -11,14 +11,14 @@ async def test_get_program_price_valid():
     Test that the get_program_price method returns the correct PriceResponse
     when given a valid item hash.
     """
-    expected_response = {
-        "required_tokens": 3.0555555555555556e-06,
-        "payment_type": "superfluid",
-    }
-    mock_session = make_mock_get_session(expected_response)
+    expected = PriceResponse(
+        required_tokens=3.0555555555555556e-06,
+        payment_type="superfluid",
+    )
+    mock_session = make_mock_get_session(expected.dict())
     async with mock_session:
         response = await mock_session.get_program_price("cacacacacacaca")
-        assert response == PriceResponse(**expected_response)  # type: ignore
+        assert response == expected
 
 
 @pytest.mark.asyncio