Rename module device_model -> device (#3639)

svartkanin · web-flow · commit 96aaf5b6acf7 · 2025-07-15T09:29:58.000+02:00
diff --git a/archinstall/lib/args.py b/archinstall/lib/args.py
@@ -16,7 +16,7 @@
 from archinstall.lib.models.application import ApplicationConfiguration
 from archinstall.lib.models.authentication import AuthenticationConfiguration
 from archinstall.lib.models.bootloader import Bootloader
-from archinstall.lib.models.device_model import DiskEncryption, DiskLayoutConfiguration
+from archinstall.lib.models.device import DiskEncryption, DiskLayoutConfiguration
 from archinstall.lib.models.locale import LocaleConfiguration
 from archinstall.lib.models.mirrors import MirrorConfiguration
 from archinstall.lib.models.network_configuration import NetworkConfiguration
diff --git a/archinstall/lib/disk/device_handler.py b/archinstall/lib/disk/device_handler.py
@@ -13,7 +13,7 @@
 from ..exceptions import DiskError, SysCallError, UnknownFilesystemFormat
 from ..general import SysCommand, SysCommandWorker
 from ..luks import Luks2
-from ..models.device_model import (
+from ..models.device import (
 	DEFAULT_ITER_TIME,
 	BDevice,
 	BtrfsMountOption,
diff --git a/archinstall/lib/disk/disk_menu.py b/archinstall/lib/disk/disk_menu.py
@@ -2,7 +2,7 @@
 from typing import override
 
 from archinstall.lib.disk.encryption_menu import DiskEncryptionMenu
-from archinstall.lib.models.device_model import (
+from archinstall.lib.models.device import (
 	DEFAULT_ITER_TIME,
 	BtrfsOptions,
 	DiskEncryption,
diff --git a/archinstall/lib/disk/encryption_menu.py b/archinstall/lib/disk/encryption_menu.py
@@ -2,7 +2,7 @@
 from typing import override
 
 from archinstall.lib.menu.menu_helper import MenuHelper
-from archinstall.lib.models.device_model import (
+from archinstall.lib.models.device import (
 	DeviceModification,
 	DiskEncryption,
 	EncryptionType,
@@ -17,7 +17,7 @@
 from archinstall.tui.types import Alignment, FrameProperties
 
 from ..menu.abstract_menu import AbstractSubMenu
-from ..models.device_model import DEFAULT_ITER_TIME, Fido2Device
+from ..models.device import DEFAULT_ITER_TIME, Fido2Device
 from ..models.users import Password
 from ..output import FormattedOutput
 from ..utils.util import get_password
diff --git a/archinstall/lib/disk/fido.py b/archinstall/lib/disk/fido.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import ClassVar
 
-from archinstall.lib.models.device_model import Fido2Device
+from archinstall.lib.models.device import Fido2Device
 
 from ..exceptions import SysCallError
 from ..general import SysCommand, SysCommandWorker, clear_vt100_escape_codes_from_str
diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py
@@ -9,7 +9,7 @@
 
 from ..interactions.general_conf import ask_abort
 from ..luks import Luks2
-from ..models.device_model import (
+from ..models.device import (
 	DiskEncryption,
 	DiskLayoutConfiguration,
 	DiskLayoutType,
diff --git a/archinstall/lib/disk/partitioning_menu.py b/archinstall/lib/disk/partitioning_menu.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 from typing import override
 
-from archinstall.lib.models.device_model import (
+from archinstall.lib.models.device import (
 	BtrfsMountOption,
 	DeviceModification,
 	FilesystemType,
diff --git a/archinstall/lib/disk/subvolume_menu.py b/archinstall/lib/disk/subvolume_menu.py
@@ -1,7 +1,7 @@
 from pathlib import Path
 from typing import assert_never, override
 
-from archinstall.lib.models.device_model import SubvolumeModification
+from archinstall.lib.models.device import SubvolumeModification
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.curses_menu import EditMenu
 from archinstall.tui.result import ResultType
diff --git a/archinstall/lib/disk/utils.py b/archinstall/lib/disk/utils.py
@@ -4,7 +4,7 @@
 
 from archinstall.lib.exceptions import DiskError, SysCallError
 from archinstall.lib.general import SysCommand
-from archinstall.lib.models.device_model import LsblkInfo
+from archinstall.lib.models.device import LsblkInfo
 from archinstall.lib.output import debug, warn
 
 
diff --git a/archinstall/lib/global_menu.py b/archinstall/lib/global_menu.py
@@ -5,7 +5,7 @@
 from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu
 from archinstall.lib.models.application import ApplicationConfiguration
 from archinstall.lib.models.authentication import AuthenticationConfiguration
-from archinstall.lib.models.device_model import DiskLayoutConfiguration, DiskLayoutType, EncryptionType, FilesystemType, PartitionModification
+from archinstall.lib.models.device import DiskLayoutConfiguration, DiskLayoutType, EncryptionType, FilesystemType, PartitionModification
 from archinstall.lib.packages import list_available_packages
 from archinstall.tui.menu_item import MenuItem, MenuItemGroup
 
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
@@ -16,7 +16,7 @@
 from archinstall.lib.disk.device_handler import device_handler
 from archinstall.lib.disk.fido import Fido2
 from archinstall.lib.disk.utils import get_lsblk_by_mountpoint, get_lsblk_info
-from archinstall.lib.models.device_model import (
+from archinstall.lib.models.device import (
 	DiskEncryption,
 	DiskLayoutConfiguration,
 	EncryptionType,
diff --git a/archinstall/lib/interactions/disk_conf.py b/archinstall/lib/interactions/disk_conf.py
@@ -4,7 +4,7 @@
 from archinstall.lib.disk.device_handler import device_handler
 from archinstall.lib.disk.partitioning_menu import manual_partitioning
 from archinstall.lib.menu.menu_helper import MenuHelper
-from archinstall.lib.models.device_model import (
+from archinstall.lib.models.device import (
 	BDevice,
 	BtrfsMountOption,
 	DeviceModification,
diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py
@@ -7,7 +7,7 @@
 from types import TracebackType
 
 from archinstall.lib.disk.utils import get_lsblk_info, umount
-from archinstall.lib.models.device_model import DEFAULT_ITER_TIME
+from archinstall.lib.models.device import DEFAULT_ITER_TIME
 
 from .exceptions import DiskError, SysCallError
 from .general import SysCommand, SysCommandWorker, generate_password, run
diff --git a/archinstall/lib/models/__init__.py b/archinstall/lib/models/__init__.py
@@ -5,7 +5,7 @@
 	BluetoothConfiguration,
 )
 from .bootloader import Bootloader
-from .device_model import (
+from .device import (
 	BDevice,
 	DeviceGeometry,
 	DeviceModification,
diff --git a/archinstall/lib/models/device.py b/archinstall/lib/models/device.py
diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py
@@ -12,7 +12,7 @@
 from archinstall.lib.installer import Installer, accessibility_tools_in_use, run_custom_user_commands
 from archinstall.lib.interactions.general_conf import PostInstallationAction, ask_post_installation
 from archinstall.lib.models import Bootloader
-from archinstall.lib.models.device_model import (
+from archinstall.lib.models.device import (
 	DiskLayoutType,
 	EncryptionType,
 )
diff --git a/docs/examples/python.rst b/docs/examples/python.rst
@@ -53,9 +53,9 @@ After running ``python -m archinstall test_installer`` it should print something
                total_size=Size(value=512110190592, unit=<Unit.B: 1>,
                sector_size=SectorSize(value=512, unit=<Unit.B: 1>)),
                free_space_regions=[
-                   <archinstall.lib.disk.device_model.DeviceGeometry object at 0x7fbe166c4250>,
-                   <archinstall.lib.disk.device_model.DeviceGeometry object at 0x7fbe166c4c50>,
-                   <archinstall.lib.disk.device_model.DeviceGeometry object at 0x7fbe166c4a10>],
+                   <archinstall.lib.disk.device.DeviceGeometry object at 0x7fbe166c4250>,
+                   <archinstall.lib.disk.device.DeviceGeometry object at 0x7fbe166c4c50>,
+                   <archinstall.lib.disk.device.DeviceGeometry object at 0x7fbe166c4a10>],
                sector_size=SectorSize(value=512, unit=<Unit.B: 1>),
                read_only=False,
                dirty=False
diff --git a/examples/auto_discovery_mounted.py b/examples/auto_discovery_mounted.py
@@ -1,7 +1,7 @@
 from pathlib import Path
 
 from archinstall.lib.disk.device_handler import device_handler
-from archinstall.lib.models.device_model import DiskLayoutConfiguration, DiskLayoutType
+from archinstall.lib.models.device import DiskLayoutConfiguration, DiskLayoutType
 
 root_mount_dir = Path('/mnt/archinstall')
 
diff --git a/examples/full_automated_installation.py b/examples/full_automated_installation.py
@@ -4,7 +4,7 @@
 from archinstall.lib.disk.device_handler import device_handler
 from archinstall.lib.disk.filesystem import FilesystemHandler
 from archinstall.lib.installer import Installer
-from archinstall.lib.models.device_model import (
+from archinstall.lib.models.device import (
 	DeviceModification,
 	DiskEncryption,
 	DiskLayoutConfiguration,
diff --git a/tests/test_args.py b/tests/test_args.py
@@ -9,7 +9,7 @@
 from archinstall.lib.models.application import ApplicationConfiguration, Audio, AudioConfiguration, BluetoothConfiguration
 from archinstall.lib.models.authentication import AuthenticationConfiguration, U2FLoginConfiguration, U2FLoginMethod
 from archinstall.lib.models.bootloader import Bootloader
-from archinstall.lib.models.device_model import DiskLayoutConfiguration, DiskLayoutType
+from archinstall.lib.models.device import DiskLayoutConfiguration, DiskLayoutType
 from archinstall.lib.models.locale import LocaleConfiguration
 from archinstall.lib.models.mirrors import CustomRepository, CustomServer, MirrorConfiguration, MirrorRegion, SignCheck, SignOption
 from archinstall.lib.models.network_configuration import NetworkConfiguration, Nic, NicType
