diff --git a/unilabos/compile/dissolve_protocol.py b/unilabos/compile/dissolve_protocol.py index 7c7022d6..3a504e25 100644 --- a/unilabos/compile/dissolve_protocol.py +++ b/unilabos/compile/dissolve_protocol.py @@ -2,6 +2,8 @@ import networkx as nx import re import logging from typing import List, Dict, Any, Union + +from unilabos.compile.utils.vessel_parser import get_vessel from .pump_protocol import generate_pump_protocol_with_rinsing logger = logging.getLogger(__name__) @@ -446,7 +448,7 @@ def generate_dissolve_protocol( """ # 🔧 核心修改:从字典中提取容器ID - vessel_id = vessel["id"] + vessel_id, vessel_data = get_vessel(vessel) debug_print("=" * 60) debug_print("🧪 开始生成溶解协议") diff --git a/unilabos/compile/dry_protocol.py b/unilabos/compile/dry_protocol.py index c04abdc6..469e929a 100644 --- a/unilabos/compile/dry_protocol.py +++ b/unilabos/compile/dry_protocol.py @@ -1,6 +1,8 @@ import networkx as nx from typing import List, Dict, Any +from unilabos.compile.utils.vessel_parser import get_vessel + def find_connected_heater(G: nx.DiGraph, vessel: str) -> str: """ @@ -63,7 +65,7 @@ def generate_dry_protocol( List[Dict[str, Any]]: 动作序列 """ # 🔧 核心修改:从字典中提取容器ID - vessel_id = vessel["id"] + vessel_id, vessel_data = get_vessel(vessel) action_sequence = [] diff --git a/unilabos/registry/devices/work_station.yaml b/unilabos/registry/devices/work_station.yaml index 097ff77e..44805c6a 100644 --- a/unilabos/registry/devices/work_station.yaml +++ b/unilabos/registry/devices/work_station.yaml @@ -1803,13 +1803,13 @@ workstation: - data_key: vessel data_source: handle data_type: resource - handler_key: vessel + handler_key: Vessel label: Evaporation Vessel output: - data_key: vessel data_source: handle data_type: resource - handler_key: vessel_out + handler_key: VesselOut label: Evaporation Vessel placeholder_keys: vessel: unilabos_nodes @@ -2036,7 +2036,7 @@ workstation: - data_key: filtrate_vessel data_source: handle data_type: resource - handler_key: filtrate_vessel + handler_key: FiltrateVessel label: Filtrate Vessel output: - data_key: vessel @@ -2047,7 +2047,7 @@ workstation: - data_key: filtrate_vessel data_source: executor data_type: resource - handler_key: filtrate_out + handler_key: FiltrateOut label: Filtrate Vessel placeholder_keys: filtrate_vessel: unilabos_resources