Specify menu return types using generics instead of Any (#3400)

Author: correctmost

archinstall/default_profiles/desktop.py

@@ -68,7 +68,7 @@ def do_on_select(self) -> SelectResult:
 		group = MenuItemGroup(items, sort_items=True, sort_case_sensitive=False)
 		group.set_selected_by_value(self.current_selection)
 
-		result = SelectMenu(
+		result = SelectMenu[Profile](
 			group,
 			multi=True,
 			allow_reset=True,

archinstall/default_profiles/desktops/hyprland.py

@@ -62,7 +62,7 @@ def _ask_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = SelectMenu(
+		result = SelectMenu[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,

archinstall/default_profiles/desktops/labwc.py

@@ -60,7 +60,7 @@ def _ask_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = SelectMenu(
+		result = SelectMenu[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,

archinstall/default_profiles/desktops/niri.py

@@ -68,7 +68,7 @@ def _ask_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = SelectMenu(
+		result = SelectMenu[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,

archinstall/default_profiles/desktops/sway.py

@@ -70,7 +70,7 @@ def _ask_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = SelectMenu(
+		result = SelectMenu[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,

archinstall/default_profiles/server.py

@@ -33,7 +33,7 @@ def do_on_select(self) -> SelectResult:
 		group = MenuItemGroup(items, sort_items=True)
 		group.set_selected_by_value(self.current_selection)
 
-		result = SelectMenu(
+		result = SelectMenu[Profile](
 			group,
 			allow_reset=True,
 			allow_skip=True,

archinstall/lib/configuration.py

@@ -69,7 +69,7 @@ def confirm_config(self) -> bool:
 			group.focus_item = MenuItem.yes()
 			group.set_preview_for_all(lambda x: self.user_config_to_json())
 
-			result = SelectMenu(
+			result = SelectMenu[bool](
 				group,
 				header=header,
 				alignment=Alignment.CENTER,
@@ -168,7 +168,7 @@ def preview(item: MenuItem) -> str | None:
 	]
 
 	group = MenuItemGroup(items)
-	result = SelectMenu(
+	result = SelectMenu[str](
 		group,
 		allow_skip=True,
 		preview_frame=FrameProperties.max(str(_('Configuration'))),

archinstall/lib/disk/disk_menu.py

@@ -22,7 +22,7 @@ class DiskMenuConfig:
 	lvm_config: LvmConfiguration | None
 
 
-class DiskLayoutConfigurationMenu(AbstractSubMenu):
+class DiskLayoutConfigurationMenu(AbstractSubMenu[DiskLayoutConfiguration]):
 	def __init__(self, disk_layout_config: DiskLayoutConfiguration | None):
 		if not disk_layout_config:
 			self._disk_menu_config = DiskMenuConfig(disk_config=None, lvm_config=None)
@@ -101,7 +101,7 @@ def _prev_disk_layouts(self, item: MenuItem) -> str | None:
 		if not item.value:
 			return None
 
-		disk_layout_conf: DiskLayoutConfiguration = item.get_value()
+		disk_layout_conf = item.get_value()
 
 		if disk_layout_conf.config_type == DiskLayoutType.Pre_mount:
 			msg = str(_('Configuration type: {}')).format(disk_layout_conf.config_type.display_msg()) + '\n'

archinstall/lib/disk/encryption_menu.py

@@ -31,7 +31,7 @@
 	_: Callable[[str], DeferredTranslation]
 
 
-class DiskEncryptionMenu(AbstractSubMenu):
+class DiskEncryptionMenu(AbstractSubMenu[DiskEncryption]):
 	def __init__(
 		self,
 		disk_config: DiskLayoutConfiguration,
@@ -233,7 +233,7 @@ def select_encryption_type(disk_config: DiskLayoutConfiguration, preset: Encrypt
 	group = MenuItemGroup(items)
 	group.set_focus_by_value(preset_value)
 
-	result = SelectMenu(
+	result = SelectMenu[EncryptionType](
 		group,
 		allow_skip=True,
 		allow_reset=True,
@@ -273,7 +273,7 @@ def select_hsm(preset: Fido2Device | None = None) -> Fido2Device | None:
 		group, table_header = MenuHelper.create_table(data=fido_devices)
 		header = f'{header}\n\n{table_header}'
 
-		result = SelectMenu(
+		result = SelectMenu[Fido2Device](
 			group,
 			header=header,
 			alignment=Alignment.CENTER,
@@ -309,7 +309,7 @@ def select_partitions_to_encrypt(
 	if avail_partitions:
 		group, header = MenuHelper.create_table(data=avail_partitions)
 
-		result = SelectMenu(
+		result = SelectMenu[PartitionModification](
 			group,
 			header=header,
 			alignment=Alignment.CENTER,
@@ -337,7 +337,7 @@ def select_lvm_vols_to_encrypt(
 	if volumes:
 		group, header = MenuHelper.create_table(data=volumes)
 
-		result = SelectMenu(
+		result = SelectMenu[LvmVolume](
 			group,
 			header=header,
 			alignment=Alignment.CENTER,

archinstall/lib/disk/partitioning_menu.py

@@ -77,7 +77,7 @@ def table_data(self) -> dict[str, str]:
 		return data
 
 
-class PartitioningList(ListManager):
+class PartitioningList(ListManager[DiskSegment]):
 	def __init__(
 		self,
 		device_mod: DeviceModification,
@@ -438,7 +438,7 @@ def _prompt_partition_fs_type(self, prompt: str | None = None) -> FilesystemType
 		items = [MenuItem(fs.value, value=fs) for fs in fs_types]
 		group = MenuItemGroup(items, sort_items=False)
 
-		result = SelectMenu(
+		result = SelectMenu[FilesystemType](
 			group,
 			header=prompt,
 			alignment=Alignment.CENTER,
@@ -509,7 +509,7 @@ def validate(value: str) -> str | None:
 
 		title = str(_('Size (default: {}): ')).format(max_size.format_highest())
 
-		result = EditMenu(
+		result = EditMenu[str](
 			title,
 			header=f'{prompt}\b',
 			allow_skip=True,
@@ -564,7 +564,7 @@ def _create_new_partition(self, free_space: FreeSpace) -> PartitionModification:
 	def _reset_confirmation(self) -> bool:
 		prompt = str(_('This will remove all newly added partitions, continue?')) + '\n'
 
-		result = SelectMenu(
+		result = SelectMenu[bool](
 			MenuItemGroup.yes_no(),
 			header=prompt,
 			alignment=Alignment.CENTER,