yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'ruff-6-warnings' (#4937) from ruff-6-warnings into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4937
This commit is contained in:
Mic92
2025-08-25 14:06:20 +00:00
parent 453b1a91a8 70274d69e9
commit b5a7a91612
14 changed files with 87 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/nix/render_options/__init__.py
View File

@@ -175,9 +175,11 @@ def print_options(
res += head if len(options.items()) else no_options res += head if len(options.items()) else no_options
for option_name, info in options.items(): for option_name, info in options.items():
if replace_prefix: if replace_prefix:
option_name = option_name.replace(replace_prefix + ".", "") display_name = option_name.replace(replace_prefix + ".", "")
else:
display_name = option_name
res += render_option(option_name, info, 4) res += render_option(display_name, info, 4)
return res return res

12
lib/test/container-test-driver/test_driver/__init__.py
View File

@@ -13,7 +13,7 @@ import uuid
from collections.abc import Callable from collections.abc import Callable
from contextlib import _GeneratorContextManager from contextlib import _GeneratorContextManager
from dataclasses import dataclass from dataclasses import dataclass
from functools import cached_property from functools import cache, cached_property
from pathlib import Path from pathlib import Path
from tempfile import NamedTemporaryFile, TemporaryDirectory from tempfile import NamedTemporaryFile, TemporaryDirectory
from typing import Any from typing import Any
@@ -22,16 +22,10 @@ from colorama import Fore, Style
from .logger import AbstractLogger, CompositeLogger, TerminalLogger from .logger import AbstractLogger, CompositeLogger, TerminalLogger
# Global flag to track if test environment has been initialized
_test_env_initialized = False
@cache
def init_test_environment() -> None: def init_test_environment() -> None:
"""Set up the test environment (network bridge, /etc/passwd) once.""" """Set up the test environment (network bridge, /etc/passwd) once."""
global _test_env_initialized
if _test_env_initialized:
return
# Set up network bridge # Set up network bridge
subprocess.run( subprocess.run(
["ip", "link", "add", "br0", "type", "bridge"], ["ip", "link", "add", "br0", "type", "bridge"],
@@ -90,8 +84,6 @@ nogroup:x:65534:
errno = ctypes.get_errno() errno = ctypes.get_errno()
raise OSError(errno, os.strerror(errno), "Failed to mount group") raise OSError(errno, os.strerror(errno), "Failed to mount group")
_test_env_initialized = True
# Load the C library # Load the C library
libc = ctypes.CDLL("libc.so.6", use_errno=True) libc = ctypes.CDLL("libc.so.6", use_errno=True)

4
pkgs/clan-cli/clan_cli/network/ping.py
View File

@@ -31,11 +31,11 @@ def ping_command(args: argparse.Namespace) -> None:
if machine in network.peers: if machine in network.peers:
found = True found = True
with network.module.connection(network) as network: with network.module.connection(network) as conn:
log.info(f"Pinging '{machine}' in network '{net_name}' ...") log.info(f"Pinging '{machine}' in network '{net_name}' ...")
res = "" res = ""
# Check if peer is online # Check if peer is online
ping = network.ping(machine) ping = conn.ping(machine)
if ping is None: if ping is None:
res = "not reachable" res = "not reachable"
log.info(f"{machine} ({net_name}): {res}") log.info(f"{machine} ({net_name}): {res}")

10
pkgs/clan-cli/clan_cli/secrets/import_sops.py
View File

@@ -37,22 +37,22 @@ def import_sops(args: argparse.Namespace) -> None:
res = run(cmd, RunOpts(error_msg=f"Could not import sops file {file}")) res = run(cmd, RunOpts(error_msg=f"Could not import sops file {file}"))
secrets = json.loads(res.stdout) secrets = json.loads(res.stdout)
for k, v in secrets.items(): for k, v in secrets.items():
k = args.prefix + k secret_name = args.prefix + k
if not isinstance(v, str): if not isinstance(v, str):
print( print(
f"WARNING: {k} is not a string but {type(v)}, skipping", f"WARNING: {secret_name} is not a string but {type(v)}, skipping",
file=sys.stderr, file=sys.stderr,
) )
continue continue
if (sops_secrets_folder(args.flake.path) / k / "secret").exists(): if (sops_secrets_folder(args.flake.path) / secret_name / "secret").exists():
print( print(
f"WARNING: {k} already exists, skipping", f"WARNING: {secret_name} already exists, skipping",
file=sys.stderr, file=sys.stderr,
) )
continue continue
encrypt_secret( encrypt_secret(
args.flake.path, args.flake.path,
sops_secrets_folder(args.flake.path) / k, sops_secrets_folder(args.flake.path) / secret_name,
v, v,
add_groups=args.group, add_groups=args.group,
add_machines=args.machine, add_machines=args.machine,

32
pkgs/clan-cli/clan_cli/templates/list.py
View File

@@ -1,3 +1,5 @@
from __future__ import annotations
import argparse import argparse
import logging import logging
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
@@ -14,9 +16,7 @@ def list_command(args: argparse.Namespace) -> None:
templates = list_templates(args.flake) templates = list_templates(args.flake)
# Display all templates # Display all templates
for i, (template_type, _builtin_template_set) in enumerate( for template_type in templates.builtins:
templates.builtins.items(),
):
builtin_template_set: TemplateClanType | None = templates.builtins.get( builtin_template_set: TemplateClanType | None = templates.builtins.get(
template_type, template_type,
None, None,
@@ -26,31 +26,31 @@ def list_command(args: argparse.Namespace) -> None:
print(f"Available '{template_type}' templates") print(f"Available '{template_type}' templates")
print("├── <builtin>") print("├── <builtin>")
for i, (name, template) in enumerate(builtin_template_set.items()): for builtin_idx, (name, template) in enumerate(builtin_template_set.items()):
description = template.get("description", "no description") description = template.get("description", "no description")
is_last_template = i == len(builtin_template_set.items()) - 1 is_last_template = builtin_idx == len(builtin_template_set.items()) - 1
if not is_last_template: if not is_last_template:
print(f"│ ├── {name}: {description}") print(f"│ ├── {name}: {description}")
else: else:
print(f"│ └── {name}: {description}") print(f"│ └── {name}: {description}")
for i, (input_name, input_templates) in enumerate(templates.custom.items()): visible_inputs = [
custom_templates: TemplateClanType | None = input_templates.get( (input_name, input_templates)
template_type, for input_name, input_templates in templates.custom.items()
None, if template_type in input_templates
) # type: ignore ]
if not custom_templates: last_idx = len(visible_inputs) - 1
continue for input_idx, (input_name, input_templates) in enumerate(visible_inputs):
custom_templates: TemplateClanType = input_templates[template_type] # type: ignore
is_last_input = i == len(templates.custom.items()) - 1 is_last_input = input_idx == last_idx
prefix = "│" if not is_last_input else " " prefix = "│" if not is_last_input else " "
if not is_last_input: if not is_last_input:
print(f"├── inputs.{input_name}:") print(f"├── inputs.{input_name}:")
else: else:
print(f"└── inputs.{input_name}:") print(f"└── inputs.{input_name}:")
for i, (name, template) in enumerate(custom_templates.items()): for custom_idx, (name, template) in enumerate(custom_templates.items()):
is_last_template = i == len(custom_templates.items()) - 1 is_last_template = custom_idx == len(custom_templates.items()) - 1
if not is_last_template: if not is_last_template:
print( print(
f"{prefix} ├── {name}: {template.get('description', 'no description')}", f"{prefix} ├── {name}: {template.get('description', 'no description')}",

30
pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py
View File

@@ -70,22 +70,31 @@ def substitute(
with file.open() as f: with file.open() as f:
for line in f: for line in f:
line = line.replace("__NIXPKGS__", str(nixpkgs_source())) processed_line = line.replace("__NIXPKGS__", str(nixpkgs_source()))
if clan_core_replacement: if clan_core_replacement:
line = line.replace("__CLAN_CORE__", clan_core_replacement) processed_line = processed_line.replace(
line = line.replace( "__CLAN_CORE__",
clan_core_replacement,
)
processed_line = processed_line.replace(
"git+https://git.clan.lol/clan/clan-core", "git+https://git.clan.lol/clan/clan-core",
clan_core_replacement, clan_core_replacement,
) )
line = line.replace( processed_line = processed_line.replace(
"https://git.clan.lol/clan/clan-core/archive/main.tar.gz", "https://git.clan.lol/clan/clan-core/archive/main.tar.gz",
clan_core_replacement, clan_core_replacement,
) )
line = line.replace("__INVENTORY_EXPR__", str(inventory_expr)) processed_line = processed_line.replace(
"__INVENTORY_EXPR__",
str(inventory_expr),
)
line = line.replace("__CLAN_SOPS_KEY_PATH__", sops_key) processed_line = processed_line.replace("__CLAN_SOPS_KEY_PATH__", sops_key)
line = line.replace("__CLAN_SOPS_KEY_DIR__", str(flake / "facts")) processed_line = processed_line.replace(
buf += line "__CLAN_SOPS_KEY_DIR__",
str(flake / "facts"),
)
buf += processed_line
print(f"file: {file}") print(f"file: {file}")
print(f"clan_core: {clan_core_flake}") print(f"clan_core: {clan_core_flake}")
@@ -202,9 +211,10 @@ class ClanFlake:
buf = "" buf = ""
with file.open() as f: with file.open() as f:
for line in f: for line in f:
processed_line = line
for key, value in self.substitutions.items(): for key, value in self.substitutions.items():
line = line.replace(key, value) processed_line = processed_line.replace(key, value)
buf += line buf += processed_line
file.write_text(buf) file.write_text(buf)
def init_from_template(self) -> None: def init_from_template(self) -> None:

4
pkgs/clan-cli/clan_cli/tests/test_api_dataclass_compat.py
View File

@@ -14,8 +14,8 @@ from clan_lib.errors import ClanError
def should_skip(file_path: Path, excludes: list[Path]) -> bool: def should_skip(file_path: Path, excludes: list[Path]) -> bool:
file_path = file_path.resolve() # Ensure absolute path file_path = file_path.resolve() # Ensure absolute path
for exclude in excludes: for exclude in excludes:
exclude = exclude.resolve() resolved_exclude = exclude.resolve()
if exclude in file_path.parents or exclude == file_path: if resolved_exclude in file_path.parents or resolved_exclude == file_path:
return True # Skip this file return True # Skip this file
return False return False

11
pkgs/clan-cli/clan_lib/bwrap/__init__.py
View File

@@ -1,21 +1,14 @@
import os import os
import shutil import shutil
from functools import cache
from pathlib import Path from pathlib import Path
from clan_lib.cmd import Log, RunOpts, run from clan_lib.cmd import Log, RunOpts, run
from clan_lib.nix import nix_shell from clan_lib.nix import nix_shell
_works: bool | None = None
@cache
def bubblewrap_works() -> bool: def bubblewrap_works() -> bool:
global _works
if _works is None:
_works = _bubblewrap_works()
return _works
def _bubblewrap_works() -> bool:
real_bash_path = Path("bash") real_bash_path = Path("bash")
if os.environ.get("IN_NIX_SANDBOX"): if os.environ.get("IN_NIX_SANDBOX"):
bash_executable_path = Path(str(shutil.which("bash"))) bash_executable_path = Path(str(shutil.which("bash")))

2
pkgs/clan-cli/clan_lib/errors/__init__.py
View File

@@ -90,7 +90,7 @@ def indent_command(command_list: list[str]) -> str:
return final_command return final_command
DEBUG_COMMANDS = os.environ.get("CLAN_DEBUG_COMMANDS", False) DEBUG_COMMANDS = os.environ.get("CLAN_DEBUG_COMMANDS") == "1"
@dataclass @dataclass

4
pkgs/clan-cli/clan_lib/flake/flake.py
View File

@@ -869,7 +869,7 @@ class Flake:
self.identifier, self.identifier,
] ]
trace_prefetch = os.environ.get("CLAN_DEBUG_NIX_PREFETCH", False) == "1" trace_prefetch = os.environ.get("CLAN_DEBUG_NIX_PREFETCH") == "1"
if not trace_prefetch: if not trace_prefetch:
log.debug(f"Prefetching flake {self.identifier}") log.debug(f"Prefetching flake {self.identifier}")
try: try:
@@ -1018,7 +1018,7 @@ class Flake:
]; ];
}} }}
""" """
trace = os.environ.get("CLAN_DEBUG_NIX_SELECTORS", False) == "1" trace = os.environ.get("CLAN_DEBUG_NIX_SELECTORS") == "1"
try: try:
build_output = Path( build_output = Path(
run( run(

54
pkgs/clan-cli/clan_lib/log_manager/__init__.py
View File

@@ -138,15 +138,6 @@ class LogFile:
return path / self.func_name / f"{self.date_second}_{self.op_key}.log" return path / self.func_name / f"{self.date_second}_{self.op_key}.log"
def __eq__(self, other: object) -> bool: def __eq__(self, other: object) -> bool:
"""Check equality with another LogFile instance.
Args:
other: The object to compare with.
Returns:
True if all significant fields are equal, False otherwise.
"""
if not isinstance(other, LogFile): if not isinstance(other, LogFile):
return NotImplemented return NotImplemented
# Compare all significant fields for equality # Compare all significant fields for equality
@@ -158,18 +149,18 @@ class LogFile:
and self._base_dir == other._base_dir and self._base_dir == other._base_dir
) )
def __hash__(self) -> int:
return hash(
(
self._datetime_obj,
self.group,
self.func_name,
self.op_key,
self._base_dir,
),
)
def __lt__(self, other: object) -> bool: def __lt__(self, other: object) -> bool:
"""Compare LogFile instances for sorting.
Sorting order: datetime (newest first), then group, func_name, op_key (all ascending).
Args:
other: The object to compare with.
Returns:
True if this instance should be sorted before the other.
"""
if not isinstance(other, LogFile): if not isinstance(other, LogFile):
return NotImplemented return NotImplemented
# Primary sort: datetime (newest first). self is "less than" other if self is newer. # Primary sort: datetime (newest first). self is "less than" other if self is newer.
@@ -228,31 +219,14 @@ class LogDayDir:
return self._base_dir / self.date_day return self._base_dir / self.date_day
def __eq__(self, other: object) -> bool: def __eq__(self, other: object) -> bool:
"""Check equality with another LogDayDir instance.
Args:
other: The object to compare with.
Returns:
True if date_day and base_dir are equal, False otherwise.
"""
if not isinstance(other, LogDayDir): if not isinstance(other, LogDayDir):
return NotImplemented return NotImplemented
return self.date_day == other.date_day and self._base_dir == other._base_dir return self.date_day == other.date_day and self._base_dir == other._base_dir
def __hash__(self) -> int:
return hash((self.date_day, self._base_dir))
def __lt__(self, other: object) -> bool: def __lt__(self, other: object) -> bool:
"""Compare LogDayDir instances for sorting.
Sorting order: date (newest first).
Args:
other: The object to compare with.
Returns:
True if this instance should be sorted before the other.
"""
if not isinstance(other, LogDayDir): if not isinstance(other, LogDayDir):
return NotImplemented return NotImplemented
# Primary sort: date (newest first) # Primary sort: date (newest first)

6
pkgs/clan-cli/clan_lib/network/network.py
View File

@@ -247,10 +247,10 @@ def get_network_overview(networks: dict[str, Network]) -> dict:
if module.is_running(): if module.is_running():
result[network_name]["status"] = True result[network_name]["status"] = True
else: else:
with module.connection(network) as network: with module.connection(network) as conn:
for peer_name in network.peers: for peer_name in conn.peers:
try: try:
result[network_name]["peers"][peer_name] = network.ping( result[network_name]["peers"][peer_name] = conn.ping(
peer_name, peer_name,
) )
except ClanError: except ClanError:

12
pkgs/clan-cli/clan_lib/persist/util.py
View File

@@ -498,12 +498,14 @@ def retrieve_typed_field_names(obj: type, prefix: str = "") -> set[str]:
# Unwrap Required/NotRequired # Unwrap Required/NotRequired
if origin in {NotRequired, Required}: if origin in {NotRequired, Required}:
field_type = args[0] unwrapped_type = args[0]
origin = get_origin(field_type) origin = get_origin(unwrapped_type)
args = get_args(field_type) args = get_args(unwrapped_type)
else:
unwrapped_type = field_type
if is_typeddict_class(field_type): if is_typeddict_class(unwrapped_type):
fields |= retrieve_typed_field_names(field_type, prefix=full_key) fields |= retrieve_typed_field_names(unwrapped_type, prefix=full_key)
else: else:
fields.add(full_key) fields.add(full_key)

14
pkgs/clan-cli/clan_lib/ssh/sudo_askpass_proxy.py
View File

@@ -79,9 +79,9 @@ class SudoAskpassProxy:
raise ClanError(msg) raise ClanError(msg)
try: try:
for line in ssh_process.stdout: for line in ssh_process.stdout:
line = line.strip() stripped_line = line.strip()
if line.startswith("PASSWORD_REQUESTED:"): if stripped_line.startswith("PASSWORD_REQUESTED:"):
prompt = line[len("PASSWORD_REQUESTED:") :].strip() prompt = stripped_line[len("PASSWORD_REQUESTED:") :].strip()
password = self.handle_password_request(prompt) password = self.handle_password_request(prompt)
if ssh_process.stdin is None: if ssh_process.stdin is None:
msg = "SSH process stdin is None" msg = "SSH process stdin is None"
@@ -89,7 +89,7 @@ class SudoAskpassProxy:
print(password, file=ssh_process.stdin) print(password, file=ssh_process.stdin)
ssh_process.stdin.flush() ssh_process.stdin.flush()
else: else:
print(line) print(stripped_line)
except Exception as e: except Exception as e:
logger.error(f"Error processing passwords requests output: {e}") logger.error(f"Error processing passwords requests output: {e}")
@@ -116,9 +116,9 @@ class SudoAskpassProxy:
raise ClanError(msg) raise ClanError(msg)
for line in self.ssh_process.stdout: for line in self.ssh_process.stdout:
line = line.strip() stripped_line = line.strip()
if line.startswith("ASKPASS_SCRIPT:"): if stripped_line.startswith("ASKPASS_SCRIPT:"):
askpass_script = line[len("ASKPASS_SCRIPT:") :].strip() askpass_script = stripped_line[len("ASKPASS_SCRIPT:") :].strip()
break break
else: else:
msg = f"Failed to create askpass script on {self.host.target}. Did not receive ASKPASS_SCRIPT line." msg = f"Failed to create askpass script on {self.host.target}. Did not receive ASKPASS_SCRIPT line."