Skip to content

Commit

Permalink
Revert commands
Browse files Browse the repository at this point in the history
  • Loading branch information
SyntaxColoring committed Dec 17, 2024
1 parent 7b5f222 commit 7900581
Show file tree
Hide file tree
Showing 42 changed files with 1 addition and 144 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,12 @@
class AirGapInPlaceParams(PipetteIdMixin, AspirateVolumeMixin, FlowRateMixin):
"""Payload required to air gap in place."""

model_config = {"defer_build": True}
pass


class AirGapInPlaceResult(BaseLiquidHandlingResult):
"""Result data from the execution of a AirGapInPlace command."""

model_config = {"defer_build": True}
pass


Expand Down
2 changes: 0 additions & 2 deletions api/src/opentrons/protocol_engine/commands/aspirate.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,12 @@ class AspirateParams(
"""Parameters required to aspirate from a specific well."""

pass
model_config = {"defer_build": True}


class AspirateResult(BaseLiquidHandlingResult, DestinationPositionResult):
"""Result data from execution of an Aspirate command."""

pass
model_config = {"defer_build": True}


_ExecuteReturn = Union[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,12 @@ class AspirateInPlaceParams(PipetteIdMixin, AspirateVolumeMixin, FlowRateMixin):
"""Payload required to aspirate in place."""

pass
model_config = {"defer_build": True}


class AspirateInPlaceResult(BaseLiquidHandlingResult):
"""Result data from the execution of a AspirateInPlace command."""

pass
model_config = {"defer_build": True}


_ExecuteReturn = Union[
Expand Down
2 changes: 0 additions & 2 deletions api/src/opentrons/protocol_engine/commands/blow_out.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,12 @@ class BlowOutParams(PipetteIdMixin, FlowRateMixin, WellLocationMixin):
"""Payload required to blow-out a specific well."""

pass
model_config = {"defer_build": True}


class BlowOutResult(DestinationPositionResult):
"""Result data from the execution of a blow-out command."""

pass
model_config = {"defer_build": True}


_ExecuteReturn = Union[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,12 @@ class BlowOutInPlaceParams(PipetteIdMixin, FlowRateMixin):
"""Payload required to blow-out in place."""

pass
model_config = {"defer_build": True}


class BlowOutInPlaceResult(BaseModel):
"""Result data from the execution of a BlowOutInPlace command."""

pass
model_config = {"defer_build": True}


_ExecuteReturn = Union[
Expand Down
4 changes: 1 addition & 3 deletions api/src/opentrons/protocol_engine/commands/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Dict,
)

from pydantic import BaseModel, ConfigDict, Field
from pydantic import BaseModel, Field
from pydantic.json_schema import SkipJsonSchema

from opentrons.hardware_control import HardwareControlAPI
Expand Down Expand Up @@ -219,8 +219,6 @@ class BaseCommand(
your own subclass per specific command type.
"""

model_config = ConfigDict(defer_build=True)

id: str = Field(
...,
description="Unique identifier of this particular command instance",
Expand Down
3 changes: 0 additions & 3 deletions api/src/opentrons/protocol_engine/commands/comment.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,11 @@ class CommentParams(BaseModel):
...,
description="A user-facing message",
)
model_config = {"defer_build": True}


class CommentResult(BaseModel):
"""Result data from the execution of a Comment command."""

model_config = {"defer_build": True}


class CommentImplementation(
AbstractCommandImpl[CommentParams, SuccessData[CommentResult]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,12 @@ class ConfigureForVolumeParams(PipetteIdMixin):
"highest version will be used.",
json_schema_extra=_remove_default,
)
model_config = {"defer_build": True}


class ConfigureForVolumeResult(BaseModel):
"""Result data from execution of an ConfigureForVolume command."""

pass
model_config = {"defer_build": True}


class ConfigureForVolumeImplementation(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,12 @@ class ConfigureNozzleLayoutParams(PipetteIdMixin):
ColumnNozzleLayoutConfiguration,
QuadrantNozzleLayoutConfiguration,
]
model_config = {"defer_build": True}


class ConfigureNozzleLayoutResult(BaseModel):
"""Result data from execution of an configureNozzleLayout command."""

pass
model_config = {"defer_build": True}


class ConfigureNozzleLayoutImplementation(
Expand Down
2 changes: 0 additions & 2 deletions api/src/opentrons/protocol_engine/commands/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@ class CustomParams(BaseModel):
"""Payload used by a custom command."""

model_config = ConfigDict(extra="allow")
model_config = {"defer_build": True}


class CustomResult(BaseModel):
"""Result data from a custom command."""

model_config = ConfigDict(extra="allow")
model_config = {"defer_build": True}


class CustomImplementation(
Expand Down
2 changes: 0 additions & 2 deletions api/src/opentrons/protocol_engine/commands/dispense.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,12 @@ class DispenseParams(
description="push the plunger a small amount farther than necessary for accurate low-volume dispensing",
json_schema_extra=_remove_default,
)
model_config = {"defer_build": True}


class DispenseResult(BaseLiquidHandlingResult, DestinationPositionResult):
"""Result data from the execution of a Dispense command."""

pass
model_config = {"defer_build": True}


_ExecuteReturn = Union[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,12 @@ class DispenseInPlaceParams(PipetteIdMixin, DispenseVolumeMixin, FlowRateMixin):
description="push the plunger a small amount farther than necessary for accurate low-volume dispensing",
json_schema_extra=_remove_default,
)
model_config = {"defer_build": True}


class DispenseInPlaceResult(BaseLiquidHandlingResult):
"""Result data from the execution of a DispenseInPlace command."""

pass
model_config = {"defer_build": True}


_ExecuteReturn = Union[
Expand Down
2 changes: 0 additions & 2 deletions api/src/opentrons/protocol_engine/commands/drop_tip.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,12 @@ class DropTipParams(PipetteIdMixin):
),
json_schema_extra=_remove_default,
)
model_config = {"defer_build": True}


class DropTipResult(DestinationPositionResult):
"""Result data from the execution of a DropTip command."""

pass
model_config = {"defer_build": True}


_ExecuteReturn = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,12 @@ class DropTipInPlaceParams(PipetteIdMixin):
),
json_schema_extra=_remove_default,
)
model_config = {"defer_build": True}


class DropTipInPlaceResult(BaseModel):
"""Result data from the execution of a DropTipInPlace command."""

pass
model_config = {"defer_build": True}


_ExecuteReturn = (
Expand Down
2 changes: 0 additions & 2 deletions api/src/opentrons/protocol_engine/commands/get_next_tip.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ class GetNextTipParams(PipetteIdMixin):
" This only applies to the first tip rack in the list provided in labwareIDs",
json_schema_extra=_remove_default,
)
model_config = {"defer_build": True}


class GetNextTipResult(BaseModel):
Expand All @@ -55,7 +54,6 @@ class GetNextTipResult(BaseModel):
description="Labware ID and well name of next available tip for a pipette,"
" or information why no tip could be resolved.",
)
model_config = {"defer_build": True}


class GetNextTipImplementation(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ class GetTipPresenceParams(PipetteIdMixin):
"""Payload required for a GetTipPresence command."""

pass
model_config = {"defer_build": True}


class GetTipPresenceResult(BaseModel):
Expand All @@ -36,7 +35,6 @@ class GetTipPresenceResult(BaseModel):
" hence, will always return TipPresenceStatus.UNKNOWN."
),
)
model_config = {"defer_build": True}


class GetTipPresenceImplementation(
Expand Down
3 changes: 0 additions & 3 deletions api/src/opentrons/protocol_engine/commands/home.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,11 @@ class HomeParams(BaseModel):
),
json_schema_extra=_remove_default,
)
model_config = {"defer_build": True}


class HomeResult(BaseModel):
"""Result data from the execution of a Home command."""

model_config = {"defer_build": True}


class HomeImplementation(AbstractCommandImpl[HomeParams, SuccessData[HomeResult]]):
"""Home command implementation."""
Expand Down
2 changes: 0 additions & 2 deletions api/src/opentrons/protocol_engine/commands/liquid_probe.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,12 @@ class LiquidProbeParams(_CommonParams):
"""Parameters required for a `liquidProbe` command."""

pass
model_config = {"defer_build": True}


class TryLiquidProbeParams(_CommonParams):
"""Parameters required for a `tryLiquidProbe` command."""

pass
model_config = {"defer_build": True}


class LiquidProbeResult(DestinationPositionResult):
Expand Down
2 changes: 0 additions & 2 deletions api/src/opentrons/protocol_engine/commands/load_labware.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ class LoadLabwareParams(BaseModel):
# TODO: Make sure v6 JSON protocols don't do that.
json_schema_extra=_remove_default,
)
model_config = {"defer_build": True}


class LoadLabwareResult(BaseModel):
Expand All @@ -96,7 +95,6 @@ class LoadLabwareResult(BaseModel):
" so the default of (0, 0, 0) will be used."
),
)
model_config = {"defer_build": True}


class LoadLabwareImplementation(
Expand Down
2 changes: 0 additions & 2 deletions api/src/opentrons/protocol_engine/commands/load_liquid.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,12 @@ class LoadLiquidParams(BaseModel):
...,
description="Volume of liquid, in µL, loaded into each well by name, in this labware. If the liquid id is the sentinel value EMPTY, all volumes must be 0.",
)
model_config = {"defer_build": True}


class LoadLiquidResult(BaseModel):
"""Result data from the execution of a LoadLiquid command."""

pass
model_config = {"defer_build": True}


class LoadLiquidImplementation(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ class LoadLiquidClassParams(BaseModel):
...,
description="The liquid class to store.",
)
model_config = {"defer_build": True}


class LoadLiquidClassResult(BaseModel):
Expand All @@ -49,7 +48,6 @@ class LoadLiquidClassResult(BaseModel):
description="The ID for the liquid class that was loaded, either the one you "
"supplied or the one we generated.",
)
model_config = {"defer_build": True}


class LoadLiquidClassImplementation(
Expand Down
4 changes: 0 additions & 4 deletions api/src/opentrons/protocol_engine/commands/load_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ class LoadModuleParams(BaseModel):
json_schema_extra=_remove_default,
)

model_config = {"defer_build": True}


class LoadModuleResult(BaseModel):
"""The results of loading a module."""
Expand Down Expand Up @@ -112,8 +110,6 @@ class LoadModuleResult(BaseModel):
"Will be `None` if a module is not electrically connected to the robot (like the Magnetic Block).",
)

model_config = {"defer_build": True}


class LoadModuleImplementation(
AbstractCommandImpl[LoadModuleParams, SuccessData[LoadModuleResult]]
Expand Down
4 changes: 0 additions & 4 deletions api/src/opentrons/protocol_engine/commands/load_pipette.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ class LoadPipetteParams(BaseModel):
json_schema_extra=_remove_default,
)

model_config = {"defer_build": True}


class LoadPipetteResult(BaseModel):
"""Result data for executing a LoadPipette."""
Expand All @@ -76,8 +74,6 @@ class LoadPipetteResult(BaseModel):
description="An ID to reference this pipette in subsequent commands.",
)

model_config = {"defer_build": True}


class LoadPipetteImplementation(
AbstractCommandImpl[LoadPipetteParams, SuccessData[LoadPipetteResult]]
Expand Down
4 changes: 0 additions & 4 deletions api/src/opentrons/protocol_engine/commands/move_labware.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ class MoveLabwareParams(BaseModel):
json_schema_extra=_remove_default,
)

model_config = {"defer_build": True}


class MoveLabwareResult(BaseModel):
"""The output of a successful ``moveLabware`` command."""
Expand All @@ -103,8 +101,6 @@ class MoveLabwareResult(BaseModel):
),
)

model_config = {"defer_build": True}


class GripperMovementError(ErrorOccurrence):
"""Returned when something physically goes wrong when the gripper moves labware.
Expand Down
3 changes: 0 additions & 3 deletions api/src/opentrons/protocol_engine/commands/move_relative.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,11 @@ class MoveRelativeParams(BaseModel):
),
)

model_config = {"defer_build": True}


class MoveRelativeResult(DestinationPositionResult):
"""Result data from the execution of a MoveRelative command."""

pass
model_config = {"defer_build": True}


class MoveRelativeImplementation(
Expand Down
Loading

0 comments on commit 7900581

Please sign in to comment.