支持选择器注册表自动生成

支持转运物料

unilabos/app/main.py

@@ -6,7 +6,6 @@ import signal
 import sys
 import threading
 import time
-from copy import deepcopy
 from typing import Dict, Any, List
 
 import networkx as nx
@@ -262,8 +261,6 @@ def main():
         read_node_link_json,
         read_graphml,
         dict_from_graph,
-        dict_to_nested_dict,
-        initialize_resources,
     )
     from unilabos.app.communication import get_communication_client
     from unilabos.registry.registry import build_registry
@@ -286,9 +283,8 @@ def main():
     graph: nx.Graph
     resource_tree_set: ResourceTreeSet
     resource_links: List[Dict[str, Any]]
-
+    request_startup_json = http_client.request_startup_json()
     if args_dict["graph"] is None:
-        request_startup_json = http_client.request_startup_json()
         if not request_startup_json:
             print_status(
                 "未指定设备加载文件路径，尝试从HTTP获取失败，请检查网络或者使用-g参数指定设备加载文件路径", "error"
@@ -339,6 +335,13 @@ def main():
             resource_edge_info.pop(edge_info - ind - 1)
             continue
 
+    # 如果从远端获取了物料信息，则与本地物料进行同步
+    if request_startup_json and "nodes" in request_startup_json:
+        print_status("开始同步远端物料到本地...", "info")
+        remote_tree_set = ResourceTreeSet.from_raw_list(request_startup_json["nodes"])
+        resource_tree_set.merge_remote_resources(remote_tree_set)
+        print_status("远端物料同步完成", "info")
+
     # 使用 ResourceTreeSet 代替 list
     args_dict["resources_config"] = resource_tree_set
     args_dict["devices_config"] = resource_tree_set

unilabos/app/web/client.py

@@ -80,7 +80,7 @@ class HTTPClient:
             info(f"首次添加资源，当前远程地址: {self.remote_addr}")
             response = requests.post(
                 f"{self.remote_addr}/edge/material",
-                json={"nodes": [x for xs in resources.dump() for x in xs], "mount_uuid": mount_uuid},
+                json={"nodes": resources.dump()[0], "mount_uuid": mount_uuid},
                 headers={"Authorization": f"Lab {self.auth}"},
                 timeout=100,
             )
@@ -102,6 +102,8 @@ class HTTPClient:
                 data = res["data"]
                 for i in data:
                     uuid_mapping[i["uuid"]] = i["cloud_uuid"]
+                    if i["cloud_uuid"] == i["uuid"]:
+                        print(i["cloud_uuid"], i["uuid"])
         else:
             logger.error(f"添加物料失败: {response.text}")
         for u, n in old_uuids.items():
@@ -298,7 +300,7 @@ class HTTPClient:
             Response: API响应对象
         """
         response = requests.get(
-            f"{self.remote_addr}/lab/resource/graph_info/",
+            f"{self.remote_addr}/edge/material/download",
             headers={"Authorization": f"Lab {self.auth}"},
             timeout=(3, 30),
         )