Remove some Any instances from the codebase

Author: correctmost

archinstall/__init__.py

@@ -8,7 +8,7 @@
 import traceback
 from argparse import ArgumentParser, Namespace
 from pathlib import Path
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING
 
 from archinstall.lib.args import arch_config_handler
 from archinstall.lib.disk.utils import disk_layouts

archinstall/lib/installer.py

@@ -45,7 +45,9 @@
 from .storage import storage
 
 if TYPE_CHECKING:
-	_: Any
+	from archinstall.lib.translationhandler import DeferredTranslation
+
+	_: Callable[[str], DeferredTranslation]
 
 # Any package that the Installer() is responsible for (optional and the default ones)
 __packages__ = ["base", "base-devel", "linux-firmware", "linux", "linux-lts", "linux-zen", "linux-hardened"]
@@ -80,7 +82,7 @@ def __init__(
 
 		self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S')
 		self.milliseconds = int(str(time.time()).split('.')[1])
-		self.helper_flags: dict[str, Any] = {'base': False, 'bootloader': None}
+		self.helper_flags: dict[str, str | bool | None] = {'base': False, 'bootloader': None}
 
 		for kernel in self.kernels:
 			self._base_packages.append(kernel)
@@ -162,23 +164,21 @@ def _verify_service_stop(self) -> None:
 		"""
 
 		if not arch_config_handler.args.skip_ntp:
-			info(_('Waiting for time sync (timedatectl show) to complete.'))
+			info(str(_('Waiting for time sync (timedatectl show) to complete.')))
 
 			started_wait = time.time()
 			notified = False
 			while True:
 				if not notified and time.time() - started_wait > 5:
 					notified = True
-					warn(
-						_("Time synchronization not completing, while you wait - check the docs for workarounds: https://archinstall.readthedocs.io/"))
+					warn(str(_("Time synchronization not completing, while you wait - check the docs for workarounds: https://archinstall.readthedocs.io/")))
 
 				time_val = SysCommand('timedatectl show --property=NTPSynchronized --value').decode()
 				if time_val and time_val.strip() == 'yes':
 					break
 				time.sleep(1)
 		else:
-			info(
-				_('Skipping waiting for automatic time sync (this can cause issues if time is out of sync during installation)'))
+			info(str(_('Skipping waiting for automatic time sync (this can cause issues if time is out of sync during installation)')))
 
 		info('Waiting for automatic mirror selection (reflector) to complete.')
 		while self._service_state('reflector') not in ('dead', 'failed', 'exited'):
@@ -188,7 +188,7 @@ def _verify_service_stop(self) -> None:
 		# while self._service_state('pacman-init') not in ('dead', 'failed', 'exited'):
 		# 	time.sleep(1)
 
-		info(_('Waiting for Arch Linux keyring sync (archlinux-keyring-wkd-sync) to complete.'))
+		info(str(_('Waiting for Arch Linux keyring sync (archlinux-keyring-wkd-sync) to complete.')))
 		# Wait for the timer to kick in
 		while self._service_started('archlinux-keyring-wkd-sync.timer') is None:
 			time.sleep(1)

archinstall/lib/models/network_configuration.py

@@ -2,13 +2,14 @@
 
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, NotRequired, TypedDict
 
 from ..models.profile_model import ProfileConfiguration
 
 if TYPE_CHECKING:
 	from collections.abc import Callable
 
+	from archinstall.lib.installer import Installer
 	from archinstall.lib.translationhandler import DeferredTranslation
 
 	_: Callable[[str], DeferredTranslation]
@@ -29,6 +30,14 @@ def display_msg(self) -> str:
 				return str(_('Manual configuration'))
 
 
+class _NicSerialization(TypedDict):
+	iface: str | None
+	ip: str | None
+	dhcp: bool
+	gateway: str | None
+	dns: list[str]
+
+
 @dataclass
 class Nic:
 	iface: str | None = None
@@ -37,7 +46,7 @@ class Nic:
 	gateway: str | None = None
 	dns: list[str] = field(default_factory=list)
 
-	def table_data(self) -> dict[str, Any]:
+	def table_data(self) -> dict[str, str | bool | list[str]]:
 		return {
 			'iface': self.iface if self.iface else '',
 			'ip': self.ip if self.ip else '',
@@ -46,7 +55,7 @@ def table_data(self) -> dict[str, Any]:
 			'dns': self.dns
 		}
 
-	def json(self) -> dict[str, Any]:
+	def json(self) -> _NicSerialization:
 		return {
 			'iface': self.iface,
 			'ip': self.ip,
@@ -56,7 +65,7 @@ def json(self) -> dict[str, Any]:
 		}
 
 	@staticmethod
-	def parse_arg(arg: dict[str, Any]) -> Nic:
+	def parse_arg(arg: _NicSerialization) -> Nic:
 		return Nic(
 			iface=arg.get('iface', None),
 			ip=arg.get('ip', None),
@@ -93,20 +102,25 @@ def as_systemd_config(self) -> str:
 		return config_str
 
 
+class _NetworkConfigurationSerialization(TypedDict):
+	type: str
+	nics: NotRequired[list[_NicSerialization]]
+
+
 @dataclass
 class NetworkConfiguration:
 	type: NicType
 	nics: list[Nic] = field(default_factory=list)
 
-	def json(self) -> dict[str, Any]:
-		config: dict[str, Any] = {'type': self.type.value}
+	def json(self) -> _NetworkConfigurationSerialization:
+		config: _NetworkConfigurationSerialization = {'type': self.type.value}
 		if self.nics:
 			config['nics'] = [n.json() for n in self.nics]
 
 		return config
 
 	@staticmethod
-	def parse_arg(config: dict[str, Any]) -> NetworkConfiguration | None:
+	def parse_arg(config: _NetworkConfigurationSerialization) -> NetworkConfiguration | None:
 		nic_type = config.get('type', None)
 		if not nic_type:
 			return None
@@ -126,7 +140,7 @@ def parse_arg(config: dict[str, Any]) -> NetworkConfiguration | None:
 
 	def install_network_config(
 		self,
-		installation: Any,
+		installation: Installer,
 		profile_config: ProfileConfiguration | None = None
 	) -> None:
 		match self.type:

archinstall/lib/models/profile_model.py

@@ -1,20 +1,29 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any
+from typing import TYPE_CHECKING, TypedDict
 
 from archinstall.default_profiles.profile import GreeterType, Profile
 
 from ..hardware import GfxDriver
 
+if TYPE_CHECKING:
+	from archinstall.lib.profile.profiles_handler import ProfileSerialization
+
+
+class _ProfileConfigurationSerialization(TypedDict):
+	profile: ProfileSerialization
+	gfx_driver: str | None
+	greeter: str | None
+
 
 @dataclass
 class ProfileConfiguration:
 	profile: Profile | None = None
 	gfx_driver: GfxDriver | None = None
 	greeter: GreeterType | None = None
 
-	def json(self) -> dict[str, Any]:
+	def json(self) -> _ProfileConfigurationSerialization:
 		from ..profile.profiles_handler import profile_handler
 		return {
 			'profile': profile_handler.to_json(self.profile),
@@ -23,7 +32,7 @@ def json(self) -> dict[str, Any]:
 		}
 
 	@classmethod
-	def parse_arg(cls, arg: dict[str, Any]) -> 'ProfileConfiguration':
+	def parse_arg(cls, arg: _ProfileConfigurationSerialization) -> 'ProfileConfiguration':
 		from ..profile.profiles_handler import profile_handler
 		profile = profile_handler.parse_profile_config(arg['profile'])
 		greeter = arg.get('greeter', None)

archinstall/lib/models/users.py

@@ -115,7 +115,7 @@ def groups(self) -> list[str]:
 		# if it's every going to be used
 		return []
 
-	def json(self) -> dict[str, Any]:
+	def json(self) -> dict[str, str | bool]:
 		return {
 			'username': self.username,
 			'!password': self.password,

archinstall/lib/pacman/__init__.py

@@ -13,7 +13,9 @@
 from .repo import Repo
 
 if TYPE_CHECKING:
-	_: Any
+	from archinstall.lib.translationhandler import DeferredTranslation
+
+	_: Callable[[str], DeferredTranslation]
 
 
 class Pacman:
@@ -33,14 +35,14 @@ def run(args: str, default_cmd: str = 'pacman') -> SysCommand:
 		pacman_db_lock = Path('/var/lib/pacman/db.lck')
 
 		if pacman_db_lock.exists():
-			warn(_('Pacman is already running, waiting maximum 10 minutes for it to terminate.'))
+			warn(str(_('Pacman is already running, waiting maximum 10 minutes for it to terminate.')))
 
 		started = time.time()
 		while pacman_db_lock.exists():
 			time.sleep(0.25)
 
 			if time.time() - started > (60 * 10):
-				error(_('Pre-existing pacman lock never exited. Please clean up any existing pacman sessions before using archinstall.'))
+				error(str(_('Pre-existing pacman lock never exited. Please clean up any existing pacman sessions before using archinstall.')))
 				exit(1)
 
 		return SysCommand(f'{default_cmd} {args}')

archinstall/lib/profile/profiles_handler.py

@@ -8,7 +8,7 @@
 from pathlib import Path
 from tempfile import NamedTemporaryFile
 from types import ModuleType
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, NotRequired, TypedDict
 
 from ...default_profiles.profile import GreeterType, Profile
 from ..hardware import GfxDriver
@@ -26,20 +26,27 @@
 	_: Callable[[str], DeferredTranslation]
 
 
+class ProfileSerialization(TypedDict):
+	main: NotRequired[str]
+	details: NotRequired[list[str]]
+	custom_settings: NotRequired[dict[str, dict[str, str | None]]]
+	path: NotRequired[str]
+
+
 class ProfileHandler:
 	def __init__(self) -> None:
 		self._profiles: list[Profile] | None = None
 
 		# special variable to keep track of a profile url configuration
 		# it is merely used to be able to export the path again when a user
 		# wants to save the configuration
-		self._url_path = None
+		self._url_path: str | None = None
 
-	def to_json(self, profile: Profile | None) -> dict[str, Any]:
+	def to_json(self, profile: Profile | None) -> ProfileSerialization:
 		"""
 		Serialize the selected profile setting to JSON
 		"""
-		data: dict[str, Any] = {}
+		data: ProfileSerialization = {}
 
 		if profile is not None:
 			data = {
@@ -53,7 +60,7 @@ def to_json(self, profile: Profile | None) -> dict[str, Any]:
 
 		return data
 
-	def parse_profile_config(self, profile_config: dict[str, Any]) -> Profile | None:
+	def parse_profile_config(self, profile_config: ProfileSerialization) -> Profile | None:
 		"""
 		Deserialize JSON configuration for profile
 		"""