Fix: Changed create_instance method signature to be similar to aleph-message schema.

Author: nesitor

src/aleph/sdk/client/abstract.py

@@ -27,7 +27,11 @@
     PostMessage,
     parse_message,
 )
-from aleph_message.models.execution.environment import HostRequirements, HypervisorType
+from aleph_message.models.execution.environment import (
+    HostRequirements,
+    HypervisorType,
+    TrustedExecutionEnvironment,
+)
 from aleph_message.models.execution.program import Encoding
 from aleph_message.status import MessageStatus
 
@@ -395,8 +399,7 @@ async def create_instance(
         internet: bool = True,
         aleph_api: bool = True,
         hypervisor: Optional[HypervisorType] = None,
-        confidential_firmware: Optional[ItemHash] = None,
-        confidential_policy: Optional[int] = None,
+        trusted_execution: Optional[TrustedExecutionEnvironment] = None,
         volumes: Optional[List[Mapping]] = None,
         volume_persistence: str = "host",
         ssh_keys: Optional[List[str]] = None,
@@ -421,8 +424,7 @@ async def create_instance(
         :param internet: Whether the VM should have internet connectivity. (Default: True)
         :param aleph_api: Whether the VM needs access to Aleph messages API (Default: True)
         :param hypervisor: Whether the VM should use as Hypervisor, like QEmu or Firecracker (Default: Qemu)
-        :param confidential_firmware: Whether the VM firmware to use for Confidential computing (Default: None)
-        :param confidential_policy: Whether the VM firmware policy to use for Confidential computing (Default: None)
+        :param trusted_execution: Whether the VM configuration (firmware and policy) to use for Confidential computing (Default: None)
         :param encoding: Encoding to use (Default: Encoding.zip)
         :param volumes: Volumes to mount
         :param volume_persistence: Where volumes are persisted, can be "host" or "store", meaning distributed across Aleph.im (Default: "host")

src/aleph/sdk/client/authenticated_http.py

@@ -524,8 +524,7 @@ async def create_instance(
         internet: bool = True,
         aleph_api: bool = True,
         hypervisor: Optional[HypervisorType] = None,
-        confidential_firmware: Optional[ItemHash] = None,
-        confidential_policy: Optional[int] = None,
+        trusted_execution: Optional[TrustedExecutionEnvironment] = None,
         volumes: Optional[List[Mapping]] = None,
         volume_persistence: str = "host",
         ssh_keys: Optional[List[str]] = None,
@@ -541,14 +540,6 @@ async def create_instance(
 
         payment = payment or Payment(chain=Chain.ETH, type=PaymentType.hold)
 
-        if confidential_firmware or confidential_policy:
-            confidential_options = TrustedExecutionEnvironment(
-                firmware=confidential_firmware,
-                policy=confidential_policy,
-            )
-        else:
-            confidential_options = None
-
         # Default to the QEMU hypervisor for instances.
         selected_hypervisor: HypervisorType = hypervisor or HypervisorType.qemu
 
@@ -559,7 +550,7 @@ async def create_instance(
                 internet=internet,
                 aleph_api=aleph_api,
                 hypervisor=selected_hypervisor,
-                trusted_execution=confidential_options,
+                trusted_execution=trusted_execution,
             ),
             variables=environment_variables,
             resources=MachineResources(

tests/unit/test_asynchronous.py

@@ -19,6 +19,7 @@
     HypervisorType,
     MachineResources,
     NodeRequirements,
+    TrustedExecutionEnvironment,
 )
 from aleph_message.status import MessageStatus
 
@@ -182,8 +183,10 @@ async def test_create_confidential_instance(mock_session_with_post_success):
                 type=PaymentType.superfluid,
             ),
             hypervisor=HypervisorType.qemu,
-            confidential_firmware="cafecafecafecafecafecafecafecafecafecafecafecafecafecafecafecafe",
-            confidential_policy=0b1,
+            trusted_execution=TrustedExecutionEnvironment(
+                firmware="cafecafecafecafecafecafecafecafecafecafecafecafecafecafecafecafe",
+                policy=0b1,
+            ),
             requirements=HostRequirements(
                 node=NodeRequirements(
                     node_hash="cafecafecafecafecafecafecafecafecafecafecafecafecafecafecafecafe",