fix(robot-server): correct the data returned from instruments endpoint #12067
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## edge #12067 +/- ##
==========================================
+ Coverage 73.95% 74.02% +0.06%
==========================================
Files 2194 2202 +8
Lines 60718 61067 +349
Branches 6428 6526 +98
==========================================
+ Hits 44907 45204 +297
- Misses 14293 14321 +28
- Partials 1518 1542 +24
Flags with carried forward coverage won't be shown. Click here to find out more.
|
ahiuchingau
reviewed
Jan 30, 2023
| @@ -498,6 +498,12 @@ async def cache_instruments( | |||
| await self.cache_pipette( | |||
| mount, cast(OT3AttachedPipette, instrument_data), req_instr_name | |||
| ) | |||
| if self._gripper_handler.gripper and OT3Mount.GRIPPER not in found.keys(): | |||
There was a problem hiding this comment.
You could do something like this
for mount in OT3Mount:
if mount in found.keys() and mount == OT3Mount.GRIPPER:
await self.cache_gripper(cast(AttachedGripper, found[mount]))
elif mount in found.keys():
req_instr_name = checked_require.get(mount, None)
await self.cache_pipette(
mount, cast(OT3AttachedPipette, found[mount]), req_instr_name
)
elif mount == OT3Mount.GRIPPER:
await self._gripper_handler.reset()
else:
self._pipette_handler.hardware_instruments[mount] = None
ahiuchingau
approved these changes
Jan 31, 2023
y3rsh
added a commit
that referenced
this pull request
Feb 7, 2023
* edge: (116 commits) feat(system-server): add sqlite database and barebones HTTP server (#12085) feat(ot3): add enableOT3FirmwareUpdates feature flag to gate firmware update functionality. (#12102) feat(app): add bare bones hardware section to protocol details (#12099) feat(app): Support failed calibrations in the calibration wizard (#12092) refactor(docs): clean up Versioning page (#12084) refactor(robot-server): Make run and protocol limits configurable at launch (#12094) feat(app): add robotServerVersion to display the current robot software version (#12096) fix(hardware): do not track tip motor positions (#12093) feat(engine): allow calibrateGripper command to save calibration data (#12046) feat(app, api-client, react-api-client): delete POC TLC calibration data from overflow menu (#12075) fix(api): actually update OT3 instrument calibration offset in cache instrument (#12089) fix(robot-server): correct the data returned from instruments endpoint (#12067) feat(api): add thermocycler plate lift to hardware controller (#12068) fix(app): reference moduleId from result not params (#12077) feat(app): create ODD protocol setup page (#12071) refactor(api): Deprecate presses and increment args when using PAPI pick_up_tip (#12079) fix(ot3): handle multiple responses for a tip action request (#12083) refactor(api): touch tip implementation for PAPIv2 engine core (#12053) refactor(app): Remove ssid parameter from OnDeviceRouteParams (#11930) fix(api): fix broken test in the api hardware controller (#12080) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Fixes the issue where
jawStateandgripperModelwere returning enums instead of strings/ values.Also fixes the issue of instrument detachments not updating correctly in the instruments cache.
Test Plan
Tested on an OT3
Review requests
GripperModeland right now it's in a bit of incomplete state pending the decision on whether to use string enums or not. Until then it would contain a bit of a redundant code related to stringification of the models.Risk assessment
None. The change is according to the schema & client expectations.