From 434fdacdb81c3b7aad8e1b8be33267fe642f5520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Aug 2024 15:46:29 +0200 Subject: [PATCH] clan-vm-manager: remove type assertions we use mypy already, so these type assertions don't make sense. Also we no longer have strings and always FlakeId in this case --- pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py | 7 +------ pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py | 4 ---- .../clan-vm-manager/clan_vm_manager/windows/main_window.py | 2 -- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py b/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py index ae91948cc..5c3f57dab 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py @@ -13,7 +13,7 @@ from typing import IO, ClassVar import gi from clan_cli import vms -from clan_cli.clan_uri import ClanURI, FlakeId +from clan_cli.clan_uri import ClanURI from clan_cli.dirs import vm_state_dir from clan_cli.history.add import HistoryEntry from clan_cli.machines.machines import Machine @@ -51,7 +51,6 @@ class VMObject(GObject.Object): # Store the data from the history entry self.data: HistoryEntry = data - assert isinstance(self.data.flake.vm.flake_url, FlakeId) self.build_log_cb = build_log_cb # Create a process object to store the VM process @@ -99,7 +98,6 @@ class VMObject(GObject.Object): return GLib.SOURCE_REMOVE def update(self, data: HistoryEntry) -> None: - assert isinstance(data.flake.flake_url, FlakeId) self.data = data def _on_vm_status_changed(self, source: "VMObject") -> None: @@ -181,14 +179,12 @@ class VMObject(GObject.Object): return GLib.SOURCE_REMOVE def __start(self) -> None: - assert isinstance(self.data.flake.vm.flake_url, FlakeId) with self._create_machine() as machine: # Start building VM tstart = datetime.now() log.info(f"Building VM {self.get_id()}") log_dir = Path(str(self.log_dir.name)) - assert isinstance(self.data.flake.vm.flake_url, FlakeId) # Start the build process self.build_process = spawn( on_except=None, @@ -275,7 +271,6 @@ class VMObject(GObject.Object): self.emit("vm_status_changed", self) return log.debug(f"VM state dir {self.log_dir.name}") - assert isinstance(self.data.flake.vm.flake_url, FlakeId) self._start_thread = threading.Thread(target=self.__start) self._start_thread.start() diff --git a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py index 5c0a7ef9d..a4c536759 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py @@ -110,12 +110,8 @@ class ClanStore: def log_details(gfile: Gio.File) -> None: self.log_details(vm, gfile) - assert isinstance(entry.flake.flake_url, FlakeId) - vm = VMObject(icon=icon, data=entry, build_log_cb=log_details) - assert isinstance(vm.data.flake.flake_url, FlakeId) self.push(vm) - assert isinstance(vm.data.flake.flake_url, FlakeId) def log_details(self, vm: VMObject, gfile: Gio.File) -> None: views = ViewStack.use().view diff --git a/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py b/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py index 4245275ac..f8d0ec6a1 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py @@ -2,7 +2,6 @@ import logging import threading import gi -from clan_cli.clan_uri import FlakeId from clan_cli.history.list import list_history from clan_vm_manager.components.interfaces import ClanConfig @@ -74,7 +73,6 @@ class MainWindow(Adw.ApplicationWindow): # Execute `clan flakes add ` to democlan for this to work # TODO: Make list_history a generator function for entry in list_history(): - assert isinstance(entry.flake.flake_url, FlakeId) GLib.idle_add(ClanStore.use().create_vm_task, entry) GLib.idle_add(self._set_clan_store_ready)