feat: 一些改进

src/heurams/kernel/repomgr/repo.py

@@ -3,6 +3,8 @@ import heurams.kernel.particles as pt
 import toml
 import json
 from .lict import Lict
+from .refvar import RefVar
+
 class Repo():
     file_mapping = {
         "orbital": "orbital.toml",
@@ -12,14 +14,22 @@ class Repo():
         "formation": "formation.toml",
     }
 
+    type_mapping = {
+        "orbital": "dict",
+        "payload": "lict",
+        "algodata": "lict",
+        "manifest": "dict",
+        "formation": "dict",
+    }
+
     default_save_list = ["algodata"]
 
     def __init__(self, orbital, payload, manifest, formation, algodata, source = None) -> None:
         self.orbital: pt.Orbital = orbital
-        self.payload: dict = payload
+        self.payload: Lict = payload
         self.manifest: dict = manifest
         self.formation: dict = formation
-        self.algodata: dict = algodata
+        self.algodata: Lict = algodata
         self.source: Path | None = source # 若存在, 指向 repo 所在 dir
         self.database = {
             "orbital": self.orbital,
@@ -29,7 +39,6 @@ class Repo():
             "algodata": self.algodata,
             "source": self.source,
         }
-        self.particles = dict()
 
     def __len__(self):
         return len(self.payload)
@@ -44,10 +53,14 @@ class Repo():
         for keyname in save_list:
             filename = self.file_mapping[keyname]
             with open(source / filename, 'w') as f:
+                try:
+                    dict_data = self.database[keyname].dicted_data
+                except:
+                    dict_data = dict(self.database[keyname])
                 if filename.endswith("toml"):
-                    toml.dump(self.database[keyname], f)
+                    toml.dump(dict_data, f)
                 elif filename.endswith("json"):
-                    json.dump(self.database[keyname], f)
+                    json.dump(dict_data, f)
                 else:
                     raise ValueError(f"不支持的文件类型: {filename}")
     
@@ -58,8 +71,8 @@ class Repo():
     def create_new_repo(cls, source = None):
         default_database = {
             "orbital": {"puzzles": {}, "schedule": {}},
-            "payload": {},
-            "algodata": {},
+            "payload": [],
+            "algodata": [],
             "manifest": {},
             "formation": {"annotation": {}, "unified": {}},
             "source": source
@@ -71,12 +84,19 @@ class Repo():
         database = {}
         for keyname, filename in cls.file_mapping.items():
             with open(source / filename, "r") as f:
+                loaded: dict
                 if filename.endswith("toml"):
-                    database[keyname] = toml.load(f)
+                    loaded = toml.load(f)
                 elif filename.endswith("json"):
-                    database[keyname] = json.load(f)
+                    loaded = json.load(f)
                 else:
                     raise ValueError(f"不支持的文件类型: {filename}")
+                if cls.type_mapping[keyname] == "lict":
+                    database[keyname] = Lict(loaded.items())
+                elif cls.type_mapping[keyname] == "dict":
+                    database[keyname] = loaded
+                else:
+                    raise ValueError(f"不支持的数据容器: {cls.type_mapping[keyname]}")
         database["source"] = source
         return Repo(**database)
     
@@ -92,16 +112,4 @@ class Repo():
             cls.create_from_repodir(source)
             return 1
         except:
-            return 0
-
-    def _load(self):
-        pass
-
-    def _load_nucleons(self):
-        self.particles["nucleons"] = Lict(initdict = self.payload)
-        self.particles["electrons"] = Lict(initdict = self.algodata)
-        
-        mtx["list"] = 
-        for ident, payload in self.payload:
-            res.append()
-
+            return 0