clan-cli: Unify list_machines and use flake caching

pkgs/clan-cli/clan_lib/api/network.py

@@ -0,0 +1,43 @@
+import logging
+import time
+from dataclasses import dataclass
+from typing import Literal
+
+from clan_cli.cmd import RunOpts
+from clan_cli.errors import ClanError
+from clan_cli.machines.machines import Machine
+
+from clan_lib.api import API
+
+log = logging.getLogger(__name__)
+
+
+@dataclass
+class ConnectionOptions:
+    timeout: int = 2
+    retries: int = 10
+
+
+@API.register
+def check_machine_online(
+    machine: Machine, opts: ConnectionOptions | None = None
+) -> Literal["Online", "Offline"]:
+    hostname = machine.target_host_address
+    if not hostname:
+        msg = f"Machine {machine.name} does not specify a targetHost"
+        raise ClanError(msg)
+
+    timeout = opts.timeout if opts and opts.timeout else 2
+
+    for _ in range(opts.retries if opts and opts.retries else 10):
+        with machine.target_host() as target:
+            res = target.run(
+                ["true"],
+                RunOpts(timeout=timeout, check=False, needs_user_terminal=True),
+            )
+
+            if res.returncode == 0:
+                return "Online"
+        time.sleep(timeout)
+
+    return "Offline"

pkgs/clan-cli/clan_lib/tests/test_create.py

@@ -15,7 +15,6 @@ from clan_cli.flake import Flake
 from clan_cli.inventory import patch_inventory_with
 from clan_cli.machines.create import CreateOptions as ClanCreateOptions
 from clan_cli.machines.create import create_machine
-from clan_cli.machines.list import check_machine_online
 from clan_cli.machines.machines import Machine
 from clan_cli.nix import nix_command
 from clan_cli.secrets.key import generate_key
@@ -26,6 +25,7 @@ from clan_cli.ssh.host_key import HostKeyCheck
 from clan_cli.vars.generate import generate_vars_for_machine, get_generators_closure
 
 from clan_lib.api.disk import hw_main_disk_options, set_machine_disk_schema
+from clan_lib.api.network import check_machine_online
 from clan_lib.nix_models.inventory import Machine as InventoryMachine
 from clan_lib.nix_models.inventory import MachineDeploy