fix(api): Fix RPC reporting wrong models for v1.3 pipettes (#1691)

Opentrons · Jun 13, 2018 · e302382 · e302382
1 parent cad5e74
commit e302382
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/api/opentrons/__init__.py b/api/opentrons/__init__.py
@@ -234,18 +234,15 @@ def _create_pipette_from_config(
         return p
 
     def _retrieve_version_number(self, mount, expected_model_substring):
-        # pass a default pipette model-version, for when robot is simulating
-        # this allows any pipette to be simulated, regardless of what is
-        # actually attached/cached on the robot's mounts
-        default_model = expected_model_substring + '_v1'  # default to v1
-        if robot.is_simulating():
-            return default_model
-
         attached_model = robot.get_attached_pipettes()[mount]['model']
+
         if attached_model and expected_model_substring in attached_model:
             return attached_model
         else:
-            return default_model
+            # pass a default pipette model-version for when robot is simulating
+            # this allows any pipette to be simulated, regardless of what is
+            # actually attached/cached on the robot's mounts
+            return expected_model_substring + '_v1'  # default to v1
 
 
 instruments = InstrumentsWrapper(robot)

diff --git a/api/opentrons/api/session.py b/api/opentrons/api/session.py
@@ -117,6 +117,9 @@ def on_command(message):
         unsubscribe = subscribe(types.COMMAND, on_command)
 
         try:
+            # ensure actual pipettes are cached before driver is disconnected
+            robot.cache_instrument_models()
+
             # TODO (artyom, 20171005): this will go away
             # once robot / driver simulation flow is fixed
             robot.disconnect()

diff --git a/api/tests/opentrons/api/test_session.py b/api/tests/opentrons/api/test_session.py
@@ -19,6 +19,7 @@ def labware_setup():
     plates = \
         [containers.load('96-PCR-flat', slot, slot) for slot in ['2', '5']]
 
+    # TODO(mc, 2018-06-13): use standard pipette factories
     p100 = instruments.Pipette(
         name='p100', mount='right', channels=8, tip_racks=tip_racks)