Fix: Solved definitively the wallet selection issue and also solved another issue fetching instances from scheduler.

Author: Andres D. Molins

src/aleph_client/commands/account.py

@@ -495,8 +495,13 @@ async def configure(
         raise typer.Exit()
 
     # Configures active private key file
-    if (not account_type or account_type == AccountType.INTERNAL and
-            not private_key_file and config and hasattr(config, "path") and Path(config.path).exists()):
+    if not account_type or (
+        account_type == AccountType.INTERNAL
+        and not private_key_file
+        and config
+        and hasattr(config, "path")
+        and Path(config.path).exists()
+    ):
         if not yes_no_input(
             f"Active private key file: [bright_cyan]{config.path}[/bright_cyan]\n[yellow]Keep current active private "
             "key?[/yellow]",
@@ -524,8 +529,7 @@ async def configure(
 
     if not private_key_file and account_type == AccountType.EXTERNAL:
         if yes_no_input(
-            "[bright_cyan]Loading External keys.[/bright_cyan] [yellow]"
-            "Do you want to import from Ledger?[/yellow]",
+            "[bright_cyan]Loading External keys.[/bright_cyan] [yellow]Do you want to import from Ledger?[/yellow]",
             default="y",
         ):
             accounts = LedgerETHAccount.get_accounts()
@@ -571,7 +575,7 @@ async def configure(
         raise typer.Exit()
 
     if not account_type:
-        account_type = AccountType.INTERNAL.value
+        account_type = AccountType.INTERNAL
 
     try:
         config = MainConfiguration(path=private_key_file, chain=chain, address=address, type=account_type)

src/aleph_client/commands/instance/__init__.py

@@ -15,7 +15,7 @@
 from aleph.sdk.chains.ethereum import ETHAccount
 from aleph.sdk.client.vm_client import VmClient
 from aleph.sdk.client.vm_confidential_client import VmConfidentialClient
-from aleph.sdk.conf import load_main_configuration, settings, AccountType
+from aleph.sdk.conf import AccountType, load_main_configuration, settings
 from aleph.sdk.evm_utils import (
     FlowUpdate,
     get_chains_with_holding,
@@ -179,7 +179,7 @@ async def create(
             console.print("No active chain selected in configuration.")
 
     # Populates account / address
-    if config and config.type == AccountType.EXTERNAL.value:
+    if config and config.type == AccountType.EXTERNAL:
         account = _load_account(None, None, chain=payment_chain)
     else:
         account = _load_account(private_key, private_key_file, chain=payment_chain)
@@ -745,7 +745,7 @@ async def delete(
 
     config = load_main_configuration(settings.CONFIG_FILE)
     # Populates account / address
-    if config and config.type == AccountType.EXTERNAL.value:
+    if config and config.type == AccountType.EXTERNAL:
         account = _load_account(None, None, chain=chain)
     else:
         account = _load_account(private_key, private_key_file, chain=chain)
@@ -866,7 +866,7 @@ async def list_instances(
 
     config = load_main_configuration(settings.CONFIG_FILE)
     # Populates account / address
-    if config and config.type == AccountType.EXTERNAL.value:
+    if config and config.type == AccountType.EXTERNAL:
         account = _load_account(None, None, chain=chain)
     else:
         account = _load_account(private_key, private_key_file, chain=chain)
@@ -909,7 +909,7 @@ async def reboot(
 
     config = load_main_configuration(settings.CONFIG_FILE)
     # Populates account / address
-    if config and config.type == AccountType.EXTERNAL.value:
+    if config and config.type == AccountType.EXTERNAL:
         account = _load_account(None, None, chain=chain)
     else:
         account = _load_account(private_key, private_key_file, chain=chain)
@@ -947,7 +947,7 @@ async def allocate(
 
     config = load_main_configuration(settings.CONFIG_FILE)
     # Populates account / address
-    if config and config.type == AccountType.EXTERNAL.value:
+    if config and config.type == AccountType.EXTERNAL:
         account = _load_account(None, None, chain=chain)
     else:
         account = _load_account(private_key, private_key_file, chain=chain)
@@ -980,7 +980,7 @@ async def logs(
 
     config = load_main_configuration(settings.CONFIG_FILE)
     # Populates account / address
-    if config and config.type == AccountType.EXTERNAL.value:
+    if config and config.type == AccountType.EXTERNAL:
         account = _load_account(None, None, chain=chain)
     else:
         account = _load_account(private_key, private_key_file, chain=chain)
@@ -1016,7 +1016,7 @@ async def stop(
 
     config = load_main_configuration(settings.CONFIG_FILE)
     # Populates account / address
-    if config and config.type == AccountType.EXTERNAL.value:
+    if config and config.type == AccountType.EXTERNAL:
         account = _load_account(None, None, chain=chain)
     else:
         account = _load_account(private_key, private_key_file, chain=chain)
@@ -1060,7 +1060,7 @@ async def confidential_init_session(
 
     config = load_main_configuration(settings.CONFIG_FILE)
     # Populates account / address
-    if config and config.type == AccountType.EXTERNAL.value:
+    if config and config.type == AccountType.EXTERNAL:
         account = _load_account(None, None, chain=chain)
     else:
         account = _load_account(private_key, private_key_file, chain=chain)
@@ -1142,7 +1142,7 @@ async def confidential_start(
     vm_hash = ItemHash(vm_id)
     config = load_main_configuration(settings.CONFIG_FILE)
     # Populates account / address
-    if config and config.type == AccountType.EXTERNAL.value:
+    if config and config.type == AccountType.EXTERNAL:
         account = _load_account(None, None, chain=chain)
     else:
         account = _load_account(private_key, private_key_file, chain=chain)

src/aleph_client/commands/instance/display.py

@@ -343,7 +343,10 @@ def _prepare_allocation_column(self):
             allocation_str = ALLOCATION_MANUAL
             color_allocation = "magenta3"
             crn_hash = safe_getattr(self.message.content.requirements, "node.node_hash") or ""
-        elif self.allocation.allocations:
+        elif isinstance(self.allocation, InstanceWithScheduler) and not self.allocation.allocations:
+            self.allocation_column = cast(Text, Text.from_markup("[red]Not allocated[/red]"))
+            return
+        else:
             crn_url = self.allocation.allocations.node.url
             allocation_str = ALLOCATION_AUTO
             color_allocation = "deep_sky_blue1"