Migrate UI to textual

.github/workflows/python-build.yml

@@ -18,7 +18,7 @@ jobs:
           pacman --noconfirm -Sy archlinux-keyring
           pacman --noconfirm -Syyu
           pacman --noconfirm -Sy python-uv python-setuptools python-pip
-          pacman --noconfirm -Sy python-pyparted python-pydantic
+          pacman --noconfirm -Sy python-pyparted python-pydantic python-textual
       - name: Remove existing archinstall (if any)
         run: 
           uv pip uninstall archinstall --break-system-packages --system

.gitignore

@@ -40,3 +40,4 @@ requirements.txt
 /actions-runner
 /cmd_output.txt
 uv.lock
+pyrightconfig.json

archinstall/__init__.py

@@ -11,15 +11,14 @@
 from archinstall.lib.network.wifi_handler import wifi_handler
 from archinstall.lib.networking import ping
 from archinstall.lib.packages.packages import check_package_upgrade
-from archinstall.tui.ui.components import tui as ttui
+from archinstall.tui.ui.components import tui as tui
 
 from .lib.general import running_from_host
 from .lib.hardware import SysInfo
 from .lib.output import FormattedOutput, debug, error, info, log, warn
 from .lib.pacman import Pacman
 from .lib.plugins import load_plugin, plugins
 from .lib.translationhandler import Language, tr, translation_handler
-from .tui.curses_menu import Tui
 
 
 # @archinstall.plugin decorator hook to programmatically add
@@ -97,7 +96,7 @@ def main() -> int:
 
 	_log_sys_info()
 
-	ttui.global_header = 'Archinstall'
+	tui.global_header = 'Archinstall'
 
 	if not arch_config_handler.args.offline:
 		_check_online()
@@ -107,7 +106,7 @@ def main() -> int:
 			new_version = check_version_upgrade()
 
 			if new_version:
-				ttui.global_header = f'{ttui.global_header} {new_version}'
+				tui.global_header = f'{tui.global_header} {new_version}'
 				info(new_version)
 				time.sleep(3)
 
@@ -135,9 +134,6 @@ def run_as_a_module() -> None:
 	except Exception as e:
 		exc = e
 	finally:
-		# restore the terminal to the original state
-		Tui.shutdown()
-
 		if exc:
 			err = ''.join(traceback.format_exception(exc))
 			error(err)
@@ -159,7 +155,6 @@ def run_as_a_module() -> None:
 	'Language',
 	'Pacman',
 	'SysInfo',
-	'Tui',
 	'arch_config_handler',
 	'debug',
 	'disk_layouts',

archinstall/default_profiles/desktop.py

@@ -1,12 +1,11 @@
 from typing import TYPE_CHECKING, override
 
 from archinstall.default_profiles.profile import GreeterType, Profile, ProfileType, SelectResult
+from archinstall.lib.menu.helpers import Selection
 from archinstall.lib.output import info
 from archinstall.lib.profile.profiles_handler import profile_handler
-from archinstall.tui.curses_menu import SelectMenu
-from archinstall.tui.menu_item import MenuItem, MenuItemGroup
-from archinstall.tui.result import ResultType
-from archinstall.tui.types import FrameProperties, PreviewStyle
+from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
+from archinstall.tui.ui.result import ResultType
 
 if TYPE_CHECKING:
 	from archinstall.lib.installer import Installer
@@ -61,23 +60,21 @@ def do_on_select(self) -> SelectResult:
 			MenuItem(
 				p.name,
 				value=p,
-				preview_action=lambda x: x.value.preview_text(),
+				preview_action=lambda x: x.value.preview_text() if x.value else None,
 			)
 			for p in profile_handler.get_desktop_profiles()
 		]
 
 		group = MenuItemGroup(items, sort_items=True, sort_case_sensitive=False)
 		group.set_selected_by_value(self.current_selection)
 
-		result = SelectMenu[Profile](
+		result = Selection[Profile](
 			group,
 			multi=True,
 			allow_reset=True,
 			allow_skip=True,
-			preview_style=PreviewStyle.RIGHT,
-			preview_size='auto',
-			preview_frame=FrameProperties.max('Info'),
-		).run()
+			preview_location='right',
+		).show()
 
 		match result.type_:
 			case ResultType.Selection:

