SyncClient.load_pipette does not need pipette_id argument.

Opentrons · May 4, 2021 · 15c0570 · 15c0570
1 parent cdc22c1
commit 15c0570
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 16 deletions.
diff --git a/api/src/opentrons/protocol_api_experimental/protocol_context.py b/api/src/opentrons/protocol_api_experimental/protocol_context.py
@@ -47,7 +47,6 @@ def load_pipette(  # noqa: D102
         result = self._engine_client.load_pipette(
             pipette_name=PipetteName(pipette_name),
             mount=Mount(mount),
-            pipette_id=None,
         )
 
         return PipetteContext(

diff --git a/api/src/opentrons/protocol_engine/clients/sync_client.py b/api/src/opentrons/protocol_engine/clients/sync_client.py
@@ -1,6 +1,6 @@
 """Synchronous ProtocolEngine client module."""
 from uuid import uuid4
-from typing import cast, Optional
+from typing import cast
 
 from opentrons.types import MountType
 
@@ -51,13 +51,11 @@ def load_pipette(
         self,
         pipette_name: PipetteName,
         mount: MountType,
-        pipette_id: Optional[str],
     ) -> commands.LoadPipetteResult:
         """Execute a LoadPipetteRequest and return the result."""
         request = commands.LoadPipetteRequest(
             pipetteName=pipette_name,
             mount=mount,
-            pipetteId=pipette_id
         )
         result = self._transport.execute_command(
             request=request,

diff --git a/api/src/opentrons/protocol_engine/commands/load_pipette.py b/api/src/opentrons/protocol_engine/commands/load_pipette.py
@@ -23,7 +23,7 @@ class LoadPipetteRequest(BaseModel):
         description="The mount the pipette should be present on.",
     )
     pipetteId: Optional[str] = Field(
-        ...,
+        None,
         description="An optional ID to assign to this pipette. If None, an ID "
                     "will be generated."
     )

diff --git a/api/src/opentrons/protocol_engine/execution/equipment.py b/api/src/opentrons/protocol_engine/execution/equipment.py
@@ -108,7 +108,7 @@ async def load_pipette(
         except RuntimeError as e:
             raise FailedToLoadPipetteError(str(e)) from e
 
-        pipette_id = pipette_id if pipette_id else \
+        pipette_id = pipette_id if pipette_id is not None else \
             self._resources.id_generator.generate_id()
 
         return LoadedPipette(pipette_id=pipette_id)
diff --git a/api/tests/opentrons/protocol_api_experimental/test_protocol_context.py b/api/tests/opentrons/protocol_api_experimental/test_protocol_context.py
@@ -50,7 +50,6 @@ def test_load_pipette(
         engine_client.load_pipette(
             pipette_name=PipetteName.P300_SINGLE,
             mount=Mount.LEFT,
-            pipette_id=None,
         )
     ).then_return(commands.LoadPipetteResult(pipetteId="pipette-id"))
 
@@ -72,15 +71,13 @@ def test_load_instrument(
         engine_client.load_pipette(
             pipette_name=PipetteName.P300_MULTI,
             mount=Mount.LEFT,
-            pipette_id=None
         )
     ).then_return(commands.LoadPipetteResult(pipetteId="left-pipette-id"))
 
     decoy.when(
         engine_client.load_pipette(
             pipette_name=PipetteName.P300_SINGLE,
             mount=Mount.RIGHT,
-            pipette_id=None
         )
     ).then_return(commands.LoadPipetteResult(pipetteId="right-pipette-id"))
 

diff --git a/api/tests/opentrons/protocol_engine/clients/test_sync_client.py b/api/tests/opentrons/protocol_engine/clients/test_sync_client.py
@@ -92,7 +92,6 @@ def test_load_pipette(
     request = commands.LoadPipetteRequest(
         pipetteName=PipetteName.P300_SINGLE,
         mount=MountType.RIGHT,
-        pipetteId=None,
     )
 
     expected_result = commands.LoadPipetteResult(pipetteId="abc123")
@@ -104,7 +103,6 @@ def test_load_pipette(
     result = subject.load_pipette(
         pipette_name=PipetteName.P300_SINGLE,
         mount=MountType.RIGHT,
-        pipette_id=None,
     )
 
     assert result == expected_result

diff --git a/api/tests/opentrons/protocol_engine/commands/test_load_pipette.py b/api/tests/opentrons/protocol_engine/commands/test_load_pipette.py
@@ -15,7 +15,6 @@ def test_load_pipette_request() -> None:
     request = LoadPipetteRequest(
         pipetteName=PipetteName.P300_SINGLE,
         mount=MountType.LEFT,
-        pipetteId=None
     )
 
     assert request.pipetteName == "p300_single"

diff --git a/api/tests/opentrons/protocol_engine/state/test_pipette_state.py b/api/tests/opentrons/protocol_engine/state/test_pipette_state.py
@@ -25,7 +25,6 @@ def load_pipette_command(now: datetime) -> CompletedLoadLabware:
         request=cmd.LoadPipetteRequest(
             pipetteName=PipetteName.P300_SINGLE,
             mount=MountType.LEFT,
-            pipetteId=None,
         ),
         result=cmd.LoadPipetteResult(pipetteId="pipette-id"),
         created_at=now,

diff --git a/robot-server/tests/service/session/models/test_command.py b/robot-server/tests/service/session/models/test_command.py
@@ -63,7 +63,6 @@ def test_not_empty():
     assert request.data.data == pe_commands.LoadPipetteRequest(
         pipetteName="p10_single",
         mount=MountType.LEFT,
-        pipetteId=None,
     )
 
     dt = datetime(2000, 1, 1)
@@ -84,7 +83,6 @@ def test_not_empty():
     assert response.data == pe_commands.LoadPipetteRequest(
         pipetteName="p10_single",
         mount=MountType.LEFT,
-        pipetteId=None,
     )
     assert response.id == "id"
     assert response.createdAt == dt

diff --git a/robot-server/tests/service/session/session_types/live_protocol/test_command_executor.py b/robot-server/tests/service/session/session_types/live_protocol/test_command_executor.py
@@ -136,7 +136,6 @@ async def test_load_instrument(command_executor, mock_protocol_engine):
     request_body = pe_commands.LoadPipetteRequest(
         pipetteName="p10_single",
         mount=MountType.LEFT,
-        pipetteId=None,
     )
 
     protocol_engine_response = pe_commands.CompletedCommand(