fix mock_reactor

添加了run column和filter through的protocol，亲测能跑
修复了很多protocol，亲测能跑
2026-02-07 23:45:10 +00:00 · 2025-06-20 21:22:32 +08:00 · 2025-06-20 18:44:59 +08:00 · 2025-06-19 20:25:07 +08:00 · 2025-06-18 11:05:15 +08:00 · 2025-06-18 10:54:51 +08:00
8 changed files with 281 additions and 1364 deletions
--- a/test/experiments/Protocol_Test_Station/clean_vessel_protocol_test_station.json
+++ b/test/experiments/Protocol_Test_Station/clean_vessel_protocol_test_station.json
@@ -28,7 +28,7 @@
            "config": {
                "protocol_type": [
                    "CleanVesselProtocol",
-                    "PumpTransferProtocol",
+                    "PumpTransferProtocol", 
                    "HeatChillProtocol",
                    "HeatChillStartProtocol",
                    "HeatChillStopProtocol"
@@ -148,7 +148,7 @@
            "children": [],
            "parent": "CleanVesselProtocolTestStation",
            "type": "container",
-            "class": "container",
+            "class": null,
            "position": {
                "x": 50,
                "y": 500,
@@ -172,7 +172,7 @@
            "children": [],
            "parent": "CleanVesselProtocolTestStation",
            "type": "container",
-            "class": "container",
+            "class": null,
            "position": {
                "x": 150,
                "y": 500,
@@ -196,7 +196,7 @@
            "children": [],
            "parent": "CleanVesselProtocolTestStation",
            "type": "container",
-            "class": "container",
+            "class": null,
            "position": {
                "x": 250,
                "y": 500,
@@ -220,7 +220,7 @@
            "children": [],
            "parent": "CleanVesselProtocolTestStation",
            "type": "container",
-            "class": "container",
+            "class": null,
            "position": {
                "x": 350,
                "y": 500,
@@ -239,7 +239,7 @@
            "children": [],
            "parent": "CleanVesselProtocolTestStation",
            "type": "container",
-            "class": "container",
+            "class": null,
            "position": {
                "x": 600,
                "y": 450,
@@ -263,7 +263,7 @@
            "children": [],
            "parent": "CleanVesselProtocolTestStation",
            "type": "container",
-            "class": "container",
+            "class": null,
            "position": {
                "x": 800,
                "y": 450,
@@ -287,7 +287,7 @@
            "children": [],
            "parent": "CleanVesselProtocolTestStation",
            "type": "container",
-            "class": "container",
+            "class": null,
            "position": {
                "x": 700,
                "y": 550,
@@ -301,9 +301,9 @@
            }
        }
    ],
-        "links": [
+    "links": [
        {
-            "id": "link_pump1_to_valve1",
+            "id": "link_pump1_valve1",
            "source": "transfer_pump_1",
            "target": "multiway_valve_1",
            "type": "fluid",
@@ -313,7 +313,7 @@
            }
        },
        {
-            "id": "link_pump2_to_valve2",
+            "id": "link_pump2_valve2",
            "source": "transfer_pump_2",
            "target": "multiway_valve_2",
            "type": "fluid",
@@ -323,123 +323,103 @@
            }
        },
        {
-            "id": "link_valve1_to_water",
+            "id": "link_valve1_air",
            "source": "multiway_valve_1",
            "target": "flask_air",
            "type": "fluid",
            "port": {
                "multiway_valve_1": "1",
                "flask_air": "top"
            }
        },
        {
            "id": "link_valve1_water",
            "source": "multiway_valve_1",
            "target": "flask_water",
            "type": "fluid",
            "port": {
                "multiway_valve_1": "2",
-                "flask_water": "top"
+                "flask_water": "outlet"
            }
        },
        {
-            "id": "link_valve1_to_acetone",
+            "id": "link_valve1_acetone",
            "source": "multiway_valve_1",
            "target": "flask_acetone",
            "type": "fluid",
            "port": {
                "multiway_valve_1": "3",
-                "flask_acetone": "top"
+                "flask_acetone": "outlet"
            }
        },
        {
-            "id": "link_valve1_to_ethanol",
+            "id": "link_valve1_ethanol",
            "source": "multiway_valve_1",
            "target": "flask_ethanol",
            "type": "fluid",
            "port": {
                "multiway_valve_1": "4",
-                "flask_ethanol": "top"
+                "flask_ethanol": "outlet"
            }
        },
        {
-            "id": "link_valve1_to_air",
+            "id": "link_valve1_valve2",
            "source": "multiway_valve_1",
            "target": "flask_air",
            "type": "fluid",
            "port": {
                "multiway_valve_1": "6",
                "flask_air": "top"
            }
        },
        {
            "id": "link_valve1_to_valve2_for_cleaning",
            "source": "multiway_valve_1",
            "target": "multiway_valve_2",
            "type": "fluid",
            "port": {
-                "multiway_valve_1": "1",
+                "multiway_valve_1": "5",
-                "multiway_valve_2": "8"
+                "multiway_valve_2": "1"
            }
        },
        {
-            "id": "link_valve2_to_main_reactor_in",
+            "id": "link_valve2_main_reactor",
            "source": "multiway_valve_2",
            "target": "main_reactor",
            "type": "fluid",
            "port": {
                "multiway_valve_2": "2",
-                "main_reactor": "top"
+                "main_reactor": "inlet"
            }
        },
        {
-            "id": "link_valve2_to_secondary_reactor_in",
+            "id": "link_valve2_secondary_reactor",
            "source": "multiway_valve_2",
            "target": "secondary_reactor",
            "type": "fluid",
            "port": {
                "multiway_valve_2": "3",
-                "secondary_reactor": "top"
+                "secondary_reactor": "inlet"
            }
        },
        {
-            "id": "link_main_reactor_out_to_valve2",
+            "id": "link_valve2_waste",
            "source": "main_reactor",
            "target": "multiway_valve_2",
            "type": "fluid",
            "port": {
                "main_reactor": "bottom",
                "multiway_valve_2": "6"
            }
        },
        {
            "id": "link_secondary_reactor_out_to_valve2",
            "source": "secondary_reactor",
            "target": "multiway_valve_2",
            "type": "fluid",
            "port": {
                "secondary_reactor": "bottom",
                "multiway_valve_2": "7"
            }
        },
        {
            "id": "link_valve2_to_waste",
            "source": "multiway_valve_2",
            "target": "waste_workup",
            "type": "fluid",
            "port": {
                "multiway_valve_2": "4",
-                "waste_workup": "top"
+                "waste_workup": "inlet"
            }
        },
        {
-            "id": "link_heatchill1_to_main_reactor",
+            "id": "link_valve2_air_return",
            "source": "multiway_valve_2",
            "target": "flask_air",
            "type": "fluid",
            "port": {
                "multiway_valve_2": "5",
                "flask_air": "bottom"
            }
        },
        {
            "id": "link_heatchill1_main_reactor",
            "source": "heatchill_1",
            "target": "main_reactor",
            "type": "mechanical",
            "port": {
                "heatchill_1": "heatchill",
-                "main_reactor": "bind"
+                "main_reactor": "heating_jacket"
            }
        },
        {
            "id": "link_heatchill1_to_secondary_reactor",
            "source": "heatchill_1",
            "target": "secondary_reactor",
            "type": "mechanical",
            "port": {
                "heatchill_1": "heatchill",
                "secondary_reactor": "bind"
            }
        }
    ]
--- a/test/experiments/comprehensive_protocol/comprehensive_station.json
+++ b/test/experiments/comprehensive_protocol/comprehensive_station.json
@@ -1,8 +1,8 @@
 {
    "nodes": [
        {
-            "id": "OrganicSynthesisStation",
+            "id": "ComprehensiveProtocolStation",
-            "name": "有机化学流程综合测试工作站",
+            "name": "综合协议测试工作站",
            "children": [
                "multiway_valve_1",
                "multiway_valve_2",
@@ -69,7 +69,7 @@
            "id": "multiway_valve_1",
            "name": "八通阀门1",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_multiway_valve",
            "position": {
@@ -89,7 +89,7 @@
            "id": "multiway_valve_2",
            "name": "八通阀门2",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_multiway_valve",
            "position": {
@@ -109,7 +109,7 @@
            "id": "transfer_pump_1",
            "name": "转移泵1",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_transfer_pump",
            "position": {
@@ -130,7 +130,7 @@
            "id": "transfer_pump_2",
            "name": "转移泵2",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_transfer_pump",
            "position": {
@@ -151,7 +151,7 @@
            "id": "reagent_bottle_1",
            "name": "试剂瓶1-DMF",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "container",
            "class": "container",
            "position": {
@@ -172,7 +172,7 @@
            "id": "reagent_bottle_2",
            "name": "试剂瓶2-乙酸乙酯",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "container",
            "class": "container",
            "position": {
@@ -193,7 +193,7 @@
            "id": "reagent_bottle_3",
            "name": "试剂瓶3-己烷",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "container",
            "class": "container",
            "position": {
@@ -214,7 +214,7 @@
            "id": "reagent_bottle_4",
            "name": "试剂瓶4-甲醇",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "container",
            "class": "container",
            "position": {
@@ -235,7 +235,7 @@
            "id": "reagent_bottle_5",
            "name": "试剂瓶5-水",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "container",
            "class": "container",
            "position": {
@@ -256,7 +256,7 @@
            "id": "centrifuge_1",
            "name": "离心机",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_centrifuge",
            "position": {
@@ -278,7 +278,7 @@
            "id": "rotavap_1",
            "name": "旋转蒸发仪",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_rotavap",
            "position": {
@@ -300,7 +300,7 @@
            "id": "main_reactor",
            "name": "主反应器",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "container",
            "class": "container",
            "position": {
@@ -324,7 +324,7 @@
            "id": "heater_1",
            "name": "加热器",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_heatchill",
            "position": {
@@ -345,7 +345,7 @@
            "id": "stirrer_1",
            "name": "搅拌器1",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_stirrer",
            "position": {
@@ -361,11 +361,11 @@
                "current_speed": 0.0
            }
        },
-        {
+                {
            "id": "stirrer_2",
            "name": "搅拌器2",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_stirrer",
            "position": {
@@ -385,7 +385,7 @@
            "id": "waste_bottle_1",
            "name": "废液瓶1",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "container",
            "class": "container",
            "position": {
@@ -404,7 +404,7 @@
            "id": "waste_bottle_2",
            "name": "废液瓶2",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "container",
            "class": "container",
            "position": {
@@ -423,7 +423,7 @@
            "id": "solenoid_valve_1",
            "name": "电磁阀1",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_solenoid_valve",
            "position": {
@@ -444,7 +444,7 @@
            "id": "solenoid_valve_2",
            "name": "电磁阀2",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_solenoid_valve",
            "position": {
@@ -465,7 +465,7 @@
            "id": "vacuum_pump_1",
            "name": "真空泵",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_vacuum_pump",
            "position": {
@@ -486,7 +486,7 @@
            "id": "gas_source_1",
            "name": "气源",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_gas_source",
            "position": {
@@ -504,7 +504,7 @@
            "id": "filter_1",
            "name": "过滤器",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_filter",
            "position": {
@@ -525,7 +525,7 @@
            "id": "column_1",
            "name": "洗脱柱",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_column",
            "position": {
@@ -547,7 +547,7 @@
            "id": "separator_1",
            "name": "分液器",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "device",
            "class": "virtual_separator",
            "position": {
@@ -568,7 +568,7 @@
            "id": "collection_bottle_1",
            "name": "接收瓶1",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "container",
            "class": "container",
            "position": {
@@ -587,7 +587,7 @@
            "id": "collection_bottle_2",
            "name": "接收瓶2",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "container",
            "class": "container",
            "position": {
@@ -606,7 +606,7 @@
            "id": "collection_bottle_3",
            "name": "接收瓶3",
            "children": [],
-            "parent": "OrganicSynthesisStation",
+            "parent": "ComprehensiveProtocolStation",
            "type": "container",
            "class": "container",
            "position": {
@@ -624,13 +624,13 @@
    ],
    "links": [
        {
-            "id": "link_pump1_valve1",
+            "id": "link_valve1_pump1",
-            "source": "transfer_pump_1",
+            "source": "multiway_valve_1",
-            "target": "multiway_valve_1",
+            "target": "transfer_pump_1",
            "type": "fluid",
            "port": {
-                "transfer_pump_1": "transferpump",
+                "multiway_valve_1": "transferpump",
-                "multiway_valve_1": "transferpump"
+                "transfer_pump_1": "transferpump"
            }
        },
        {
@@ -667,7 +667,7 @@
            "id": "link_valve1_centrifuge",
            "source": "multiway_valve_1",
            "target": "centrifuge_1",
-            "type": "transport",
+            "type": "fluid",
            "port": {
                "multiway_valve_1": "4",
                "centrifuge_1": "centrifuge"
@@ -680,7 +680,7 @@
            "type": "fluid",
            "port": {
                "multiway_valve_1": "5",
-                "rotavap_1": "sample_in"
+                "rotavap_1": "rotavap-sample"
            }
        },
        {
@@ -714,13 +714,13 @@
            }
        },
        {
-            "id": "link_pump2_valve2",
+            "id": "link_valve2_pump2",
-            "source": "transfer_pump_2",
+            "source": "multiway_valve_2",
-            "target": "multiway_valve_2",
+            "target": "transfer_pump_2",
            "type": "fluid",
            "port": {
-                "transfer_pump_2": "transferpump",
+                "multiway_valve_2": "transferpump",
-                "multiway_valve_2": "transferpump"
+                "transfer_pump_2": "transferpump"
            }
        },
        {
@@ -734,13 +734,13 @@
            }
        },
        {
-            "id": "link_vacuum_solenoid1",
+            "id": "link_solenoid1_vacuum",
-            "source": "vacuum_pump_1",
+            "source": "solenoid_valve_1",
-            "target": "solenoid_valve_1",
+            "target": "vacuum_pump_1",
            "type": "fluid",
            "port": {
-                "vacuum_pump_1": "vacuumpump",
+                "solenoid_valve_1": "out",
-                "solenoid_valve_1": "out"
+                "vacuum_pump_1": "vacuumpump"
            }
        },
        {
@@ -754,30 +754,40 @@
            }
        },
        {
-            "id": "link_gas_solenoid2",
+            "id": "link_solenoid2_gas",
-            "source": "gas_source_1",
+            "source": "solenoid_valve_2",
-            "target": "solenoid_valve_2",
+            "target": "gas_source_1",
            "type": "fluid",
            "port": {
-                "gas_source_1": "gassource",
+                "solenoid_valve_2": "out",
-                "solenoid_valve_2": "out"
+                "gas_source_1": "gassource"
            }
        },
        {
            "id": "link_valve2_filter",
            "source": "multiway_valve_2",
            "target": "filter_1",
-            "type": "transport",
+            "type": "fluid",
            "port": {
                "multiway_valve_2": "4",
-                "filter_1": "filter_in"
+                "filter_1": "filterin"
            }
        },
        {
            "id": "link_filter_collection1",
            "source": "filter_1",
            "target": "collection_bottle_1",
            "type": "fluid",
            "port": {
                "filter_1": "filtrate_out",
                "collection_bottle_1": "top"
            }
        },
        {
            "id": "link_valve2_column",
            "source": "multiway_valve_2",
            "target": "column_1",
-            "type": "transport",
+            "type": "fluid",
            "port": {
                "multiway_valve_2": "5",
                "column_1": "columnin"
@@ -787,7 +797,7 @@
            "id": "link_column_collection2",
            "source": "column_1",
            "target": "collection_bottle_2",
-            "type": "transport",
+            "type": "fluid",
            "port": {
                "column_1": "columnout",
                "collection_bottle_2": "top"
@@ -800,7 +810,7 @@
            "type": "fluid",
            "port": {
                "multiway_valve_2": "6",
-                "separator_1": "separator_in"
+                "separator_1": "separatorin"
            }
        },
        {
@@ -809,10 +819,30 @@
            "target": "collection_bottle_3",
            "type": "fluid",
            "port": {
-                "separator_1": "bottom_phase_out",
+                "separator_1": "separatorout",
                "collection_bottle_3": "top"
            }
        },
        {
            "id": "link_separator_stirrer_2",
            "source": "separator_1",
            "target": "stirrer_2",
            "type": "fluid",
            "port": {
                "separator_1": "separatorout",
                "stirrer_2": "stirrer"
            }
        },
        {
            "id": "link_separator_waste2",
            "source": "separator_1",
            "target": "waste_bottle_2",
            "type": "fluid",
            "port": {
                "separator_1": "separatorout",
                "waste_bottle_2": "top"
            }
        },
        {
            "id": "link_valve2_reagent4",
            "source": "multiway_valve_2",
@@ -837,60 +867,20 @@
            "id": "mech_stirrer_reactor",
            "source": "stirrer_1",
            "target": "main_reactor",
-            "type": "mechanical",
+            "type": "fluid",
            "port": {
                "stirrer_1": "stirrer",
-                "main_reactor": "bind"
+                "main_reactor": "top"
            }
        },
        {
            "id": "thermal_heater_reactor",
            "source": "heater_1",
            "target": "main_reactor",
            "type": "mechanical",
            "port": {
                "heater_1": "heatchill",
                "main_reactor": "bind"
            }
        },
        {
            "id": "link_separator_waste2",
            "source": "separator_1",
            "target": "waste_bottle_2",
            "type": "fluid",
            "port": {
-                "separator_1": "top_phase_out",
+                "heater_1": "heatchill",
-                "waste_bottle_2": "top"
+                "main_reactor": "bottom"
            }
        },
        {
            "id": "mech_stirrer2_separator",
            "source": "stirrer_2",
            "target": "separator_1",
            "type": "mechanical",
            "port": {
                "stirrer_2": "stirrer",
                "separator_1": "bind"
            }
        },
        {
        "id": "link_filter_filtrate_to_collection1",
        "source": "filter_1",
        "target": "collection_bottle_1",
        "type": "transport",
        "port": {
            "filter_1": "filtrate_out",
            "collection_bottle_1": "top"
        }
        },
        {
            "id": "link_filter_retentate_to_waste1",
            "source": "filter_1",
            "target": "waste_bottle_1",
            "type": "transport",
            "port": {
                "filter_1": "retentate_out",
                "waste_bottle_1": "top"
            }
        }
    ]
--- a/unilabos/compile/init.py
+++ b/unilabos/compile/init.py
@@ -25,25 +25,26 @@ from .wash_solid_protocol import generate_wash_solid_protocol
 # Define a dictionary of protocol generators.
 action_protocol_generators = {
-    AddProtocol: generate_add_protocol,
+    PumpTransferProtocol: generate_pump_protocol_with_rinsing,
    CleanProtocol: generate_clean_protocol,
    SeparateProtocol: generate_separate_protocol,
    EvaporateProtocol: generate_evaporate_protocol,
    EvacuateAndRefillProtocol: generate_evacuateandrefill_protocol,
    AGVTransferProtocol: generate_agv_transfer_protocol,
    CentrifugeProtocol: generate_centrifuge_protocol,
-    CleanProtocol: generate_clean_protocol,
+    AddProtocol: generate_add_protocol,
    CleanVesselProtocol: generate_clean_vessel_protocol,
    DissolveProtocol: generate_dissolve_protocol,
    EvacuateAndRefillProtocol: generate_evacuateandrefill_protocol,
    EvaporateProtocol: generate_evaporate_protocol,
    FilterProtocol: generate_filter_protocol,
    FilterThroughProtocol: generate_filter_through_protocol,
    HeatChillProtocol: generate_heat_chill_protocol,
    HeatChillStartProtocol: generate_heat_chill_start_protocol,
    HeatChillStopProtocol: generate_heat_chill_stop_protocol,
-    PumpTransferProtocol: generate_pump_protocol_with_rinsing,
+    # HeatChillToTempProtocol: generate_heat_chill_to_temp_protocol,  # **移除这行**
    RunColumnProtocol: generate_run_column_protocol,
    SeparateProtocol: generate_separate_protocol,
    StartStirProtocol: generate_start_stir_protocol,
    StirProtocol: generate_stir_protocol,
    StartStirProtocol: generate_start_stir_protocol,
    StopStirProtocol: generate_stop_stir_protocol,
    TransferProtocol: generate_transfer_protocol,
    CleanVesselProtocol: generate_clean_vessel_protocol,
    DissolveProtocol: generate_dissolve_protocol,
    FilterThroughProtocol: generate_filter_through_protocol,
    RunColumnProtocol: generate_run_column_protocol,
    WashSolidProtocol: generate_wash_solid_protocol,
-}
+}
--- a/unilabos/compile/add_protocol.py
+++ b/unilabos/compile/add_protocol.py
@@ -5,10 +5,7 @@ from .pump_protocol import generate_pump_protocol_with_rinsing
 def find_reagent_vessel(G: nx.DiGraph, reagent: str) -> str:
    """
-    根据试剂名称查找对应的试剂瓶，支持多种匹配模式：
+    根据试剂名称查找对应的试剂瓶
    1. 容器名称匹配（如 flask_DMF, reagent_bottle_1-DMF）
    2. 容器内液体类型匹配（如 liquid_type: "DMF", name: "ethanol"）
    3. 试剂名称匹配（如 reagent_name: "DMF", config.reagent: "ethyl_acetate"）
    Args:
        G: 网络图
@@ -20,184 +17,23 @@ def find_reagent_vessel(G: nx.DiGraph, reagent: str) -> str:
    Raises:
        ValueError: 如果找不到对应的试剂瓶
    """
-    print(f"ADD_PROTOCOL: 正在查找试剂 '{reagent}' 的容器...")
+    # 按照pump_protocol的命名规则查找试剂瓶
    reagent_vessel_id = f"flask_{reagent}"
-    # 第一步：通过容器名称匹配
+    if reagent_vessel_id in G.nodes():
-    possible_names = [
+        return reagent_vessel_id
        f"flask_{reagent}",           # flask_DMF, flask_ethanol
        f"bottle_{reagent}",          # bottle_DMF, bottle_ethanol  
        f"vessel_{reagent}",          # vessel_DMF, vessel_ethanol
        f"{reagent}_flask",           # DMF_flask, ethanol_flask
        f"{reagent}_bottle",          # DMF_bottle, ethanol_bottle
        f"{reagent}",                 # 直接用试剂名
        f"reagent_{reagent}",         # reagent_DMF, reagent_ethanol
        f"reagent_bottle_{reagent}",  # reagent_bottle_DMF
    ]
-    # 尝试名称匹配
+    # 如果直接匹配失败，尝试模糊匹配
-    for vessel_name in possible_names:
+    for node in G.nodes():
-        if vessel_name in G.nodes():
+        if node.startswith('flask_') and reagent.lower() in node.lower():
-            print(f"ADD_PROTOCOL: 通过名称匹配找到容器: {vessel_name}")
+            return node
            return vessel_name
-    # 第二步：通过模糊名称匹配（名称中包含试剂名）
+    # 如果还是找不到，列出所有可用的试剂瓶
-    for node_id in G.nodes():
+    available_flasks = [node for node in G.nodes() 
-        if G.nodes[node_id].get('type') == 'container':
+                       if node.startswith('flask_') 
-            # 检查节点ID或名称中是否包含试剂名
+                       and G.nodes[node].get('type') == 'container']
            node_name = G.nodes[node_id].get('name', '').lower()
            if (reagent.lower() in node_id.lower() or 
                reagent.lower() in node_name):
                print(f"ADD_PROTOCOL: 通过模糊名称匹配找到容器: {node_id} (名称: {node_name})")
                return node_id
-    # 第三步：通过液体类型匹配
+    raise ValueError(f"找不到试剂 '{reagent}' 对应的试剂瓶。可用试剂瓶: {available_flasks}")
    for node_id in G.nodes():
        if G.nodes[node_id].get('type') == 'container':
            vessel_data = G.nodes[node_id].get('data', {})
            liquids = vessel_data.get('liquid', [])
            for liquid in liquids:
                if isinstance(liquid, dict):
                    # 支持两种格式的液体类型字段
                    liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
                    reagent_name = vessel_data.get('reagent_name', '')
                    config_reagent = G.nodes[node_id].get('config', {}).get('reagent', '')
                    # 检查多个可能的字段
                    if (liquid_type.lower() == reagent.lower() or 
                        reagent_name.lower() == reagent.lower() or
                        config_reagent.lower() == reagent.lower()):
                        print(f"ADD_PROTOCOL: 通过液体类型匹配找到容器: {node_id}")
                        print(f"  - liquid_type: {liquid_type}")
                        print(f"  - reagent_name: {reagent_name}")
                        print(f"  - config.reagent: {config_reagent}")
                        return node_id
    # 第四步：列出所有可用的容器信息帮助调试
    available_containers = []
    for node_id in G.nodes():
        if G.nodes[node_id].get('type') == 'container':
            vessel_data = G.nodes[node_id].get('data', {})
            config_data = G.nodes[node_id].get('config', {})
            liquids = vessel_data.get('liquid', [])
            container_info = {
                'id': node_id,
                'name': G.nodes[node_id].get('name', ''),
                'liquid_types': [],
                'reagent_name': vessel_data.get('reagent_name', ''),
                'config_reagent': config_data.get('reagent', '')
            }
            for liquid in liquids:
                if isinstance(liquid, dict):
                    liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
                    if liquid_type:
                        container_info['liquid_types'].append(liquid_type)
            available_containers.append(container_info)
    print(f"ADD_PROTOCOL: 可用容器列表:")
    for container in available_containers:
        print(f"  - {container['id']}: {container['name']}")
        print(f"    液体类型: {container['liquid_types']}")
        print(f"    试剂名称: {container['reagent_name']}")
        print(f"    配置试剂: {container['config_reagent']}")
    raise ValueError(f"找不到试剂 '{reagent}' 对应的试剂瓶。尝试了名称匹配: {possible_names}")
 def find_reagent_vessel_by_any_match(G: nx.DiGraph, reagent: str) -> str:
    """
    增强版试剂容器查找，支持各种匹配方式的别名函数
    """
    return find_reagent_vessel(G, reagent)
 def get_vessel_reagent_volume(G: nx.DiGraph, vessel: str) -> float:
    """获取容器中的试剂体积"""
    if vessel not in G.nodes():
        return 0.0
    vessel_data = G.nodes[vessel].get('data', {})
    liquids = vessel_data.get('liquid', [])
    total_volume = 0.0
    for liquid in liquids:
        if isinstance(liquid, dict):
            # 支持两种格式：新格式 (name, volume) 和旧格式 (liquid_type, liquid_volume)
            volume = liquid.get('volume') or liquid.get('liquid_volume', 0.0)
            total_volume += volume
    return total_volume
 def get_vessel_reagent_types(G: nx.DiGraph, vessel: str) -> List[str]:
    """获取容器中所有试剂的类型"""
    if vessel not in G.nodes():
        return []
    vessel_data = G.nodes[vessel].get('data', {})
    liquids = vessel_data.get('liquid', [])
    reagent_types = []
    for liquid in liquids:
        if isinstance(liquid, dict):
            # 支持两种格式的试剂类型字段
            reagent_type = liquid.get('liquid_type') or liquid.get('name', '')
            if reagent_type:
                reagent_types.append(reagent_type)
    # 同时检查配置中的试剂信息
    config_reagent = G.nodes[vessel].get('config', {}).get('reagent', '')
    reagent_name = vessel_data.get('reagent_name', '')
    if config_reagent and config_reagent not in reagent_types:
        reagent_types.append(config_reagent)
    if reagent_name and reagent_name not in reagent_types:
        reagent_types.append(reagent_name)
    return reagent_types
 def find_vessels_by_reagent(G: nx.DiGraph, reagent: str) -> List[str]:
    """
    根据试剂类型查找所有匹配的容器
    返回匹配容器的ID列表
    """
    matching_vessels = []
    for node_id in G.nodes():
        if G.nodes[node_id].get('type') == 'container':
            # 检查容器名称匹配
            node_name = G.nodes[node_id].get('name', '').lower()
            if reagent.lower() in node_id.lower() or reagent.lower() in node_name:
                matching_vessels.append(node_id)
                continue
            # 检查试剂类型匹配
            vessel_data = G.nodes[node_id].get('data', {})
            liquids = vessel_data.get('liquid', [])
            config_data = G.nodes[node_id].get('config', {})
            # 检查 reagent_name 和 config.reagent
            reagent_name = vessel_data.get('reagent_name', '').lower()
            config_reagent = config_data.get('reagent', '').lower()
            if (reagent.lower() == reagent_name or 
                reagent.lower() == config_reagent):
                matching_vessels.append(node_id)
                continue
            # 检查液体列表
            for liquid in liquids:
                if isinstance(liquid, dict):
                    liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
                    if liquid_type.lower() == reagent.lower():
                        matching_vessels.append(node_id)
                        break
    return matching_vessels
 def find_connected_stirrer(G: nx.DiGraph, vessel: str) -> str:
@@ -213,7 +49,7 @@ def find_connected_stirrer(G: nx.DiGraph, vessel: str) -> str:
    """
    # 查找所有搅拌器节点
    stirrer_nodes = [node for node in G.nodes() 
-                    if (G.nodes[node].get('class') or '') == 'virtual_stirrer']
+                    if G.nodes[node].get('class') == 'virtual_stirrer']
    # 检查哪个搅拌器与目标容器相连
    for stirrer in stirrer_nodes:
@@ -238,10 +74,10 @@ def generate_add_protocol(
    purpose: str = "添加试剂"
 ) -> List[Dict[str, Any]]:
    """
-    生成添加试剂的协议序列，支持智能试剂匹配
+    生成添加试剂的协议序列
    基于pump_protocol的成熟算法，实现试剂添加功能：
-    1. 智能查找试剂瓶（支持名称匹配、液体类型匹配、试剂配置匹配）
+    1. 自动查找试剂瓶
    2. **先启动搅拌，再进行转移** - 确保试剂添加更均匀
    3. 使用pump_protocol实现液体转移
@@ -266,41 +102,24 @@ def generate_add_protocol(
    """
    action_sequence = []
    print(f"ADD_PROTOCOL: 开始生成添加试剂协议")
    print(f"  - 目标容器: {vessel}")
    print(f"  - 试剂: {reagent}")
    print(f"  - 体积: {volume} mL")
    print(f"  - 质量: {mass} g")
    print(f"  - 搅拌: {stir} (速度: {stir_speed} RPM)")
    print(f"  - 粘稠: {viscous}")
    print(f"  - 目的: {purpose}")
    # 1. 验证目标容器存在
    if vessel not in G.nodes():
        raise ValueError(f"目标容器 '{vessel}' 不存在于系统中")
-    # 2. 智能查找试剂瓶
+    # 2. 查找试剂瓶
    try:
        reagent_vessel = find_reagent_vessel(G, reagent)
        print(f"ADD_PROTOCOL: 找到试剂容器: {reagent_vessel}")
    except ValueError as e:
        raise ValueError(f"无法找到试剂 '{reagent}': {str(e)}")
-    # 3. 验证试剂容器中的试剂体积
+    # 3. 验证是否存在从试剂瓶到目标容器的路径
    available_volume = get_vessel_reagent_volume(G, reagent_vessel)
    print(f"ADD_PROTOCOL: 试剂容器 {reagent_vessel} 中有 {available_volume} mL 试剂")
    if available_volume < volume:
        print(f"ADD_PROTOCOL: 警告 - 试剂容器中的试剂不足！需要 {volume} mL，可用 {available_volume} mL")
    # 4. 验证是否存在从试剂瓶到目标容器的路径
    try:
        path = nx.shortest_path(G, source=reagent_vessel, target=vessel)
        print(f"ADD_PROTOCOL: 找到路径 {reagent_vessel} -> {vessel}: {path}")
    except nx.NetworkXNoPath:
        raise ValueError(f"从试剂瓶 '{reagent_vessel}' 到目标容器 '{vessel}' 没有可用路径")
-    # 5. **先启动搅拌** - 关键改进！
+    # 4. **先启动搅拌** - 关键改进！
    if stir:
        try:
            stirrer_id = find_connected_stirrer(G, vessel)
@@ -321,21 +140,15 @@ def generate_add_protocol(
                action_sequence.append(stir_action)
                print(f"ADD_PROTOCOL: 已添加搅拌动作，速度 {stir_speed} RPM")
                # 等待搅拌稳定
                action_sequence.append({
                    "action_name": "wait",
                    "action_kwargs": {"time": 5}
                })
            else:
                print(f"ADD_PROTOCOL: 警告 - 需要搅拌但未找到与容器 {vessel} 相连的搅拌器")
        except Exception as e:
            print(f"ADD_PROTOCOL: 搅拌器配置出错: {str(e)}")
-    # 6. 如果指定了体积，执行液体转移
+    # 5. 如果指定了体积，执行液体转移
    if volume > 0:
-        # 6.1 计算流速参数
+        # 5.1 计算流速参数
        if time > 0:
            # 根据时间计算流速
            transfer_flowrate = volume / time
@@ -352,7 +165,7 @@ def generate_add_protocol(
        print(f"ADD_PROTOCOL: 准备转移 {volume} mL 从 {reagent_vessel} 到 {vessel}")
        print(f"ADD_PROTOCOL: 转移流速={transfer_flowrate} mL/s, 注入流速={flowrate} mL/s")
-        # 6.2 使用pump_protocol的核心算法实现液体转移
+        # 5.2 使用pump_protocol的核心算法实现液体转移
        try:
            pump_actions = generate_pump_protocol_with_rinsing(
                G=G,
@@ -377,8 +190,6 @@ def generate_add_protocol(
            raise ValueError(f"生成泵协议时出错: {str(e)}")
    print(f"ADD_PROTOCOL: 生成了 {len(action_sequence)} 个动作")
    print(f"ADD_PROTOCOL: 添加试剂协议生成完成")
    return action_sequence
@@ -399,7 +210,7 @@ def generate_add_protocol_with_cleaning(
    cleaning_repeats: int = 1
 ) -> List[Dict[str, Any]]:
    """
-    生成带清洗的添加试剂协议，支持智能试剂匹配
+    生成带清洗的添加试剂协议
    与普通添加协议的区别是会在添加后进行管道清洗
@@ -424,7 +235,7 @@ def generate_add_protocol_with_cleaning(
    """
    action_sequence = []
-    # 1. 智能查找试剂瓶
+    # 1. 查找试剂瓶
    reagent_vessel = find_reagent_vessel(G, reagent)
    # 2. **先启动搅拌**
@@ -440,12 +251,6 @@ def generate_add_protocol_with_cleaning(
                    "purpose": f"{purpose}: 启动搅拌，准备添加 {reagent}"
                }
            })
            # 等待搅拌稳定
            action_sequence.append({
                "action_name": "wait",
                "action_kwargs": {"time": 5}
            })
    # 3. 计算流速
    if time > 0:
@@ -491,7 +296,7 @@ def generate_sequential_add_protocol(
    final_stir_time: float = 300.0
 ) -> List[Dict[str, Any]]:
    """
-    生成连续添加多种试剂的协议，支持智能试剂匹配
+    生成连续添加多种试剂的协议
    Args:
        G: 网络图
@@ -508,13 +313,13 @@ def generate_sequential_add_protocol(
    Example:
        reagents = [
            {
-                "reagent": "DMF",           # 会匹配 reagent_bottle_1 (reagent_name: "DMF")
+                "reagent": "DMF",
                "volume": 10.0,
                "viscous": False,
                "stir_speed": 300.0
            },
            {
-                "reagent": "ethyl_acetate", # 会匹配 reagent_bottle_2 (reagent_name: "ethyl_acetate")
+                "reagent": "ethyl_acetate", 
                "volume": 5.0,
                "viscous": False,
                "stir_speed": 350.0
@@ -523,17 +328,14 @@ def generate_sequential_add_protocol(
    """
    action_sequence = []
    print(f"ADD_PROTOCOL: 开始连续添加 {len(reagents)} 种试剂到容器 {vessel}")
    for i, reagent_params in enumerate(reagents):
-        reagent_name = reagent_params.get('reagent')
+        print(f"ADD_PROTOCOL: 处理第 {i+1}/{len(reagents)} 个试剂: {reagent_params.get('reagent')}")
        print(f"ADD_PROTOCOL: 处理第 {i+1}/{len(reagents)} 个试剂: {reagent_name}")
        # 生成单个试剂的添加协议
        add_actions = generate_add_protocol(
            G=G,
            vessel=vessel,
-            reagent=reagent_name,
+            reagent=reagent_params.get('reagent'),
            volume=reagent_params.get('volume', 0.0),
            mass=reagent_params.get('mass', 0.0),
            amount=reagent_params.get('amount', ''),
@@ -541,7 +343,7 @@ def generate_sequential_add_protocol(
            stir=stir_between_additions,
            stir_speed=reagent_params.get('stir_speed', 300.0),
            viscous=reagent_params.get('viscous', False),
-            purpose=reagent_params.get('purpose', f'添加试剂 {reagent_name} ({i+1}/{len(reagents)})')
+            purpose=reagent_params.get('purpose', f'添加试剂 {i+1}')
        )
        action_sequence.extend(add_actions)
@@ -550,23 +352,17 @@ def generate_sequential_add_protocol(
        if i < len(reagents) - 1:  # 不是最后一个试剂
            action_sequence.append({
                "action_name": "wait",
-                "action_kwargs": {"time": 10}  # 试剂混合时间
+                "action_kwargs": {"time": 2}
            })
    # 最终搅拌
    if final_stir:
        stirrer_id = find_connected_stirrer(G, vessel)
        if stirrer_id:
            print(f"ADD_PROTOCOL: 添加最终搅拌动作，速度 {final_stir_speed} RPM，时间 {final_stir_time} 秒")
            action_sequence.extend([
                {
-                    "device_id": stirrer_id,
+                    "action_name": "wait",
-                    "action_name": "stir",
+                    "action_kwargs": {"time": final_stir_time}
                    "action_kwargs": {
                        "stir_time": final_stir_time,
                        "stir_speed": final_stir_speed,
                        "settling_time": 30.0
                    }
                }
            ])
@@ -574,52 +370,10 @@ def generate_sequential_add_protocol(
    return action_sequence
 # 便捷函数：常用添加方案
 def generate_organic_add_protocol(
    G: nx.DiGraph,
    vessel: str,
    organic_reagent: str,
    volume: float,
    stir_speed: float = 400.0
 ) -> List[Dict[str, Any]]:
    """有机试剂添加：慢速、搅拌"""
    return generate_add_protocol(
        G, vessel, organic_reagent, volume, 0.0, "", 0.0, 
        True, stir_speed, False, f"添加有机试剂 {organic_reagent}"
    )
 def generate_viscous_add_protocol(
    G: nx.DiGraph,
    vessel: str,
    viscous_reagent: str,
    volume: float,
    addition_time: float = 120.0
 ) -> List[Dict[str, Any]]:
    """粘稠试剂添加：慢速、长时间"""
    return generate_add_protocol(
        G, vessel, viscous_reagent, volume, 0.0, "", addition_time, 
        True, 250.0, True, f"缓慢添加粘稠试剂 {viscous_reagent}"
    )
 def generate_solvent_add_protocol(
    G: nx.DiGraph,
    vessel: str,
    solvent: str,
    volume: float
 ) -> List[Dict[str, Any]]:
    """溶剂添加：快速、无需特殊处理"""
    return generate_add_protocol(
        G, vessel, solvent, volume, 0.0, "", 0.0, 
        False, 300.0, False, f"添加溶剂 {solvent}"
    )
 # 使用示例和测试函数
 def test_add_protocol():
    """测试添加协议的示例"""
-    print("=== ADD PROTOCOL 智能匹配测试 ===")
+    print("=== ADD PROTOCOL 测试 ===")
    print("测试完成")
--- a/unilabos/compile/clean_vessel_protocol.py
+++ b/unilabos/compile/clean_vessel_protocol.py
@@ -5,13 +5,9 @@ from .pump_protocol import generate_pump_protocol
 def find_solvent_vessel(G: nx.DiGraph, solvent: str) -> str:
    """
-    查找溶剂容器，支持多种匹配模式：
+    查找溶剂容器，支持多种命名模式
    1. 容器名称匹配（如 flask_water, reagent_bottle_1-DMF）
    2. 容器内液体类型匹配（如 liquid_type: "DMF", "ethanol"）
    """
-    print(f"CLEAN_VESSEL: 正在查找溶剂 '{solvent}' 的容器...")
+    # 可能的溶剂容器命名模式
    # 第一步：通过容器名称匹配
    possible_names = [
        f"flask_{solvent}",           # flask_water, flask_ethanol
        f"bottle_{solvent}",          # bottle_water, bottle_ethanol  
@@ -20,87 +16,13 @@ def find_solvent_vessel(G: nx.DiGraph, solvent: str) -> str:
        f"{solvent}_bottle",          # water_bottle, ethanol_bottle
        f"{solvent}",                 # 直接用溶剂名
        f"solvent_{solvent}",         # solvent_water, solvent_ethanol
        f"reagent_bottle_{solvent}",  # reagent_bottle_DMF
    ]
    # 尝试名称匹配
    for vessel_name in possible_names:
        if vessel_name in G.nodes():
            print(f"CLEAN_VESSEL: 通过名称匹配找到容器: {vessel_name}")
            return vessel_name
-    # 第二步：通过模糊名称匹配（名称中包含溶剂名）
+    raise ValueError(f"未找到溶剂 '{solvent}' 的容器。尝试了以下名称: {possible_names}")
    for node_id in G.nodes():
        if G.nodes[node_id].get('type') == 'container':
            # 检查节点ID或名称中是否包含溶剂名
            node_name = G.nodes[node_id].get('name', '').lower()
            if (solvent.lower() in node_id.lower() or 
                solvent.lower() in node_name):
                print(f"CLEAN_VESSEL: 通过模糊名称匹配找到容器: {node_id} (名称: {node_name})")
                return node_id
    # 第三步：通过液体类型匹配
    for node_id in G.nodes():
        if G.nodes[node_id].get('type') == 'container':
            vessel_data = G.nodes[node_id].get('data', {})
            liquids = vessel_data.get('liquid', [])
            for liquid in liquids:
                if isinstance(liquid, dict):
                    # 支持两种格式的液体类型字段
                    liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
                    reagent_name = vessel_data.get('reagent_name', '')
                    config_reagent = G.nodes[node_id].get('config', {}).get('reagent', '')
                    # 检查多个可能的字段
                    if (liquid_type.lower() == solvent.lower() or 
                        reagent_name.lower() == solvent.lower() or
                        config_reagent.lower() == solvent.lower()):
                        print(f"CLEAN_VESSEL: 通过液体类型匹配找到容器: {node_id}")
                        print(f"  - liquid_type: {liquid_type}")
                        print(f"  - reagent_name: {reagent_name}")
                        print(f"  - config.reagent: {config_reagent}")
                        return node_id
    # 第四步：列出所有可用的容器信息帮助调试
    available_containers = []
    for node_id in G.nodes():
        if G.nodes[node_id].get('type') == 'container':
            vessel_data = G.nodes[node_id].get('data', {})
            config_data = G.nodes[node_id].get('config', {})
            liquids = vessel_data.get('liquid', [])
            container_info = {
                'id': node_id,
                'name': G.nodes[node_id].get('name', ''),
                'liquid_types': [],
                'reagent_name': vessel_data.get('reagent_name', ''),
                'config_reagent': config_data.get('reagent', '')
            }
            for liquid in liquids:
                if isinstance(liquid, dict):
                    liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
                    if liquid_type:
                        container_info['liquid_types'].append(liquid_type)
            available_containers.append(container_info)
    print(f"CLEAN_VESSEL: 可用容器列表:")
    for container in available_containers:
        print(f"  - {container['id']}: {container['name']}")
        print(f"    液体类型: {container['liquid_types']}")
        print(f"    试剂名称: {container['reagent_name']}")
        print(f"    配置试剂: {container['config_reagent']}")
    raise ValueError(f"未找到溶剂 '{solvent}' 的容器。尝试了名称匹配: {possible_names}")
 def find_solvent_vessel_by_any_match(G: nx.DiGraph, solvent: str) -> str:
    """
    增强版溶剂容器查找，支持各种匹配方式的别名函数
    """
    return find_solvent_vessel(G, solvent)
 def find_waste_vessel(G: nx.DiGraph) -> str:
@@ -359,81 +281,4 @@ def generate_organic_clean_protocol(
    )
    action_sequence.extend(water_actions)
-    return action_sequence
+    return action_sequence
 def get_vessel_liquid_volume(G: nx.DiGraph, vessel: str) -> float:
    """获取容器中的液体体积（修复版）"""
    if vessel not in G.nodes():
        return 0.0
    vessel_data = G.nodes[vessel].get('data', {})
    liquids = vessel_data.get('liquid', [])
    total_volume = 0.0
    for liquid in liquids:
        if isinstance(liquid, dict):
            # 支持两种格式：新格式 (name, volume) 和旧格式 (liquid_type, liquid_volume)
            volume = liquid.get('volume') or liquid.get('liquid_volume', 0.0)
            total_volume += volume
    return total_volume
 def get_vessel_liquid_types(G: nx.DiGraph, vessel: str) -> List[str]:
    """获取容器中所有液体的类型"""
    if vessel not in G.nodes():
        return []
    vessel_data = G.nodes[vessel].get('data', {})
    liquids = vessel_data.get('liquid', [])
    liquid_types = []
    for liquid in liquids:
        if isinstance(liquid, dict):
            # 支持两种格式的液体类型字段
            liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
            if liquid_type:
                liquid_types.append(liquid_type)
    return liquid_types
 def find_vessel_by_content(G: nx.DiGraph, content: str) -> List[str]:
    """
    根据内容物查找所有匹配的容器
    返回匹配容器的ID列表
    """
    matching_vessels = []
    for node_id in G.nodes():
        if G.nodes[node_id].get('type') == 'container':
            # 检查容器名称匹配
            node_name = G.nodes[node_id].get('name', '').lower()
            if content.lower() in node_id.lower() or content.lower() in node_name:
                matching_vessels.append(node_id)
                continue
            # 检查液体类型匹配
            vessel_data = G.nodes[node_id].get('data', {})
            liquids = vessel_data.get('liquid', [])
            config_data = G.nodes[node_id].get('config', {})
            # 检查 reagent_name 和 config.reagent
            reagent_name = vessel_data.get('reagent_name', '').lower()
            config_reagent = config_data.get('reagent', '').lower()
            if (content.lower() == reagent_name or 
                content.lower() == config_reagent):
                matching_vessels.append(node_id)
                continue
            # 检查液体列表
            for liquid in liquids:
                if isinstance(liquid, dict):
                    liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
                    if liquid_type.lower() == content.lower():
                        matching_vessels.append(node_id)
                        break
    return matching_vessels
--- a/unilabos/registry/devices/virtual_device.yaml
+++ b/unilabos/registry/devices/virtual_device.yaml
@@ -2,17 +2,17 @@
 # 1. virtual_pump - 虚拟泵
 # 描述：具有多通道阀门特性的泵，根据valve_position可连接多个容器
-# 连接特性：1个输入口 + 1个输出口
+# 连接特性：1个输入口 + 1个输出口（当前配置，实际应该有多个输出口）
 # 数据类型：fluid（流体连接）
 # 2. virtual_stirrer - 虚拟搅拌器  
 # 描述：机械连接设备，提供搅拌功能
-# 连接特性：1个连接点
+# 连接特性：1个双向连接点（undirected）
 # 数据类型：mechanical（机械连接）
 # 3a. virtual_valve - 虚拟八通阀门
-# 描述：8通阀门，可切换流向
+# 描述：8通阀门（实际配置为7通），可切换流向
-# 连接特性：1个口连接注射泵 + 多个输出口
+# 连接特性：1个口连接注射泵 + 7个输出口
 # 数据类型：fluid（流体连接）
 # 3b. virtual_solenoid_valve (电磁阀门)
@@ -32,12 +32,12 @@
 # 6. virtual_heatchill - 虚拟加热/冷却器
 # 描述：温控设备，容器直接放置在设备上进行温度控制
-# 连接特性：1个连接点
+# 连接特性：1个双向连接点（undirected）
 # 数据类型：mechanical（机械/物理接触连接）
 # 7. virtual_transfer_pump - 虚拟转移泵（注射器式）
 # 描述：注射器式转移泵，通过同一个口吸入和排出液体
-# 连接特性：1个连接点
+# 连接特性：1个双向连接点（undirected）
 # 数据类型：fluid（流体连接）
 # 8. virtual_column - 虚拟色谱柱
@@ -57,23 +57,26 @@
 # 11. virtual_vacuum_pump - 虚拟真空泵
 # 描述：真空泵设备，用于抽真空操作和真空/充气循环
-# 连接特性：1个输出口（连接需要抽真空的系统）
+# 连接特性：1个输入口（连接需要抽真空的系统）
 # 数据类型：fluid（流体连接）
 # 主要功能：开启/关闭、状态控制（ON/OFF）
 # 12. virtual_gas_source - 虚拟气源
 # 描述：气源设备，用于充气操作和真空/充气循环
 # 连接特性：1个输出口（向系统提供加压气体）
 # 数据类型：fluid（流体连接）
 # 主要功能：开启/关闭、状态控制（ON/OFF）
 virtual_pump:
  description: Virtual Pump for PumpTransferProtocol Testing
  #icon: 这个注册的设备应该是写错了，后续删掉
  class:
    module: unilabos.devices.virtual.virtual_pump:VirtualPump
    type: python
    status_types:
      status: String
      position: Float64
-      valve_position: Int32
+      valve_position: Int32 # 修复：使用 Int32 而不是 String
      max_volume: Float64
      current_volume: Float64
    action_value_mappings:
@@ -102,6 +105,7 @@ virtual_pump:
          status: status
        result:
          success: success
  # 虚拟泵节点配置 - 具有多通道阀门特性，根据valve_position可连接多个容器
  handles:
  - handler_key: pumpio
    label: pumpio
@@ -109,7 +113,7 @@ virtual_pump:
    io_type: source
    data_source: handle
    data_key: fluid_in
-    description: "泵的输出口"
+    description: "泵的进液口，连接源容器"
  schema:
    type: object
    properties:
@@ -129,11 +133,11 @@ virtual_stirrer:
    type: python
    status_types:
      status: String
-      operation_mode: String
+      operation_mode: String       # 操作模式
-      current_vessel: String
+      current_vessel: String       # 当前容器  
-      current_speed: Float64
+      current_speed: Float64       # 当前搅拌速度
-      is_stirring: Bool
+      is_stirring: Bool           # 是否搅拌
-      remaining_time: Float64
+      remaining_time: Float64     # 剩余时间
    action_value_mappings:
      stir:
        type: Stir
@@ -163,15 +167,16 @@ virtual_stirrer:
          status: status
        result:
          success: success
  # 虚拟搅拌器节点配置 - 机械连接设备，双向连接点用于搅拌容器
  handles:
  - handler_key: stirrer
    label: stirrer
    data_type: mechanical
    side: NORTH
-    io_type: source
+    io_type: undirected
    data_source: handle
    data_key: vessel
-    description: "搅拌器的机械连接口"
+    description: "搅拌器的机械连接口，容器通过机械连接进行搅拌"
  schema:
    type: object
    properties:
@@ -213,6 +218,7 @@ virtual_multiway_valve:
        feedback: {}
        result:
          success: success
  # 八通阀门节点配置 - 1个输入口，8个输出口，可切换流向
  handles:
  - handler_key: transferpump
    label: transferpump
@@ -221,7 +227,7 @@ virtual_multiway_valve:
    io_type: target
    data_source: handle
    data_key: fluid_in
-    description: "八通阀门进液口"
+    description: "八通阀门进液口，接收来源流体"
  - handler_key: 1
    label: 1
    data_type: fluid
@@ -229,7 +235,7 @@ virtual_multiway_valve:
    io_type: source
    data_source: executor
    data_key: fluid_port_1
-    description: "八通阀门端口1"
+    description: "八通阀门端口1，position=1时流体从此口流出"
  - handler_key: 2
    label: 2
    data_type: fluid
@@ -237,7 +243,7 @@ virtual_multiway_valve:
    io_type: source
    data_source: executor
    data_key: fluid_port_2
-    description: "八通阀门端口2"
+    description: "八通阀门端口2，position=2时流体从此口流出"
  - handler_key: 3
    label: 3
    data_type: fluid
@@ -245,7 +251,7 @@ virtual_multiway_valve:
    io_type: source
    data_source: executor
    data_key: fluid_port_3
-    description: "八通阀门端口3"
+    description: "八通阀门端口3，position=3时流体从此口流出"
  - handler_key: 4
    label: 4
    data_type: fluid
@@ -253,7 +259,7 @@ virtual_multiway_valve:
    io_type: source
    data_source: executor
    data_key: fluid_port_4
-    description: "八通阀门端口4"
+    description: "八通阀门端口4，position=4时流体从此口流出"
  - handler_key: 5
    label: 5
    data_type: fluid
@@ -261,15 +267,7 @@ virtual_multiway_valve:
    io_type: source
    data_source: executor
    data_key: fluid_port_5
-    description: "八通阀门端口5"
+    description: "八通阀门端口5，position=5时流体从此口流出"
  - handler_key: 6
    label: 6
    data_type: fluid
    side: WEST
    io_type: source
    data_source: executor
    data_key: fluid_port_6
    description: "八通阀门端口6"
  - handler_key: 7
    label: 7
    data_type: fluid
@@ -277,7 +275,15 @@ virtual_multiway_valve:
    io_type: source
    data_source: executor
    data_key: fluid_port_7
-    description: "八通阀门端口7"
+    description: "八通阀门端口7，position=7时流体从此口流出"
  - handler_key: 6
    label: 6
    data_type: fluid
    side: WEST
    io_type: source
    data_source: executor
    data_key: fluid_port_6
    description: "八通阀门端口6，position=6时流体从此口流出"
  - handler_key: 8
    label: 8
    data_type: fluid
@@ -285,7 +291,7 @@ virtual_multiway_valve:
    io_type: source
    data_source: executor
    data_key: fluid_port_8
-    description: "八通阀门端口8"
+    description: "八通阀门端口8，position=8时流体从此口流出"
  schema:
    type: object
    properties:
@@ -296,21 +302,21 @@ virtual_multiway_valve:
        type: integer
        default: 8
    additionalProperties: false
 virtual_solenoid_valve:
  description: Virtual Solenoid Valve for simple on/off flow control
  #icon: SolenoidValve.webp暂时还没有
  class:
    module: unilabos.devices.virtual.virtual_solenoid_valve:VirtualSolenoidValve
    type: python
    status_types:
      status: String
-      valve_state: String
+      valve_state: String # "open" or "closed"
      is_open: Bool
    action_value_mappings:
      set_valve_position:
        type: SendCmd
        goal:
-          command: command
+          command: command  # 确保参数名匹配
        feedback: {}
        result:
          success: success
@@ -335,17 +341,18 @@ virtual_solenoid_valve:
        feedback: {}
        result:
          success: success
  # 电磁阀门节点配置 - 双向流通的开关型阀门，流动方向由泵决定
  handles:
-  - handler_key: in
+  - handler_key: inlet
-    label: in
+    label: inlet
    data_type: fluid
    side: NORTH
    io_type: target
    data_source: handle
    data_key: fluid_port_in
    description: "电磁阀的进液口"
-  - handler_key: out
+  - handler_key: outlet
-    label: out
+    label: outlet
    data_type: fluid
    side: SOUTH
    io_type: source
@@ -365,9 +372,9 @@ virtual_solenoid_valve:
        type: number
        default: 0.1
    additionalProperties: false
 virtual_centrifuge:
  description: Virtual Centrifuge for CentrifugeProtocol Testing
  #icon: Centrifuge.webp暂时还没有
  class:
    module: unilabos.devices.virtual.virtual_centrifuge:VirtualCentrifuge
    type: python
@@ -382,8 +389,8 @@ virtual_centrifuge:
      min_temp: Float64
      centrifuge_state: String
      time_remaining: Float64
-      progress: Float64
+      progress: Float64            # 添加这个状态
-      message: String
+      message: String              # 添加这个状态
    action_value_mappings:
      centrifuge:
        type: Centrifuge
@@ -400,6 +407,7 @@ virtual_centrifuge:
        result:
          success: success
          message: message
  # 虚拟离心机节点配置 - 单个样品处理设备，输入输出都是同一个样品容器
  handles:
  - handler_key: centrifuge
    label: centrifuge
@@ -428,6 +436,7 @@ virtual_centrifuge:
 virtual_filter:
  description: Virtual Filter for FilterProtocol Testing
  #icon: Filter.webp暂时还没有
  class:
    module: unilabos.devices.virtual.virtual_filter:VirtualFilter
    type: python
@@ -461,31 +470,16 @@ virtual_filter:
          success: success
          message: message
          return_info: message
  # 过滤器节点配置 - 固液分离设备
  handles:
-  - handler_key: filter_in
+  - handler_key: filter
-    label: filter_in
+    label: filter
    data_type: transport
    side: NORTH
-    io_type: target
+    io_type: source
    data_source: handle
-    data_key: vessel_in
+    data_key: vessel
    description: "需要过滤的样品容器"
  - handler_key: filtrate_out
    label: filtrate_out
    data_type: transport
    side: SOUTH
    io_type: source
    data_source: handle
    data_key: filtrate_out
    description: "滤液出口"
  - handler_key: retentate_out
    label: retentate_out
    data_type: transport
    side: EAST
    io_type: source
    data_source: handle
    data_key: retentate_out
    description: "滤渣/固体出口"
  schema:
    type: object
    properties:
@@ -511,9 +505,10 @@ virtual_heatchill:
    type: python
    status_types:
      status: String
-      operation_mode: String
+      operation_mode: String         # 保留：操作模式
-      is_stirring: Bool
+      is_stirring: Bool             # 保留：是否搅拌
-      stir_speed: Float64
+      stir_speed: Float64           # 保留：搅拌速度
      # remaining_time: Float64       # 保留：剩余时间
    action_value_mappings:
      heat_chill:
        type: HeatChill
@@ -546,6 +541,7 @@ virtual_heatchill:
          status: status
        result:
          success: success
  # 虚拟加热/冷却器节点配置
  handles:
  - handler_key: heatchill
    label: heatchill
@@ -554,7 +550,7 @@ virtual_heatchill:
    io_type: source
    data_source: handle
    data_key: vessel
-    description: "加热/冷却器的物理连接口"
+    description: "加热/冷却器的物理连接口，容器直接放置在设备上进行温度控制"
  schema:
    type: object
    properties:
@@ -606,10 +602,10 @@ virtual_transfer_pump:
          success: success
          message: message
      set_position:
-        type: SetPumpPosition
+        type: SetPumpPosition  # ← 使用新的动作类型
        goal:
-          position: position
+          position: position        # ← 直接映射参数名
-          max_velocity: max_velocity
+          max_velocity: max_velocity # ← 直接映射参数名
        feedback:
          status: status
          current_position: current_position
@@ -617,6 +613,7 @@ virtual_transfer_pump:
        result:
          success: success
          message: message
  # 注射器式转移泵节点配置 - 只有一个双向连接口，可吸入和排出液体
  handles:
  - handler_key: transferpump
    label: transferpump
@@ -625,7 +622,7 @@ virtual_transfer_pump:
    io_type: source
    data_source: handle
    data_key: fluid_port
-    description: "注射器式转移泵的连接口"
+    description: "注射器式转移泵的唯一连接口，通过阀门切换实现吸入和排出"
  schema:
    type: object
    properties:
@@ -645,6 +642,7 @@ virtual_transfer_pump:
 virtual_column:
  description: Virtual Column Chromatography Device for RunColumn Protocol Testing
  #icon: Column.webp暂时还没有
  class:
    module: unilabos.devices.virtual.virtual_column:VirtualColumn
    type: python
@@ -673,12 +671,13 @@ virtual_column:
          success: success
          message: current_status
          return_info: current_status
  # 柱层析设备节点配置 - 色谱分离设备
  handles:
  - handler_key: columnin
    label: columnin
    data_type: transport
    side: WEST
-    io_type: target
+    io_type: sink
    data_source: handle
    data_key: from_vessel
    description: "样品输入口"
@@ -742,31 +741,16 @@ virtual_rotavap:
        result:
          success: success
          message: message
  # 虚拟旋转蒸发仪节点配置 - 1个样品口
  handles:
-  - handler_key: sample_in
+  - handler_key: rotavap-sample
-    label: sample_in
+    label: rotavap-sample
    data_type: fluid
    side: NORTH
    io_type: target
    data_source: handle
-    data_key: vessel_in
+    data_key: vessel
-    description: "样品连接口"
+    description: "样品连接口，放入需要蒸发的样品"
  - handler_key: product_out
    label: product_out
    data_type: fluid
    side: SOUTH
    io_type: source
    data_source: handle
    data_key: product_out
    description: "浓缩产物出口"
  - handler_key: solvent_out
    label: solvent_out
    data_type: fluid
    side: EAST
    io_type: source
    data_source: handle
    data_key: solvent_out
    description: "冷凝溶剂出口"
  schema:
    type: object
    properties:
@@ -820,39 +804,24 @@ virtual_separator:
        result:
          success: success
          message: message
  # 虚拟分液器节点配置 - 分离设备，1个输入口(混合液)，2个输出口(上相和下相)
  handles:
-  - handler_key: separator_in
+  - handler_key: separatorin
-    label: separator_in
+    label: separatorin
    data_type: fluid
    side: NORTH
    io_type: target
    data_source: handle
    data_key: from_vessel
    description: "需要分离的混合液体输入口"
-  - handler_key: bottom_phase_out
+  - handler_key: separatorout
-    label: bottom_phase_out
+    label: separatorout
    data_type: fluid
    side: SOUTH
    io_type: source
    data_source: executor
    data_key: bottom_outlet
    description: "下相（重相）液体输出口"
  - handler_key: top_phase_out
    label: top_phase_out
    data_type: fluid
    side: EAST
    io_type: source
    data_source: executor
    data_key: top_outlet
    description: "上相（轻相）液体输出口"
  - handler_key: bind
    label: bind
    io_type: target
    data_type: mechanical
    side: WEST
    data_source: handle
    data_key: mechanical_port
    description: "用于连接搅拌器等机械设备的接口"
  schema:
    type: object
    properties:
@@ -892,6 +861,7 @@ virtual_vacuum_pump:
          string: string
        feedback: {}
        result: {}
  # 虚拟真空泵节点配置 - 真空设备，1个输入口连接需要抽真空的系统
  handles:
  - handler_key: vacuumpump
    label: vacuumpump
@@ -900,7 +870,7 @@ virtual_vacuum_pump:
    io_type: source
    data_source: handle
    data_key: fluid_in
-    description: "真空泵进气口"
+    description: "真空泵进气口，连接需要抽真空的容器或管路"
  schema:
    type: object
    properties:
@@ -912,6 +882,7 @@ virtual_vacuum_pump:
 virtual_gas_source:
  description: Virtual gas source
  #icon: GasSource.webp暂时还没有
  class:
    module: unilabos.devices.virtual.virtual_gas_source:VirtualGasSource
    type: python
@@ -934,6 +905,7 @@ virtual_gas_source:
          string: string
        feedback: {}
        result: {}
  # 虚拟气源节点配置 - 气体供应设备，1个输出口提供加压气体
  handles:
  - handler_key: gassource
    label: gassource
@@ -942,7 +914,7 @@ virtual_gas_source:
    io_type: source
    data_source: executor
    data_key: fluid_out
-    description: "气源出气口"
+    description: "气源出气口，向容器或管路提供加压气体"
  schema:
    type: object
    properties:
@@ -958,4 +930,4 @@ virtual_gas_source:
        type: number
        default: 5.0
        description: "最大输出压力 (bar)"
-    additionalProperties: false
+    additionalProperties: false
--- a/unilabos/registry/devices/work_station.yaml
+++ b/unilabos/registry/devices/work_station.yaml
@@ -3,623 +3,5 @@ workstation:
  class:
    module: unilabos.ros.nodes.presets.protocol_node:ROS2ProtocolNode
    type: ros2
-    action_value_mappings:
+  schema:
-      AddProtocol:
+    properties: {}
        type: Add
        goal:
          vessel: vessel
          reagent: reagent
          volume: volume
          mass: mass
          amount: amount
          time: time
          stir: stir
          stir_speed: stir_speed
          viscous: viscous
          purpose: purpose
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: reagent
              label: Reagent
              data_type: resource
              data_source: handle
              data_key: reagent
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      AGVTransferProtocol:
        type: AGVTransfer
        goal:
          from_repo: from_repo
          from_repo_position: from_repo_position
          to_repo: to_repo
          to_repo_position: to_repo_position
        feedback: {}
        result: {}
      CentrifugeProtocol:
        type: Centrifuge
        goal:
          vessel: vessel
          speed: speed
          time: time
          temp: temp
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      CleanProtocol:
        type: Clean
        goal:
          vessel: vessel
          solvent: solvent
          volume: volume
          temp: temp
          repeats: repeats
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: solvent
              label: Solvent
              data_type: resource
              data_source: handle
              data_key: solvent
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      CleanVesselProtocol:
        type: CleanVessel
        goal:
          vessel: vessel
          solvent: solvent
          volume: volume
          temp: temp
          repeats: repeats
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: solvent
              label: Solvent
              data_type: resource
              data_source: handle
              data_key: solvent
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      DissolveProtocol:
        type: Dissolve
        goal:
          vessel: vessel
          solvent: solvent
          volume: volume
          amount: amount
          temp: temp
          time: time
          stir_speed: stir_speed
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: solvent
              label: Solvent
              data_type: resource
              data_source: handle
              data_key: solvent
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      EvacuateAndRefillProtocol:
        type: EvacuateAndRefill
        goal:
          vessel: vessel
          gas: gas
          repeats: repeats
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      EvaporateProtocol:
        type: Evaporate
        goal:
          vessel: vessel
          pressure: pressure
          temp: temp
          time: time
          stir_speed: stir_speed
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      FilterProtocol:
        type: Filter
        goal:
          vessel: vessel
          filtrate_vessel: filtrate_vessel
          stir: stir
          stir_speed: stir_speed
          temp: temp
          continue_heatchill: continue_heatchill
          volume: volume
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: filtrate_vessel
              label: Filtrate Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
            - handler_key: filtrate_out
              label: Filtrate Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      FilterThroughProtocol:
        type: FilterThrough
        goal:
          from_vessel: from_vessel
          to_vessel: to_vessel
          filter_through: filter_through
          eluting_solvent: eluting_solvent
          eluting_volume: eluting_volume
          eluting_repeats: eluting_repeats
          residence_time: residence_time
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: from_vessel
              label: From Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: to_vessel
              label: To Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
            - handler_key: solvent
              label: Eluting Solvent
              data_type: resource
              data_source: handle
              data_key: solvent
          output:
            - handler_key: from_vessel_out
              label: From Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: to_vessel_out
              label: To Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      HeatChillProtocol:
        type: HeatChill
        goal:
          vessel: vessel
          temp: temp
          time: time
          stir: stir
          stir_speed: stir_speed
          purpose: purpose
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      HeatChillStartProtocol:
        type: HeatChillStart
        goal:
          vessel: vessel
          temp: temp
          purpose: purpose
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      HeatChillStopProtocol:
        type: HeatChillStop
        goal:
          vessel: vessel
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      PumpTransferProtocol:
        type: PumpTransfer
        goal:
          from_vessel: from_vessel
          to_vessel: to_vessel
          volume: volume
          amount: amount
          time: time
          viscous: viscous
          rinsing_solvent: rinsing_solvent
          rinsing_volume: rinsing_volume
          rinsing_repeats: rinsing_repeats
          solid: solid
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: from_vessel
              label: From Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: to_vessel
              label: To Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
            - handler_key: solvent
              label: Rinsing Solvent
              data_type: resource
              data_source: handle
              data_key: solvent
          output:
            - handler_key: from_vessel_out
              label: From Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: to_vessel_out
              label: To Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      RunColumnProtocol:
        type: RunColumn
        goal:
          from_vessel: from_vessel
          to_vessel: to_vessel
          column: column
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: from_vessel
              label: From Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: to_vessel
              label: To Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
          output:
            - handler_key: from_vessel_out
              label: From Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: to_vessel_out
              label: To Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      SeparateProtocol:
        type: Separate
        goal:
          purpose: purpose
          product_phase: product_phase
          from_vessel: from_vessel
          separation_vessel: separation_vessel
          to_vessel: to_vessel
          waste_phase_to_vessel: waste_phase_to_vessel
          solvent: solvent
          solvent_volume: solvent_volume
          through: through
          repeats: repeats
          stir_time: stir_time
          stir_speed: stir_speed
          settling_time: settling_time
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: from_vessel
              label: From Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: to_vessel
              label: To Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
            - handler_key: solvent
              label: Solvent
              data_type: resource
              data_source: handle
              data_key: solvent
          output:
            - handler_key: from_vessel_out
              label: From Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: to_vessel_out
              label: To Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      StartStirProtocol:
        type: StartStir
        goal:
          vessel: vessel
          stir_speed: stir_speed
          purpose: purpose
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      StirProtocol:
        type: Stir
        goal:
          stir_time: stir_time
          stir_speed: stir_speed
          settling_time: settling_time
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      StopStirProtocol:
        type: StopStir
        goal:
          vessel: vessel
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
          output:
            - handler_key: vessel_out
              label: Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      TransferProtocol:
        type: Transfer
        goal:
          from_vessel: from_vessel
          to_vessel: to_vessel
          volume: volume
          amount: amount
          time: time
          viscous: viscous
          rinsing_solvent: rinsing_solvent
          rinsing_volume: rinsing_volume
          rinsing_repeats: rinsing_repeats
          solid: solid
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: from_vessel
              label: From Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: to_vessel
              label: To Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
            - handler_key: solvent
              label: Rinsing Solvent
              data_type: resource
              data_source: handle
              data_key: solvent
          output:
            - handler_key: from_vessel_out
              label: From Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: to_vessel_out
              label: To Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
      WashSolidProtocol:
        type: WashSolid
        goal:
          vessel: vessel
          solvent: solvent
          volume: volume
          filtrate_vessel: filtrate_vessel
          temp: temp
          stir: stir
          stir_speed: stir_speed
          time: time
          repeats: repeats
        feedback: {}
        result: {}
        handles:
          input:
            - handler_key: vessel
              label: Vessel
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: solvent
              label: Solvent
              data_type: resource
              data_source: handle
              data_key: solvent
            - handler_key: filtrate_vessel
              label: Filtrate Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
          output:
            - handler_key: vessel_out
              label: Vessel Out
              data_type: resource
              data_source: handle
              data_key: vessel
            - handler_key: filtrate_vessel_out
              label: Filtrate Vessel
              data_type: resource
              data_source: executor
              data_key: vessel
--- a/unilabos/registry/resources/organic/container.yaml
+++ b/unilabos/registry/resources/organic/container.yaml
@@ -1,6 +1,5 @@
 container:
  description: regular organic container
  icon: Flask.webp
  class: 
    module: unilabos.resources.container:RegularContainer
    type: unilabos
@@ -10,19 +9,13 @@ container:
      io_type: target
      data_type: fluid
      side: NORTH
      data_source: handle
      data_key: fluid_in
    - handler_key: bottom
      label: bottom
      io_type: source
      data_type: fluid
      side: SOUTH
      data_source: handle
      data_key: fluid_out
    - handler_key: bind
      label: bind
      io_type: target
      data_type: mechanical
-      side: SOUTH
+      side: SOUTH
      data_source: handle
      data_key: mechanical_port