Workstation yb merge dev ready 260113

unilabos/app/ws_client.py

@@ -902,28 +902,28 @@ def _notify_resource_tree(dev_id, act, item_list):
     async def _handle_request_restart(self, data: Dict[str, Any]):
         """
         处理重启请求
-        
+
         当LabGo发送request_restart时，执行清理并触发重启
         """
         reason = data.get("reason", "unknown")
         delay = data.get("delay", 2)  # 默认延迟2秒
         logger.info(f"[MessageProcessor] Received restart request, reason: {reason}, delay: {delay}s")
-        
+
         # 发送确认消息
         if self.websocket_client:
             await self.websocket_client.send_message({
                 "action": "restart_acknowledged",
                 "data": {"reason": reason, "delay": delay}
             })
-        
+
         # 设置全局重启标志
         import unilabos.app.main as main_module
         main_module._restart_requested = True
         main_module._restart_reason = reason
-        
+
         # 延迟后执行清理
         await asyncio.sleep(delay)
-        
+
         # 在新线程中执行清理，避免阻塞当前事件循环
         def do_cleanup():
             import time
@@ -937,7 +937,7 @@ def do_cleanup():
                     logger.error("[MessageProcessor] Cleanup failed")
             except Exception as e:
                 logger.error(f"[MessageProcessor] Error during cleanup: {e}")
-        
+
         cleanup_thread = threading.Thread(target=do_cleanup, name="RestartCleanupThread", daemon=True)
         cleanup_thread.start()
         logger.info(f"[MessageProcessor] Restart cleanup scheduled")
@@ -1375,15 +1375,15 @@ def publish_host_ready(self) -> None:
         # 收集设备信息
         devices = []
         machine_name = BasicConfig.machine_name
-        
+
         try:
             host_node = HostNode.get_instance(0)
             if host_node:
                 # 获取设备信息
                 for device_id, namespace in host_node.devices_names.items():
                     device_key = f"{namespace}/{device_id}" if namespace.startswith("/") else f"/{namespace}/{device_id}"
                     is_online = device_key in host_node._online_devices
-                    
+
                     # 获取设备的动作信息
                     actions = {}
                     for action_id, client in host_node._action_clients.items():
@@ -1394,7 +1394,7 @@ def publish_host_ready(self) -> None:
                                 "action_path": action_id,
                                 "action_type": str(type(client).__name__),
                             }
-                    
+
                     devices.append({
                         "device_id": device_id,
                         "namespace": namespace,
@@ -1403,7 +1403,7 @@ def publish_host_ready(self) -> None:
                         "machine_name": host_node.device_machine_names.get(device_id, machine_name),
                         "actions": actions,
                     })
-                
+
                 logger.info(f"[WebSocketClient] Collected {len(devices)} devices for host_ready")
         except Exception as e:
             logger.warning(f"[WebSocketClient] Error collecting device info: {e}")