archinstall/default_profiles/desktops/hyprland.py

@@ -3,11 +3,10 @@
 from archinstall.default_profiles.desktops import SeatAccess
 from archinstall.default_profiles.profile import GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
+from archinstall.lib.menu.helpers import Selection
 from archinstall.lib.translationhandler import tr
-from archinstall.tui.curses_menu import SelectMenu
-from archinstall.tui.menu_item import MenuItem, MenuItemGroup
-from archinstall.tui.result import ResultType
-from archinstall.tui.types import Alignment, FrameProperties
+from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
+from archinstall.tui.ui.result import ResultType
 
 
 class HyprlandProfile(XorgProfile):
@@ -57,13 +56,11 @@ def _ask_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = SelectMenu[SeatAccess](
+		result = Selection[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,
-			frame=FrameProperties.min(tr('Seat access')),
-			alignment=Alignment.CENTER,
-		).run()
+		).show()
 
 		if result.type_ == ResultType.Selection:
 			self.custom_settings['seat_access'] = result.get_value().value

archinstall/default_profiles/desktops/labwc.py

@@ -3,11 +3,10 @@
 from archinstall.default_profiles.desktops import SeatAccess
 from archinstall.default_profiles.profile import GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
+from archinstall.lib.menu.helpers import Selection
 from archinstall.lib.translationhandler import tr
-from archinstall.tui.curses_menu import SelectMenu
-from archinstall.tui.menu_item import MenuItem, MenuItemGroup
-from archinstall.tui.result import ResultType
-from archinstall.tui.types import Alignment, FrameProperties
+from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
+from archinstall.tui.ui.result import ResultType
 
 
 class LabwcProfile(XorgProfile):
@@ -54,13 +53,11 @@ def _ask_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = SelectMenu[SeatAccess](
+		result = Selection[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,
-			frame=FrameProperties.min(tr('Seat access')),
-			alignment=Alignment.CENTER,
-		).run()
+		).show()
 
 		if result.type_ == ResultType.Selection:
 			self.custom_settings['seat_access'] = result.get_value().value

archinstall/default_profiles/desktops/niri.py

@@ -3,11 +3,10 @@
 from archinstall.default_profiles.desktops import SeatAccess
 from archinstall.default_profiles.profile import GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
+from archinstall.lib.menu.helpers import Selection
 from archinstall.lib.translationhandler import tr
-from archinstall.tui.curses_menu import SelectMenu
-from archinstall.tui.menu_item import MenuItem, MenuItemGroup
-from archinstall.tui.result import ResultType
-from archinstall.tui.types import Alignment, FrameProperties
+from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
+from archinstall.tui.ui.result import ResultType
 
 
 class NiriProfile(XorgProfile):
@@ -62,13 +61,11 @@ def _ask_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = SelectMenu[SeatAccess](
+		result = Selection[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,
-			frame=FrameProperties.min(tr('Seat access')),
-			alignment=Alignment.CENTER,
-		).run()
+		).show()
 
 		if result.type_ == ResultType.Selection:
 			self.custom_settings['seat_access'] = result.get_value().value

archinstall/default_profiles/desktops/sway.py

@@ -3,11 +3,10 @@
 from archinstall.default_profiles.desktops import SeatAccess
 from archinstall.default_profiles.profile import GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
+from archinstall.lib.menu.helpers import Selection
 from archinstall.lib.translationhandler import tr
-from archinstall.tui.curses_menu import SelectMenu
-from archinstall.tui.menu_item import MenuItem, MenuItemGroup
-from archinstall.tui.result import ResultType
-from archinstall.tui.types import Alignment, FrameProperties
+from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
+from archinstall.tui.ui.result import ResultType
 
 
 class SwayProfile(XorgProfile):
@@ -64,13 +63,11 @@ def _ask_seat_access(self) -> None:
 		default = self.custom_settings.get('seat_access', None)
 		group.set_default_by_value(default)
 
