union of simulating port

Opentrons · Mar 4, 2024 · 880db71 · 880db71
1 parent 9b6ebd4
commit 880db71
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/api/src/opentrons/drivers/rpi_drivers/interfaces.py b/api/src/opentrons/drivers/rpi_drivers/interfaces.py
@@ -11,5 +11,5 @@ class USBDriverInterface(Protocol):
     def match_virtual_ports(
         self,
         virtual_port: Union[List[ModuleAtPort], List[SimulatingModuleAtPort]],
-    ) -> List[ModuleAtPort]:
+    ) -> Union[List[ModuleAtPort], List[SimulatingModuleAtPort]]:
         ...
diff --git a/api/src/opentrons/drivers/rpi_drivers/usb.py b/api/src/opentrons/drivers/rpi_drivers/usb.py
@@ -8,9 +8,12 @@
 import subprocess
 import re
 import os
-from typing import List
+from typing import List, Union
 
-from opentrons.hardware_control.modules.types import ModuleAtPort
+from opentrons.hardware_control.modules.types import (
+    ModuleAtPort,
+    SimulatingModuleAtPort,
+)
 from opentrons.hardware_control.types import BoardRevision
 
 from .interfaces import USBDriverInterface
@@ -79,8 +82,8 @@ def _read_usb_bus(self) -> List[USBPort]:
 
     def match_virtual_ports(
         self,
-        virtual_ports: List[ModuleAtPort],
-    ) -> List[ModuleAtPort]:
+        virtual_ports: Union[List[ModuleAtPort], List[SimulatingModuleAtPort]],
+    ) -> Union[List[ModuleAtPort], List[SimulatingModuleAtPort]]:
         """
         Match Virtual Ports
 

diff --git a/api/src/opentrons/drivers/rpi_drivers/usb_simulator.py b/api/src/opentrons/drivers/rpi_drivers/usb_simulator.py
@@ -17,8 +17,6 @@
 class USBBusSimulator(USBDriverInterface):
     def match_virtual_ports(
         self,
-        virtual_port: Union[
-            List[ModuleAtPort], List[SimulatingModuleAtPort]
-        ],  # should probably one use simulating
+        virtual_port: Union[List[ModuleAtPort], List[SimulatingModuleAtPort]],
     ) -> Union[List[ModuleAtPort], List[SimulatingModuleAtPort]]:
         return virtual_port