clan-cli: Move Machine object to clan_lib

pkgs/clan-cli/clan_cli/backups/create.py

@@ -3,13 +3,13 @@ import logging
 
 from clan_lib.backups.create import create_backup
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 
 from clan_cli.completions import (
     add_dynamic_completer,
     complete_backup_providers_for_machine,
     complete_machines,
 )
-from clan_cli.machines.machines import Machine
 
 log = logging.getLogger(__name__)
 

pkgs/clan-cli/clan_cli/backups/list.py

@@ -2,13 +2,13 @@ import argparse
 
 from clan_lib.backups.list import list_backups
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 
 from clan_cli.completions import (
     add_dynamic_completer,
     complete_backup_providers_for_machine,
     complete_machines,
 )
-from clan_cli.machines.machines import Machine
 
 
 def list_command(args: argparse.Namespace) -> None:

pkgs/clan-cli/clan_cli/backups/restore.py

@@ -2,13 +2,13 @@ import argparse
 
 from clan_lib.backups.restore import restore_backup
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 
 from clan_cli.completions import (
     add_dynamic_completer,
     complete_backup_providers_for_machine,
     complete_machines,
 )
-from clan_cli.machines.machines import Machine
 
 
 def restore_command(args: argparse.Namespace) -> None:

pkgs/clan-cli/clan_cli/clan/inspect.py