-		result = SelectMenu[SeatAccess](
+		result = Selection[SeatAccess](
 			group,
 			header=header,
 			allow_skip=False,
-			frame=FrameProperties.min(tr('Seat access')),
-			alignment=Alignment.CENTER,
-		).run()
+		).show()
 
 		if result.type_ == ResultType.Selection:
 			self.custom_settings['seat_access'] = result.get_value().value

archinstall/default_profiles/server.py

@@ -1,12 +1,11 @@
 from typing import TYPE_CHECKING, override
 
 from archinstall.default_profiles.profile import Profile, ProfileType, SelectResult
+from archinstall.lib.menu.helpers import Selection
 from archinstall.lib.output import info
 from archinstall.lib.profile.profiles_handler import profile_handler
-from archinstall.tui.curses_menu import SelectMenu
-from archinstall.tui.menu_item import MenuItem, MenuItemGroup
-from archinstall.tui.result import ResultType
-from archinstall.tui.types import FrameProperties, PreviewStyle
+from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
+from archinstall.tui.ui.result import ResultType
 
 if TYPE_CHECKING:
 	from archinstall.lib.installer import Installer
@@ -26,23 +25,21 @@ def do_on_select(self) -> SelectResult:
 			MenuItem(
 				p.name,
 				value=p,
-				preview_action=lambda x: x.value.preview_text(),
+				preview_action=lambda x: x.value.preview_text() if x.value else None,
 			)
 			for p in profile_handler.get_server_profiles()
 		]
 
 		group = MenuItemGroup(items, sort_items=True)
 		group.set_selected_by_value(self.current_selection)
 
-		result = SelectMenu[Profile](
+		result = Selection[Profile](
 			group,
 			allow_reset=True,
 			allow_skip=True,
-			preview_style=PreviewStyle.RIGHT,
-			preview_size='auto',
-			preview_frame=FrameProperties.max('Info'),
 			multi=True,
-		).run()
+			preview_location='right',
+		).show()
 
 		match result.type_:
 			case ResultType.Selection:

archinstall/lib/applications/application_menu.py

@@ -1,12 +1,11 @@
 from typing import override
 
 from archinstall.lib.menu.abstract_menu import AbstractSubMenu
+from archinstall.lib.menu.helpers import Confirmation, Selection
 from archinstall.lib.models.application import ApplicationConfiguration, Audio, AudioConfiguration, BluetoothConfiguration
 from archinstall.lib.translationhandler import tr
-from archinstall.tui.curses_menu import SelectMenu
-from archinstall.tui.menu_item import MenuItem, MenuItemGroup
-from archinstall.tui.result import ResultType
-from archinstall.tui.types import Alignment, FrameProperties, Orientation
+from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
+from archinstall.tui.ui.result import ResultType
 
 
 class ApplicationMenu(AbstractSubMenu[ApplicationConfiguration]):
@@ -67,22 +66,14 @@ def _prev_audio(self, item: MenuItem) -> str | None:
 
 
 def select_bluetooth(preset: BluetoothConfiguration | None) -> BluetoothConfiguration | None:
-	group = MenuItemGroup.yes_no()
-	group.focus_item = MenuItem.no()
-
-	if preset is not None:
-		group.set_selected_by_value(preset.enabled)
-
 	header = tr('Would you like to configure Bluetooth?') + '\n'
+	preset_val = preset.enabled if preset else False
 
-	result = SelectMenu[bool](
-		group,
+	result = Confirmation(
 		header=header,
-		alignment=Alignment.CENTER,
-		columns=2,
-		orientation=Orientation.HORIZONTAL,
 		allow_skip=True,
-	).run()
+		preset=preset_val,
+	).show()
 
 	match result.type_:
 		case ResultType.Selection:
@@ -101,12 +92,11 @@ def select_audio(preset: AudioConfiguration | None = None) -> AudioConfiguration
 	if preset:
 		group.set_focus_by_value(preset.audio)
 
-	result = SelectMenu[Audio](
+	result = Selection[Audio](
 		group,
+		header=tr('Select audio configuration'),
 		allow_skip=True,
-		alignment=Alignment.CENTER,
-		frame=FrameProperties.min(tr('Audio')),
-	).run()
+	).show()
 
 	match result.type_:
 		case ResultType.Skip: