fix: ports in the aggregate can be None, if None then we continue

Author: 1yam

src/aleph_client/commands/instance/__init__.py

@@ -6,7 +6,7 @@
 import shutil
 from decimal import Decimal
 from pathlib import Path
-from typing import Annotated, Any, Optional, Union
+from typing import Annotated, Any, Optional
 
 import aiohttp
 import typer
@@ -30,8 +30,6 @@
 )
 from aleph.sdk.query.responses import PriceResponse
 from aleph.sdk.types import (
-    CrnExecutionV1,
-    CrnExecutionV2,
     InstanceAllocationsInfo,
     InstanceWithScheduler,
     PortFlags,
@@ -470,7 +468,6 @@ async def create(
                 echo(f"Failed to fetch credit info, error: {e}")
                 raise typer.Exit(code=1) from e
 
-    stream_reward_address = None
     crn, crn_info, gpu_id = None, None, None
     if is_stream or confidential or gpu or is_credit:
         if crn_url:
@@ -610,7 +607,7 @@ async def create(
 
     payment = Payment(
         chain=payment_chain,
-        receiver=stream_reward_address if stream_reward_address else None,
+        receiver=crn_info.stream_reward_address if crn_info and crn_info.stream_reward_address else None,
         type=payment_type,
     )
 
@@ -636,7 +633,7 @@ async def create(
         try:
             content = make_instance_content(**content_dict)
             price: PriceResponse = await client.get_estimated_price(content)
-            required_tokens = Decimal(price.required_tokens)
+            required_tokens = price.required_tokens if price.cost is None else Decimal(price.cost)
         except Exception as e:
             echo(f"Failed to estimate instance cost, error: {e}")
             raise typer.Exit(code=1) from e
@@ -839,7 +836,6 @@ async def delete(
             existing_message: InstanceMessage = await client.get_message(
                 item_hash=ItemHash(item_hash), message_type=InstanceMessage
             )
-
         except MessageNotFoundError:
             echo("Instance does not exist")
             raise typer.Exit(code=1) from None
@@ -872,11 +868,6 @@ async def delete(
         if isinstance(instance_info, InstanceWithScheduler):
             echo(f"Instance {item_hash} was auto-scheduled, VM will be erased automatically.")
         elif instance_info is not None and hasattr(instance_info, "crn_url") and instance_info.crn_url:
-            execution: Optional[Union[CrnExecutionV1, CrnExecutionV2]] = await client.crn.get_vm(
-                instance_info.crn_url, item_hash=ItemHash(item_hash)
-            )
-            if not execution:
-                echo("VM is not running or CRN not accessible, Skipping ...")
             try:
                 async with VmClient(account, instance_info.crn_url) as manager:
                     status, _ = await manager.erase_instance(vm_id=item_hash)

src/aleph_client/commands/instance/display.py

@@ -283,7 +283,7 @@ async def _prepare_instance_column(self):
         # Price information
         async with AlephHttpClient() as client:
             price: PriceResponse = await client.get_program_price(self.message.item_hash)
-            required_tokens = Decimal(price.required_tokens)
+            required_tokens = price.required_tokens if price.cost is None else Decimal(price.cost)
 
         if self.is_hold:
             aleph_price = Text(f"{displayable_amount(required_tokens, decimals=3)} (fixed)", style="magenta3")

src/aleph_client/commands/program.py

@@ -242,7 +242,7 @@ async def upload(
         try:
             content = make_program_content(**content_dict)
             price: PriceResponse = await client.get_estimated_price(content)
-            required_tokens = Decimal(price.required_tokens)
+            required_tokens = price.required_tokens if price.cost is None else Decimal(price.cost)
         except Exception as e:
             typer.echo(f"Failed to estimate program cost, error: {e}")
             raise typer.Exit(code=1) from e
@@ -575,7 +575,7 @@ async def list_programs(
             if message.sender != message.content.address:
                 payer = Text.assemble("\nPayer: ", Text(str(message.content.address), style="orange1"))
             price: PriceResponse = await client.get_program_price(message.item_hash)
-            required_tokens = Decimal(price.required_tokens)
+            required_tokens = price.required_tokens if price.cost is None else Decimal(price.cost)
             if price.payment_type == PaymentType.hold.value:
                 aleph_price = Text(
                     f"{displayable_amount(required_tokens, decimals=3)} (fixed)".ljust(13), style="violet"

tests/unit/test_display.py

@@ -147,6 +147,7 @@ async def test_instance_display_columns():
     with patch("aleph_client.commands.instance.display.download", AsyncMock(return_value=None)):
         mock_price = MagicMock()
         mock_price.required_tokens = "0.001"
+        mock_price.cost = "0.001"
         mock_client = AsyncMock()
         mock_client.get_program_price = AsyncMock(return_value=mock_price)
 
@@ -321,6 +322,7 @@ async def test_instance_table_builder():
             mock_client = AsyncMock()
             mock_price = MagicMock()
             mock_price.required_tokens = "0.001"
+            mock_price.cost = "0.001"
             mock_client.get_program_price = AsyncMock(return_value=mock_price)
 
             mock_client_class.return_value.__aenter__ = AsyncMock(return_value=mock_client)
@@ -430,6 +432,7 @@ async def test_show_instances():
                     mock_client = AsyncMock()
                     mock_price = MagicMock()
                     mock_price.required_tokens = "0.001"
+                    mock_price.cost = "0.001"
                     mock_client.get_program_price = AsyncMock(return_value=mock_price)
 
                     mock_client_class.return_value.__aenter__ = AsyncMock(return_value=mock_client)

tests/unit/test_instance.py

@@ -292,6 +292,7 @@ def create_mock_client(
         get_estimated_price=AsyncMock(
             return_value=MagicMock(
                 required_tokens=required_tokens,
+                cost=required_tokens,
                 payment_type=payment_type,
             )
         ),
@@ -317,8 +318,10 @@ def create_mock_auth_client(
 ):
 
     def response_get_program_price(ptype):
+        required_tokens = 0.00001527777777777777 if ptype == "superfluid" else 1000
         return MagicMock(
-            required_tokens=0.00001527777777777777 if ptype == "superfluid" else 1000,
+            required_tokens=required_tokens,
+            cost=required_tokens,
             payment_type=ptype,
         )
 

tests/unit/test_program.py

@@ -100,12 +100,14 @@ def create_mock_auth_client(mock_account, swap_persistent=False):
         get_estimated_price=AsyncMock(
             return_value=MagicMock(
                 required_tokens=1000,
+                cost=1000,
                 payment_type="hold",
             )
         ),
         get_program_price=AsyncMock(
             return_value=MagicMock(
                 required_tokens=1000,
+                cost=1000,
                 payment_type="hold",
             )
         ),