@@ -7,6 +7,7 @@ from clan_lib.cmd import run
 from clan_lib.dirs import machine_gcroot
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import (
     nix_add_to_gcroots,
     nix_build,
@@ -16,7 +17,6 @@ from clan_lib.nix import (
 )
 
 from clan_cli.machines.list import list_machines
-from clan_cli.machines.machines import Machine
 from clan_cli.vms.inspect import VmConfig, inspect_vm
 
 

pkgs/clan-cli/clan_cli/facts/check.py

@@ -1,8 +1,9 @@
 import argparse
 import logging
 
+from clan_lib.machines.machines import Machine
+
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.machines.machines import Machine
 
 log = logging.getLogger(__name__)
 

pkgs/clan-cli/clan_cli/facts/generate.py

@@ -10,6 +10,7 @@ from tempfile import TemporaryDirectory
 from clan_lib.cmd import RunOpts, run
 from clan_lib.errors import ClanError
 from clan_lib.git import commit_files
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_shell
 
 from clan_cli.completions import (
@@ -18,7 +19,6 @@ from clan_cli.completions import (
     complete_services_for_machine,
 )
 from clan_cli.machines.list import list_machines
-from clan_cli.machines.machines import Machine
 
 from .check import check_secrets
 from .public_modules import FactStoreBase

pkgs/clan-cli/clan_cli/facts/list.py

@@ -2,8 +2,9 @@ import argparse
 import json
 import logging
 
+from clan_lib.machines.machines import Machine
+
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.machines.machines import Machine
 
 log = logging.getLogger(__name__)
 

pkgs/clan-cli/clan_cli/facts/public_modules/__init__.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from pathlib import Path
 
-import clan_cli.machines.machines as machines
+import clan_lib.machines.machines as machines
 
 
 class FactStoreBase(ABC):

pkgs/clan-cli/clan_cli/facts/public_modules/in_repo.py

@@ -1,8 +1,7 @@
 from pathlib import Path
 
 from clan_lib.errors import ClanError
-
-from clan_cli.machines.machines import Machine
+from clan_lib.machines.machines import Machine
 
 from . import FactStoreBase
 

pkgs/clan-cli/clan_cli/facts/public_modules/vm.py

@@ -3,8 +3,7 @@ from pathlib import Path
 
 from clan_lib.dirs import vm_state_dir
 from clan_lib.errors import ClanError
-
-from clan_cli.machines.machines import Machine
+from clan_lib.machines.machines import Machine
 
 from . import FactStoreBase
 

pkgs/clan-cli/clan_cli/facts/secret_modules/__init__.py

@@ -3,10 +3,9 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from pathlib import Path
 
+import clan_lib.machines.machines as machines
 from clan_lib.ssh.remote import Remote
 
-import clan_cli.machines.machines as machines
-
 
 class SecretStoreBase(ABC):
     @abstractmethod

pkgs/clan-cli/clan_cli/facts/secret_modules/password_store.py

@@ -4,11 +4,11 @@ from pathlib import Path
 from typing import override
 
 from clan_lib.cmd import Log, RunOpts
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_shell
 from clan_lib.ssh.remote import Remote
 
 from clan_cli.facts.secret_modules import SecretStoreBase
-from clan_cli.machines.machines import Machine
 
 
 class SecretStore(SecretStoreBase):

pkgs/clan-cli/clan_cli/facts/secret_modules/sops.py

@@ -1,9 +1,9 @@
 from pathlib import Path
 from typing import override
 
+from clan_lib.machines.machines import Machine
 from clan_lib.ssh.remote import Remote
 
-from clan_cli.machines.machines import Machine
 from clan_cli.secrets.folders import sops_secrets_folder
 from clan_cli.secrets.machines import add_machine, has_machine
 from clan_cli.secrets.secrets import decrypt_secret, encrypt_secret, has_secret

pkgs/clan-cli/clan_cli/facts/secret_modules/vm.py

@@ -3,8 +3,7 @@ from pathlib import Path
 from typing import override
 
 from clan_lib.dirs import vm_state_dir
-
-from clan_cli.machines.machines import Machine
+from clan_lib.machines.machines import Machine
 
 from . import SecretStoreBase
 

pkgs/clan-cli/clan_cli/facts/upload.py

@@ -3,8 +3,9 @@ import logging
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
+from clan_lib.machines.machines import Machine
+
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.machines.machines import Machine
 from clan_cli.ssh.upload import upload
 
 log = logging.getLogger(__name__)

pkgs/clan-cli/clan_cli/flash/automount.py

@@ -6,8 +6,7 @@ from pathlib import Path
 
 from clan_lib.cmd import Log, RunOpts, run
 from clan_lib.errors import ClanError
-
-from clan_cli.machines.machines import Machine
+from clan_lib.machines.machines import Machine
 
 log = logging.getLogger(__name__)
 

pkgs/clan-cli/clan_cli/flash/flash.py

@@ -9,10 +9,10 @@ from typing import Any
 from clan_lib.api import API
 from clan_lib.cmd import Log, RunOpts, cmd_with_root, run
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_shell
 
 from clan_cli.facts.generate import generate_facts
-from clan_cli.machines.machines import Machine
 from clan_cli.vars.generate import generate_vars
 from clan_cli.vars.upload import populate_secret_vars
 

pkgs/clan-cli/clan_cli/flash/flash_cmd.py

@@ -7,9 +7,9 @@ from pathlib import Path
 from typing import Any
 
 from clan_lib.flake import Flake
+from clan_lib.machines.machines import Machine
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.machines.machines import Machine
 
 from .flash import Disk, SystemConfig, flash_machine
 

pkgs/clan-cli/clan_cli/machines/delete.py

@@ -6,9 +6,9 @@ from pathlib import Path
 from clan_lib import inventory
 from clan_lib.api import API
 from clan_lib.dirs import specific_machine_dir
+from clan_lib.machines.machines import Machine
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.machines.machines import Machine
 from clan_cli.secrets.folders import sops_secrets_folder
 from clan_cli.secrets.machines import has_machine as secrets_has_machine
 from clan_cli.secrets.machines import remove_machine as secrets_machine_remove

pkgs/clan-cli/clan_cli/machines/hardware.py

@@ -10,10 +10,10 @@ from clan_lib.cmd import RunOpts, run
 from clan_lib.dirs import specific_machine_dir
 from clan_lib.errors import ClanCmdError, ClanError
 from clan_lib.git import commit_file
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_config, nix_eval
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.machines.machines import Machine
 
 from .types import machine_name_type
 

pkgs/clan-cli/clan_cli/machines/install.py

@@ -10,6 +10,7 @@ from tempfile import TemporaryDirectory
 from clan_lib.api import API
 from clan_lib.cmd import Log, RunOpts, run
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_shell
 
 from clan_cli.completions import (
@@ -19,7 +20,6 @@ from clan_cli.completions import (
 )
 from clan_cli.facts.generate import generate_facts
 from clan_cli.machines.hardware import HardwareConfig
-from clan_cli.machines.machines import Machine
 from clan_cli.ssh.deploy_info import DeployInfo, find_reachable_host, ssh_command_parse
 from clan_cli.ssh.host_key import HostKeyCheck
 from clan_cli.vars.generate import generate_vars

pkgs/clan-cli/clan_cli/machines/inventory.py

@@ -1,13 +1,12 @@
 from clan_lib.api import API
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 from clan_lib.nix_models.inventory import (
     Machine as InventoryMachine,
 )
 from clan_lib.persist.inventory_store import InventoryStore
 from clan_lib.persist.util import apply_patch
 
-from clan_cli.machines.machines import Machine
-
 
 @API.register
 def get_machine(machine: Machine) -> InventoryMachine:

pkgs/clan-cli/clan_cli/machines/list.py

@@ -9,13 +9,13 @@ from clan_lib.api.modules import parse_frontmatter
 from clan_lib.dirs import specific_machine_dir
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
+from clan_lib.machines.machines import Machine
 from clan_lib.nix_models.inventory import Machine as InventoryMachine
 from clan_lib.persist.inventory_store import InventoryStore
 
 from clan_cli.completions import add_dynamic_completer, complete_tags
 from clan_cli.machines.hardware import HardwareConfig
 from clan_cli.machines.inventory import get_machine
-from clan_cli.machines.machines import Machine
 
 log = logging.getLogger(__name__)
 

pkgs/clan-cli/clan_cli/machines/machines.py

@@ -1,236 +0,0 @@
-import importlib
-import json
-import logging
-import re
-from dataclasses import dataclass, field
-from functools import cached_property
-from pathlib import Path
-from typing import TYPE_CHECKING, Any
-
-from clan_lib.errors import ClanCmdError, ClanError
-from clan_lib.flake import Flake
-from clan_lib.nix import nix_config, nix_test_store
-from clan_lib.ssh.remote import Remote
-
-from clan_cli.facts import public_modules as facts_public_modules
-from clan_cli.facts import secret_modules as facts_secret_modules
-from clan_cli.ssh.host_key import HostKeyCheck
-from clan_cli.vars._types import StoreBase
-
-log = logging.getLogger(__name__)
-
-if TYPE_CHECKING:
-    from clan_cli.vars.generate import Generator
-
-
-@dataclass(frozen=True)
-class Machine:
-    name: str
-    flake: Flake
-
-    nix_options: list[str] = field(default_factory=list)
-    override_target_host: None | str = None
-    override_build_host: None | str = None
-    private_key: Path | None = None
-    host_key_check: HostKeyCheck = HostKeyCheck.STRICT
-
-    def get_id(self) -> str:
-        return f"{self.flake}#{self.name}"
-
-    def flush_caches(self) -> None:
-        self.flake.invalidate_cache()
-
-    def __str__(self) -> str:
-        return f"Machine(name={self.name}, flake={self.flake})"
-
-    def __repr__(self) -> str:
-        return str(self)
-
-    def debug(self, msg: str, *args: Any, **kwargs: Any) -> None:
-        kwargs.update({"extra": {"command_prefix": self.name}})
-        log.debug(msg, *args, **kwargs)
-
-    def info(self, msg: str, *args: Any, **kwargs: Any) -> None:
-        kwargs.update({"extra": {"command_prefix": self.name}})
-        log.info(msg, *args, **kwargs)
-
-    def error(self, msg: str, *args: Any, **kwargs: Any) -> None:
-        kwargs.update({"extra": {"command_prefix": self.name}})
-        log.error(msg, *args, **kwargs)
-
-    @property
-    # `class` is a keyword, `_class` triggers `SLF001` so we use a sunder name
-    def _class_(self) -> str:
-        try:
-            return self.flake.select(
-                f"clanInternals.inventory.machines.{self.name}.machineClass"
-            )
-        except ClanCmdError as e:
-            if re.search(f"error: attribute '{self.name}' missing", e.cmd.stderr):
-                return "nixos"
-            raise
-
-    @property
-    def system(self) -> str:
-        return self.flake.select(
-            f"{self._class_}Configurations.{self.name}.pkgs.hostPlatform.system"
-        )
-
-    @property
-    def deployment(self) -> dict:
-        deployment = json.loads(
-            self.build_nix("config.system.clan.deployment.file").read_text()
-        )
-        return deployment
-
-    @property
-    def target_host_address(self) -> str:
-        val = self.override_target_host or self.deployment.get("targetHost")
-        if val is None:
-            msg = f"'targetHost' is not set for machine '{self.name}'"
-            raise ClanError(
-                msg,
-                description="See https://docs.clan.lol/guides/getting-started/deploy/#setting-the-target-host for more information.",
-            )
-        return val
-
-    @cached_property
-    def secret_facts_store(self) -> facts_secret_modules.SecretStoreBase:
-        module = importlib.import_module(self.deployment["facts"]["secretModule"])
-        return module.SecretStore(machine=self)
-
-    @cached_property
-    def public_facts_store(self) -> facts_public_modules.FactStoreBase:
-        module = importlib.import_module(self.deployment["facts"]["publicModule"])
-        return module.FactStore(machine=self)
-
-    @cached_property
-    def secret_vars_store(self) -> StoreBase:
-        module = importlib.import_module(self.deployment["vars"]["secretModule"])
-        return module.SecretStore(machine=self)
-
-    @cached_property
-    def public_vars_store(self) -> StoreBase:
-        module = importlib.import_module(self.deployment["vars"]["publicModule"])
-        return module.FactStore(machine=self)
-
-    @property
-    def facts_data(self) -> dict[str, dict[str, Any]]:
-        if self.deployment["facts"]["services"]:
-            return self.deployment["facts"]["services"]
-        return {}
-
-    def vars_generators(self) -> list["Generator"]:
-        from clan_cli.vars.generate import Generator
-
-        clan_vars = self.deployment.get("vars")
-        if clan_vars is None:
-            return []
-        generators: dict[str, Any] = clan_vars.get("generators")
-        if generators is None:
-            return []
-        _generators = [Generator.from_json(gen) for gen in generators.values()]
-        for gen in _generators:
-            gen.machine(self)
-
-        return _generators
-
-    @property
-    def secrets_upload_directory(self) -> str:
-        return self.deployment["facts"]["secretUploadDirectory"]
-
-    @property
-    def flake_dir(self) -> Path:
-        return self.flake.path
-
-    def target_host(self) -> Remote:
-        return Remote.from_deployment_address(
-            machine_name=self.name,
-            address=self.target_host_address,
-            host_key_check=self.host_key_check,
-            private_key=self.private_key,
-        )
-
-    def build_host(self) -> Remote | None:
-        """
-        The host where the machine is built and deployed from.
-        Can be the same as the target host.
-        """
-        address = self.override_build_host or self.deployment.get("buildHost")
-        if address is None:
-            return None
-        # enable ssh agent forwarding to allow the build host to access the target host
-        host = Remote.from_deployment_address(
-            machine_name=self.name,
-            address=address,
-            host_key_check=self.host_key_check,
-            forward_agent=True,
-            private_key=self.private_key,
-        )
-        return host
-
-    def nix(
-        self,
-        attr: str,
-        nix_options: list[str] | None = None,
-    ) -> Any:
-        """
-        Build the machine and return the path to the result
-        accepts a secret store and a facts store # TODO
-        """
-        if nix_options is None:
-            nix_options = []
-
-        config = nix_config()
-        system = config["system"]
-
-        return self.flake.select(
-            f'clanInternals.machines."{system}".{self.name}.{attr}',
-            nix_options=nix_options,
-        )
-
-    def eval_nix(
-        self,
-        attr: str,
-        extra_config: None | dict = None,
-        nix_options: list[str] | None = None,
-    ) -> Any:
-        """
-        eval a nix attribute of the machine
-        @attr: the attribute to get
-        """
-
-        if extra_config:
-            log.warning("extra_config in eval_nix is no longer supported")
-
-        if nix_options is None:
-            nix_options = []
-
-        return self.nix(attr, nix_options)
-
-    def build_nix(
-        self,
-        attr: str,
-        extra_config: None | dict = None,
-        nix_options: list[str] | None = None,
-    ) -> Path:
-        """
-        build a nix attribute of the machine
-        @attr: the attribute to get
-        """
-
-        if extra_config:
-            log.warning("extra_config in build_nix is no longer supported")
-
-        if nix_options is None:
-            nix_options = []
-
-        output = self.nix(attr, nix_options)
-        output = Path(output)
-        if tmp_store := nix_test_store():
-            output = tmp_store.joinpath(*output.parts[1:])
-        assert output.exists(), f"The output {output} doesn't exist"
-        if isinstance(output, Path):
-            return output
-        msg = "build_nix returned not a Path"
-        raise ClanError(msg)

pkgs/clan-cli/clan_cli/machines/machines_test.py

@@ -1,7 +1,6 @@
 import pytest
 from clan_lib.flake import Flake
-
-from clan_cli.machines.machines import Machine
+from clan_lib.machines.machines import Machine
 
 # Functions to test
 from clan_cli.tests.fixtures_flakes import FlakeForTest

pkgs/clan-cli/clan_cli/machines/morph.py

@@ -11,11 +11,11 @@ from clan_lib.cmd import Log, RunOpts, run
 from clan_lib.dirs import get_clan_flake_toplevel_or_env
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_build, nix_command
 from clan_lib.nix_models.inventory import Machine as InventoryMachine
 
 from clan_cli.machines.create import CreateOptions, create_machine
-from clan_cli.machines.machines import Machine
 from clan_cli.vars.generate import generate_vars
 
 log = logging.getLogger(__name__)

pkgs/clan-cli/clan_cli/machines/update.py

@@ -11,6 +11,7 @@ from clan_lib.async_run import AsyncContext, AsyncOpts, AsyncRuntime, is_async_c
 from clan_lib.cmd import Log, MsgColor, RunOpts, run
 from clan_lib.colors import AnsiColor
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_command, nix_config, nix_metadata
 from clan_lib.ssh.remote import HostKeyCheck, Remote
 
@@ -21,7 +22,6 @@ from clan_cli.completions import (
 from clan_cli.facts.generate import generate_facts
 from clan_cli.facts.upload import upload_secrets
 from clan_cli.machines.list import list_machines
-from clan_cli.machines.machines import Machine
 from clan_cli.vars.generate import generate_vars
 from clan_cli.vars.upload import upload_secret_vars
 

pkgs/clan-cli/clan_cli/ssh/deploy_info.py

@@ -9,6 +9,7 @@ from typing import Any
 from clan_lib.async_run import AsyncRuntime
 from clan_lib.cmd import run
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_shell
 from clan_lib.ssh.parse import parse_deployment_address
 from clan_lib.ssh.remote import Remote, is_ssh_reachable
@@ -17,7 +18,6 @@ from clan_cli.completions import (
     add_dynamic_completer,
     complete_machines,
 )
-from clan_cli.machines.machines import Machine
 from clan_cli.ssh.host_key import HostKeyCheck
 from clan_cli.ssh.tor import TorTarget, spawn_tor, ssh_tor_reachable
 

pkgs/clan-cli/clan_cli/state/list.py

@@ -6,6 +6,7 @@ from pathlib import Path
 from clan_lib.cmd import RunOpts, run
 from clan_lib.dirs import get_clan_flake_toplevel_or_env
 from clan_lib.errors import ClanCmdError, ClanError
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_eval
 
 from clan_cli.completions import (
@@ -13,7 +14,6 @@ from clan_cli.completions import (
     complete_machines,
     complete_state_services_for_machine,
 )
-from clan_cli.machines.machines import Machine
 
 log = logging.getLogger(__name__)
 

pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py

@@ -10,7 +10,6 @@ from pathlib import Path
 from typing import Any, NamedTuple
 
 import pytest
-from clan_cli.machines.machines import Machine
 from clan_cli.tests import age_keys
 from clan_cli.tests.fixture_error import FixtureError
 from clan_cli.tests.root import CLAN_CORE
@@ -23,6 +22,7 @@ from clan_lib.dirs import (
 )
 from clan_lib.flake import Flake
 from clan_lib.locked_open import locked_open
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_test_store
 
 log = logging.getLogger(__name__)

pkgs/clan-cli/clan_cli/tests/test_modules.py

@@ -18,8 +18,8 @@ from clan_lib.persist.inventory_store import InventoryStore
 if TYPE_CHECKING:
     from .age_keys import KeyPair
 
-from clan_cli.machines.machines import Machine as MachineMachine
 from clan_cli.tests.helpers import cli
+from clan_lib.machines.machines import Machine as MachineMachine
 
 
 @pytest.mark.with_core

pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py

@@ -3,12 +3,12 @@ from typing import TYPE_CHECKING
 
 import pytest
 from clan_cli.facts.secret_modules.sops import SecretStore
-from clan_cli.machines.machines import Machine
 from clan_cli.secrets.folders import sops_secrets_folder
 from clan_cli.tests.fixtures_flakes import FlakeForTest
 from clan_cli.tests.helpers import cli
 from clan_cli.tests.helpers.validator import is_valid_age_key
 from clan_lib.flake import Flake
+from clan_lib.machines.machines import Machine
 
 if TYPE_CHECKING:
     from .age_keys import KeyPair

pkgs/clan-cli/clan_cli/tests/test_vars.py

@@ -4,7 +4,6 @@ import shutil
 from pathlib import Path
 
 import pytest
-from clan_cli.machines.machines import Machine
 from clan_cli.tests.age_keys import SopsSetup
 from clan_cli.tests.fixtures_flakes import ClanFlake
 from clan_cli.tests.helpers import cli
@@ -23,6 +22,7 @@ from clan_cli.vars.secret_modules import password_store, sops
 from clan_cli.vars.set import set_var
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_eval, run
 
 

pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py

@@ -4,7 +4,6 @@ import sys
 from contextlib import ExitStack
 
 import pytest
-from clan_cli.machines.machines import Machine
 from clan_cli.tests.age_keys import SopsSetup
 from clan_cli.tests.fixtures_flakes import ClanFlake
 from clan_cli.tests.helpers import cli
@@ -12,6 +11,7 @@ from clan_cli.tests.nix_config import ConfigItem
 from clan_cli.vms.run import inspect_vm, spawn_vm
 from clan_lib import cmd
 from clan_lib.flake import Flake
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_eval, run
 
 

pkgs/clan-cli/clan_cli/tests/test_vms_cli.py

@@ -2,12 +2,12 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 import pytest
-from clan_cli.machines.machines import Machine
 from clan_cli.tests.fixtures_flakes import ClanFlake, FlakeForTest
 from clan_cli.tests.helpers import cli
 from clan_cli.tests.stdout import CaptureOutput
 from clan_cli.vms.run import inspect_vm, spawn_vm
 from clan_lib.flake import Flake
+from clan_lib.machines.machines import Machine
 
 if TYPE_CHECKING:
     from .age_keys import KeyPair

pkgs/clan-cli/clan_cli/vars/_types.py

@@ -5,8 +5,8 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from clan_cli.machines import machines
 from clan_lib.errors import ClanError
+from clan_lib.machines import machines
 from clan_lib.ssh.remote import Remote
 
 if TYPE_CHECKING:

pkgs/clan-cli/clan_cli/vars/check.py

@@ -2,8 +2,8 @@ import argparse
 import logging
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.machines.machines import Machine
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 
 log = logging.getLogger(__name__)
 

pkgs/clan-cli/clan_cli/vars/fix.py

@@ -2,8 +2,8 @@ import argparse
 import logging
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.machines.machines import Machine
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 
 log = logging.getLogger(__name__)
 

pkgs/clan-cli/clan_cli/vars/generate.py

@@ -35,7 +35,7 @@ from .var import Var
 log = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
-    from clan_cli.machines.machines import Machine
+    from clan_lib.machines.machines import Machine
 
 
 @dataclass
@@ -356,7 +356,7 @@ def get_generators_closure(
     full_closure: bool = False,
     include_previous_values: bool = False,
 ) -> list[Generator]:
-    from clan_cli.machines.machines import Machine
+    from clan_lib.machines.machines import Machine
 
     return get_closure(
         machine=Machine(name=machine_name, flake=Flake(str(base_dir))),
@@ -395,7 +395,7 @@ def generate_vars_for_machine(
     base_dir: Path,
     no_sandbox: bool = False,
 ) -> bool:
-    from clan_cli.machines.machines import Machine
+    from clan_lib.machines.machines import Machine
 
     machine = Machine(name=machine_name, flake=Flake(str(base_dir)))
     generators_set = set(generators)

pkgs/clan-cli/clan_cli/vars/list.py

@@ -2,10 +2,10 @@ import argparse
 import logging
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.machines.machines import Machine
 from clan_lib.api import API
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
+from clan_lib.machines.machines import Machine
 
 from ._types import GeneratorUpdate
 from .generate import Generator, Prompt, Var, execute_generator

pkgs/clan-cli/clan_cli/vars/migration.py

@@ -8,8 +8,8 @@ from clan_lib.git import commit_files
 log = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
-    from clan_cli.machines.machines import Machine
     from clan_cli.vars.generate import Generator
+    from clan_lib.machines.machines import Machine
 
 
 def _migration_file_exists(

pkgs/clan-cli/clan_cli/vars/public_modules/in_repo.py

@@ -2,10 +2,10 @@ import shutil
 from collections.abc import Iterable
 from pathlib import Path
 
-from clan_cli.machines.machines import Machine
 from clan_cli.vars._types import StoreBase
 from clan_cli.vars.generate import Generator, Var
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 from clan_lib.ssh.remote import Remote
 
 

pkgs/clan-cli/clan_cli/vars/public_modules/vm.py

@@ -3,11 +3,11 @@ import shutil
 from collections.abc import Iterable
 from pathlib import Path
 
-from clan_cli.machines.machines import Machine
 from clan_cli.vars._types import StoreBase
 from clan_cli.vars.generate import Generator, Var
 from clan_lib.dirs import vm_state_dir
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 from clan_lib.ssh.remote import Remote
 
 log = logging.getLogger(__name__)

pkgs/clan-cli/clan_cli/vars/secret_modules/fs.py

@@ -2,9 +2,9 @@ import shutil
 import tempfile
 from pathlib import Path
 
-from clan_cli.machines.machines import Machine
 from clan_cli.vars._types import StoreBase
 from clan_cli.vars.generate import Generator, Var
+from clan_lib.machines.machines import Machine
 from clan_lib.ssh.remote import Remote
 
 

pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py

@@ -7,11 +7,11 @@ from itertools import chain
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from clan_cli.machines.machines import Machine
 from clan_cli.ssh.upload import upload
 from clan_cli.vars._types import StoreBase
 from clan_cli.vars.generate import Generator, Var
 from clan_lib.cmd import CmdOut, Log, RunOpts, run
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_shell
 from clan_lib.ssh.remote import Remote
 

pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py

@@ -5,7 +5,6 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import override
 
-from clan_cli.machines.machines import Machine
 from clan_cli.secrets import sops
 from clan_cli.secrets.folders import (
     sops_groups_folder,
@@ -27,6 +26,7 @@ from clan_cli.vars._types import StoreBase
 from clan_cli.vars.generate import Generator
 from clan_cli.vars.var import Var
 from clan_lib.errors import ClanError
+from clan_lib.machines.machines import Machine
 from clan_lib.ssh.remote import Remote
 
 

pkgs/clan-cli/clan_cli/vars/secret_modules/vm.py

@@ -2,10 +2,10 @@ import shutil
 from collections.abc import Iterable
 from pathlib import Path
 
-from clan_cli.machines.machines import Machine
 from clan_cli.vars._types import StoreBase
 from clan_cli.vars.generate import Generator, Var
 from clan_lib.dirs import vm_state_dir
+from clan_lib.machines.machines import Machine
 from clan_lib.ssh.remote import Remote
 
 

pkgs/clan-cli/clan_cli/vars/set.py

@@ -3,11 +3,11 @@ import logging
 import sys
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.machines.machines import Machine
 from clan_cli.vars.get import get_var
 from clan_cli.vars.prompt import PromptType
 from clan_lib.flake import Flake
 from clan_lib.git import commit_files
+from clan_lib.machines.machines import Machine
 
 from .generate import Var
 from .prompt import ask

pkgs/clan-cli/clan_cli/vars/upload.py

@@ -3,7 +3,7 @@ import logging
 from pathlib import Path
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.machines.machines import Machine
+from clan_lib.machines.machines import Machine
 from clan_lib.ssh.remote import Remote
 
 log = logging.getLogger(__name__)

pkgs/clan-cli/clan_cli/vms/inspect.py

@@ -5,9 +5,9 @@ from pathlib import Path
 from typing import Any
 
 from clan_lib.flake import Flake
+from clan_lib.machines.machines import Machine
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.machines.machines import Machine
 
 
 @dataclass

pkgs/clan-cli/clan_cli/vms/run.py

@@ -15,11 +15,11 @@ from tempfile import TemporaryDirectory
 from clan_lib.cmd import CmdOut, Log, RunOpts, handle_io, run
 from clan_lib.dirs import module_root, user_cache_dir, vm_state_dir
 from clan_lib.errors import ClanCmdError, ClanError
+from clan_lib.machines.machines import Machine
 from clan_lib.nix import nix_shell
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
 from clan_cli.facts.generate import generate_facts
-from clan_cli.machines.machines import Machine
 from clan_cli.qemu.qga import QgaSession
 from clan_cli.qemu.qmp import QEMUMonitorProtocol
 from clan_cli.vars.generate import generate_vars