diff --git a/unilabos/app/web/client.py b/unilabos/app/web/client.py index 6eedfdd8..61a98511 100644 --- a/unilabos/app/web/client.py +++ b/unilabos/app/web/client.py @@ -132,7 +132,7 @@ class HTTPClient: """ response = requests.put( f"{self.remote_addr}/lab/material", - json=resources, + json={"nodes": resources}, headers={"Authorization": f"Lab {self.auth}"}, timeout=100, ) diff --git a/unilabos/registry/devices/liquid_handler.yaml b/unilabos/registry/devices/liquid_handler.yaml index 50d24152..3d9b75f9 100644 --- a/unilabos/registry/devices/liquid_handler.yaml +++ b/unilabos/registry/devices/liquid_handler.yaml @@ -7304,151 +7304,6 @@ liquid_handler.prcxi: title: LiquidHandlerRemove type: object type: LiquidHandlerRemove - set_group: - feedback: {} - goal: - group_name: group_name - volumes: volumes - wells: wells - goal_default: - group_name: '' - volumes: - - 0.0 - wells: - - category: '' - children: [] - config: '' - data: '' - id: '' - name: '' - parent: '' - pose: - orientation: - w: 1.0 - x: 0.0 - y: 0.0 - z: 0.0 - position: - x: 0.0 - y: 0.0 - z: 0.0 - sample_id: '' - type: '' - handles: {} - result: {} - schema: - description: '' - properties: - feedback: - properties: {} - required: [] - title: LiquidHandlerSetGroup_Feedback - type: object - goal: - properties: - group_name: - type: string - volumes: - items: - type: number - type: array - wells: - items: - properties: - category: - type: string - children: - items: - type: string - type: array - config: - type: string - data: - type: string - id: - type: string - name: - type: string - parent: - type: string - pose: - properties: - orientation: - properties: - w: - type: number - x: - type: number - y: - type: number - z: - type: number - required: - - x - - y - - z - - w - title: orientation - type: object - position: - properties: - x: - type: number - y: - type: number - z: - type: number - required: - - x - - y - - z - title: position - type: object - required: - - position - - orientation - title: pose - type: object - sample_id: - type: string - type: - type: string - required: - - id - - name - - sample_id - - children - - parent - - type - - category - - pose - - config - - data - title: wells - type: object - type: array - required: - - group_name - - wells - - volumes - title: LiquidHandlerSetGroup_Goal - type: object - result: - properties: - return_info: - type: string - success: - type: boolean - required: - - return_info - - success - title: LiquidHandlerSetGroup_Result - type: object - required: - - goal - title: LiquidHandlerSetGroup - type: object - type: LiquidHandlerSetGroup set_liquid: feedback: {} goal: @@ -7824,56 +7679,6 @@ liquid_handler.prcxi: title: Transfer type: object type: Transfer - transfer_group: - feedback: {} - goal: - source_group_name: source_group_name - target_group_name: target_group_name - unit_volume: unit_volume - goal_default: - source_group_name: '' - target_group_name: '' - unit_volume: 0.0 - handles: {} - result: {} - schema: - description: '' - properties: - feedback: - properties: {} - required: [] - title: LiquidHandlerTransferGroup_Feedback - type: object - goal: - properties: - source_group_name: - type: string - target_group_name: - type: string - unit_volume: - type: number - required: - - source_group_name - - target_group_name - - unit_volume - title: LiquidHandlerTransferGroup_Goal - type: object - result: - properties: - return_info: - type: string - success: - type: boolean - required: - - return_info - - success - title: LiquidHandlerTransferGroup_Result - type: object - required: - - goal - title: LiquidHandlerTransferGroup - type: object - type: LiquidHandlerTransferGroup transfer_liquid: feedback: {} goal: diff --git a/unilabos_msgs/CMakeLists.txt b/unilabos_msgs/CMakeLists.txt index c67bdf47..0725514f 100644 --- a/unilabos_msgs/CMakeLists.txt +++ b/unilabos_msgs/CMakeLists.txt @@ -68,12 +68,10 @@ set(action_files "action/LiquidHandlerSetTipRack.action" "action/LiquidHandlerStamp.action" "action/LiquidHandlerTransfer.action" - "action/LiquidHandlerSetGroup.action" "action/LiquidHandlerTransferBiomek.action" "action/LiquidHandlerIncubateBiomek.action" "action/LiquidHandlerMoveBiomek.action" "action/LiquidHandlerOscillateBiomek.action" - "action/LiquidHandlerTransferGroup.action" "action/LiquidHandlerAdd.action" "action/LiquidHandlerMix.action" "action/LiquidHandlerMoveTo.action"