clan-cli: Move Machine object to clan_lib

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__)