workflow upload & set liquid fix & add set liquid with plate

fix upload workflow json

save class name when deserialize & protocol execute test

Support root node change pos

add unilabos_class

gather query

scripts/workflow.py

@@ -2,6 +2,7 @@ import json
 import logging
 import traceback
 import uuid
+import xml.etree.ElementTree as ET
 from typing import Any, Dict, List
 
 import networkx as nx
@@ -24,15 +25,7 @@ class SimpleGraph:
 
     def add_edge(self, source, target, **attrs):
         """添加边"""
-        # edge = {"source": source, "target": target, **attrs}
-        edge = {
-            "source": source, "target": target,
-            "source_node_uuid": source,
-            "target_node_uuid": target,
-            "source_handle_io": "source",
-            "target_handle_io": "target",
-            **attrs
-        }
+        edge = {"source": source, "target": target, **attrs}
         self.edges.append(edge)
 
     def to_dict(self):
@@ -49,7 +42,6 @@ class SimpleGraph:
             "multigraph": False,
             "graph": {},
             "nodes": nodes_list,
-            "edges": self.edges,
             "links": self.edges,
         }
 
@@ -66,8 +58,495 @@ def extract_json_from_markdown(text: str) -> str:
     return text
 
 
+def convert_to_type(val: str) -> Any:
+    """将字符串值转换为适当的数据类型"""
+    if val == "True":
+        return True
+    if val == "False":
+        return False
+    if val == "?":
+        return None
+    if val.endswith(" g"):
+        return float(val.split(" ")[0])
+    if val.endswith("mg"):
+        return float(val.split("mg")[0])
+    elif val.endswith("mmol"):
+        return float(val.split("mmol")[0]) / 1000
+    elif val.endswith("mol"):
+        return float(val.split("mol")[0])
+    elif val.endswith("ml"):
+        return float(val.split("ml")[0])
+    elif val.endswith("RPM"):
+        return float(val.split("RPM")[0])
+    elif val.endswith(" °C"):
+        return float(val.split(" ")[0])
+    elif val.endswith(" %"):
+        return float(val.split(" ")[0])
+    return val
 
 
+def refactor_data(data: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+    """统一的数据重构函数，根据操作类型自动选择模板"""
+    refactored_data = []
+
+    # 定义操作映射，包含生物实验和有机化学的所有操作
+    OPERATION_MAPPING = {
+        # 生物实验操作
+        "transfer_liquid": "SynBioFactory-liquid_handler.prcxi-transfer_liquid",
+        "transfer": "SynBioFactory-liquid_handler.biomek-transfer",
+        "incubation": "SynBioFactory-liquid_handler.biomek-incubation",
+        "move_labware": "SynBioFactory-liquid_handler.biomek-move_labware",
+        "oscillation": "SynBioFactory-liquid_handler.biomek-oscillation",
+        # 有机化学操作
+        "HeatChillToTemp": "SynBioFactory-workstation-HeatChillProtocol",
+        "StopHeatChill": "SynBioFactory-workstation-HeatChillStopProtocol",
+        "StartHeatChill": "SynBioFactory-workstation-HeatChillStartProtocol",
+        "HeatChill": "SynBioFactory-workstation-HeatChillProtocol",
+        "Dissolve": "SynBioFactory-workstation-DissolveProtocol",
+        "Transfer": "SynBioFactory-workstation-TransferProtocol",
+        "Evaporate": "SynBioFactory-workstation-EvaporateProtocol",
+        "Recrystallize": "SynBioFactory-workstation-RecrystallizeProtocol",
+        "Filter": "SynBioFactory-workstation-FilterProtocol",
+        "Dry": "SynBioFactory-workstation-DryProtocol",
+        "Add": "SynBioFactory-workstation-AddProtocol",
+    }
+
+    UNSUPPORTED_OPERATIONS = ["Purge", "Wait", "Stir", "ResetHandling"]
+
+    for step in data:
+        operation = step.get("action")
+        if not operation or operation in UNSUPPORTED_OPERATIONS:
+            continue
+
+        # 处理重复操作
+        if operation == "Repeat":
+            times = step.get("times", step.get("parameters", {}).get("times", 1))
+            sub_steps = step.get("steps", step.get("parameters", {}).get("steps", []))
+            for i in range(int(times)):
+                sub_data = refactor_data(sub_steps)
+                refactored_data.extend(sub_data)
+            continue
+
+        # 获取模板名称
+        template = OPERATION_MAPPING.get(operation)
+        if not template:
+            # 自动推断模板类型
+            if operation.lower() in ["transfer", "incubation", "move_labware", "oscillation"]:
+                template = f"SynBioFactory-liquid_handler.biomek-{operation}"
+            else:
+                template = f"SynBioFactory-workstation-{operation}Protocol"
+
+        # 创建步骤数据
+        step_data = {
+            "template": template,
+            "description": step.get("description", step.get("purpose", f"{operation} operation")),
+            "lab_node_type": "Device",
+            "parameters": step.get("parameters", step.get("action_args", {})),
+        }
+        refactored_data.append(step_data)
+
+    return refactored_data
+
+
+def build_protocol_graph(
+    labware_info: List[Dict[str, Any]], protocol_steps: List[Dict[str, Any]], workstation_name: str
+) -> SimpleGraph:
+    """统一的协议图构建函数，根据设备类型自动选择构建逻辑"""
+    G = SimpleGraph()
+    resource_last_writer = {}
+    LAB_NAME = "SynBioFactory"
+
+    protocol_steps = refactor_data(protocol_steps)
+
+    # 检查协议步骤中的模板来判断协议类型
+    has_biomek_template = any(
+        ("biomek" in step.get("template", "")) or ("prcxi" in step.get("template", ""))
+        for step in protocol_steps
+    )
+
+    if has_biomek_template:
+        # 生物实验协议图构建
+        for labware_id, labware in labware_info.items():
+            node_id = str(uuid.uuid4())
+
+            labware_attrs = labware.copy()
+            labware_id = labware_attrs.pop("id", labware_attrs.get("name", f"labware_{uuid.uuid4()}"))
+            labware_attrs["description"] = labware_id
+            labware_attrs["lab_node_type"] = (
+                "Reagent" if "Plate" in str(labware_id) else "Labware" if "Rack" in str(labware_id) else "Sample"
+            )
+            labware_attrs["device_id"] = workstation_name
+
+            G.add_node(node_id, template=f"{LAB_NAME}-host_node-create_resource", **labware_attrs)
+            resource_last_writer[labware_id] = f"{node_id}:labware"
+
+        # 处理协议步骤
+        prev_node = None
+        for i, step in enumerate(protocol_steps):
+            node_id = str(uuid.uuid4())
+            G.add_node(node_id, **step)
+
+            # 添加控制流边
+            if prev_node is not None:
+                G.add_edge(prev_node, node_id, source_port="ready", target_port="ready")
+            prev_node = node_id
+
+            # 处理物料流
+            params = step.get("parameters", {})
+            if "sources" in params and params["sources"] in resource_last_writer:
+                source_node, source_port = resource_last_writer[params["sources"]].split(":")
+                G.add_edge(source_node, node_id, source_port=source_port, target_port="labware")
+
+            if "targets" in params:
+                resource_last_writer[params["targets"]] = f"{node_id}:labware"
+
+        # 添加协议结束节点
+        end_id = str(uuid.uuid4())
+        G.add_node(end_id, template=f"{LAB_NAME}-liquid_handler.biomek-run_protocol")
+        if prev_node is not None:
+            G.add_edge(prev_node, end_id, source_port="ready", target_port="ready")
+
+    else:
+        # 有机化学协议图构建
+        WORKSTATION_ID = workstation_name
+
+        # 为所有labware创建资源节点
+        for item_id, item in labware_info.items():
+            # item_id = item.get("id") or item.get("name", f"item_{uuid.uuid4()}")
+            node_id = str(uuid.uuid4())
+
+            # 判断节点类型
+            if item.get("type") == "hardware" or "reactor" in str(item_id).lower():
+                if "reactor" not in str(item_id).lower():
+                    continue
+                lab_node_type = "Sample"
+                description = f"Prepare Reactor: {item_id}"
+                liquid_type = []
+                liquid_volume = []
+            else:
+                lab_node_type = "Reagent"
+                description = f"Add Reagent to Flask: {item_id}"
+                liquid_type = [item_id]
+                liquid_volume = [1e5]
+
+            G.add_node(
+                node_id,
+                template=f"{LAB_NAME}-host_node-create_resource",
+                description=description,
+                lab_node_type=lab_node_type,
+                res_id=item_id,
+                device_id=WORKSTATION_ID,
+                class_name="container",
+                parent=WORKSTATION_ID,
+                bind_locations={"x": 0.0, "y": 0.0, "z": 0.0},
+                liquid_input_slot=[-1],
+                liquid_type=liquid_type,
+                liquid_volume=liquid_volume,
+                slot_on_deck="",
+                role=item.get("role", ""),
+            )
+            resource_last_writer[item_id] = f"{node_id}:labware"
+
+        last_control_node_id = None
+
+        # 处理协议步骤
+        for step in protocol_steps:
+            node_id = str(uuid.uuid4())
+            G.add_node(node_id, **step)
+
+            # 控制流
+            if last_control_node_id is not None:
+                G.add_edge(last_control_node_id, node_id, source_port="ready", target_port="ready")
+            last_control_node_id = node_id
+
+            # 物料流
+            params = step.get("parameters", {})
+            input_resources = {
+                "Vessel": params.get("vessel"),
+                "ToVessel": params.get("to_vessel"),
+                "FromVessel": params.get("from_vessel"),
+                "reagent": params.get("reagent"),
+                "solvent": params.get("solvent"),
+                "compound": params.get("compound"),
+                "sources": params.get("sources"),
+                "targets": params.get("targets"),
+            }
+
+            for target_port, resource_name in input_resources.items():
+                if resource_name and resource_name in resource_last_writer:
+                    source_node, source_port = resource_last_writer[resource_name].split(":")
+                    G.add_edge(source_node, node_id, source_port=source_port, target_port=target_port)
+
+            output_resources = {
+                "VesselOut": params.get("vessel"),
+                "FromVesselOut": params.get("from_vessel"),
+                "ToVesselOut": params.get("to_vessel"),
+                "FiltrateOut": params.get("filtrate_vessel"),
+                "reagent": params.get("reagent"),
+                "solvent": params.get("solvent"),
+                "compound": params.get("compound"),
+                "sources_out": params.get("sources"),
+                "targets_out": params.get("targets"),
+            }
+
+            for source_port, resource_name in output_resources.items():
+                if resource_name:
+                    resource_last_writer[resource_name] = f"{node_id}:{source_port}"
+
+    return G
+
+
+def draw_protocol_graph(protocol_graph: SimpleGraph, output_path: str):
+    """
+    (辅助功能) 使用 networkx 和 matplotlib 绘制协议工作流图，用于可视化。
+    """
+    if not protocol_graph:
+        print("Cannot draw graph: Graph object is empty.")
+        return
+
+    G = nx.DiGraph()
+
+    for node_id, attrs in protocol_graph.nodes.items():
+        label = attrs.get("description", attrs.get("template", node_id[:8]))
+        G.add_node(node_id, label=label, **attrs)
+
+    for edge in protocol_graph.edges:
+        G.add_edge(edge["source"], edge["target"])
+
+    plt.figure(figsize=(20, 15))
+    try:
+        pos = nx.nx_agraph.graphviz_layout(G, prog="dot")
+    except Exception:
+        pos = nx.shell_layout(G)  # Fallback layout
+
+    node_labels = {node: data["label"] for node, data in G.nodes(data=True)}
+    nx.draw(
+        G,
+        pos,
+        with_labels=False,
+        node_size=2500,
+        node_color="skyblue",
+        node_shape="o",
+        edge_color="gray",
+        width=1.5,
+        arrowsize=15,
+    )
+    nx.draw_networkx_labels(G, pos, labels=node_labels, font_size=8, font_weight="bold")
+
+    plt.title("Chemical Protocol Workflow Graph", size=15)
+    plt.savefig(output_path, dpi=300, bbox_inches="tight")
+    plt.close()
+    print(f"  - Visualization saved to '{output_path}'")
+
+
+from networkx.drawing.nx_agraph import to_agraph
+import re
+
+COMPASS = {"n","e","s","w","ne","nw","se","sw","c"}
+
+def _is_compass(port: str) -> bool:
+    return isinstance(port, str) and port.lower() in COMPASS
+
+def draw_protocol_graph_with_ports(protocol_graph, output_path: str, rankdir: str = "LR"):
+    """
+    使用 Graphviz 端口语法绘制协议工作流图。
+    - 若边上的 source_port/target_port 是 compass（n/e/s/w/...），直接用 compass。
+    - 否则自动为节点创建 record 形状并定义命名端口 <portname>。
+    最终由 PyGraphviz 渲染并输出到 output_path（后缀决定格式，如 .png/.svg/.pdf）。
+    """
+    if not protocol_graph:
+        print("Cannot draw graph: Graph object is empty.")
+        return
+
+    # 1) 先用 networkx 搭建有向图，保留端口属性
+    G = nx.DiGraph()
+    for node_id, attrs in protocol_graph.nodes.items():
+        label = attrs.get("description", attrs.get("template", node_id[:8]))
+        # 保留一个干净的“中心标签”，用于放在 record 的中间槽
+        G.add_node(node_id, _core_label=str(label), **{k:v for k,v in attrs.items() if k not in ("label",)})
+
+    edges_data = []
+    in_ports_by_node  = {}  # 收集命名输入端口
+    out_ports_by_node = {}  # 收集命名输出端口
+
+    for edge in protocol_graph.edges:
+        u = edge["source"]
+        v = edge["target"]
+        sp = edge.get("source_port")
+        tp = edge.get("target_port")
+
+        # 记录到图里（保留原始端口信息）
+        G.add_edge(u, v, source_port=sp, target_port=tp)
+        edges_data.append((u, v, sp, tp))
+
+        # 如果不是 compass，就按“命名端口”先归类，等会儿给节点造 record
+        if sp and not _is_compass(sp):
+            out_ports_by_node.setdefault(u, set()).add(str(sp))
+        if tp and not _is_compass(tp):
+            in_ports_by_node.setdefault(v, set()).add(str(tp))
+
+    # 2) 转为 AGraph，使用 Graphviz 渲染
+    A = to_agraph(G)
+    A.graph_attr.update(rankdir=rankdir, splines="true", concentrate="false", fontsize="10")
+    A.node_attr.update(shape="box", style="rounded,filled", fillcolor="lightyellow", color="#999999", fontname="Helvetica")
+    A.edge_attr.update(arrowsize="0.8", color="#666666")
+
+    # 3) 为需要命名端口的节点设置 record 形状与 label
+    #    左列 = 输入端口；中间 = 核心标签；右列 = 输出端口
+    for n in A.nodes():
+        node = A.get_node(n)
+        core = G.nodes[n].get("_core_label", n)
+
+        in_ports  = sorted(in_ports_by_node.get(n, []))
+        out_ports = sorted(out_ports_by_node.get(n, []))
+
+        # 如果该节点涉及命名端口，则用 record；否则保留原 box
+        if in_ports or out_ports:
+            def port_fields(ports):
+                if not ports:
+                    return " "  # 必须留一个空槽占位
+                # 每个端口一个小格子，<p> name
+                return "|".join(f"<{re.sub(r'[^A-Za-z0-9_:.|-]', '_', p)}> {p}" for p in ports)
+
+            left  = port_fields(in_ports)
+            right = port_fields(out_ports)
+
+            # 三栏：左(入) | 中(节点名) | 右(出)
+            record_label = f"{{ {left} | {core} | {right} }}"
+            node.attr.update(shape="record", label=record_label)
+        else:
+            # 没有命名端口：普通盒子，显示核心标签
+            node.attr.update(label=str(core))
+
+    # 4) 给边设置 headport / tailport
+    #    - 若端口为 compass：直接用 compass（e.g., headport="e"）
+    #    - 若端口为命名端口：使用在 record 中定义的 <port> 名（同名即可）
+    for (u, v, sp, tp) in edges_data:
+        e = A.get_edge(u, v)
+
+        # Graphviz 属性：tail 是源，head 是目标
+        if sp:
+            if _is_compass(sp):
+                e.attr["tailport"] = sp.lower()
+            else:
+                # 与 record label 中 <port> 名一致；特殊字符已在 label 中做了清洗
+                e.attr["tailport"] = re.sub(r'[^A-Za-z0-9_:.|-]', '_', str(sp))
+
+        if tp:
+            if _is_compass(tp):
+                e.attr["headport"] = tp.lower()
+            else:
+                e.attr["headport"] = re.sub(r'[^A-Za-z0-9_:.|-]', '_', str(tp))
+
+        # 可选：若想让边更贴边缘，可设置 constraint/spline 等
+        # e.attr["arrowhead"] = "vee"
+
+    # 5) 输出
+    A.draw(output_path, prog="dot")
+    print(f"  - Port-aware workflow rendered to '{output_path}'")
+
+
+def flatten_xdl_procedure(procedure_elem: ET.Element) -> List[ET.Element]:
+    """展平嵌套的XDL程序结构"""
+    flattened_operations = []
+    TEMP_UNSUPPORTED_PROTOCOL = ["Purge", "Wait", "Stir", "ResetHandling"]
+
+    def extract_operations(element: ET.Element):
+        if element.tag not in ["Prep", "Reaction", "Workup", "Purification", "Procedure"]:
+            if element.tag not in TEMP_UNSUPPORTED_PROTOCOL:
+                flattened_operations.append(element)
+
+        for child in element:
+            extract_operations(child)
+
+    for child in procedure_elem:
+        extract_operations(child)
+
+    return flattened_operations
+
+
+def parse_xdl_content(xdl_content: str) -> tuple:
+    """解析XDL内容"""
+    try:
+        xdl_content_cleaned = "".join(c for c in xdl_content if c.isprintable())
+        root = ET.fromstring(xdl_content_cleaned)
+
+        synthesis_elem = root.find("Synthesis")
+        if synthesis_elem is None:
+            return None, None, None
+
+        # 解析硬件组件
+        hardware_elem = synthesis_elem.find("Hardware")
+        hardware = []
+        if hardware_elem is not None:
+            hardware = [{"id": c.get("id"), "type": c.get("type")} for c in hardware_elem.findall("Component")]
+
+        # 解析试剂
+        reagents_elem = synthesis_elem.find("Reagents")
+        reagents = []
+        if reagents_elem is not None:
+            reagents = [{"name": r.get("name"), "role": r.get("role", "")} for r in reagents_elem.findall("Reagent")]
+
+        # 解析程序
+        procedure_elem = synthesis_elem.find("Procedure")
+        if procedure_elem is None:
+            return None, None, None
+
+        flattened_operations = flatten_xdl_procedure(procedure_elem)
+        return hardware, reagents, flattened_operations
+
+    except ET.ParseError as e:
+        raise ValueError(f"Invalid XDL format: {e}")
+
+
+def convert_xdl_to_dict(xdl_content: str) -> Dict[str, Any]:
+    """
+    将XDL XML格式转换为标准的字典格式
+
+    Args:
+        xdl_content: XDL XML内容
+
+    Returns:
+        转换结果，包含步骤和器材信息
+    """
+    try:
+        hardware, reagents, flattened_operations = parse_xdl_content(xdl_content)
+        if hardware is None:
+            return {"error": "Failed to parse XDL content", "success": False}
+
+        # 将XDL元素转换为字典格式
+        steps_data = []
+        for elem in flattened_operations:
+            # 转换参数类型
+            parameters = {}
+            for key, val in elem.attrib.items():
+                converted_val = convert_to_type(val)
+                if converted_val is not None:
+                    parameters[key] = converted_val
+
+            step_dict = {
+                "operation": elem.tag,
+                "parameters": parameters,
+                "description": elem.get("purpose", f"Operation: {elem.tag}"),
+            }
+            steps_data.append(step_dict)
+
+        # 合并硬件和试剂为统一的labware_info格式
+        labware_data = []
+        labware_data.extend({"id": hw["id"], "type": "hardware", **hw} for hw in hardware)
+        labware_data.extend({"name": reagent["name"], "type": "reagent", **reagent} for reagent in reagents)
+
+        return {
+            "success": True,
+            "steps": steps_data,
+            "labware": labware_data,
+            "message": f"Successfully converted XDL to dict format. Found {len(steps_data)} steps and {len(labware_data)} labware items.",
+        }
+
+    except Exception as e:
+        error_msg = f"XDL conversion failed: {str(e)}"
+        logger.error(error_msg)
+        return {"error": error_msg, "success": False}
 
 
 def create_workflow(

unilabos/app/ws_client.py

@@ -439,7 +439,7 @@ class MessageProcessor:
                     self.connected = True
                     self.reconnect_count = 0
 
-                    logger.trace(f"[MessageProcessor] Connected to {self.websocket_url}")
+                    logger.info(f"[MessageProcessor] Connected to {self.websocket_url}")
 
                     # 启动发送协程
                     send_task = asyncio.create_task(self._send_handler())
@@ -517,7 +517,7 @@ class MessageProcessor:
 
     async def _send_handler(self):
         """处理发送队列中的消息"""
-        logger.trace("[MessageProcessor] Send handler started")
+        logger.debug("[MessageProcessor] Send handler started")
 
         try:
             while self.connected and self.websocket:
@@ -1026,7 +1026,7 @@ class QueueProcessor:
 
     def _run(self):
         """运行队列处理主循环"""
-        logger.trace("[QueueProcessor] Queue processor started")
+        logger.debug("[QueueProcessor] Queue processor started")
 
         while self.is_running:
             try:
@@ -1236,6 +1236,7 @@ class WebSocketClient(BaseCommunicationClient):
         else:
             url = f"{scheme}://{parsed.netloc}/api/v1/ws/schedule"
 
+        logger.debug(f"[WebSocketClient] URL: {url}")
         return url
 
     def start(self) -> None:
@@ -1248,11 +1249,13 @@ class WebSocketClient(BaseCommunicationClient):
             logger.error("[WebSocketClient] WebSocket URL not configured")
             return
 
+        logger.info(f"[WebSocketClient] Starting connection to {self.websocket_url}")
+
         # 启动两个核心线程
         self.message_processor.start()
         self.queue_processor.start()
 
-        logger.trace("[WebSocketClient] All threads started")
+        logger.info("[WebSocketClient] All threads started")
 
     def stop(self) -> None:
         """停止WebSocket客户端"""

unilabos/devices/motor/ZDT_X42.py

@@ -1,376 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-ZDT X42 Closed-Loop Stepper Motor Driver
-RS485 Serial Communication via USB-Serial Converter
-
-- Baudrate: 115200
-"""
-
-import serial
-import time
-import threading
-import struct
-import logging
-from typing import Optional, Any
-
-try:
-    from unilabos.device_comms.universal_driver import UniversalDriver
-except ImportError:
-    class UniversalDriver:
-        def __init__(self, *args, **kwargs):
-            self.logger = logging.getLogger(self.__class__.__name__)
-        def execute_command_from_outer(self, command: Any): pass
-
-from serial.rs485 import RS485Settings
-
-
-class ZDTX42Driver(UniversalDriver):
-    """
-    ZDT X42 闭环步进电机驱动器
-
-    支持功能:
-    - 速度模式运行
-    - 位置模式运行 (相对/绝对)
-    - 位置读取和清零
-    - 使能/禁用控制
-
-    通信协议:
-    - 帧格式: [设备ID] [功能码] [数据...] [校验位=0x6B]
-    - 响应长度根据功能码决定
-    """
-
-    def __init__(
-        self,
-        port: str,
-        baudrate: int = 115200,
-        device_id: int = 1,
-        timeout: float = 0.5,
-        debug: bool = False
-    ):
-        """
-        初始化 ZDT X42 电机驱动
-
-        Args:
-            port: 串口设备路径
-            baudrate: 波特率 (默认 115200)
-            device_id: 设备地址 (1-255)
-            timeout: 通信超时时间(秒)
-            debug: 是否启用调试输出
-        """
-        super().__init__()
-        self.id = device_id
-        self.debug = debug
-        self.lock = threading.RLock()
-        self.status = "idle"         # 对应注册表中的 status (str)
-        self.position = 0             # 对应注册表中的 position (int)
-
-        try:
-            self.ser = serial.Serial(
-                port=port,
-                baudrate=baudrate,
-                timeout=timeout,
-                bytesize=serial.EIGHTBITS,
-                parity=serial.PARITY_NONE,
-                stopbits=serial.STOPBITS_ONE
-            )
-
-            # 启用 RS485 模式
-            try:
-                self.ser.rs485_mode = RS485Settings(
-                    rts_level_for_tx=True,
-                    rts_level_for_rx=False
-                )
-            except Exception:
-                pass  # RS485 模式是可选的
-
-            self.logger.info(
-                f"ZDT X42 Motor connected: {port} "
-                f"(Baud: {baudrate}, ID: {device_id})"
-            )
-            # 自动使能电机，确保初始状态可运动
-            self.enable(True)
-
-            # 启动背景轮询线程，确保 position 实时刷新
-            self._stop_event = threading.Event()
-            self._polling_thread = threading.Thread(
-                target=self._update_loop,
-                name=f"ZDTPolling_{port}",
-                daemon=True
-            )
-            self._polling_thread.start()
-        except Exception as e:
-            self.logger.error(f"Failed to open serial port {port}: {e}")
-            self.ser = None
-
-    def _update_loop(self):
-        """背景循环读取电机位置"""
-        while not self._stop_event.is_set():
-            try:
-                self.get_position()
-            except Exception as e:
-                if self.debug:
-                    self.logger.error(f"Polling error: {e}")
-            time.sleep(1.0) # 每1秒刷新一次位置数据
-
-    def _send(self, func_code: int, payload: list) -> bytes:
-        """
-        发送指令并接收响应
-
-        Args:
-            func_code: 功能码
-            payload: 数据负载 (list of bytes)
-
-        Returns:
-            响应数据 (bytes)
-        """
-        if not self.ser:
-            self.logger.error("Serial port not available")
-            return b""
-
-        with self.lock:
-            # 清空输入缓冲区
-            self.ser.reset_input_buffer()
-
-            # 构建消息: [ID] [功能码] [数据...] [校验位=0x6B]
-            message = bytes([self.id, func_code] + payload + [0x6B])
-
-            # 发送
-            self.ser.write(message)
-
-            # 根据功能码决定响应长度
-            # 查询类指令返回 10 字节，控制类指令返回 4 字节
-            read_len = 10 if func_code in [0x31, 0x32, 0x35, 0x24, 0x27] else 4
-            response = self.ser.read(read_len)
-
-            # 调试输出
-            if self.debug:
-                sent_hex = message.hex().upper()
-                recv_hex = response.hex().upper() if response else 'TIMEOUT'
-                print(f"[ID {self.id}] TX: {sent_hex} → RX: {recv_hex}")
-
-            return response
-
-    def enable(self, on: bool = True) -> bool:
-        """
-        使能/禁用电机
-
-        Args:
-            on: True=使能(锁轴), False=禁用(松轴)
-
-        Returns:
-            是否成功
-        """
-        state = 1 if on else 0
-        resp = self._send(0xF3, [0xAB, state, 0])
-        return len(resp) >= 4
-
-    def move_speed(
-        self,
-        speed_rpm: int,
-        direction: str = "CW",
-        acceleration: int = 10
-    ) -> bool:
-        """
-        速度模式运行
-
-        Args:
-            speed_rpm: 转速 (RPM)
-            direction: 方向 ("CW"=顺时针, "CCW"=逆时针)
-            acceleration: 加速度 (0-255)
-
-        Returns:
-            是否成功
-        """
-        dir_val = 0 if direction.upper() in ["CW", "顺时针"] else 1
-        speed_bytes = struct.pack('>H', int(speed_rpm))
-        self.status = f"moving@{speed_rpm}rpm"
-        resp = self._send(0xF6, [dir_val, speed_bytes[0], speed_bytes[1], acceleration, 0])
-        return len(resp) >= 4
-
-    def move_position(
-        self,
-        pulses: int,
-        speed_rpm: int,
-        direction: str = "CW",
-        acceleration: int = 10,
-        absolute: bool = False
-    ) -> bool:
-        """
-        位置模式运行
-
-        Args:
-            pulses: 脉冲数
-            speed_rpm: 转速 (RPM)
-            direction: 方向 ("CW"=顺时针, "CCW"=逆时针)
-            acceleration: 加速度 (0-255)
-            absolute: True=绝对位置, False=相对位置
-
-        Returns:
-            是否成功
-        """
-        dir_val = 0 if direction.upper() in ["CW", "顺时针"] else 1
-        speed_bytes = struct.pack('>H', int(speed_rpm))
-        self.status = f"moving_to_{pulses}"
-        pulse_bytes = struct.pack('>I', int(pulses))
-        abs_flag = 1 if absolute else 0
-
-        payload = [
-            dir_val,
-            speed_bytes[0], speed_bytes[1],
-            acceleration,
-            pulse_bytes[0], pulse_bytes[1], pulse_bytes[2], pulse_bytes[3],
-            abs_flag,
-            0
-        ]
-
-        resp = self._send(0xFD, payload)
-        return len(resp) >= 4
-
-    def stop(self) -> bool:
-        """
-        停止电机
-
-        Returns:
-            是否成功
-        """
-        self.status = "idle"
-        resp = self._send(0xFE, [0x98, 0])
-        return len(resp) >= 4
-
-    def rotate_quarter(self, speed_rpm: int = 60, direction: str = "CW") -> bool:
-        """
-        电机旋转 1/4 圈 (阻塞式)
-        假设电机细分为 3200 脉冲/圈，1/4 圈 = 800 脉冲
-        """
-        pulses = 800
-        success = self.move_position(pulses=pulses, speed_rpm=speed_rpm, direction=direction, absolute=False)
-
-        if success:
-            # 计算预估旋转时间并进行阻塞等待 (Time = revolutions / (RPM/60))
-            # 1/4 rev / (RPM/60) = 15.0 / RPM
-            estimated_time = 15.0 / max(1, speed_rpm)
-            time.sleep(estimated_time + 0.5)  # 额外给 0.5 秒缓冲
-            self.status = "idle"
-
-        return success
-
-    def wait_time(self, duration_s: float) -> bool:
-        """
-        等待指定时间 (秒)
-        """
-        self.logger.info(f"Waiting for {duration_s} seconds...")
-        time.sleep(duration_s)
-        return True
-
-    def set_zero(self) -> bool:
-        """
-        清零当前位置
-
-        Returns:
-            是否成功
-        """
-        resp = self._send(0x0A, [])
-        return len(resp) >= 4
-
-    def get_position(self) -> Optional[int]:
-        """
-        读取当前位置 (脉冲数)
-
-        Returns:
-            当前位置脉冲数，失败返回 None
-        """
-        resp = self._send(0x32, [])
-
-        if len(resp) >= 8:
-            # 响应格式: [ID] [Func] [符号位] [数值4字节] [校验]
-            sign = resp[2]  # 0=正, 1=负
-            value = struct.unpack('>I', resp[3:7])[0]
-            self.position = -value if sign == 1 else value
-
-            if self.debug:
-                print(f"[Position] Raw: {resp.hex().upper()}, Parsed: {self.position}")
-
-            return self.position
-
-        self.logger.warning("Failed to read position")
-        return None
-
-    def close(self):
-        """关闭串口连接并停止线程"""
-        if hasattr(self, '_stop_event'):
-            self._stop_event.set()
-
-        if self.ser and self.ser.is_open:
-            self.ser.close()
-            self.logger.info("Serial port closed")
-
-
-# ============================================================
-# 测试和调试代码
-# ============================================================
-
-def test_motor():
-    """基础功能测试"""
-    logging.basicConfig(level=logging.INFO)
-
-    print("="*60)
-    print("ZDT X42 电机驱动测试")
-    print("="*60)
-
-    driver = ZDTX42Driver(
-        port="/dev/tty.usbserial-3110",
-        baudrate=115200,
-        device_id=2,
-        debug=True
-    )
-
-    if not driver.ser:
-        print("❌ 串口打开失败")
-        return
-
-    try:
-        # 测试 1: 读取位置
-        print("\n[1] 读取当前位置")
-        pos = driver.get_position()
-        print(f"✓ 当前位置: {pos} 脉冲")
-
-        # 测试 2: 使能
-        print("\n[2] 使能电机")
-        driver.enable(True)
-        time.sleep(0.3)
-        print("✓ 电机已锁定")
-
-        # 测试 3: 相对位置运动
-        print("\n[3] 相对位置运动 (1000脉冲)")
-        driver.move_position(pulses=1000, speed_rpm=60, direction="CW")
-        time.sleep(2)
-        pos = driver.get_position()
-        print(f"✓ 新位置: {pos}")
-
-        # 测试 4: 速度运动
-        print("\n[4] 速度模式 (30RPM, 3秒)")
-        driver.move_speed(speed_rpm=30, direction="CW")
-        time.sleep(3)
-        driver.stop()
-        pos = driver.get_position()
-        print(f"✓ 停止后位置: {pos}")
-
-        # 测试 5: 禁用
-        print("\n[5] 禁用电机")
-        driver.enable(False)
-        print("✓ 电机已松开")
-
-        print("\n" + "="*60)
-        print("✅ 测试完成")
-        print("="*60)
-
-    except Exception as e:
-        print(f"\n❌ 测试失败: {e}")
-        import traceback
-        traceback.print_exc()
-    finally:
-        driver.close()
-
-
-if __name__ == "__main__":
-    test_motor()

unilabos/devices/separator/chinwe.py

@@ -623,119 +623,6 @@ class ChinweDevice(UniversalDriver):
         time.sleep(duration)
         return True
 
-    def separation_step(self, motor_id: int = 5, speed: int = 60, pulses: int = 700,
-                       max_cycles: int = 0, timeout: int = 300) -> bool:
-        """
-        分液步骤 - 液位传感器与电机联动
-        当液位传感器检测到"有液"时,电机顺时针旋转指定脉冲数
-        当液位传感器检测到"无液"时,电机逆时针旋转指定脉冲数
-
-        :param motor_id: 电机ID (必须在初始化时配置的motor_ids中)
-        :param speed: 电机转速 (RPM)
-        :param pulses: 每次旋转的脉冲数 (默认700约为1/4圈,假设3200脉冲/圈)
-        :param max_cycles: 最大执行循环次数 (0=无限制,默认0)
-        :param timeout: 整体超时时间 (秒)
-        :return: 成功返回True,超时或失败返回False
-        """
-        motor_id = int(motor_id)
-        speed = int(speed)
-        pulses = int(pulses)
-        max_cycles = int(max_cycles)
-        timeout = int(timeout)
-
-        # 检查电机是否存在
-        if motor_id not in self.motors:
-            self.logger.error(f"Motor {motor_id} not found in configured motors: {list(self.motors.keys())}")
-            return False
-
-        # 检查传感器是否可用
-        if not self.sensor:
-            self.logger.error("Sensor not initialized")
-            return False
-
-        motor = self.motors[motor_id]
-
-        # 停止轮询线程，避免与 separation_step 同时读取传感器造成串口冲突
-        self.logger.info("Stopping polling thread for separation_step...")
-        self._stop_event.set()
-        if self._poll_thread and self._poll_thread.is_alive():
-            self._poll_thread.join(timeout=2.0)
-
-        # 使能电机
-        self.logger.info(f"Enabling motor {motor_id}...")
-        motor.enable(True)
-        time.sleep(0.2)
-
-        self.logger.info(f"Starting separation step: motor_id={motor_id}, speed={speed} RPM, "
-                        f"pulses={pulses}, max_cycles={max_cycles}, timeout={timeout}s")
-
-        # 记录上一次的液位状态
-        last_level = None
-        cycle_count = 0
-        start_time = time.time()
-        error_count = 0
-
-        try:
-            while True:
-                # 检查超时
-                if time.time() - start_time > timeout:
-                    self.logger.warning(f"Separation step timeout after {timeout} seconds")
-                    return False
-
-                # 检查循环次数限制
-                if max_cycles > 0 and cycle_count >= max_cycles:
-                    self.logger.info(f"Separation step completed: reached max_cycles={max_cycles}")
-                    return True
-
-                # 读取传感器数据
-                data = self.sensor.read_level()
-
-                if data is None:
-                    error_count += 1
-                    if error_count > 5:
-                        self.logger.warning("Sensor read failed multiple times, retrying...")
-                        error_count = 0
-                    time.sleep(0.5)
-                    continue
-
-                error_count = 0
-                current_level = data['level']
-                rssi = data['rssi']
-
-                # 检测状态变化 (包括首次检测)
-                if current_level != last_level:
-                    cycle_count += 1
-
-                    if current_level:
-                        # 有液 -> 电机顺时针旋转
-                        self.logger.info(f"[Cycle {cycle_count}] Liquid detected (RSSI={rssi}), "
-                                       f"rotating motor {motor_id} clockwise {pulses} pulses")
-                        motor.run_position(pulses=pulses, speed_rpm=speed, direction=0, absolute=False)
-
-                        # 等待电机完成 (预估时间)
-                        estimated_time = 15.0 / max(1, speed)
-                        time.sleep(estimated_time + 0.5)
-
-                    else:
-                        # 无液 -> 电机逆时针旋转
-                        self.logger.info(f"[Cycle {cycle_count}] No liquid detected (RSSI={rssi}), "
-                                       f"rotating motor {motor_id} counter-clockwise {pulses} pulses")
-                        motor.run_position(pulses=pulses, speed_rpm=speed, direction=1, absolute=False)
-
-                        # 等待电机完成 (预估时间)
-                        estimated_time = 15.0 / max(1, speed)
-                        time.sleep(estimated_time + 0.5)
-
-                # 更新状态
-                last_level = current_level
-
-                # 轮询间隔
-                time.sleep(0.1)
-        finally:
-            # 恢复轮询线程
-            self.logger.info("Restarting polling thread...")
-            self._start_polling()
-
     def execute_command_from_outer(self, command_dict: Dict[str, Any]) -> bool:
         """支持标准 JSON 指令调用"""
         return super().execute_command_from_outer(command_dict)

unilabos/devices/separator/xkc_sensor.py

@@ -1,379 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-XKC RS485 液位传感器 (Modbus RTU)
-
-说明:
-    1. 遵循 Modbus-RTU 协议。
-    2. 数据寄存器: 0x0001 (液位状态, 1=有液, 0=无液), 0x0002 (RSSI 信号强度)。
-    3. 地址寄存器: 0x0004 (可读写, 范围 1-254)。
-    4. 波特率寄存器: 0x0005 (可写, 代码表见 change_baudrate 方法)。
-"""
-
-import struct
-import threading
-import time
-import logging
-import serial
-from typing import Optional, Dict, Any, List
-
-from unilabos.device_comms.universal_driver import UniversalDriver
-
-class TransportManager:
-    """
-    统一通信管理类。
-    仅支持 串口 (Serial/有线) 连接。
-    """
-    def __init__(self, port: str, baudrate: int = 9600, timeout: float = 3.0, logger=None):
-        self.port = port
-        self.baudrate = baudrate
-        self.timeout = timeout
-        self.logger = logger
-        self.lock = threading.RLock() # 线程锁，确保多设备共用一个连接时不冲突
-
-        self.serial = None
-        self._connect_serial()
-
-    def _connect_serial(self):
-        try:
-            self.serial = serial.Serial(
-                port=self.port,
-                baudrate=self.baudrate,
-                timeout=self.timeout
-            )
-        except Exception as e:
-            raise ConnectionError(f"Serial open failed: {e}")
-
-    def close(self):
-        """关闭连接"""
-        if self.serial and self.serial.is_open:
-            self.serial.close()
-
-    def clear_buffer(self):
-        """清空缓冲区 (Thread-safe)"""
-        with self.lock:
-            if self.serial:
-                self.serial.reset_input_buffer()
-
-    def write(self, data: bytes):
-        """发送原始字节"""
-        with self.lock:
-            if self.serial:
-                self.serial.write(data)
-
-    def read(self, size: int) -> bytes:
-        """读取指定长度字节"""
-        if self.serial:
-            return self.serial.read(size)
-        return b''
-
-class XKCSensorDriver(UniversalDriver):
-    """XKC RS485 液位传感器 (Modbus RTU)"""
-
-    def __init__(self, port: str, baudrate: int = 9600, device_id: int = 6,
-                 threshold: int = 300, timeout: float = 3.0, debug: bool = False):
-        super().__init__()
-        self.port = port
-        self.baudrate = baudrate
-        self.device_id = device_id
-        self.threshold = threshold
-        self.timeout = timeout
-        self.debug = debug
-        self.level = False
-        self.rssi = 0
-        self.status = {"level": self.level, "rssi": self.rssi}
-
-        try:
-            self.transport = TransportManager(port, baudrate, timeout, logger=self.logger)
-            self.logger.info(f"XKCSensorDriver connected to {port} (ID: {device_id})")
-        except Exception as e:
-            self.logger.error(f"Failed to connect XKCSensorDriver: {e}")
-            self.transport = None
-
-        # 启动背景轮询线程，确保 status 实时刷新
-        self._stop_event = threading.Event()
-        self._polling_thread = threading.Thread(
-            target=self._update_loop,
-            name=f"XKCPolling_{port}",
-            daemon=True
-        )
-        if self.transport:
-            self._polling_thread.start()
-
-    def _update_loop(self):
-        """背景循环读取传感器数据"""
-        while not self._stop_event.is_set():
-            try:
-                self.read_level()
-            except Exception as e:
-                if self.debug:
-                    self.logger.error(f"Polling error: {e}")
-            time.sleep(2.0) # 每2秒刷新一次数据
-
-    def _crc(self, data: bytes) -> bytes:
-        crc = 0xFFFF
-        for byte in data:
-            crc ^= byte
-            for _ in range(8):
-                if crc & 0x0001: crc = (crc >> 1) ^ 0xA001
-                else: crc >>= 1
-        return struct.pack('<H', crc)
-
-    def read_level(self) -> Optional[Dict[str, Any]]:
-        """
-        读取液位。
-        返回: {'level': bool, 'rssi': int}
-        """
-        if not self.transport:
-            return None
-
-        with self.transport.lock:
-            self.transport.clear_buffer()
-            # Modbus Read Registers: 01 03 00 01 00 02 CRC
-            payload = struct.pack('>HH', 0x0001, 0x0002)
-            msg = struct.pack('BB', self.device_id, 0x03) + payload
-            msg += self._crc(msg)
-
-            if self.debug:
-                self.logger.info(f"TX (ID {self.device_id}): {msg.hex().upper()}")
-
-            self.transport.write(msg)
-
-            # Read header
-            h = self.transport.read(3) # Addr, Func, Len
-            if self.debug:
-                self.logger.info(f"RX Header: {h.hex().upper()}")
-
-            if len(h) < 3: return None
-            length = h[2]
-
-            # Read body + CRC
-            body = self.transport.read(length + 2)
-            if self.debug:
-                self.logger.info(f"RX Body+CRC: {body.hex().upper()}")
-            if len(body) < length + 2:
-                # Firmware bug fix specific to some modules
-                if len(body) == 4 and length == 4:
-                    pass
-                else:
-                    return None
-
-            data = body[:-2]
-            # 根据手册说明:
-            # 寄存器 0x0001 (data[0:2]): 液位状态 (00 01 为有液, 00 00 为无液)
-            # 寄存器 0x0002 (data[2:4]): 信号强度 RSSI
-
-            hw_level = False
-            rssi = 0
-
-            if len(data) >= 4:
-                hw_level = ((data[0] << 8) | data[1]) == 1
-                rssi = (data[2] << 8) | data[3]
-            elif len(data) == 2:
-                # 兼容模式: 某些老固件可能只返回 1 个寄存器
-                rssi = (data[0] << 8) | data[1]
-                hw_level = rssi > self.threshold
-            else:
-                return None
-
-            # 最终判定: 优先使用硬件层级的 level 判定，但 RSSI 阈值逻辑作为补充/校验
-            # 注意: 如果用户显式设置了 THRESHOLD，我们可以在逻辑中做权衡
-            self.level = hw_level or (rssi > self.threshold)
-            self.rssi = rssi
-            result = {
-                'level': self.level,
-                'rssi': self.rssi
-            }
-            self.status = result
-            return result
-
-    def wait_level(self, target_state: bool, timeout: float = 60.0) -> bool:
-        """
-        等待液位达到目标状态 (阻塞式)
-        """
-        self.logger.info(f"Waiting for level: {target_state}")
-        start_time = time.time()
-        while (time.time() - start_time) < timeout:
-            res = self.read_level()
-            if res and res.get('level') == target_state:
-                return True
-            time.sleep(0.5)
-        self.logger.warning(f"Wait level timeout ({timeout}s)")
-        return False
-
-    def wait_for_liquid(self, target_state: bool, timeout: float = 120.0) -> bool:
-        """
-        实时检测电导率(RSSI)并等待用户指定的“有液”或“无液”状态。
-        一旦检测到符合目标状态，立即返回。
-
-        Args:
-            target_state: True 为“有液”, False 为“无液”
-            timeout: 最大等待时间(秒)
-        """
-        state_str = "有液" if target_state else "无液"
-        self.logger.info(f"开始实时检测电导率，等待状态: {state_str} (超时: {timeout}s)")
-
-        start_time = time.time()
-        while (time.time() - start_time) < timeout:
-            res = self.read_level() # 内部已更新 self.level 和 self.rssi
-            if res:
-                current_level = res.get('level')
-                current_rssi = res.get('rssi')
-                if current_level == target_state:
-                    self.logger.info(f"✅ 检测到目标状态: {state_str} (当前电导率/RSSI: {current_rssi})")
-                    return True
-
-                if self.debug:
-                    self.logger.debug(f"当前状态: {'有液' if current_level else '无液'}, RSSI: {current_rssi}")
-
-            time.sleep(0.2) # 高频采样
-
-        self.logger.warning(f"❌ 等待 {state_str} 状态超时 ({timeout}s)")
-        return False
-
-    def set_threshold(self, threshold: int):
-        """设置液位判定阈值"""
-        self.threshold = int(threshold)
-        self.logger.info(f"Threshold updated to: {self.threshold}")
-
-    def change_device_id(self, new_id: int) -> bool:
-        """
-        修改设备的 Modbus 从站地址。
-        寄存器: 0x0004, 功能码: 0x06
-        """
-        if not (1 <= new_id <= 254):
-            self.logger.error(f"Invalid device ID: {new_id}. Must be 1-254.")
-            return False
-
-        self.logger.info(f"Changing device ID from {self.device_id} to {new_id}")
-        success = self._write_single_register(0x0004, new_id)
-        if success:
-            self.device_id = new_id # 更新内存中的地址
-            self.logger.info(f"Device ID update command sent successfully (target {new_id}).")
-        return success
-
-    def change_baudrate(self, baud_code: int) -> bool:
-        """
-        更改通讯波特率 (寄存器: 0x0005)。
-        设置成功后传感器 LED 会闪烁，通常无数据返回。
-
-        波特率代码对照表 (16进制):
-        05: 2400
-        06: 4800
-        07: 9600 (默认)
-        08: 14400
-        09: 19200
-        0A: 28800
-        0C: 57600
-        0D: 115200
-        0E: 128000
-        0F: 256000
-        """
-        self.logger.info(f"Sending baudrate change command (Code: {baud_code:02X})")
-        # 写入寄存器 0x0005
-        self._write_single_register(0x0005, baud_code)
-        self.logger.info("Baudrate change command executed. Device LED should flash. Please update connection settings.")
-        return True
-
-    def factory_reset(self) -> bool:
-        """
-        恢复出厂设置 (通过广播地址 FF)。
-        设置地址为 01，逻辑为向 0x0004 写入 0x0002
-        """
-        self.logger.info("Sending factory reset command via broadcast address FF...")
-        # 广播指令通常无回显
-        self._write_single_register(0x0004, 0x0002, slave_id=0xFF)
-        self.logger.info("Factory reset command sent. Device address should be 01 now.")
-        return True
-
-    def _write_single_register(self, reg_addr: int, value: int, slave_id: Optional[int] = None) -> bool:
-        """内部辅助函数: Modbus 功能码 06 写单个寄存器"""
-        if not self.transport: return False
-
-        target_id = slave_id if slave_id is not None else self.device_id
-        msg = struct.pack('BBHH', target_id, 0x06, reg_addr, value)
-        msg += self._crc(msg)
-
-        with self.transport.lock:
-            self.transport.clear_buffer()
-            if self.debug:
-                self.logger.info(f"TX Write (Reg {reg_addr:#06x}): {msg.hex().upper()}")
-
-            self.transport.write(msg)
-
-            # 广播地址、波特率修改或厂家特定指令可能无回显
-            if target_id == 0xFF or reg_addr == 0x0005:
-                time.sleep(0.5)
-                return True
-
-            # 等待返回 (正常应返回相同报文)
-            resp = self.transport.read(len(msg))
-            if self.debug:
-                self.logger.info(f"RX Write Response: {resp.hex().upper()}")
-
-            return resp == msg
-
-    def close(self):
-        if self.transport:
-            self.transport.close()
-
-if __name__ == "__main__":
-    # 快速实例化测试
-    import logging
-    # 减少冗余日志，仅显示重要信息
-    logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s')
-
-    # 硬件配置 (根据实际情况修改)
-    TEST_PORT = "/dev/tty.usbserial-3110"
-    SLAVE_ID = 1
-    THRESHOLD = 300
-
-    print("\n" + "="*50)
-    print(f"  XKC RS485 传感器独立测试程序")
-    print(f"  端口: {TEST_PORT} | 地址: {SLAVE_ID} | 阈值: {THRESHOLD}")
-    print("="*50)
-
-    sensor = XKCSensorDriver(port=TEST_PORT, device_id=SLAVE_ID, threshold=THRESHOLD, debug=False)
-
-    try:
-        if sensor.transport:
-            print(f"\n开始实时连续采样测试 (持续 15 秒)...")
-            print(f"按 Ctrl+C 可提前停止\n")
-
-            start_time = time.time()
-            duration = 15
-            count = 0
-
-            while time.time() - start_time < duration:
-                count += 1
-                res = sensor.read_level()
-                if res:
-                    rssi = res['rssi']
-                    level = res['level']
-                    status_str = "【有液】" if level else "【无液】"
-                    # 使用 \r 实现单行刷新显示 (或者不刷，直接打印历史)
-                    # 为了方便查看变化，我们直接打印
-                    elapsed = time.time() - start_time
-                    print(f" [{elapsed:4.1f}s] 采样 {count:<3}: 电导率/RSSI = {rssi:<5} | 判定结果: {status_str}")
-                else:
-                    print(f" [{time.time()-start_time:4.1f}s] 采样 {count:<3}: 通信失败 (无响应)")
-
-                time.sleep(0.5) # 每秒采样 2 次
-
-            print(f"\n--- 15 秒采样测试完成 (总计 {count} 次) ---")
-
-            # [3] 测试动态修改阈值
-            print(f"\n[3] 动态修改阈值演示...")
-            new_threshold = 400
-            sensor.set_threshold(new_threshold)
-            res = sensor.read_level()
-            if res:
-                print(f"  采样 (当前阈值={new_threshold}): 电导率/RSSI = {res['rssi']:<5} | 判定结果: {'【有液】' if res['level'] else '【无液】'}")
-            sensor.set_threshold(THRESHOLD) # 还原
-
-    except KeyboardInterrupt:
-        print("\n[!] 用户中断测试")
-    except Exception as e:
-        print(f"\n[!] 测试运行出错: {e}")
-    finally:
-        sensor.close()
-        print("\n--- 测试程序已退出 ---\n")

unilabos/registry/devices/chinwe.yaml

@@ -317,47 +317,6 @@ separator.chinwe:
               - port
               type: object
         type: UniLabJsonCommand
-      separation_step:
-        goal:
-          max_cycles: 0
-          motor_id: 5
-          pulses: 700
-          speed: 60
-          timeout: 300
-        handles: {}
-        schema:
-          description: 分液步骤 - 液位传感器与电机联动 (有液→顺时针, 无液→逆时针)
-          properties:
-            goal:
-              properties:
-                max_cycles:
-                  default: 0
-                  description: 最大循环次数 (0=无限制)
-                  type: integer
-                motor_id:
-                  default: '5'
-                  description: 选择电机
-                  enum:
-                  - '4'
-                  - '5'
-                  title: '注: 4=搅拌, 5=旋钮'
-                  type: string
-                pulses:
-                  default: 700
-                  description: 每次旋转脉冲数 (约1/4圈)
-                  type: integer
-                speed:
-                  default: 60
-                  description: 电机转速 (RPM)
-                  type: integer
-                timeout:
-                  default: 300
-                  description: 超时时间 (秒)
-                  type: integer
-              required:
-              - motor_id
-              type: object
-        type: UniLabJsonCommand
       wait_sensor_level:
         goal:
           target_state: 有液

unilabos/registry/devices/motor.yaml

@@ -1,286 +0,0 @@
-motor.zdt_x42:
-  category:
-  - motor
-  class:
-    action_value_mappings:
-      auto-enable:
-        feedback: {}
-        goal: {}
-        goal_default:
-          'on': true
-        handles: {}
-        placeholder_keys: {}
-        result: {}
-        schema:
-          description: 使能或禁用电机。使能后电机进入锁轴状态，可接收运动指令；禁用后电机进入松轴状态。
-          properties:
-            feedback: {}
-            goal:
-              properties:
-                'on':
-                  default: true
-                  type: boolean
-              required: []
-              type: object
-            result: {}
-          required:
-          - goal
-          title: enable参数
-          type: object
-        type: UniLabJsonCommand
-      auto-get_position:
-        feedback: {}
-        goal: {}
-        goal_default: {}
-        handles: {}
-        placeholder_keys: {}
-        result: {}
-        schema:
-          description: 获取当前电机脉冲位置。
-          properties:
-            feedback: {}
-            goal:
-              properties: {}
-              required: []
-              type: object
-            result:
-              properties:
-                position:
-                  type: integer
-              type: object
-          required:
-          - goal
-          title: get_position参数
-          type: object
-        type: UniLabJsonCommand
-      auto-move_position:
-        feedback: {}
-        goal: {}
-        goal_default:
-          absolute: false
-          acceleration: 10
-          direction: CW
-          pulses: 1000
-          speed_rpm: 60
-        handles: {}
-        placeholder_keys: {}
-        result: {}
-        schema:
-          description: 位置模式运行。控制电机移动到指定脉冲位置或相对于当前位置移动指定脉冲数。
-          properties:
-            feedback: {}
-            goal:
-              properties:
-                absolute:
-                  default: false
-                  type: boolean
-                acceleration:
-                  default: 10
-                  maximum: 255
-                  minimum: 0
-                  type: integer
-                direction:
-                  default: CW
-                  enum:
-                  - CW
-                  - CCW
-                  type: string
-                pulses:
-                  default: 1000
-                  type: integer
-                speed_rpm:
-                  default: 60
-                  minimum: 0
-                  type: integer
-              required:
-              - pulses
-              - speed_rpm
-              type: object
-            result: {}
-          required:
-          - goal
-          title: move_position参数
-          type: object
-        type: UniLabJsonCommand
-      auto-move_speed:
-        feedback: {}
-        goal: {}
-        goal_default:
-          acceleration: 10
-          direction: CW
-          speed_rpm: 60
-        handles: {}
-        placeholder_keys: {}
-        result: {}
-        schema:
-          description: 速度模式运行。控制电机以指定转速和方向持续转动。
-          properties:
-            feedback: {}
-            goal:
-              properties:
-                acceleration:
-                  default: 10
-                  maximum: 255
-                  minimum: 0
-                  type: integer
-                direction:
-                  default: CW
-                  enum:
-                  - CW
-                  - CCW
-                  type: string
-                speed_rpm:
-                  default: 60
-                  minimum: 0
-                  type: integer
-              required:
-              - speed_rpm
-              type: object
-            result: {}
-          required:
-          - goal
-          title: move_speed参数
-          type: object
-        type: UniLabJsonCommand
-      auto-rotate_quarter:
-        feedback: {}
-        goal: {}
-        goal_default:
-          direction: CW
-          speed_rpm: 60
-        handles: {}
-        placeholder_keys: {}
-        result: {}
-        schema:
-          description: 电机旋转 1/4 圈 (阻塞式)。
-          properties:
-            feedback: {}
-            goal:
-              properties:
-                direction:
-                  default: CW
-                  enum:
-                  - CW
-                  - CCW
-                  type: string
-                speed_rpm:
-                  default: 60
-                  minimum: 1
-                  type: integer
-              required: []
-              type: object
-            result: {}
-          required:
-          - goal
-          title: rotate_quarter参数
-          type: object
-        type: UniLabJsonCommand
-      auto-set_zero:
-        feedback: {}
-        goal: {}
-        goal_default: {}
-        handles: {}
-        placeholder_keys: {}
-        result: {}
-        schema:
-          description: 将当前电机位置设为零点。
-          properties:
-            feedback: {}
-            goal:
-              properties: {}
-              required: []
-              type: object
-            result: {}
-          required:
-          - goal
-          title: set_zero参数
-          type: object
-        type: UniLabJsonCommand
-      auto-stop:
-        feedback: {}
-        goal: {}
-        goal_default: {}
-        handles: {}
-        placeholder_keys: {}
-        result: {}
-        schema:
-          description: 立即停止电机运动。
-          properties:
-            feedback: {}
-            goal:
-              properties: {}
-              required: []
-              type: object
-            result: {}
-          required:
-          - goal
-          title: stop参数
-          type: object
-        type: UniLabJsonCommand
-      auto-wait_time:
-        feedback: {}
-        goal: {}
-        goal_default:
-          duration_s: 1.0
-        handles: {}
-        placeholder_keys: {}
-        result: {}
-        schema:
-          description: 等待指定时间 (秒)。
-          properties:
-            feedback: {}
-            goal:
-              properties:
-                duration_s:
-                  default: 1.0
-                  minimum: 0
-                  type: number
-              required:
-              - duration_s
-              type: object
-            result: {}
-          required:
-          - goal
-          title: wait_time参数
-          type: object
-        type: UniLabJsonCommand
-    module: unilabos.devices.motor.ZDT_X42:ZDTX42Driver
-    status_types:
-      position: int
-      status: str
-    type: python
-  config_info: []
-  description: ZDT X42 闭环步进电机驱动。支持速度运行、精确位置控制、位置查询和清零功能。适用于各种需要精确运动控制的实验室自动化场景。
-  handles: []
-  icon: ''
-  init_param_schema:
-    config:
-      properties:
-        baudrate:
-          default: 115200
-          type: integer
-        debug:
-          default: false
-          type: boolean
-        device_id:
-          default: 1
-          type: integer
-        port:
-          type: string
-        timeout:
-          default: 0.5
-          type: number
-      required:
-      - port
-      type: object
-    data:
-      properties:
-        position:
-          type: integer
-        status:
-          type: string
-      required:
-      - status
-      - position
-      type: object
-  version: 1.0.0

unilabos/registry/devices/sensor.yaml

@@ -1,148 +0,0 @@
-sensor.xkc_rs485:
-  category:
-  - sensor
-  - separator
-  class:
-    action_value_mappings:
-      auto-change_baudrate:
-        goal:
-          baud_code: 7
-        handles: {}
-        schema:
-          description: '更改通讯波特率 (设置成功后无返回，且需手动切换波特率重连)。代码表 (16进制): 05=2400, 06=4800,
-            07=9600, 08=14400, 09=19200, 0A=28800, 0C=57600, 0D=115200, 0E=128000,
-            0F=256000'
-          properties:
-            goal:
-              properties:
-                baud_code:
-                  description: '波特率代码 (例如: 7 为 9600, 13 即 0x0D 为 115200)'
-                  type: integer
-              required:
-              - baud_code
-              type: object
-        type: UniLabJsonCommand
-      auto-change_device_id:
-        goal:
-          new_id: 1
-        handles: {}
-        schema:
-          description: 修改传感器的 Modbus 从站地址
-          properties:
-            goal:
-              properties:
-                new_id:
-                  description: 新的从站地址 (1-254)
-                  maximum: 254
-                  minimum: 1
-                  type: integer
-              required:
-              - new_id
-              type: object
-        type: UniLabJsonCommand
-      auto-factory_reset:
-        goal: {}
-        handles: {}
-        schema:
-          description: 恢复出厂设置 (地址重置为 01)
-          properties:
-            goal:
-              type: object
-        type: UniLabJsonCommand
-      auto-read_level:
-        goal: {}
-        handles: {}
-        schema:
-          description: 直接读取当前液位及信号强度
-          properties:
-            goal:
-              type: object
-          type: object
-        type: UniLabJsonCommand
-      auto-set_threshold:
-        goal:
-          threshold: 300
-        handles: {}
-        schema:
-          description: 设置液位判定阈值
-          properties:
-            goal:
-              properties:
-                threshold:
-                  type: integer
-              required:
-              - threshold
-              type: object
-        type: UniLabJsonCommand
-      auto-wait_for_liquid:
-        goal:
-          target_state: true
-          timeout: 120
-        handles: {}
-        schema:
-          description: 实时检测电导率(RSSI)并等待用户指定的状态
-          properties:
-            goal:
-              properties:
-                target_state:
-                  default: true
-                  description: 目标状态 (True=有液, False=无液)
-                  type: boolean
-                timeout:
-                  default: 120
-                  description: 超时时间 (秒)
-              required:
-              - target_state
-              type: object
-        type: UniLabJsonCommand
-      auto-wait_level:
-        goal:
-          level: true
-          timeout: 10
-        handles: {}
-        schema:
-          description: 等待液位达到目标状态
-          properties:
-            goal:
-              properties:
-                level:
-                  type: boolean
-                timeout:
-                  type: number
-              required:
-              - level
-              type: object
-        type: UniLabJsonCommand
-    module: unilabos.devices.separator.xkc_sensor:XKCSensorDriver
-    status_types:
-      level: bool
-      rssi: int
-    type: python
-  config_info: []
-  description: XKC RS485 非接触式液位传感器 (Modbus RTU)
-  handles: []
-  icon: ''
-  init_param_schema:
-    config:
-      properties:
-        baudrate:
-          default: 9600
-          type: integer
-        debug:
-          default: false
-          type: boolean
-        device_id:
-          default: 1
-          type: integer
-        port:
-          type: string
-        threshold:
-          default: 300
-          type: integer
-        timeout:
-          default: 3.0
-          type: number
-      required:
-      - port
-      type: object
-  version: 1.0.0

unilabos/registry/registry.py

@@ -4,8 +4,6 @@ import os
 import sys
 import inspect
 import importlib
-import threading
-from concurrent.futures import ThreadPoolExecutor, as_completed
 from pathlib import Path
 from typing import Any, Dict, List, Union, Tuple
 
@@ -62,7 +60,6 @@ class Registry:
         self.device_module_to_registry = {}
         self.resource_type_registry = {}
         self._setup_called = False  # 跟踪setup是否已调用
-        self._registry_lock = threading.Lock()  # 多线程加载时的锁
         # 其他状态变量
         # self.is_host_mode = False  # 移至BasicConfig中
 
@@ -180,7 +177,8 @@ class Registry:
                                 "result": {},
                                 "schema": test_latency_schema,
                                 "goal_default": {
-                                    arg["name"]: arg["default"] for arg in test_latency_method_info.get("args", [])
+                                    arg["name"]: arg["default"]
+                                    for arg in test_latency_method_info.get("args", [])
                                 },
                                 "handles": {},
                             },
@@ -264,115 +262,67 @@ class Registry:
         # 标记setup已被调用
         self._setup_called = True
 
-    def _load_single_resource_file(
-        self, file: Path, complete_registry: bool, upload_registry: bool
-    ) -> Tuple[Dict[str, Any], Dict[str, Any], bool]:
-        """
-        加载单个资源文件 (线程安全)
-
-        Returns:
-            (data, complete_data, is_valid): 资源数据, 完整数据, 是否有效
-        """
-        try:
-            with open(file, encoding="utf-8", mode="r") as f:
-                data = yaml.safe_load(io.StringIO(f.read()))
-        except Exception as e:
-            logger.warning(f"[UniLab Registry] 读取资源文件失败: {file}, 错误: {e}")
-            return {}, {}, False
-
-        if not data:
-            return {}, {}, False
-
-        complete_data = {}
-        for resource_id, resource_info in data.items():
-            if "version" not in resource_info:
-                resource_info["version"] = "1.0.0"
-            if "category" not in resource_info:
-                resource_info["category"] = [file.stem]
-            elif file.stem not in resource_info["category"]:
-                resource_info["category"].append(file.stem)
-            elif not isinstance(resource_info.get("category"), list):
-                resource_info["category"] = [resource_info["category"]]
-            if "config_info" not in resource_info:
-                resource_info["config_info"] = []
-            if "icon" not in resource_info:
-                resource_info["icon"] = ""
-            if "handles" not in resource_info:
-                resource_info["handles"] = []
-            if "init_param_schema" not in resource_info:
-                resource_info["init_param_schema"] = {}
-            if "config_info" in resource_info:
-                del resource_info["config_info"]
-            if "file_path" in resource_info:
-                del resource_info["file_path"]
-            complete_data[resource_id] = copy.deepcopy(dict(sorted(resource_info.items())))
-            if upload_registry:
-                class_info = resource_info.get("class", {})
-                if len(class_info) and "module" in class_info:
-                    if class_info.get("type") == "pylabrobot":
-                        res_class = get_class(class_info["module"])
-                        if callable(res_class) and not isinstance(res_class, type):
-                            res_instance = res_class(res_class.__name__)
-                            res_ulr = tree_to_list([resource_plr_to_ulab(res_instance)])
-                            resource_info["config_info"] = res_ulr
-            resource_info["registry_type"] = "resource"
-            resource_info["file_path"] = str(file.absolute()).replace("\\", "/")
-
-        complete_data = dict(sorted(complete_data.items()))
-        complete_data = copy.deepcopy(complete_data)
-
-        if complete_registry:
-            try:
-                with open(file, "w", encoding="utf-8") as f:
-                    yaml.dump(complete_data, f, allow_unicode=True, default_flow_style=False, Dumper=NoAliasDumper)
-            except Exception as e:
-                logger.warning(f"[UniLab Registry] 写入资源文件失败: {file}, 错误: {e}")
-
-        return data, complete_data, True
-
     def load_resource_types(self, path: os.PathLike, complete_registry: bool, upload_registry: bool):
         abs_path = Path(path).absolute()
         resource_path = abs_path / "resources"
         files = list(resource_path.glob("*/*.yaml"))
         logger.debug(f"[UniLab Registry] resources: {resource_path.exists()}, total: {len(files)}")
-
-        if not files:
-            return
-
-        # 使用线程池并行加载
-        max_workers = min(8, len(files))
-        results = []
-
-        with ThreadPoolExecutor(max_workers=max_workers) as executor:
-            future_to_file = {
-                executor.submit(self._load_single_resource_file, file, complete_registry, upload_registry): file
-                for file in files
-            }
-            for future in as_completed(future_to_file):
-                file = future_to_file[future]
-                try:
-                    data, complete_data, is_valid = future.result()
-                    if is_valid:
-                        results.append((file, data))
-                except Exception as e:
-                    logger.warning(f"[UniLab Registry] 处理资源文件异常: {file}, 错误: {e}")
-
-        # 线程安全地更新注册表
         current_resource_number = len(self.resource_type_registry) + 1
-        with self._registry_lock:
-            for i, (file, data) in enumerate(results):
+        for i, file in enumerate(files):
+            with open(file, encoding="utf-8", mode="r") as f:
+                data = yaml.safe_load(io.StringIO(f.read()))
+            complete_data = {}
+            if data:
+                # 为每个资源添加文件路径信息
+                for resource_id, resource_info in data.items():
+                    if "version" not in resource_info:
+                        resource_info["version"] = "1.0.0"
+                    if "category" not in resource_info:
+                        resource_info["category"] = [file.stem]
+                    elif file.stem not in resource_info["category"]:
+                        resource_info["category"].append(file.stem)
+                    elif not isinstance(resource_info.get("category"), list):
+                        resource_info["category"] = [resource_info["category"]]
+                    if "config_info" not in resource_info:
+                        resource_info["config_info"] = []
+                    if "icon" not in resource_info:
+                        resource_info["icon"] = ""
+                    if "handles" not in resource_info:
+                        resource_info["handles"] = []
+                    if "init_param_schema" not in resource_info:
+                        resource_info["init_param_schema"] = {}
+                    if "config_info" in resource_info:
+                        del resource_info["config_info"]
+                    if "file_path" in resource_info:
+                        del resource_info["file_path"]
+                    complete_data[resource_id] = copy.deepcopy(dict(sorted(resource_info.items())))
+                    if upload_registry:
+                        class_info = resource_info.get("class", {})
+                        if len(class_info) and "module" in class_info:
+                            if class_info.get("type") == "pylabrobot":
+                                res_class = get_class(class_info["module"])
+                                if callable(res_class) and not isinstance(
+                                    res_class, type
+                                ):  # 有的是类，有的是函数，这里暂时只登记函数类的
+                                    res_instance = res_class(res_class.__name__)
+                                    res_ulr = tree_to_list([resource_plr_to_ulab(res_instance)])
+                                    resource_info["config_info"] = res_ulr
+                    resource_info["registry_type"] = "resource"
+                    resource_info["file_path"] = str(file.absolute()).replace("\\", "/")
+                complete_data = dict(sorted(complete_data.items()))
+                complete_data = copy.deepcopy(complete_data)
+                if complete_registry:
+                    with open(file, "w", encoding="utf-8") as f:
+                        yaml.dump(complete_data, f, allow_unicode=True, default_flow_style=False, Dumper=NoAliasDumper)
+
                 self.resource_type_registry.update(data)
-                logger.trace(
-                    f"[UniLab Registry] Resource-{current_resource_number} File-{i+1}/{len(results)} "
+                logger.trace(  # type: ignore
+                    f"[UniLab Registry] Resource-{current_resource_number} File-{i+1}/{len(files)} "
                     + f"Add {list(data.keys())}"
                 )
                 current_resource_number += 1
-
-        # 记录无效文件
-        valid_files = {r[0] for r in results}
-        for file in files:
-            if file not in valid_files:
-                logger.debug(f"[UniLab Registry] Res File Not Valid YAML File: {file.absolute()}")
+            else:
+                logger.debug(f"[UniLab Registry] Res File-{i+1}/{len(files)} Not Valid YAML File: {file.absolute()}")
 
     def _extract_class_docstrings(self, module_string: str) -> Dict[str, str]:
         """
@@ -724,244 +674,213 @@ class Registry:
                 "handles": {},
             }
 
-    def _load_single_device_file(
-        self, file: Path, complete_registry: bool, get_yaml_from_goal_type
-    ) -> Tuple[Dict[str, Any], Dict[str, Any], bool, List[str]]:
-        """
-        加载单个设备文件 (线程安全)
-
-        Returns:
-            (data, complete_data, is_valid, device_ids): 设备数据, 完整数据, 是否有效, 设备ID列表
-        """
-        try:
-            with open(file, encoding="utf-8", mode="r") as f:
-                data = yaml.safe_load(io.StringIO(f.read()))
-        except Exception as e:
-            logger.warning(f"[UniLab Registry] 读取设备文件失败: {file}, 错误: {e}")
-            return {}, {}, False, []
-
-        if not data:
-            return {}, {}, False, []
-
-        complete_data = {}
-        action_str_type_mapping = {
-            "UniLabJsonCommand": "UniLabJsonCommand",
-            "UniLabJsonCommandAsync": "UniLabJsonCommandAsync",
-        }
-        status_str_type_mapping = {}
-        device_ids = []
-
-        for device_id, device_config in data.items():
-            if "version" not in device_config:
-                device_config["version"] = "1.0.0"
-            if "category" not in device_config:
-                device_config["category"] = [file.stem]
-            elif file.stem not in device_config["category"]:
-                device_config["category"].append(file.stem)
-            if "config_info" not in device_config:
-                device_config["config_info"] = []
-            if "description" not in device_config:
-                device_config["description"] = ""
-            if "icon" not in device_config:
-                device_config["icon"] = ""
-            if "handles" not in device_config:
-                device_config["handles"] = []
-            if "init_param_schema" not in device_config:
-                device_config["init_param_schema"] = {}
-            if "class" in device_config:
-                if "status_types" not in device_config["class"] or device_config["class"]["status_types"] is None:
-                    device_config["class"]["status_types"] = {}
-                if (
-                    "action_value_mappings" not in device_config["class"]
-                    or device_config["class"]["action_value_mappings"] is None
-                ):
-                    device_config["class"]["action_value_mappings"] = {}
-                enhanced_info = {}
-                if complete_registry:
-                    device_config["class"]["status_types"].clear()
-                    enhanced_info = get_enhanced_class_info(device_config["class"]["module"], use_dynamic=True)
-                    if not enhanced_info.get("dynamic_import_success", False):
-                        continue
-                    device_config["class"]["status_types"].update(
-                        {k: v["return_type"] for k, v in enhanced_info["status_methods"].items()}
-                    )
-                for status_name, status_type in device_config["class"]["status_types"].items():
-                    if isinstance(status_type, tuple) or status_type in ["Any", "None", "Unknown"]:
-                        status_type = "String"
-                        device_config["class"]["status_types"][status_name] = status_type
-                    try:
-                        target_type = self._replace_type_with_class(status_type, device_id, f"状态 {status_name}")
-                    except ROSMsgNotFound:
-                        continue
-                    if target_type in [dict, list]:
-                        target_type = String
-                    status_str_type_mapping[status_type] = target_type
-                device_config["class"]["status_types"] = dict(sorted(device_config["class"]["status_types"].items()))
-                if complete_registry:
-                    old_action_configs = {}
-                    for action_name, action_config in device_config["class"]["action_value_mappings"].items():
-                        old_action_configs[action_name] = action_config
-
-                    device_config["class"]["action_value_mappings"] = {
-                        k: v
-                        for k, v in device_config["class"]["action_value_mappings"].items()
-                        if not k.startswith("auto-")
-                    }
-                    device_config["class"]["action_value_mappings"].update(
-                        {
-                            f"auto-{k}": {
-                                "type": "UniLabJsonCommandAsync" if v["is_async"] else "UniLabJsonCommand",
-                                "goal": {},
-                                "feedback": {},
-                                "result": {},
-                                "schema": self._generate_unilab_json_command_schema(
-                                    v["args"],
-                                    k,
-                                    v.get("return_annotation"),
-                                    old_action_configs.get(f"auto-{k}", {}).get("schema"),
-                                ),
-                                "goal_default": {i["name"]: i["default"] for i in v["args"]},
-                                "handles": old_action_configs.get(f"auto-{k}", {}).get("handles", []),
-                                "placeholder_keys": {
-                                    i["name"]: (
-                                        "unilabos_resources"
-                                        if i["type"] == "unilabos.registry.placeholder_type:ResourceSlot"
-                                        or i["type"] == ("list", "unilabos.registry.placeholder_type:ResourceSlot")
-                                        else "unilabos_devices"
-                                    )
-                                    for i in v["args"]
-                                    if i.get("type", "")
-                                    in [
-                                        "unilabos.registry.placeholder_type:ResourceSlot",
-                                        "unilabos.registry.placeholder_type:DeviceSlot",
-                                        ("list", "unilabos.registry.placeholder_type:ResourceSlot"),
-                                        ("list", "unilabos.registry.placeholder_type:DeviceSlot"),
-                                    ]
-                                },
-                            }
-                            for k, v in enhanced_info["action_methods"].items()
-                            if k not in device_config["class"]["action_value_mappings"]
-                        }
-                    )
-                    for action_name, old_config in old_action_configs.items():
-                        if action_name in device_config["class"]["action_value_mappings"]:
-                            old_schema = old_config.get("schema", {})
-                            if "description" in old_schema and old_schema["description"]:
-                                device_config["class"]["action_value_mappings"][action_name]["schema"][
-                                    "description"
-                                ] = old_schema["description"]
-                    device_config["init_param_schema"] = {}
-                    device_config["init_param_schema"]["config"] = self._generate_unilab_json_command_schema(
-                        enhanced_info["init_params"], "__init__"
-                    )["properties"]["goal"]
-                    device_config["init_param_schema"]["data"] = self._generate_status_types_schema(
-                        enhanced_info["status_methods"]
-                    )
-
-                device_config.pop("schema", None)
-                device_config["class"]["action_value_mappings"] = dict(
-                    sorted(device_config["class"]["action_value_mappings"].items())
-                )
-                for action_name, action_config in device_config["class"]["action_value_mappings"].items():
-                    if "handles" not in action_config:
-                        action_config["handles"] = {}
-                    elif isinstance(action_config["handles"], list):
-                        if len(action_config["handles"]):
-                            logger.error(f"设备{device_id} {action_name} 的handles配置错误，应该是字典类型")
-                            continue
-                        else:
-                            action_config["handles"] = {}
-                    if "type" in action_config:
-                        action_type_str: str = action_config["type"]
-                        if not action_type_str.startswith("UniLabJsonCommand"):
-                            try:
-                                target_type = self._replace_type_with_class(
-                                    action_type_str, device_id, f"动作 {action_name}"
-                                )
-                            except ROSMsgNotFound:
-                                continue
-                            action_str_type_mapping[action_type_str] = target_type
-                            if target_type is not None:
-                                action_config["goal_default"] = yaml.safe_load(
-                                    io.StringIO(get_yaml_from_goal_type(target_type.Goal))
-                                )
-                                action_config["schema"] = ros_action_to_json_schema(target_type)
-                            else:
-                                logger.warning(
-                                    f"[UniLab Registry] 设备 {device_id} 的动作 {action_name} 类型为空，跳过替换"
-                                )
-                complete_data[device_id] = copy.deepcopy(dict(sorted(device_config.items())))
-                for status_name, status_type in device_config["class"]["status_types"].items():
-                    device_config["class"]["status_types"][status_name] = status_str_type_mapping[status_type]
-                for action_name, action_config in device_config["class"]["action_value_mappings"].items():
-                    if action_config["type"] not in action_str_type_mapping:
-                        continue
-                    action_config["type"] = action_str_type_mapping[action_config["type"]]
-                self._add_builtin_actions(device_config, device_id)
-            device_config["file_path"] = str(file.absolute()).replace("\\", "/")
-            device_config["registry_type"] = "device"
-            device_ids.append(device_id)
-
-        complete_data = dict(sorted(complete_data.items()))
-        complete_data = copy.deepcopy(complete_data)
-        try:
-            with open(file, "w", encoding="utf-8") as f:
-                yaml.dump(complete_data, f, allow_unicode=True, default_flow_style=False, Dumper=NoAliasDumper)
-        except Exception as e:
-            logger.warning(f"[UniLab Registry] 写入设备文件失败: {file}, 错误: {e}")
-
-        return data, complete_data, True, device_ids
-
     def load_device_types(self, path: os.PathLike, complete_registry: bool):
+        # return
         abs_path = Path(path).absolute()
         devices_path = abs_path / "devices"
         device_comms_path = abs_path / "device_comms"
         files = list(devices_path.glob("*.yaml")) + list(device_comms_path.glob("*.yaml"))
-        logger.trace(
+        logger.trace(  # type: ignore
             f"[UniLab Registry] devices: {devices_path.exists()}, device_comms: {device_comms_path.exists()}, "
             + f"total: {len(files)}"
         )
-
-        if not files:
-            return
-
+        current_device_number = len(self.device_type_registry) + 1
         from unilabos.app.web.utils.action_utils import get_yaml_from_goal_type
 
-        # 使用线程池并行加载
-        max_workers = min(8, len(files))
-        results = []
-
-        with ThreadPoolExecutor(max_workers=max_workers) as executor:
-            future_to_file = {
-                executor.submit(self._load_single_device_file, file, complete_registry, get_yaml_from_goal_type): file
-                for file in files
+        for i, file in enumerate(files):
+            with open(file, encoding="utf-8", mode="r") as f:
+                data = yaml.safe_load(io.StringIO(f.read()))
+            complete_data = {}
+            action_str_type_mapping = {
+                "UniLabJsonCommand": "UniLabJsonCommand",
+                "UniLabJsonCommandAsync": "UniLabJsonCommandAsync",
             }
-            for future in as_completed(future_to_file):
-                file = future_to_file[future]
-                try:
-                    data, complete_data, is_valid, device_ids = future.result()
-                    if is_valid:
-                        results.append((file, data, device_ids))
-                except Exception as e:
-                    logger.warning(f"[UniLab Registry] 处理设备文件异常: {file}, 错误: {e}")
+            status_str_type_mapping = {}
+            if data:
+                # 在添加到注册表前处理类型替换
+                for device_id, device_config in data.items():
+                    # 添加文件路径信息 - 使用规范化的完整文件路径
+                    if "version" not in device_config:
+                        device_config["version"] = "1.0.0"
+                    if "category" not in device_config:
+                        device_config["category"] = [file.stem]
+                    elif file.stem not in device_config["category"]:
+                        device_config["category"].append(file.stem)
+                    if "config_info" not in device_config:
+                        device_config["config_info"] = []
+                    if "description" not in device_config:
+                        device_config["description"] = ""
+                    if "icon" not in device_config:
+                        device_config["icon"] = ""
+                    if "handles" not in device_config:
+                        device_config["handles"] = []
+                    if "init_param_schema" not in device_config:
+                        device_config["init_param_schema"] = {}
+                    if "class" in device_config:
+                        if (
+                            "status_types" not in device_config["class"]
+                            or device_config["class"]["status_types"] is None
+                        ):
+                            device_config["class"]["status_types"] = {}
+                        if (
+                            "action_value_mappings" not in device_config["class"]
+                            or device_config["class"]["action_value_mappings"] is None
+                        ):
+                            device_config["class"]["action_value_mappings"] = {}
+                        enhanced_info = {}
+                        if complete_registry:
+                            device_config["class"]["status_types"].clear()
+                            enhanced_info = get_enhanced_class_info(device_config["class"]["module"], use_dynamic=True)
+                            if not enhanced_info.get("dynamic_import_success", False):
+                                continue
+                            device_config["class"]["status_types"].update(
+                                {k: v["return_type"] for k, v in enhanced_info["status_methods"].items()}
+                            )
+                        for status_name, status_type in device_config["class"]["status_types"].items():
+                            if isinstance(status_type, tuple) or status_type in ["Any", "None", "Unknown"]:
+                                status_type = "String"  # 替换成ROS的String，便于显示
+                                device_config["class"]["status_types"][status_name] = status_type
+                            try:
+                                target_type = self._replace_type_with_class(
+                                    status_type, device_id, f"状态 {status_name}"
+                                )
+                            except ROSMsgNotFound:
+                                continue
+                            if target_type in [
+                                dict,
+                                list,
+                            ]:  # 对于嵌套类型返回的对象，暂时处理成字符串，无法直接进行转换
+                                target_type = String
+                            status_str_type_mapping[status_type] = target_type
+                        device_config["class"]["status_types"] = dict(
+                            sorted(device_config["class"]["status_types"].items())
+                        )
+                        if complete_registry:
+                            # 保存原有的 action 配置（用于保留 schema 的 description 和 handles 等）
+                            old_action_configs = {}
+                            for action_name, action_config in device_config["class"]["action_value_mappings"].items():
+                                old_action_configs[action_name] = action_config
 
-        # 线程安全地更新注册表
-        current_device_number = len(self.device_type_registry) + 1
-        with self._registry_lock:
-            for file, data, device_ids in results:
-                self.device_type_registry.update(data)
-                for device_id in device_ids:
-                    logger.trace(
-                        f"[UniLab Registry] Device-{current_device_number} Add {device_id} "
+                            device_config["class"]["action_value_mappings"] = {
+                                k: v
+                                for k, v in device_config["class"]["action_value_mappings"].items()
+                                if not k.startswith("auto-")
+                            }
+                            # 处理动作值映射
+                            device_config["class"]["action_value_mappings"].update(
+                                {
+                                    f"auto-{k}": {
+                                        "type": "UniLabJsonCommandAsync" if v["is_async"] else "UniLabJsonCommand",
+                                        "goal": {},
+                                        "feedback": {},
+                                        "result": {},
+                                        "schema": self._generate_unilab_json_command_schema(
+                                            v["args"],
+                                            k,
+                                            v.get("return_annotation"),
+                                            # 传入旧的 schema 以保留字段 description
+                                            old_action_configs.get(f"auto-{k}", {}).get("schema"),
+                                        ),
+                                        "goal_default": {i["name"]: i["default"] for i in v["args"]},
+                                        # 保留原有的 handles 配置
+                                        "handles": old_action_configs.get(f"auto-{k}", {}).get("handles", []),
+                                        "placeholder_keys": {
+                                            i["name"]: (
+                                                "unilabos_resources"
+                                                if i["type"] == "unilabos.registry.placeholder_type:ResourceSlot"
+                                                or i["type"]
+                                                == ("list", "unilabos.registry.placeholder_type:ResourceSlot")
+                                                else "unilabos_devices"
+                                            )
+                                            for i in v["args"]
+                                            if i.get("type", "")
+                                            in [
+                                                "unilabos.registry.placeholder_type:ResourceSlot",
+                                                "unilabos.registry.placeholder_type:DeviceSlot",
+                                                ("list", "unilabos.registry.placeholder_type:ResourceSlot"),
+                                                ("list", "unilabos.registry.placeholder_type:DeviceSlot"),
+                                            ]
+                                        },
+                                    }
+                                    # 不生成已配置action的动作
+                                    for k, v in enhanced_info["action_methods"].items()
+                                    if k not in device_config["class"]["action_value_mappings"]
+                                }
+                            )
+                            # 恢复原有的 description 信息（非 auto- 开头的动作）
+                            for action_name, old_config in old_action_configs.items():
+                                if action_name in device_config["class"]["action_value_mappings"]:  # 有一些会被删除
+                                    old_schema = old_config.get("schema", {})
+                                    if "description" in old_schema and old_schema["description"]:
+                                        device_config["class"]["action_value_mappings"][action_name]["schema"][
+                                            "description"
+                                        ] = old_schema["description"]
+                            device_config["init_param_schema"] = {}
+                            device_config["init_param_schema"]["config"] = self._generate_unilab_json_command_schema(
+                                enhanced_info["init_params"], "__init__"
+                            )["properties"]["goal"]
+                            device_config["init_param_schema"]["data"] = self._generate_status_types_schema(
+                                enhanced_info["status_methods"]
+                            )
+
+                        device_config.pop("schema", None)
+                        device_config["class"]["action_value_mappings"] = dict(
+                            sorted(device_config["class"]["action_value_mappings"].items())
+                        )
+                        for action_name, action_config in device_config["class"]["action_value_mappings"].items():
+                            if "handles" not in action_config:
+                                action_config["handles"] = {}
+                            elif isinstance(action_config["handles"], list):
+                                if len(action_config["handles"]):
+                                    logger.error(f"设备{device_id} {action_name} 的handles配置错误，应该是字典类型")
+                                    continue
+                                else:
+                                    action_config["handles"] = {}
+                            if "type" in action_config:
+                                action_type_str: str = action_config["type"]
+                                # 通过Json发放指令，而不是通过特殊的ros action进行处理
+                                if not action_type_str.startswith("UniLabJsonCommand"):
+                                    try:
+                                        target_type = self._replace_type_with_class(
+                                            action_type_str, device_id, f"动作 {action_name}"
+                                        )
+                                    except ROSMsgNotFound:
+                                        continue
+                                    action_str_type_mapping[action_type_str] = target_type
+                                    if target_type is not None:
+                                        action_config["goal_default"] = yaml.safe_load(
+                                            io.StringIO(get_yaml_from_goal_type(target_type.Goal))
+                                        )
+                                        action_config["schema"] = ros_action_to_json_schema(target_type)
+                                    else:
+                                        logger.warning(
+                                            f"[UniLab Registry] 设备 {device_id} 的动作 {action_name} 类型为空，跳过替换"
+                                        )
+                        complete_data[device_id] = copy.deepcopy(dict(sorted(device_config.items())))  # 稍后dump到文件
+                        for status_name, status_type in device_config["class"]["status_types"].items():
+                            device_config["class"]["status_types"][status_name] = status_str_type_mapping[status_type]
+                        for action_name, action_config in device_config["class"]["action_value_mappings"].items():
+                            if action_config["type"] not in action_str_type_mapping:
+                                continue
+                            action_config["type"] = action_str_type_mapping[action_config["type"]]
+                        # 添加内置的驱动命令动作
+                        self._add_builtin_actions(device_config, device_id)
+                    device_config["file_path"] = str(file.absolute()).replace("\\", "/")
+                    device_config["registry_type"] = "device"
+                    logger.trace(  # type: ignore
+                        f"[UniLab Registry] Device-{current_device_number} File-{i+1}/{len(files)} Add {device_id} "
                         + f"[{data[device_id].get('name', '未命名设备')}]"
                     )
                     current_device_number += 1
-
-        # 记录无效文件
-        valid_files = {r[0] for r in results}
-        for file in files:
-            if file not in valid_files:
-                logger.debug(f"[UniLab Registry] Device File Not Valid YAML File: {file.absolute()}")
+                complete_data = dict(sorted(complete_data.items()))
+                complete_data = copy.deepcopy(complete_data)
+                with open(file, "w", encoding="utf-8") as f:
+                    yaml.dump(complete_data, f, allow_unicode=True, default_flow_style=False, Dumper=NoAliasDumper)
+                self.device_type_registry.update(data)
+            else:
+                logger.debug(
+                    f"[UniLab Registry] Device File-{i+1}/{len(files)} Not Valid YAML File: {file.absolute()}"
+                )
 
     def obtain_registry_device_info(self):
         devices = []

unilabos/resources/graphio.py

@@ -42,7 +42,7 @@ def canonicalize_nodes_data(
     Returns:
         ResourceTreeSet: 标准化后的资源树集合
     """
-    print_status(f"{len(nodes)} Resources loaded", "info")
+    print_status(f"{len(nodes)} Resources loaded:", "info")
 
     # 第一步：基本预处理（处理graphml的label字段）
     outer_host_node_id = None

unilabos/resources/resource_tracker.py

@@ -69,8 +69,8 @@ class ResourceDict(BaseModel):
     klass: str = Field(alias="class", description="Resource class name")
     pose: ResourceDictPosition = Field(description="Resource position", default_factory=ResourceDictPosition)
     config: Dict[str, Any] = Field(description="Resource configuration")
-    data: Dict[str, Any] = Field(description="Resource data, eg: container liquid data")
-    extra: Dict[str, Any] = Field(description="Extra data, eg: slot index")
+    data: Dict[str, Any] = Field(description="Resource data")
+    extra: Dict[str, Any] = Field(description="Extra data")
 
     @field_serializer("parent_uuid")
     def _serialize_parent(self, parent_uuid: Optional["ResourceDict"]):

unilabos/test/experiments/xkc_sensor_test.json

@@ -1,29 +0,0 @@
-{
-    "nodes": [
-        {
-            "id": "Liquid_Sensor_1",
-            "name": "XKC Sensor",
-            "children": [],
-            "parent": null,
-            "type": "device",
-            "class": "sensor.xkc_rs485",
-            "position": {
-                "x": 0,
-                "y": 0,
-                "z": 0
-            },
-            "config": {
-                "port": "/dev/tty.usbserial-3110",
-                "baudrate": 9600,
-                "device_id": 1,
-                "threshold": 300,
-                "timeout": 3.0
-            },
-            "data": {
-                "level": false,
-                "rssi": 0
-            }
-        }
-    ],
-    "links": []
-}

unilabos/test/experiments/zdt_motor_test.json

@@ -1,28 +0,0 @@
-{
-    "nodes": [
-        {
-            "id": "ZDT_Motor",
-            "name": "ZDT Motor",
-            "children": [],
-            "parent": null,
-            "type": "device",
-            "class": "motor.zdt_x42",
-            "position": {
-                "x": 0,
-                "y": 0,
-                "z": 0
-            },
-            "config": {
-                "port": "/dev/tty.usbserial-3110",
-                "baudrate": 115200,
-                "device_id": 1,
-                "debug": true
-            },
-            "data": {
-                "position": 0,
-                "status": "idle"
-            }
-        }
-    ],
-    "links": []
-}

unilabos/workflow/from_python_script.py

@@ -1,241 +0,0 @@
-import ast
-import json
-from typing import Dict, List, Any, Tuple, Optional
-
-from .common import WorkflowGraph, RegistryAdapter
-
-Json = Dict[str, Any]
-
-# ---------------- Converter ----------------
-
-class DeviceMethodConverter:
-    """
-    - 字段统一：resource_name（原 device_class）、template_name（原 action_key）
-    - params 单层；inputs 使用 'params.' 前缀
-    - SimpleGraph.add_workflow_node 负责变量连线与边
-    """
-    def __init__(self, device_registry: Optional[Dict[str, Any]] = None):
-        self.graph = WorkflowGraph()
-        self.variable_sources: Dict[str, Dict[str, Any]] = {}        # var -> {node_id, output_name}
-        self.instance_to_resource: Dict[str, Optional[str]] = {}     # 实例名 -> resource_name
-        self.node_id_counter: int = 0
-        self.registry = RegistryAdapter(device_registry or {})
-
-    # ---- helpers ----
-    def _new_node_id(self) -> int:
-        nid = self.node_id_counter
-        self.node_id_counter += 1
-        return nid
-
-    def _assign_targets(self, targets) -> List[str]:
-        names: List[str] = []
-        import ast
-        if isinstance(targets, ast.Tuple):
-            for elt in targets.elts:
-                if isinstance(elt, ast.Name):
-                    names.append(elt.id)
-        elif isinstance(targets, ast.Name):
-            names.append(targets.id)
-        return names
-
-    def _extract_device_instantiation(self, node) -> Optional[Tuple[str, str]]:
-        import ast
-        if not isinstance(node.value, ast.Call):
-            return None
-        callee = node.value.func
-        if isinstance(callee, ast.Name):
-            class_name = callee.id
-        elif isinstance(callee, ast.Attribute) and isinstance(callee.value, ast.Name):
-            class_name = callee.attr
-        else:
-            return None
-        if isinstance(node.targets[0], ast.Name):
-            instance = node.targets[0].id
-            return instance, class_name
-        return None
-
-    def _extract_call(self, call) -> Tuple[str, str, Dict[str, Any], str]:
-        import ast
-        owner_name, method_name, call_kind = "", "", "func"
-        if isinstance(call.func, ast.Attribute):
-            method_name = call.func.attr
-            if isinstance(call.func.value, ast.Name):
-                owner_name = call.func.value.id
-                call_kind = "instance" if owner_name in self.instance_to_resource else "class_or_module"
-            elif isinstance(call.func.value, ast.Attribute) and isinstance(call.func.value.value, ast.Name):
-                owner_name = call.func.value.attr
-                call_kind = "class_or_module"
-        elif isinstance(call.func, ast.Name):
-            method_name = call.func.id
-            call_kind = "func"
-
-        def pack(node):
-            if isinstance(node, ast.Name):
-                return {"type": "variable", "value": node.id}
-            if isinstance(node, ast.Constant):
-                return {"type": "constant", "value": node.value}
-            if isinstance(node, ast.Dict):
-                return {"type": "dict", "value": self._parse_dict(node)}
-            if isinstance(node, ast.List):
-                return {"type": "list", "value": self._parse_list(node)}
-            return {"type": "raw", "value": ast.unparse(node) if hasattr(ast, "unparse") else str(node)}
-
-        args: Dict[str, Any] = {}
-        pos: List[Any] = []
-        for a in call.args:
-            pos.append(pack(a))
-        for kw in call.keywords:
-            args[kw.arg] = pack(kw.value)
-        if pos:
-            args["_positional"] = pos
-        return owner_name, method_name, args, call_kind
-
-    def _parse_dict(self, node) -> Dict[str, Any]:
-        import ast
-        out: Dict[str, Any] = {}
-        for k, v in zip(node.keys, node.values):
-            if isinstance(k, ast.Constant):
-                key = str(k.value)
-                if isinstance(v, ast.Name):
-                    out[key] = f"var:{v.id}"
-                elif isinstance(v, ast.Constant):
-                    out[key] = v.value
-                elif isinstance(v, ast.Dict):
-                    out[key] = self._parse_dict(v)
-                elif isinstance(v, ast.List):
-                    out[key] = self._parse_list(v)
-        return out
-
-    def _parse_list(self, node) -> List[Any]:
-        import ast
-        out: List[Any] = []
-        for elt in node.elts:
-            if isinstance(elt, ast.Name):
-                out.append(f"var:{elt.id}")
-            elif isinstance(elt, ast.Constant):
-                out.append(elt.value)
-            elif isinstance(elt, ast.Dict):
-                out.append(self._parse_dict(elt))
-            elif isinstance(elt, ast.List):
-                out.append(self._parse_list(elt))
-        return out
-
-    def _normalize_var_tokens(self, x: Any) -> Any:
-        if isinstance(x, str) and x.startswith("var:"):
-            return {"__var__": x[4:]}
-        if isinstance(x, list):
-            return [self._normalize_var_tokens(i) for i in x]
-        if isinstance(x, dict):
-            return {k: self._normalize_var_tokens(v) for k, v in x.items()}
-        return x
-
-    def _make_params_payload(self, resource_name: Optional[str], template_name: str, call_args: Dict[str, Any]) -> Dict[str, Any]:
-        input_keys = self.registry.get_action_input_keys(resource_name, template_name) if resource_name else []
-        defaults = self.registry.get_action_goal_default(resource_name, template_name) if resource_name else {}
-        params: Dict[str, Any] = dict(defaults)
-
-        def unpack(p):
-            t, v = p.get("type"), p.get("value")
-            if t == "variable":
-                return {"__var__": v}
-            if t == "dict":
-                return self._normalize_var_tokens(v)
-            if t == "list":
-                return self._normalize_var_tokens(v)
-            return v
-
-        for k, p in call_args.items():
-            if k == "_positional":
-                continue
-            params[k] = unpack(p)
-
-        pos = call_args.get("_positional", [])
-        if pos:
-            if input_keys:
-                for i, p in enumerate(pos):
-                    if i >= len(input_keys):
-                        break
-                    name = input_keys[i]
-                    if name in params:
-                        continue
-                    params[name] = unpack(p)
-            else:
-                for i, p in enumerate(pos):
-                    params[f"arg_{i}"] = unpack(p)
-        return params
-
-    # ---- handlers ----
-    def _on_assign(self, stmt):
-        import ast
-        inst = self._extract_device_instantiation(stmt)
-        if inst:
-            instance, code_class = inst
-            resource_name = self.registry.resolve_resource_by_classname(code_class)
-            self.instance_to_resource[instance] = resource_name
-            return
-
-        if isinstance(stmt.value, ast.Call):
-            owner, method, call_args, kind = self._extract_call(stmt.value)
-            if kind == "instance":
-                device_key = owner
-                resource_name = self.instance_to_resource.get(owner)
-            else:
-                device_key = owner
-                resource_name = self.registry.resolve_resource_by_classname(owner)
-
-            module = self.registry.get_device_module(resource_name)
-            params = self._make_params_payload(resource_name, method, call_args)
-
-            nid = self._new_node_id()
-            self.graph.add_workflow_node(
-                nid,
-                device_key=device_key,
-                resource_name=resource_name,      # ✅
-                module=module,
-                template_name=method,             # ✅
-                params=params,
-                variable_sources=self.variable_sources,
-                add_ready_if_no_vars=True,
-                prev_node_id=(nid - 1) if nid > 0 else None,
-            )
-
-            out_vars = self._assign_targets(stmt.targets[0])
-            for var in out_vars:
-                self.variable_sources[var] = {"node_id": nid, "output_name": "result"}
-
-    def _on_expr(self, stmt):
-        import ast
-        if not isinstance(stmt.value, ast.Call):
-            return
-        owner, method, call_args, kind = self._extract_call(stmt.value)
-        if kind == "instance":
-            device_key = owner
-            resource_name = self.instance_to_resource.get(owner)
-        else:
-            device_key = owner
-            resource_name = self.registry.resolve_resource_by_classname(owner)
-
-        module = self.registry.get_device_module(resource_name)
-        params = self._make_params_payload(resource_name, method, call_args)
-
-        nid = self._new_node_id()
-        self.graph.add_workflow_node(
-            nid,
-            device_key=device_key,
-            resource_name=resource_name,      # ✅
-            module=module,
-            template_name=method,             # ✅
-            params=params,
-            variable_sources=self.variable_sources,
-            add_ready_if_no_vars=True,
-            prev_node_id=(nid - 1) if nid > 0 else None,
-        )
-
-    def convert(self, python_code: str):
-        tree = ast.parse(python_code)
-        for stmt in tree.body:
-            if isinstance(stmt, ast.Assign):
-                self._on_assign(stmt)
-            elif isinstance(stmt, ast.Expr):
-                self._on_expr(stmt)
-        return self

unilabos/workflow/from_xdl.py

@@ -1,131 +0,0 @@
-from typing import List, Any, Dict
-import xml.etree.ElementTree as ET
-
-
-def convert_to_type(val: str) -> Any:
-    """将字符串值转换为适当的数据类型"""
-    if val == "True":
-        return True
-    if val == "False":
-        return False
-    if val == "?":
-        return None
-    if val.endswith(" g"):
-        return float(val.split(" ")[0])
-    if val.endswith("mg"):
-        return float(val.split("mg")[0])
-    elif val.endswith("mmol"):
-        return float(val.split("mmol")[0]) / 1000
-    elif val.endswith("mol"):
-        return float(val.split("mol")[0])
-    elif val.endswith("ml"):
-        return float(val.split("ml")[0])
-    elif val.endswith("RPM"):
-        return float(val.split("RPM")[0])
-    elif val.endswith(" °C"):
-        return float(val.split(" ")[0])
-    elif val.endswith(" %"):
-        return float(val.split(" ")[0])
-    return val
-
-
-def flatten_xdl_procedure(procedure_elem: ET.Element) -> List[ET.Element]:
-    """展平嵌套的XDL程序结构"""
-    flattened_operations = []
-    TEMP_UNSUPPORTED_PROTOCOL = ["Purge", "Wait", "Stir", "ResetHandling"]
-
-    def extract_operations(element: ET.Element):
-        if element.tag not in ["Prep", "Reaction", "Workup", "Purification", "Procedure"]:
-            if element.tag not in TEMP_UNSUPPORTED_PROTOCOL:
-                flattened_operations.append(element)
-
-        for child in element:
-            extract_operations(child)
-
-    for child in procedure_elem:
-        extract_operations(child)
-
-    return flattened_operations
-
-
-def parse_xdl_content(xdl_content: str) -> tuple:
-    """解析XDL内容"""
-    try:
-        xdl_content_cleaned = "".join(c for c in xdl_content if c.isprintable())
-        root = ET.fromstring(xdl_content_cleaned)
-
-        synthesis_elem = root.find("Synthesis")
-        if synthesis_elem is None:
-            return None, None, None
-
-        # 解析硬件组件
-        hardware_elem = synthesis_elem.find("Hardware")
-        hardware = []
-        if hardware_elem is not None:
-            hardware = [{"id": c.get("id"), "type": c.get("type")} for c in hardware_elem.findall("Component")]
-
-        # 解析试剂
-        reagents_elem = synthesis_elem.find("Reagents")
-        reagents = []
-        if reagents_elem is not None:
-            reagents = [{"name": r.get("name"), "role": r.get("role", "")} for r in reagents_elem.findall("Reagent")]
-
-        # 解析程序
-        procedure_elem = synthesis_elem.find("Procedure")
-        if procedure_elem is None:
-            return None, None, None
-
-        flattened_operations = flatten_xdl_procedure(procedure_elem)
-        return hardware, reagents, flattened_operations
-
-    except ET.ParseError as e:
-        raise ValueError(f"Invalid XDL format: {e}")
-
-
-def convert_xdl_to_dict(xdl_content: str) -> Dict[str, Any]:
-    """
-    将XDL XML格式转换为标准的字典格式
-
-    Args:
-        xdl_content: XDL XML内容
-
-    Returns:
-        转换结果，包含步骤和器材信息
-    """
-    try:
-        hardware, reagents, flattened_operations = parse_xdl_content(xdl_content)
-        if hardware is None:
-            return {"error": "Failed to parse XDL content", "success": False}
-
-        # 将XDL元素转换为字典格式
-        steps_data = []
-        for elem in flattened_operations:
-            # 转换参数类型
-            parameters = {}
-            for key, val in elem.attrib.items():
-                converted_val = convert_to_type(val)
-                if converted_val is not None:
-                    parameters[key] = converted_val
-
-            step_dict = {
-                "operation": elem.tag,
-                "parameters": parameters,
-                "description": elem.get("purpose", f"Operation: {elem.tag}"),
-            }
-            steps_data.append(step_dict)
-
-        # 合并硬件和试剂为统一的labware_info格式
-        labware_data = []
-        labware_data.extend({"id": hw["id"], "type": "hardware", **hw} for hw in hardware)
-        labware_data.extend({"name": reagent["name"], "type": "reagent", **reagent} for reagent in reagents)
-
-        return {
-            "success": True,
-            "steps": steps_data,
-            "labware": labware_data,
-            "message": f"Successfully converted XDL to dict format. Found {len(steps_data)} steps and {len(labware_data)} labware items.",
-        }
-
-    except Exception as e:
-        error_msg = f"XDL conversion failed: {str(e)}"
-        return {"error": error_msg, "success": False}