Merge remote-tracking branch 'upstream/dev' into device_visualization

unilabos/app/controler.py

@@ -1,8 +1,10 @@
 
 import json
+import traceback
 import uuid
 from unilabos.app.model import JobAddReq, JobData
 from unilabos.ros.nodes.presets.host_node import HostNode
+from unilabos.utils.type_check import serialize_result_info
 
 
 def get_resources() -> tuple:
@@ -25,12 +27,19 @@ def job_add(req: JobAddReq) -> JobData:
     if req.job_id is None:
         req.job_id = str(uuid.uuid4())
     action_name = req.data["action"]
-    action_kwargs = req.data["action_kwargs"]
-    req.data['action'] = action_name
-    if action_name == "execute_command_from_outer":
-        action_kwargs = {"command": json.dumps(action_kwargs)}
-    elif "command" in action_kwargs:
-        action_kwargs = action_kwargs["command"]
+    action_type = req.data.get("action_type", "LocalUnknown")
+    action_args = req.data.get("action_kwargs", None)  # 兼容老版本，后续删除
+    if action_args is None:
+        action_args = req.data.get("action_args")
+    else:
+        if "command" in action_args:
+            action_args = action_args["command"]
     # print(f"job_add:{req.device_id} {action_name} {action_kwargs}")
-    HostNode.get_instance().send_goal(req.device_id, action_name=action_name, action_kwargs=action_kwargs, goal_uuid=req.job_id, server_info=req.server_info)
+    try:
+        HostNode.get_instance().send_goal(req.device_id, action_type=action_type, action_name=action_name, action_kwargs=action_args, goal_uuid=req.job_id, server_info=req.server_info)
+    except Exception as e:
+        for bridge in HostNode.get_instance().bridges:
+            traceback.print_exc()
+            if hasattr(bridge, "publish_job_status"):
+                bridge.publish_job_status({}, req.job_id, "failed", serialize_result_info(traceback.format_exc(), False, {}))
     return JobData(jobId=req.job_id)

unilabos/app/mq.py

@@ -56,6 +56,10 @@ class MQTTClient:
                     payload_json["data"] = {}
                 if "action" in payload_json:
                     payload_json["data"]["action"] = payload_json.pop("action")
+                if "action_type" in payload_json:
+                    payload_json["data"]["action_type"] = payload_json.pop("action_type")
+                if "action_args" in payload_json:
+                    payload_json["data"]["action_args"] = payload_json.pop("action_args")
                 if "action_kwargs" in payload_json:
                     payload_json["data"]["action_kwargs"] = payload_json.pop("action_kwargs")
                 job_req = JobAddReq.model_validate(payload_json)

unilabos/app/register.py

@@ -18,10 +18,22 @@ def register_devices_and_resources(mqtt_client, lab_registry):
         mqtt_client.publish_registry(device_info["id"], device_info, False)
         logger.debug(f"[UniLab Register] 注册设备: {device_info['id']}")
 
-    # 注册资源信息
+    # 注册资源信息 - 使用HTTP方式
+    from unilabos.app.web.client import http_client
+
+    resources_to_register = {}
     for resource_info in lab_registry.obtain_registry_resource_info():
-        mqtt_client.publish_registry(resource_info["id"], resource_info, False)
-        logger.debug(f"[UniLab Register] 注册资源: {resource_info['id']}")
+        resources_to_register[resource_info["id"]] = resource_info
+        logger.debug(f"[UniLab Register] 准备注册资源: {resource_info['id']}")
+
+    if resources_to_register:
+        start_time = time.time()
+        response = http_client.resource_registry(resources_to_register)
+        cost_time = time.time() - start_time
+        if response.status_code in [200, 201]:
+            logger.info(f"[UniLab Register] 成功通过HTTP注册 {len(resources_to_register)} 个资源 {cost_time}ms")
+        else:
+            logger.error(f"[UniLab Register] HTTP注册资源失败: {response.status_code}, {response.text} {cost_time}ms")
 
     time.sleep(10)
 
@@ -34,7 +46,7 @@ def main():
     """
     parser = argparse.ArgumentParser(description="注册设备和资源到 MQTT")
     parser.add_argument(
-        "--registry_path",
+        "--registry",
         type=str,
         default=None,
         action="append",
@@ -46,12 +58,16 @@ def main():
         default=None,
         help="配置文件路径，支持.py格式的Python配置文件",
     )
+    parser.add_argument(
+        "--complete_registry",
+        action="store_true",
+        default=False,
+        help="是否补全注册表",
+    )
     args = parser.parse_args()
-
-    # 构建注册表
-    build_registry(args.registry_path)
     load_config_from_file(args.config)
-
+    # 构建注册表
+    build_registry(args.registry, args.complete_registry)
     from unilabos.app.mq import mqtt_client
 
     # 连接mqtt
@@ -64,4 +80,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()

unilabos/app/web/client.py

@@ -40,8 +40,9 @@ class HTTPClient:
         Returns:
             Response: API响应对象
         """
+        database_param = 1 if database_process_later else 0
         response = requests.post(
-            f"{self.remote_addr}/lab/resource/edge/batch_create/?database_process_later={1 if database_process_later else 0}",
+            f"{self.remote_addr}/lab/resource/edge/batch_create/?database_process_later={database_param}",
             json=resources,
             headers={"Authorization": f"lab {self.auth}"},
             timeout=100,
@@ -149,6 +150,26 @@ class HTTPClient:
             )
         return response
 
+    def resource_registry(self, registry_data: Dict[str, Any]) -> requests.Response:
+        """
+        注册资源到服务器
+
+        Args:
+            registry_data: 注册表数据，格式为 {resource_id: resource_info}
+
+        Returns:
+            Response: API响应对象
+        """
+        response = requests.post(
+            f"{self.remote_addr}/lab/registry/",
+            json=registry_data,
+            headers={"Authorization": f"lab {self.auth}"},
+            timeout=30,
+        )
+        if response.status_code not in [200, 201]:
+            logger.error(f"注册资源失败: {response.status_code}, {response.text}")
+        return response
+
 
 # 创建默认客户端实例
 http_client = HTTPClient()

unilabos/app/web/pages.py

@@ -7,6 +7,7 @@ Web页面模块
 import json
 import os
 import sys
+import traceback
 from pathlib import Path
 from typing import Dict
 
@@ -17,7 +18,7 @@ from jinja2 import Environment, FileSystemLoader
 from unilabos.config.config import BasicConfig
 from unilabos.registry.registry import lab_registry
 from unilabos.ros.msgs.message_converter import msg_converter_manager
-from unilabos.utils.log import error
+from unilabos.utils.log import error, debug
 from unilabos.utils.type_check import TypeEncoder
 from unilabos.app.web.utils.device_utils import get_registry_info
 from unilabos.app.web.utils.host_utils import get_host_node_info
@@ -123,6 +124,7 @@ def setup_web_pages(router: APIRouter) -> None:
 
             return html
         except Exception as e:
+            debug(traceback.format_exc())
             error(f"生成状态页面时出错: {str(e)}")
             raise HTTPException(status_code=500, detail=f"Error generating status page: {str(e)}")
 

unilabos/app/web/utils/action_utils.py

@@ -65,6 +65,8 @@ def get_yaml_from_goal_type(goal_type) -> str:
     Returns:
         str: 默认Goal参数的YAML格式字符串
     """
+    if isinstance(goal_type, str):
+        return "{}"
     if not goal_type:
         return "{}"