From 8d56c523bb58b090ad3b3f0bff7bf4aee0fd427a Mon Sep 17 00:00:00 2001 From: Junhan Chang Date: Mon, 16 Jun 2025 12:15:39 +0800 Subject: [PATCH] update container registry and handles --- test/experiments/mock_reactor.json | 2 +- unilabos/registry/devices/pump_and_valve.yaml | 8 +++---- .../registry/devices/vacuum_and_purge.yaml | 24 ++++--------------- .../resources/opentrons/container.yaml | 5 ---- .../registry/resources/organic/container.yaml | 14 +++++++++++ 5 files changed, 23 insertions(+), 30 deletions(-) delete mode 100644 unilabos/registry/resources/opentrons/container.yaml create mode 100644 unilabos/registry/resources/organic/container.yaml diff --git a/test/experiments/mock_reactor.json b/test/experiments/mock_reactor.json index e73ab5c..546c15f 100644 --- a/test/experiments/mock_reactor.json +++ b/test/experiments/mock_reactor.json @@ -30,7 +30,7 @@ "children": [], "parent": "ReactorX", "type": "container", - "class": null, + "class": "container", "position": { "x": 698.1111111111111, "y": 428, diff --git a/unilabos/registry/devices/pump_and_valve.yaml b/unilabos/registry/devices/pump_and_valve.yaml index 6e264ee..71a2c97 100644 --- a/unilabos/registry/devices/pump_and_valve.yaml +++ b/unilabos/registry/devices/pump_and_valve.yaml @@ -48,12 +48,12 @@ solenoid_valve.mock: feedback: {} result: {} handles: - - handler_key: fluid-input - label: Fluid Input + - handler_key: 0 + label: 0 data_type: fluid side: NORTH - - handler_key: fluid-output - label: Fluid Output + - handler_key: 1 + label: 1 data_type: fluid side: SOUTH init_param_schema: diff --git a/unilabos/registry/devices/vacuum_and_purge.yaml b/unilabos/registry/devices/vacuum_and_purge.yaml index 6bdff16..160f8fc 100644 --- a/unilabos/registry/devices/vacuum_and_purge.yaml +++ b/unilabos/registry/devices/vacuum_and_purge.yaml @@ -23,20 +23,12 @@ vacuum_pump.mock: feedback: {} result: {} handles: - input: - - handler_key: fluid-input - label: Fluid Input + - handler_key: out + label: out data_type: fluid io_type: target data_source: handle data_key: fluid_in - output: - - handler_key: fluid-output - label: Fluid Output - data_type: fluid - io_type: source - data_source: executor - data_key: fluid_out init_param_schema: type: object properties: @@ -72,16 +64,8 @@ gas_source.mock: feedback: {} result: {} handles: - input: - - handler_key: fluid-input - label: Fluid Input - data_type: fluid - io_type: target - data_source: handle - data_key: fluid_in - output: - - handler_key: fluid-output - label: Fluid Output + - handler_key: out + label: out data_type: fluid io_type: source data_source: executor diff --git a/unilabos/registry/resources/opentrons/container.yaml b/unilabos/registry/resources/opentrons/container.yaml deleted file mode 100644 index c64b45f..0000000 --- a/unilabos/registry/resources/opentrons/container.yaml +++ /dev/null @@ -1,5 +0,0 @@ -container: - description: regular organic container - class: - module: unilabos.resources.container:RegularContainer - type: unilabos diff --git a/unilabos/registry/resources/organic/container.yaml b/unilabos/registry/resources/organic/container.yaml new file mode 100644 index 0000000..33ee26c --- /dev/null +++ b/unilabos/registry/resources/organic/container.yaml @@ -0,0 +1,14 @@ +container: + description: regular organic container + class: + module: unilabos.resources.container:RegularContainer + type: unilabos + handles: + - handler_key: top + label: top + data_type: fluid + side: NORTH + - handler_key: bottom + label: bottom + data_type: fluid + side: SOUTH \ No newline at end of file