feat: add sk & ak

unilabos/app/register.py

@@ -1,44 +1,59 @@
 import argparse
+import json
 import time
 
+from unilabos.config.config import BasicConfig
 from unilabos.registry.registry import build_registry
 
 from unilabos.app.main import load_config_from_file
 from unilabos.utils.log import logger
+from unilabos.utils.type_check import TypeEncoder
 
 
 def register_devices_and_resources(mqtt_client, lab_registry):
     """
     注册设备和资源到 MQTT
     """
-    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']}")
 
     # 注册资源信息 - 使用HTTP方式
     from unilabos.app.web.client import http_client
+    logger.info("[UniLab Register] 开始注册设备和资源...")
+    if BasicConfig.auth_secret():
+        # 注册设备信息
+        devices_to_register = {}
+        for device_info in lab_registry.obtain_registry_device_info():
+            devices_to_register[device_info["id"]] = json.loads(json.dumps(device_info, ensure_ascii=False, cls=TypeEncoder))
+            logger.debug(f"[UniLab Register] 收集设备: {device_info['id']}")
+        resources_to_register = {}
+        for resource_info in lab_registry.obtain_registry_resource_info():
+            resources_to_register[resource_info["id"]] = resource_info
+            logger.debug(f"[UniLab Register] 收集资源: {resource_info['id']}")
+        print("[UniLab Register] 设备注册", http_client.resource_registry({"resources": list(devices_to_register.values())}).text)
+        print("[UniLab Register] 资源注册", http_client.resource_registry({"resources": list(resources_to_register.values())}).text)
+    else:
+        # 注册设备信息
+        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']}")
 
-    resources_to_register = {}
-    for resource_info in lab_registry.obtain_registry_resource_info():
-        resources_to_register[resource_info["id"]] = resource_info
-        logger.debug(f"[UniLab Register] 准备注册资源: {resource_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']}")
 
-    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")
+        resources_to_register = {}
+        for resource_info in lab_registry.obtain_registry_resource_info():
+            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")
     logger.info("[UniLab Register] 设备和资源注册完成.")
 
 
@@ -60,6 +75,18 @@ def main():
         default=None,
         help="配置文件路径，支持.py格式的Python配置文件",
     )
+    parser.add_argument(
+        "--ak",
+        type=str,
+        default="",
+        help="实验室请求的ak",
+    )
+    parser.add_argument(
+        "--sk",
+        type=str,
+        default="",
+        help="实验室请求的sk",
+    )
     parser.add_argument(
         "--complete_registry",
         action="store_true",
@@ -68,6 +95,8 @@ def main():
     )
     args = parser.parse_args()
     load_config_from_file(args.config)
+    BasicConfig.ak = args.ak
+    BasicConfig.sk = args.sk
     # 构建注册表
     build_registry(args.registry, args.complete_registry, True)
     from unilabos.app.mq import mqtt_client