fixup! add type hints for app.py

add Literal DeviceClass

minor naming fix

remove unnecessary assert

Author: anon

qubesadmin/app.py

@@ -56,6 +56,8 @@
 except ImportError:
     has_qubesdb = False
 
+DeviceClass = typing.Literal["mic", "block", "pci", "usb", "webcam"]
+
 
 class VMCollection:
     """Collection of VMs objects"""
@@ -83,24 +85,24 @@ def refresh_cache(self, force: bool=False) -> None:
         if not force and self._vm_dict_initialized:
             return
         vm_list_data = self.app.qubesd_call("dom0", "admin.vm.List")
-        new_vm_list = {}
+        new_vm_dict = {}
         self._vm_dict_initialized = True
         # FIXME: this will probably change
         for vm_data in vm_list_data.splitlines():
             vm_name, props = vm_data.decode("ascii").split(" ", 1)
             vm_name = str(vm_name)
             props = props.split(" ")
-            new_vm_list[vm_name] = dict(
+            new_vm_dict[vm_name] = dict(
                 [vm_prop.split("=", 1) for vm_prop in props]
             )
             # if cache not enabled, drop power state
             if not self.app.cache_enabled:
                 try:
-                    del new_vm_list[vm_name]["state"]
+                    del new_vm_dict[vm_name]["state"]
                 except KeyError:
                     pass
 
-        self._vm_dict = new_vm_list
+        self._vm_dict = new_vm_dict
         for name, vm in list(self._vm_objects.items()):
             if vm.name not in self._vm_dict:
                 # VM no longer exists
@@ -224,14 +226,17 @@ def list_vmclass(self) -> list[Klass]:
             assert e in typing.get_args(Klass)
         return typing.cast(list[Klass], sorted(vmclass))
 
-    def list_deviceclass(self) -> list[str]:  # TODO make Literal ?
+    def list_deviceclass(self) -> list[DeviceClass]:
         """Call Qubesd in order to obtain the device classes list"""
         deviceclasses = (
             self.qubesd_call("dom0", "admin.deviceclass.List")
             .decode()
             .splitlines()
         )
-        return sorted(deviceclasses)
+        for e in deviceclasses:
+            assert e in typing.get_args(DeviceClass)
+
+        return typing.cast(list[DeviceClass], sorted(deviceclasses))
 
     def _refresh_pool_drivers(self) -> None:
         """

qubesadmin/base.py

@@ -91,13 +91,9 @@ def qubesd_call(self, dest: str | None, method: str,
             if dest.startswith("@dispvm:"):
                 dest = dest[len("@dispvm:") :]
             else:
-                # TODO what if `dest` remains None here ?
-                #  qubesd_call expects a non-None `dest` arg
                 dest: QubesVM | None = getattr(self.app, "default_dispvm", None)
-                assert dest is not None
                 if dest:
-                    dest: str = dest.name
-        assert isinstance(dest, str)
+                    dest = dest.name
         # have the actual implementation at Qubes() instance
         return self.app.qubesd_call(dest, method, arg, payload,
             payload_stream)

qubesadmin/device_protocol.py

@@ -605,7 +605,6 @@ def _parse(
                 backend = get_domain(backend_name)
         else:
             identity = representation
-        assert backend is not None
 
         port_id, _, devid = identity.replace(sep, ":").partition(":")
         if port_id == "_":

qubesadmin/vm/__init__.py

@@ -67,7 +67,7 @@ def __init__(self, app, name, klass=None, power_state=None):
         self.firewall = qubesadmin.firewall.Firewall(self)
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Domain name"""
         return self._method_dest
 
@@ -83,7 +83,7 @@ def name(self, new_value):
         self._volumes = None
         self.app.domains.clear_cache()
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self._method_dest
 
     def __lt__(self, other):