From 8b1968cca65e6f93d0542020cb358005ea7179a2 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Thu, 22 May 2025 19:11:19 +0200 Subject: [PATCH] clan-cli: Move Machine object to clan_lib --- pkgs/clan-cli/clan_cli/backups/create.py | 2 +- pkgs/clan-cli/clan_cli/backups/list.py | 2 +- pkgs/clan-cli/clan_cli/backups/restore.py | 2 +- pkgs/clan-cli/clan_cli/clan/inspect.py | 2 +- pkgs/clan-cli/clan_cli/facts/check.py | 3 ++- pkgs/clan-cli/clan_cli/facts/generate.py | 2 +- pkgs/clan-cli/clan_cli/facts/list.py | 3 ++- .../clan-cli/clan_cli/facts/public_modules/__init__.py | 2 +- pkgs/clan-cli/clan_cli/facts/public_modules/in_repo.py | 3 +-- pkgs/clan-cli/clan_cli/facts/public_modules/vm.py | 3 +-- .../clan-cli/clan_cli/facts/secret_modules/__init__.py | 3 +-- .../clan_cli/facts/secret_modules/password_store.py | 2 +- pkgs/clan-cli/clan_cli/facts/secret_modules/sops.py | 2 +- pkgs/clan-cli/clan_cli/facts/secret_modules/vm.py | 3 +-- pkgs/clan-cli/clan_cli/facts/upload.py | 3 ++- pkgs/clan-cli/clan_cli/flash/automount.py | 3 +-- pkgs/clan-cli/clan_cli/flash/flash.py | 2 +- pkgs/clan-cli/clan_cli/flash/flash_cmd.py | 2 +- pkgs/clan-cli/clan_cli/machines/delete.py | 2 +- pkgs/clan-cli/clan_cli/machines/hardware.py | 2 +- pkgs/clan-cli/clan_cli/machines/install.py | 2 +- pkgs/clan-cli/clan_cli/machines/inventory.py | 3 +-- pkgs/clan-cli/clan_cli/machines/list.py | 2 +- pkgs/clan-cli/clan_cli/machines/machines_test.py | 3 +-- pkgs/clan-cli/clan_cli/machines/morph.py | 2 +- pkgs/clan-cli/clan_cli/machines/update.py | 2 +- pkgs/clan-cli/clan_cli/ssh/deploy_info.py | 2 +- pkgs/clan-cli/clan_cli/state/list.py | 2 +- pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_modules.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_vars.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py | 2 +- pkgs/clan-cli/clan_cli/tests/test_vms_cli.py | 2 +- pkgs/clan-cli/clan_cli/vars/_types.py | 2 +- pkgs/clan-cli/clan_cli/vars/check.py | 2 +- pkgs/clan-cli/clan_cli/vars/fix.py | 2 +- pkgs/clan-cli/clan_cli/vars/generate.py | 6 +++--- pkgs/clan-cli/clan_cli/vars/list.py | 2 +- pkgs/clan-cli/clan_cli/vars/migration.py | 2 +- pkgs/clan-cli/clan_cli/vars/public_modules/in_repo.py | 2 +- pkgs/clan-cli/clan_cli/vars/public_modules/vm.py | 2 +- pkgs/clan-cli/clan_cli/vars/secret_modules/fs.py | 2 +- .../clan_cli/vars/secret_modules/password_store.py | 2 +- pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py | 2 +- pkgs/clan-cli/clan_cli/vars/secret_modules/vm.py | 2 +- pkgs/clan-cli/clan_cli/vars/set.py | 2 +- pkgs/clan-cli/clan_cli/vars/upload.py | 2 +- pkgs/clan-cli/clan_cli/vms/inspect.py | 2 +- pkgs/clan-cli/clan_cli/vms/run.py | 2 +- pkgs/clan-cli/clan_lib/api/disk.py | 2 +- pkgs/clan-cli/clan_lib/api/network.py | 3 +-- pkgs/clan-cli/clan_lib/api/serde_deserialize_test.py | 2 +- pkgs/clan-cli/clan_lib/backups/create.py | 3 +-- pkgs/clan-cli/clan_lib/backups/list.py | 3 +-- pkgs/clan-cli/clan_lib/backups/restore.py | 3 +-- pkgs/clan-cli/clan_lib/dirs/__init__.py | 3 +-- pkgs/clan-cli/clan_lib/machines/__init__.py | 0 .../{clan_cli => clan_lib}/machines/machines.py | 10 +++++----- pkgs/clan-cli/clan_lib/tests/test_create.py | 2 +- .../clan_vm_manager/components/vmobj.py | 2 +- .../clan_vm_manager/singletons/use_join.py | 2 +- .../clan_vm_manager/singletons/use_vms.py | 2 +- 63 files changed, 71 insertions(+), 80 deletions(-) create mode 100644 pkgs/clan-cli/clan_lib/machines/__init__.py rename pkgs/clan-cli/{clan_cli => clan_lib}/machines/machines.py (100%) diff --git a/pkgs/clan-cli/clan_cli/backups/create.py b/pkgs/clan-cli/clan_cli/backups/create.py index c4e27647e..20d4c87f6 100644 --- a/pkgs/clan-cli/clan_cli/backups/create.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/backups/list.py b/pkgs/clan-cli/clan_cli/backups/list.py index 33ffa9516..ee628192b 100644 --- a/pkgs/clan-cli/clan_cli/backups/list.py +++ b/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: diff --git a/pkgs/clan-cli/clan_cli/backups/restore.py b/pkgs/clan-cli/clan_cli/backups/restore.py index f3d2bcc7e..5754b0991 100644 --- a/pkgs/clan-cli/clan_cli/backups/restore.py +++ b/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: diff --git a/pkgs/clan-cli/clan_cli/clan/inspect.py b/pkgs/clan-cli/clan_cli/clan/inspect.py index bef93cad6..51ffffb19 100644 --- a/pkgs/clan-cli/clan_cli/clan/inspect.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/facts/check.py b/pkgs/clan-cli/clan_cli/facts/check.py index fccf3b92f..61d6730d2 100644 --- a/pkgs/clan-cli/clan_cli/facts/check.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/facts/generate.py b/pkgs/clan-cli/clan_cli/facts/generate.py index 3ef68427e..b1eb038d2 100644 --- a/pkgs/clan-cli/clan_cli/facts/generate.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/facts/list.py b/pkgs/clan-cli/clan_cli/facts/list.py index c89d5f17a..a58e3ef56 100644 --- a/pkgs/clan-cli/clan_cli/facts/list.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/facts/public_modules/__init__.py b/pkgs/clan-cli/clan_cli/facts/public_modules/__init__.py index 64949bb88..f39349677 100644 --- a/pkgs/clan-cli/clan_cli/facts/public_modules/__init__.py +++ b/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): diff --git a/pkgs/clan-cli/clan_cli/facts/public_modules/in_repo.py b/pkgs/clan-cli/clan_cli/facts/public_modules/in_repo.py index 8de4faa4c..1747f253c 100644 --- a/pkgs/clan-cli/clan_cli/facts/public_modules/in_repo.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/facts/public_modules/vm.py b/pkgs/clan-cli/clan_cli/facts/public_modules/vm.py index 3544661b2..aa63e0baa 100644 --- a/pkgs/clan-cli/clan_cli/facts/public_modules/vm.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/facts/secret_modules/__init__.py b/pkgs/clan-cli/clan_cli/facts/secret_modules/__init__.py index 05226c0c8..7db2c3ed7 100644 --- a/pkgs/clan-cli/clan_cli/facts/secret_modules/__init__.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/facts/secret_modules/password_store.py b/pkgs/clan-cli/clan_cli/facts/secret_modules/password_store.py index 7ada30486..674d141c8 100644 --- a/pkgs/clan-cli/clan_cli/facts/secret_modules/password_store.py +++ b/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): diff --git a/pkgs/clan-cli/clan_cli/facts/secret_modules/sops.py b/pkgs/clan-cli/clan_cli/facts/secret_modules/sops.py index 1ab5d4103..cf602c985 100644 --- a/pkgs/clan-cli/clan_cli/facts/secret_modules/sops.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/facts/secret_modules/vm.py b/pkgs/clan-cli/clan_cli/facts/secret_modules/vm.py index dbbcb4942..09d0e03fd 100644 --- a/pkgs/clan-cli/clan_cli/facts/secret_modules/vm.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/facts/upload.py b/pkgs/clan-cli/clan_cli/facts/upload.py index 26c158d69..464df85dc 100644 --- a/pkgs/clan-cli/clan_cli/facts/upload.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/flash/automount.py b/pkgs/clan-cli/clan_cli/flash/automount.py index 2ccd86cab..9b1f10ab3 100644 --- a/pkgs/clan-cli/clan_cli/flash/automount.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/flash/flash.py b/pkgs/clan-cli/clan_cli/flash/flash.py index 82d4da2d8..b4b9734bb 100644 --- a/pkgs/clan-cli/clan_cli/flash/flash.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/flash/flash_cmd.py b/pkgs/clan-cli/clan_cli/flash/flash_cmd.py index b9533d86c..699edfd6b 100644 --- a/pkgs/clan-cli/clan_cli/flash/flash_cmd.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/machines/delete.py b/pkgs/clan-cli/clan_cli/machines/delete.py index c5ef63260..9a1fb006c 100644 --- a/pkgs/clan-cli/clan_cli/machines/delete.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/machines/hardware.py b/pkgs/clan-cli/clan_cli/machines/hardware.py index 9e300730e..e2dce8173 100644 --- a/pkgs/clan-cli/clan_cli/machines/hardware.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/machines/install.py b/pkgs/clan-cli/clan_cli/machines/install.py index 00617194e..508edda01 100644 --- a/pkgs/clan-cli/clan_cli/machines/install.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/machines/inventory.py b/pkgs/clan-cli/clan_cli/machines/inventory.py index 918e3f1a2..1e3ca85cc 100644 --- a/pkgs/clan-cli/clan_cli/machines/inventory.py +++ b/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: diff --git a/pkgs/clan-cli/clan_cli/machines/list.py b/pkgs/clan-cli/clan_cli/machines/list.py index 201101b06..324b63cc6 100644 --- a/pkgs/clan-cli/clan_cli/machines/list.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/machines/machines_test.py b/pkgs/clan-cli/clan_cli/machines/machines_test.py index d6cd52122..4410a0377 100644 --- a/pkgs/clan-cli/clan_cli/machines/machines_test.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/machines/morph.py b/pkgs/clan-cli/clan_cli/machines/morph.py index bd1045f01..f997db767 100644 --- a/pkgs/clan-cli/clan_cli/machines/morph.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/machines/update.py b/pkgs/clan-cli/clan_cli/machines/update.py index 2601afa76..161eb1354 100644 --- a/pkgs/clan-cli/clan_cli/machines/update.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/ssh/deploy_info.py b/pkgs/clan-cli/clan_cli/ssh/deploy_info.py index 6ac292e02..0f6178668 100644 --- a/pkgs/clan-cli/clan_cli/ssh/deploy_info.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/state/list.py b/pkgs/clan-cli/clan_cli/state/list.py index be8d1e893..d1d29f123 100644 --- a/pkgs/clan-cli/clan_cli/state/list.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py b/pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py index 4bccabfbd..873d4879b 100644 --- a/pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/tests/test_modules.py b/pkgs/clan-cli/clan_cli/tests/test_modules.py index 671fe90b6..d2a7fc903 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_modules.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py b/pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py index f1b3932ba..4e311384a 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/tests/test_vars.py b/pkgs/clan-cli/clan_cli/tests/test_vars.py index 35c46993c..96078e7e9 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_vars.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py b/pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py index 4712a8f76..1feadef65 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/tests/test_vms_cli.py b/pkgs/clan-cli/clan_cli/tests/test_vms_cli.py index 34df7d129..64e0b9b07 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_vms_cli.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/vars/_types.py b/pkgs/clan-cli/clan_cli/vars/_types.py index 7e09c380d..99cd36d19 100644 --- a/pkgs/clan-cli/clan_cli/vars/_types.py +++ b/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: diff --git a/pkgs/clan-cli/clan_cli/vars/check.py b/pkgs/clan-cli/clan_cli/vars/check.py index 0d4e4762e..d024f854a 100644 --- a/pkgs/clan-cli/clan_cli/vars/check.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/vars/fix.py b/pkgs/clan-cli/clan_cli/vars/fix.py index c5a434d51..c6e1ee53d 100644 --- a/pkgs/clan-cli/clan_cli/vars/fix.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/vars/generate.py b/pkgs/clan-cli/clan_cli/vars/generate.py index cce65e111..9c0f71630 100644 --- a/pkgs/clan-cli/clan_cli/vars/generate.py +++ b/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) diff --git a/pkgs/clan-cli/clan_cli/vars/list.py b/pkgs/clan-cli/clan_cli/vars/list.py index 87e07f4d1..b48e8ffc4 100644 --- a/pkgs/clan-cli/clan_cli/vars/list.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/vars/migration.py b/pkgs/clan-cli/clan_cli/vars/migration.py index 316b8e0aa..5d8d653c9 100644 --- a/pkgs/clan-cli/clan_cli/vars/migration.py +++ b/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( diff --git a/pkgs/clan-cli/clan_cli/vars/public_modules/in_repo.py b/pkgs/clan-cli/clan_cli/vars/public_modules/in_repo.py index 8214618d5..ac8630016 100644 --- a/pkgs/clan-cli/clan_cli/vars/public_modules/in_repo.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/vars/public_modules/vm.py b/pkgs/clan-cli/clan_cli/vars/public_modules/vm.py index 0304c061b..03ccf028a 100644 --- a/pkgs/clan-cli/clan_cli/vars/public_modules/vm.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/vars/secret_modules/fs.py b/pkgs/clan-cli/clan_cli/vars/secret_modules/fs.py index 01cfb1257..552613d0a 100644 --- a/pkgs/clan-cli/clan_cli/vars/secret_modules/fs.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py b/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py index 340c07955..80f5843cc 100644 --- a/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py b/pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py index 8a63a9dfc..04a3bb485 100644 --- a/pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/vars/secret_modules/vm.py b/pkgs/clan-cli/clan_cli/vars/secret_modules/vm.py index 9a4808e13..872a62169 100644 --- a/pkgs/clan-cli/clan_cli/vars/secret_modules/vm.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/vars/set.py b/pkgs/clan-cli/clan_cli/vars/set.py index e2237295e..ceeb4f46e 100644 --- a/pkgs/clan-cli/clan_cli/vars/set.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/vars/upload.py b/pkgs/clan-cli/clan_cli/vars/upload.py index 0a5fcd4a1..63236f12a 100644 --- a/pkgs/clan-cli/clan_cli/vars/upload.py +++ b/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__) diff --git a/pkgs/clan-cli/clan_cli/vms/inspect.py b/pkgs/clan-cli/clan_cli/vms/inspect.py index 320b96b9b..491312a3e 100644 --- a/pkgs/clan-cli/clan_cli/vms/inspect.py +++ b/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 diff --git a/pkgs/clan-cli/clan_cli/vms/run.py b/pkgs/clan-cli/clan_cli/vms/run.py index 97c27c09b..eef58695c 100644 --- a/pkgs/clan-cli/clan_cli/vms/run.py +++ b/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 diff --git a/pkgs/clan-cli/clan_lib/api/disk.py b/pkgs/clan-cli/clan_lib/api/disk.py index 3cab138d5..cb7043dce 100644 --- a/pkgs/clan-cli/clan_lib/api/disk.py +++ b/pkgs/clan-cli/clan_lib/api/disk.py @@ -6,13 +6,13 @@ from typing import Any, TypedDict from uuid import uuid4 from clan_cli.machines.hardware import HardwareConfig, show_machine_hardware_config -from clan_cli.machines.machines import Machine from clan_lib.api import API from clan_lib.api.modules import Frontmatter, extract_frontmatter from clan_lib.dirs import TemplateType, clan_templates from clan_lib.errors import ClanError from clan_lib.git import commit_file +from clan_lib.machines.machines import Machine log = logging.getLogger(__name__) diff --git a/pkgs/clan-cli/clan_lib/api/network.py b/pkgs/clan-cli/clan_lib/api/network.py index f41e26b6f..1aca87673 100644 --- a/pkgs/clan-cli/clan_lib/api/network.py +++ b/pkgs/clan-cli/clan_lib/api/network.py @@ -3,11 +3,10 @@ import time from dataclasses import dataclass from typing import Literal -from clan_cli.machines.machines import Machine - from clan_lib.api import API from clan_lib.cmd import RunOpts from clan_lib.errors import ClanError +from clan_lib.machines.machines import Machine log = logging.getLogger(__name__) diff --git a/pkgs/clan-cli/clan_lib/api/serde_deserialize_test.py b/pkgs/clan-cli/clan_lib/api/serde_deserialize_test.py index 62497e774..6b8065154 100644 --- a/pkgs/clan-cli/clan_lib/api/serde_deserialize_test.py +++ b/pkgs/clan-cli/clan_lib/api/serde_deserialize_test.py @@ -3,11 +3,11 @@ from pathlib import Path from typing import Any, Literal, TypedDict import pytest -from clan_cli.machines import machines # Functions to test from clan_lib.api import dataclass_to_dict, from_dict from clan_lib.errors import ClanError +from clan_lib.machines import machines def test_simple() -> None: diff --git a/pkgs/clan-cli/clan_lib/backups/create.py b/pkgs/clan-cli/clan_lib/backups/create.py index 7e384dcdf..4edef8cc4 100644 --- a/pkgs/clan-cli/clan_lib/backups/create.py +++ b/pkgs/clan-cli/clan_lib/backups/create.py @@ -1,6 +1,5 @@ -from clan_cli.machines.machines import Machine - from clan_lib.errors import ClanError +from clan_lib.machines.machines import Machine def create_backup(machine: Machine, provider: str | None = None) -> None: diff --git a/pkgs/clan-cli/clan_lib/backups/list.py b/pkgs/clan-cli/clan_lib/backups/list.py index fffb0adc0..e6b377e5c 100644 --- a/pkgs/clan-cli/clan_lib/backups/list.py +++ b/pkgs/clan-cli/clan_lib/backups/list.py @@ -1,10 +1,9 @@ import json from dataclasses import dataclass -from clan_cli.machines.machines import Machine - from clan_lib.cmd import Log, RunOpts from clan_lib.errors import ClanError +from clan_lib.machines.machines import Machine from clan_lib.ssh.remote import Remote diff --git a/pkgs/clan-cli/clan_lib/backups/restore.py b/pkgs/clan-cli/clan_lib/backups/restore.py index 7d39cf940..6cef57022 100644 --- a/pkgs/clan-cli/clan_lib/backups/restore.py +++ b/pkgs/clan-cli/clan_lib/backups/restore.py @@ -1,7 +1,6 @@ -from clan_cli.machines.machines import Machine - from clan_lib.cmd import Log, RunOpts from clan_lib.errors import ClanError +from clan_lib.machines.machines import Machine from clan_lib.ssh.remote import Remote diff --git a/pkgs/clan-cli/clan_lib/dirs/__init__.py b/pkgs/clan-cli/clan_lib/dirs/__init__.py index c7e9f9be5..0c3c7de89 100644 --- a/pkgs/clan-cli/clan_lib/dirs/__init__.py +++ b/pkgs/clan-cli/clan_lib/dirs/__init__.py @@ -9,9 +9,8 @@ from typing import TYPE_CHECKING from clan_lib.errors import ClanError if TYPE_CHECKING: - from clan_cli.machines.machines import Machine - from clan_lib.flake import Flake + from clan_lib.machines.machines import Machine log = logging.getLogger(__name__) diff --git a/pkgs/clan-cli/clan_lib/machines/__init__.py b/pkgs/clan-cli/clan_lib/machines/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/pkgs/clan-cli/clan_cli/machines/machines.py b/pkgs/clan-cli/clan_lib/machines/machines.py similarity index 100% rename from pkgs/clan-cli/clan_cli/machines/machines.py rename to pkgs/clan-cli/clan_lib/machines/machines.py index 92283b647..a36da46bf 100644 --- a/pkgs/clan-cli/clan_cli/machines/machines.py +++ b/pkgs/clan-cli/clan_lib/machines/machines.py @@ -7,16 +7,16 @@ 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 +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 + log = logging.getLogger(__name__) if TYPE_CHECKING: diff --git a/pkgs/clan-cli/clan_lib/tests/test_create.py b/pkgs/clan-cli/clan_lib/tests/test_create.py index 02b305ee2..bc4965aee 100644 --- a/pkgs/clan-cli/clan_lib/tests/test_create.py +++ b/pkgs/clan-cli/clan_lib/tests/test_create.py @@ -10,7 +10,6 @@ import clan_cli.clan.create import pytest from clan_cli.machines.create import CreateOptions as ClanCreateOptions from clan_cli.machines.create import create_machine -from clan_cli.machines.machines import Machine from clan_cli.secrets.key import generate_key from clan_cli.secrets.sops import maybe_get_admin_public_key from clan_cli.secrets.users import add_user @@ -24,6 +23,7 @@ from clan_lib.dirs import specific_machine_dir from clan_lib.errors import ClanError from clan_lib.flake import Flake from clan_lib.inventory import patch_inventory_with +from clan_lib.machines.machines import Machine from clan_lib.nix import nix_command from clan_lib.nix_models.inventory import Machine as InventoryMachine from clan_lib.nix_models.inventory import MachineDeploy diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py b/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py index 8e54731d5..0be941739 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py @@ -13,10 +13,10 @@ from typing import IO, ClassVar import gi from clan_cli import vms -from clan_cli.machines.machines import Machine from clan_cli.vms.inspect import inspect_vm from clan_cli.vms.qemu import QMPWrapper from clan_lib.dirs import vm_state_dir +from clan_lib.machines.machines import Machine from clan_vm_manager.clan_uri import ClanURI from clan_vm_manager.components.executor import MPProcess, spawn diff --git a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py index 1dc0097a0..03826def5 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py @@ -4,7 +4,7 @@ from collections.abc import Callable from typing import Any, ClassVar, cast import gi -from clan_cli.machines.machines import Machine +from clan_lib.machines.machines import Machine from clan_vm_manager.clan_uri import ClanURI from clan_vm_manager.components.gkvstore import GKVStore diff --git a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py index 85bab2685..6135dafdb 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py @@ -4,8 +4,8 @@ from pathlib import Path from typing import Any, ClassVar import gi -from clan_cli.machines.machines import Machine from clan_lib.flake import Flake +from clan_lib.machines.machines import Machine from clan_vm_manager import assets from clan_vm_manager.clan_uri import ClanURI