mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2026-02-03 21:05:09 +00:00
Workbench example, adjust log level, and ci check (#220) * TestLatency Return Value Example & gitignore update * Adjust log level & Add workbench virtual example & Add not action decorator & Add check_mode & * Add CI Check Fix/workstation yb revision (#217) * Revert log change & update registry * Revert opcua client & move electrolyte node Workstation yb merge dev ready 260113 (#216) * feat(bioyond): 添加计算实验设计功能,支持化合物配比和滴定比例参数 * feat(bioyond): 添加测量小瓶功能,支持基本参数配置 * feat(bioyond): 添加测量小瓶配置,支持新设备参数 * feat(bioyond): 更新仓库布局和尺寸,支持竖向排列的测量小瓶和试剂存放堆栈 * feat(bioyond): 优化任务创建流程,确保无论成功与否都清理任务队列以避免重复累积 * feat(bioyond): 添加设置反应器温度功能,支持温度范围和异常处理 * feat(bioyond): 调整反应器位置配置,统一坐标格式 * feat(bioyond): 添加调度器启动功能,支持任务队列执行并处理异常 * feat(bioyond): 优化调度器启动功能,添加异常处理并更新相关配置 * feat(opcua): 增强节点ID解析兼容性和数据类型处理 改进节点ID解析逻辑以支持多种格式,包括字符串和数字标识符 添加数据类型转换处理,确保写入值时类型匹配 优化错误提示信息,便于调试节点连接问题 * feat(registry): 新增后处理站的设备配置文件 添加后处理站的YAML配置文件,包含动作映射、状态类型和设备描述 * 添加调度器启动功能,合并物料参数配置,优化物料参数处理逻辑 * 添加从 Bioyond 系统自动同步工作流序列的功能,并更新相关配置 * fix:兼容 BioyondReactionStation 中 workflow_sequence 被重写为 property * fix:同步工作流序列 * feat: remove commented workflow synchronization from `reaction_station.py`. * 添加时间约束功能及相关配置 * fix:自动更新物料缓存功能,添加物料时更新缓存并在删除时移除缓存项 * fix:在添加物料时处理字符串和字典返回值,确保正确更新缓存 * fix:更新奔曜错误处理报送为物料变更报送,调整日志记录和响应消息 * feat:添加实验报告简化功能,去除冗余信息并保留关键信息 * feat: 添加任务状态事件发布功能,监控并报告任务运行、超时、完成和错误状态 * fix: 修复添加物料时数据格式错误 * Refactor bioyond_dispensing_station and reaction_station_bioyond YAML configurations - Removed redundant action value mappings from bioyond_dispensing_station. - Updated goal properties in bioyond_dispensing_station to use enums for target_stack and other parameters. - Changed data types for end_point and start_point in reaction_station_bioyond to use string enums (Start, End). - Simplified descriptions and updated measurement units from μL to mL where applicable. - Removed unused commands from reaction_station_bioyond to streamline the configuration. * fix:Change the material unit from μL to mL * fix:refresh_material_cache * feat: 动态获取工作流步骤ID,优化工作流配置 * feat: 添加清空服务端所有非核心工作流功能 * fix:修复Bottle类的序列化和反序列化方法 * feat:增强材料缓存更新逻辑,支持处理返回数据中的详细信息 * Add debug log * feat(workstation): update bioyond config migration and coin cell material search logic - Migrate bioyond_cell config to JSON structure and remove global variable dependencies - Implement material search confirmation dialog auto-handling - Add documentation: 20260113_物料搜寻确认弹窗自动处理功能.md and 20260113_配置迁移修改总结.md * Refactor module paths for Bioyond devices in YAML configuration files - Updated the module path for BioyondDispensingStation in bioyond_dispensing_station.yaml to reflect the new directory structure. - Updated the module path for BioyondReactionStation and BioyondReactor in reaction_station_bioyond.yaml to align with the revised organization of the codebase. * fix: WareHouse 的不可哈希类型错误,优化父节点去重逻辑 * refactor: Move config from module to instance initialization * fix: 修正 reaction_station 目录名拼写错误 * feat: Integrate material search logic and cleanup deprecated files - Update coin_cell_assembly.py with material search dialog handling - Update YB_warehouses.py with latest warehouse configurations - Remove outdated documentation and test data files * Refactor: Use instance attributes for action names and workflow step IDs * refactor: Split tipbox storage into left and right warehouses * refactor: Merge tipbox storage left and right into single warehouse --------- Co-authored-by: ZiWei <131428629+ZiWei09@users.noreply.github.com> Co-authored-by: Andy6M <xieqiming1132@qq.com> fix: WareHouse 的不可哈希类型错误,优化父节点去重逻辑 fix parent_uuid fetch when bind_parent_id == node_name 物料更新也是用父节点进行报送 Add None conversion for tube rack etc. Add set_liquid example. Add create_resource and test_resource example. Add restart. Temp allow action message. Add no_update_feedback option. Create session_id by edge. bump version to 0.10.15 temp cancel update req
238 lines
8.8 KiB
Python
238 lines
8.8 KiB
Python
import json
|
||
|
||
# from nt import device_encoding
|
||
import threading
|
||
import time
|
||
from typing import Optional, Dict, Any, List
|
||
import uuid
|
||
|
||
import rclpy
|
||
from unilabos_msgs.srv._serial_command import SerialCommand_Response
|
||
|
||
from unilabos.app.register import register_devices_and_resources
|
||
from unilabos.ros.nodes.presets.resource_mesh_manager import ResourceMeshManager
|
||
from unilabos.resources.resource_tracker import DeviceNodeResourceTracker, ResourceTreeSet
|
||
from unilabos.devices.ros_dev.liquid_handler_joint_publisher import LiquidHandlerJointPublisher
|
||
from unilabos_msgs.srv import SerialCommand # type: ignore
|
||
from rclpy.executors import MultiThreadedExecutor
|
||
from rclpy.node import Node
|
||
from rclpy.timer import Timer
|
||
|
||
from unilabos.registry.registry import lab_registry
|
||
from unilabos.ros.initialize_device import initialize_device_from_dict
|
||
from unilabos.ros.nodes.presets.host_node import HostNode
|
||
from unilabos.utils import logger
|
||
from unilabos.config.config import BasicConfig
|
||
from unilabos.utils.type_check import TypeEncoder
|
||
|
||
|
||
def exit() -> None:
|
||
"""关闭ROS节点和资源"""
|
||
host_instance = HostNode.get_instance()
|
||
if host_instance is not None:
|
||
# 停止发现定时器
|
||
# noinspection PyProtectedMember
|
||
if hasattr(host_instance, "_discovery_timer") and isinstance(host_instance._discovery_timer, Timer):
|
||
# noinspection PyProtectedMember
|
||
host_instance._discovery_timer.cancel()
|
||
for _, device_node in host_instance.devices_instances.items():
|
||
if hasattr(device_node, "destroy_node"):
|
||
device_node.ros_node_instance.destroy_node()
|
||
host_instance.destroy_node()
|
||
rclpy.shutdown()
|
||
|
||
|
||
def main(
|
||
devices_config: ResourceTreeSet,
|
||
resources_config: ResourceTreeSet,
|
||
resources_edge_config: list[dict] = [],
|
||
graph: Optional[Dict[str, Any]] = None,
|
||
controllers_config: Dict[str, Any] = {},
|
||
bridges: List[Any] = [],
|
||
visual: str = "disable",
|
||
resources_mesh_config: dict = {},
|
||
rclpy_init_args: List[str] = ["--log-level", "debug"],
|
||
discovery_interval: float = 15.0,
|
||
) -> None:
|
||
"""主函数"""
|
||
|
||
# Support restart - check if rclpy is already initialized
|
||
if not rclpy.ok():
|
||
rclpy.init(args=rclpy_init_args)
|
||
else:
|
||
logger.info("[ROS] rclpy already initialized, reusing context")
|
||
executor = rclpy.__executor = MultiThreadedExecutor()
|
||
# 创建主机节点
|
||
host_node = HostNode(
|
||
"host_node",
|
||
devices_config,
|
||
resources_config,
|
||
resources_edge_config,
|
||
graph,
|
||
controllers_config,
|
||
bridges,
|
||
discovery_interval,
|
||
)
|
||
|
||
if visual != "disable":
|
||
from unilabos.ros.nodes.presets.joint_republisher import JointRepublisher
|
||
|
||
# 将 ResourceTreeSet 转换为 list 用于 visual 组件
|
||
resources_list = (
|
||
[node.res_content.model_dump(by_alias=True) for node in resources_config.all_nodes]
|
||
if resources_config
|
||
else []
|
||
)
|
||
resource_mesh_manager = ResourceMeshManager(
|
||
resources_mesh_config,
|
||
resources_list,
|
||
resource_tracker=host_node.resource_tracker,
|
||
device_id="resource_mesh_manager",
|
||
device_uuid=str(uuid.uuid4()),
|
||
)
|
||
joint_republisher = JointRepublisher("joint_republisher", host_node.resource_tracker)
|
||
# lh_joint_pub = LiquidHandlerJointPublisher(
|
||
# resources_config=resources_list, resource_tracker=host_node.resource_tracker
|
||
# )
|
||
executor.add_node(resource_mesh_manager)
|
||
executor.add_node(joint_republisher)
|
||
# executor.add_node(lh_joint_pub)
|
||
|
||
thread = threading.Thread(target=executor.spin, daemon=True, name="host_executor_thread")
|
||
thread.start()
|
||
|
||
while True:
|
||
time.sleep(1)
|
||
|
||
|
||
def slave(
|
||
devices_config: ResourceTreeSet,
|
||
resources_config: ResourceTreeSet,
|
||
resources_edge_config: list = [],
|
||
graph: Optional[Dict[str, Any]] = None,
|
||
controllers_config: Dict[str, Any] = {},
|
||
bridges: List[Any] = [],
|
||
visual: str = "disable",
|
||
resources_mesh_config: dict = {},
|
||
rclpy_init_args: List[str] = ["--log-level", "debug"],
|
||
) -> None:
|
||
"""从节点函数"""
|
||
# 1. 初始化 ROS2
|
||
if not rclpy.ok():
|
||
rclpy.init(args=rclpy_init_args)
|
||
executor = rclpy.__executor
|
||
if not executor:
|
||
executor = rclpy.__executor = MultiThreadedExecutor()
|
||
|
||
# 1.5 启动 executor 线程
|
||
thread = threading.Thread(target=executor.spin, daemon=True, name="slave_executor_thread")
|
||
thread.start()
|
||
|
||
# 2. 创建 Slave Machine Node
|
||
n = Node(f"slaveMachine_{BasicConfig.machine_name}", parameter_overrides=[])
|
||
executor.add_node(n)
|
||
|
||
# 3. 向 Host 报送节点信息和物料,获取 UUID 映射
|
||
uuid_mapping = {}
|
||
if not BasicConfig.slave_no_host:
|
||
# 3.1 报送节点信息
|
||
sclient = n.create_client(SerialCommand, "/node_info_update")
|
||
sclient.wait_for_service()
|
||
|
||
registry_config = {}
|
||
devices_to_register, resources_to_register = register_devices_and_resources(lab_registry, True)
|
||
registry_config.update(devices_to_register)
|
||
registry_config.update(resources_to_register)
|
||
request = SerialCommand.Request()
|
||
request.command = json.dumps(
|
||
{
|
||
"machine_name": BasicConfig.machine_name,
|
||
"type": "slave",
|
||
"devices_config": devices_config.dump(),
|
||
"registry_config": registry_config,
|
||
},
|
||
ensure_ascii=False,
|
||
cls=TypeEncoder,
|
||
)
|
||
sclient.call_async(request).result()
|
||
logger.info(f"Slave node info updated.")
|
||
|
||
# 3.2 报送物料树,获取 UUID 映射
|
||
if resources_config:
|
||
rclient = n.create_client(SerialCommand, "/c2s_update_resource_tree")
|
||
rclient.wait_for_service()
|
||
|
||
request = SerialCommand.Request()
|
||
request.command = json.dumps(
|
||
{
|
||
"data": {
|
||
"data": resources_config.dump(),
|
||
"mount_uuid": "",
|
||
"first_add": True,
|
||
},
|
||
"action": "add",
|
||
},
|
||
ensure_ascii=False,
|
||
)
|
||
tree_response: SerialCommand_Response = rclient.call(request)
|
||
uuid_mapping = json.loads(tree_response.response)
|
||
logger.info(f"Slave resource tree added. UUID mapping: {len(uuid_mapping)} nodes")
|
||
|
||
# 3.3 使用 UUID 映射更新 resources_config 的 UUID(参考 client.py 逻辑)
|
||
old_uuids = {node.res_content.uuid: node for node in resources_config.all_nodes}
|
||
for old_uuid, node in old_uuids.items():
|
||
if old_uuid in uuid_mapping:
|
||
new_uuid = uuid_mapping[old_uuid]
|
||
node.res_content.uuid = new_uuid
|
||
# 更新所有子节点的 parent_uuid
|
||
for child in node.children:
|
||
child.res_content.parent_uuid = new_uuid
|
||
else:
|
||
logger.warning(f"资源UUID未更新: {old_uuid}")
|
||
else:
|
||
logger.info("No resources to add.")
|
||
|
||
# 4. 初始化所有设备实例(此时 resources_config 的 UUID 已更新)
|
||
devices_instances = {}
|
||
for device_config in devices_config.root_nodes:
|
||
device_id = device_config.res_content.id
|
||
if device_config.res_content.type == "device":
|
||
d = initialize_device_from_dict(device_id, device_config)
|
||
if d is not None:
|
||
devices_instances[device_id] = d
|
||
logger.info(f"Device {device_id} initialized.")
|
||
else:
|
||
logger.warning(f"Device {device_id} initialization failed.")
|
||
|
||
# 5. 如果启用可视化,创建可视化相关节点
|
||
if visual != "disable":
|
||
from unilabos.ros.nodes.presets.joint_republisher import JointRepublisher
|
||
|
||
# 将 ResourceTreeSet 转换为 list 用于 visual 组件
|
||
resources_list = (
|
||
[node.res_content.model_dump(by_alias=True) for node in resources_config.all_nodes]
|
||
if resources_config
|
||
else []
|
||
)
|
||
resource_mesh_manager = ResourceMeshManager(
|
||
resources_mesh_config,
|
||
resources_list,
|
||
resource_tracker=DeviceNodeResourceTracker(),
|
||
device_id="resource_mesh_manager",
|
||
)
|
||
joint_republisher = JointRepublisher("joint_republisher", DeviceNodeResourceTracker())
|
||
lh_joint_pub = LiquidHandlerJointPublisher(
|
||
resources_config=resources_list, resource_tracker=DeviceNodeResourceTracker()
|
||
)
|
||
executor.add_node(resource_mesh_manager)
|
||
executor.add_node(joint_republisher)
|
||
executor.add_node(lh_joint_pub)
|
||
|
||
# 7. 保持运行
|
||
while True:
|
||
time.sleep(1)
|
||
|
||
|
||
if __name__ == "__main__":
|
||
main()
|