新增注册表补全功能，修复Protocol执行失败

unilabos/app/controler.py

@@ -25,12 +25,13 @@ 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)
+    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)
     return JobData(jobId=req.job_id)

unilabos/app/register.py

@@ -13,17 +13,17 @@ def register_devices_and_resources(mqtt_client, lab_registry):
     """
     logger.info("[UniLab Register] 开始注册设备和资源...")
 
-    # 注册设备信息
-    for device_info in lab_registry.obtain_registry_device_info():
-        mqtt_client.publish_registry(device_info["id"], device_info, False)
-        logger.debug(f"[UniLab Register] 注册设备: {device_info['id']}")
-
-    # 注册资源信息
-    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']}")
-
-    time.sleep(10)
+    # # 注册设备信息
+    # for device_info in lab_registry.obtain_registry_device_info():
+    #     mqtt_client.publish_registry(device_info["id"], device_info, False)
+    #     logger.debug(f"[UniLab Register] 注册设备: {device_info['id']}")
+    #
+    # # 注册资源信息
+    # 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']}")
+    #
+    # time.sleep(10)
 
     logger.info("[UniLab Register] 设备和资源注册完成.")
 
@@ -34,7 +34,7 @@ def main():
     """
     parser = argparse.ArgumentParser(description="注册设备和资源到 MQTT")
     parser.add_argument(
-        "--registry_path",
+        "--registry",
         type=str,
         default=None,
         action="append",
@@ -46,10 +46,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)
+    build_registry(args.registry, args.complete_registry)
     load_config_from_file(args.config)
 
     from unilabos.app.mq import mqtt_client

unilabos/app/web/client.py

@@ -40,6 +40,7 @@ class HTTPClient:
         Returns:
             Response: API响应对象
         """
+        return True
         response = requests.post(
             f"{self.remote_addr}/lab/resource/edge/batch_create/?database_process_later={1 if database_process_later else 0}",
             json=resources,
@@ -60,6 +61,7 @@ class HTTPClient:
         Returns:
             Response: API响应对象
         """
+        return True
         response = requests.post(
             f"{self.remote_addr}/lab/resource/?database_process_later={1 if database_process_later else 0}",
             json=resources,

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 "{}"