Cleanup imports and unused code (#1801)

* Cleanup imports and unused code

* Update build check

* Keep deprecation exception

* Simplify logging

---------

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>

5 files changed, 39 insertions, 36 deletions

diff --git a/examples/full_automated_installation.py b/examples/full_automated_installation.py
index a169dd50..dcef731a 100644
--- a/examples/full_automated_installation.py
+++ b/examples/full_automated_installation.py
@@ -1,9 +1,10 @@
 from pathlib import Path
 
-from archinstall import Installer, ProfileConfiguration, profile_handler
+from archinstall import Installer
+from archinstall import profile
 from archinstall.default_profiles.minimal import MinimalProfile
 from archinstall import disk
-from archinstall.lib.models import User
+from archinstall import models
 
 # we're creating a new ext4 filesystem installation
 fs_type = disk.FilesystemType('ext4')
@@ -88,8 +89,8 @@ with Installer(
 
 # Optionally, install a profile of choice.
 # In this case, we install a minimal profile that is empty
-profile_config = ProfileConfiguration(MinimalProfile())
-profile_handler.install_profile_config(installation, profile_config)
+profile_config = profile.ProfileConfiguration(MinimalProfile())
+profile.profile_handler.install_profile_config(installation, profile_config)
 
-user = User('archinstall', 'password', True)
+user = models.User('archinstall', 'password', True)
 installation.create_users(user)
diff --git a/examples/interactive_installation.py b/examples/interactive_installation.py
index a27ec0f9..72595048 100644
--- a/examples/interactive_installation.py
+++ b/examples/interactive_installation.py
@@ -1,13 +1,16 @@
-import logging
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 import archinstall
-from archinstall import log, Installer, use_mirrors, profile_handler
+from archinstall import Installer
+from archinstall import profile
+from archinstall import SysInfo
+from archinstall import mirrors
 from archinstall.default_profiles.applications.pipewire import PipewireProfile
 from archinstall import disk
 from archinstall import menu
-from archinstall.lib.models import Bootloader, NetworkConfigurationHandler
+from archinstall import models
+from archinstall import info, debug
 
 if TYPE_CHECKING:
 	_: Any
@@ -84,7 +87,7 @@ def perform_installation(mountpoint: Path):
 	Only requirement is that the block devices are
 	formatted and setup prior to entering this function.
 	"""
-	log('Starting installation', level=logging.INFO)
+	info('Starting installation')
 	disk_config: disk.DiskLayoutConfiguration = archinstall.arguments['disk_config']
 
 	# Retrieve list of additional repositories and set boolean values appropriately
@@ -114,7 +117,7 @@ def perform_installation(mountpoint: Path):
 
 		# Set mirrors used by pacstrap (outside of installation)
 		if archinstall.arguments.get('mirror-region', None):
-			use_mirrors(archinstall.arguments['mirror-region'])  # Set the mirrors for the live medium
+			mirrors.use_mirrors(archinstall.arguments['mirror-region'])  # Set the mirrors for the live medium
 
 		installation.minimal_installation(
 			testing=enable_testing,
@@ -130,7 +133,7 @@ def perform_installation(mountpoint: Path):
 		if archinstall.arguments.get('swap'):
 			installation.setup_swap('zram')
 
-		if archinstall.arguments.get("bootloader") == Bootloader.Grub and archinstall.has_uefi():
+		if archinstall.arguments.get("bootloader") == models.Bootloader.Grub and SysInfo.has_uefi():
 			installation.add_additional_packages("grub")
 
 		installation.add_bootloader(archinstall.arguments["bootloader"])
@@ -140,7 +143,7 @@ def perform_installation(mountpoint: Path):
 		network_config = archinstall.arguments.get('nic', None)
 
 		if network_config:
-			handler = NetworkConfigurationHandler(network_config)
+			handler = models.NetworkConfigurationHandler(network_config)
 			handler.config_installer(
 				installation,
 				archinstall.arguments.get('profile_config', None)
@@ -153,16 +156,16 @@ def perform_installation(mountpoint: Path):
 			installation.create_users(users)
 
 		if audio := archinstall.arguments.get('audio', None):
-			log(f'Installing audio server: {audio}', level=logging.INFO)
+			info(f'Installing audio server: {audio}')
 			if audio == 'pipewire':
 				PipewireProfile().install(installation)
 			elif audio == 'pulseaudio':
 				installation.add_additional_packages("pulseaudio")
 		else:
-			installation.log("No audio server will be installed.", level=logging.INFO)
+			info("No audio server will be installed.")
 
 		if profile_config := archinstall.arguments.get('profile_config', None):
-			profile_handler.install_profile_config(installation, profile_config)
+			profile.profile_handler.install_profile_config(installation, profile_config)
 
 		if timezone := archinstall.arguments.get('timezone', None):
 			installation.set_timezone(timezone)
@@ -194,7 +197,7 @@ def perform_installation(mountpoint: Path):
 
 		installation.genfstab()
 
-		installation.log("For post-installation tips, see https://wiki.archlinux.org/index.php/Installation_guide#Post-installation", fg="yellow")
+		info("For post-installation tips, see https://wiki.archlinux.org/index.php/Installation_guide#Post-installation")
 
 		if not archinstall.arguments.get('silent'):
 			prompt = str(_('Would you like to chroot into the newly created installation and perform post-installation configuration?'))
@@ -202,10 +205,10 @@ def perform_installation(mountpoint: Path):
 			if choice.value == menu.Menu.yes():
 				try:
 					installation.drop_to_shell()
-				except:
+				except Exception:
 					pass
 
-	archinstall.log(f"Disk states after installing: {disk.disk_layouts()}", level=logging.DEBUG)
+	debug(f"Disk states after installing: {disk.disk_layouts()}")
 
 
 ask_user_questions()
diff --git a/examples/mac_address_installation.py b/examples/mac_address_installation.py
index 0a1c5160..74a123c7 100644
--- a/examples/mac_address_installation.py
+++ b/examples/mac_address_installation.py
@@ -1,13 +1,13 @@
 import time
 
 import archinstall
-from archinstall.lib.profile.profiles_handler import profile_handler
+from archinstall import profile, info
 
-for profile in profile_handler.get_mac_addr_profiles():
+for _profile in profile.profile_handler.get_mac_addr_profiles():
 	# Tailored means it's a match for this machine
 	# based on it's MAC address (or some other criteria
 	# that fits the requirements for this machine specifically).
-	archinstall.log(f'Found a tailored profile for this machine called: "{profile.name}"')
+	info(f'Found a tailored profile for this machine called: "{_profile.name}"')
 
 	print('Starting install in:')
 	for i in range(10, 0, -1):
@@ -15,4 +15,4 @@ for profile in profile_handler.get_mac_addr_profiles():
 		time.sleep(1)
 
 	install_session = archinstall.storage['installation_session']
-	profile.install(install_session)
+	_profile.install(install_session)
diff --git a/examples/minimal_installation.py b/examples/minimal_installation.py
index 8bd6fd55..e31adea4 100644
--- a/examples/minimal_installation.py
+++ b/examples/minimal_installation.py
@@ -2,11 +2,12 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any, List
 
 import archinstall
-from archinstall.lib import disk
-from archinstall import Installer, ProfileConfiguration, profile_handler
+from archinstall import disk
+from archinstall import Installer
+from archinstall import profile
+from archinstall import models
+from archinstall import interactions
 from archinstall.default_profiles.minimal import MinimalProfile
-from archinstall.lib.models import Bootloader, User
-from archinstall.lib.user_interaction.disk_conf import select_devices, suggest_single_disk_layout
 
 if TYPE_CHECKING:
 	_: Any
@@ -26,7 +27,7 @@ def perform_installation(mountpoint: Path):
 		# some other minor details as specified by this profile and user.
 		if installation.minimal_installation():
 			installation.set_hostname('minimal-arch')
-			installation.add_bootloader(Bootloader.Systemd)
+			installation.add_bootloader(models.Bootloader.Systemd)
 
 			# Optionally enable networking:
 			if archinstall.arguments.get('network', None):
@@ -34,10 +35,10 @@ def perform_installation(mountpoint: Path):
 
 			installation.add_additional_packages(['nano', 'wget', 'git'])
 
-			profile_config = ProfileConfiguration(MinimalProfile())
-			profile_handler.install_profile_config(installation, profile_config)
+			profile_config = profile.ProfileConfiguration(MinimalProfile())
+			profile.profile_handler.install_profile_config(installation, profile_config)
 
-			user = User('devel', 'devel', False)
+			user = models.User('devel', 'devel', False)
 			installation.create_users(user)
 
 
@@ -46,8 +47,8 @@ def prompt_disk_layout():
 	if filesystem := archinstall.arguments.get('filesystem', None):
 		fs_type = disk.FilesystemType(filesystem)
 
-	devices = select_devices()
-	modifications = suggest_single_disk_layout(devices[0], filesystem_type=fs_type)
+	devices = interactions.select_devices()
+	modifications = interactions.suggest_single_disk_layout(devices[0], filesystem_type=fs_type)
 
 	archinstall.arguments['disk_config'] = disk.DiskLayoutConfiguration(
 		config_type=disk.DiskLayoutType.Default,
diff --git a/examples/only_hd_installation.py b/examples/only_hd_installation.py
index 2fc74bf0..075bde20 100644
--- a/examples/only_hd_installation.py
+++ b/examples/only_hd_installation.py
@@ -1,9 +1,7 @@
-import logging
 from pathlib import Path
 
 import archinstall
-from archinstall import Installer
-from archinstall.lib import disk
+from archinstall import Installer, disk, debug
 
 
 def ask_user_questions():
@@ -48,7 +46,7 @@ def perform_installation(mountpoint: Path):
 			target.parent.mkdir(parents=True)
 
 	# For support reasons, we'll log the disk layout post installation (crash or no crash)
-	archinstall.log(f"Disk states after installing: {disk.disk_layouts()}", level=logging.DEBUG)
+	debug(f"Disk states after installing: {disk.disk_layouts()}")
 
 
 ask_user_questions()