automas_admin/AUTO-MAS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 配置基类添加异步

Browse Source
This commit is contained in:
DLmaster361
2025-08-04 01:36:26 +08:00
parent b576440612
commit 9031ea6b3f
4 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/api.py
View File

@@ -136,7 +136,7 @@ async def add_script(script: ScriptCreateIn = Body(...)) -> ScriptCreateOut:
"""添加脚本""" """添加脚本"""
uid, config = await Config.add_script(script.type) uid, config = await Config.add_script(script.type)
return ScriptCreateOut(scriptId=str(uid), data=config.toDict()) return ScriptCreateOut(scriptId=str(uid), data=await config.toDict())
@app.post("/api/get/scripts", summary="查询脚本") @app.post("/api/get/scripts", summary="查询脚本")

18
app/core/config.py
View File

@@ -602,10 +602,18 @@ class AppConfig(GlobalConfig):
self.ScriptConfig = MultipleConfig([MaaConfig, GeneralConfig]) self.ScriptConfig = MultipleConfig([MaaConfig, GeneralConfig])
self.PlanConfig = MultipleConfig([MaaPlanConfig]) self.PlanConfig = MultipleConfig([MaaPlanConfig])
self.QueueConfig = MultipleConfig([QueueConfig]) self.QueueConfig = MultipleConfig([QueueConfig])
self.connect(self.config_path / "Config.json")
self.ScriptConfig.connect(self.config_path / "ScriptConfig.json") import asyncio
self.PlanConfig.connect(self.config_path / "PlanConfig.json")
self.QueueConfig.connect(self.config_path / "QueueConfig.json") loop = asyncio.get_event_loop()
loop.run_until_complete(self.init_config())
async def init_config(self) -> None:
"""初始化配置管理"""
await self.connect(self.config_path / "Config.json")
await self.ScriptConfig.connect(self.config_path / "ScriptConfig.json")
await self.PlanConfig.connect(self.config_path / "PlanConfig.json")
await self.QueueConfig.connect(self.config_path / "QueueConfig.json")
# self.check_data() # self.check_data()
logger.info("程序初始化完成", module="配置管理") logger.info("程序初始化完成", module="配置管理")
@@ -648,7 +656,7 @@ class AppConfig(GlobalConfig):
class_book = {"MAA": MaaConfig, "General": GeneralConfig} class_book = {"MAA": MaaConfig, "General": GeneralConfig}
return self.ScriptConfig.add(class_book[script]) return await self.ScriptConfig.add(class_book[script])
# def check_data(self) -> None: # def check_data(self) -> None:
# """检查用户数据文件并处理数据文件版本更新""" # """检查用户数据文件并处理数据文件版本更新"""

54
app/models/ConfigBase.py
View File

@@ -192,7 +192,7 @@ class ConfigBase:
self.file: None | Path = None self.file: None | Path = None
def connect(self, path: Path): async def connect(self, path: Path):
""" """
将配置文件连接到指定配置文件 将配置文件连接到指定配置文件
@@ -219,9 +219,9 @@ class ConfigBase:
except json.JSONDecodeError: except json.JSONDecodeError:
data = {} data = {}
self.load(data) await self.load(data)
def load(self, data: dict): async def load(self, data: dict):
""" """
从字典加载配置数据 从字典加载配置数据
@@ -240,7 +240,7 @@ class ConfigBase:
if hasattr(self, k): if hasattr(self, k):
sub_config = getattr(self, k) sub_config = getattr(self, k)
if isinstance(sub_config, MultipleConfig): if isinstance(sub_config, MultipleConfig):
sub_config.load(v) await sub_config.load(v)
data.pop("SubConfigsInfo") data.pop("SubConfigsInfo")
for group, info in data.items(): for group, info in data.items():
@@ -251,9 +251,9 @@ class ConfigBase:
configItem.setValue(value) configItem.setValue(value)
if self.file: if self.file:
self.save() await self.save()
def toDict(self) -> Dict[str, Any]: async def toDict(self) -> Dict[str, Any]:
"""将配置项转换为字典""" """将配置项转换为字典"""
data = {} data = {}
@@ -271,11 +271,11 @@ class ConfigBase:
if not data.get("SubConfigsInfo"): if not data.get("SubConfigsInfo"):
data["SubConfigsInfo"] = {} data["SubConfigsInfo"] = {}
data["SubConfigsInfo"][name] = item.toDict() data["SubConfigsInfo"][name] = await item.toDict()
return data return data
def get(self, group: str, name: str) -> Any: async def get(self, group: str, name: str) -> Any:
"""获取配置项的值""" """获取配置项的值"""
if not hasattr(self, f"{group}_{name}"): if not hasattr(self, f"{group}_{name}"):
@@ -289,7 +289,7 @@ class ConfigBase:
f"Config item '{group}_{name}' is not a ConfigItem instance." f"Config item '{group}_{name}' is not a ConfigItem instance."
) )
def set(self, group: str, name: str, value: Any): async def set(self, group: str, name: str, value: Any):
""" """
设置配置项的值 设置配置项的值
@@ -310,13 +310,13 @@ class ConfigBase:
if isinstance(configItem, ConfigItem): if isinstance(configItem, ConfigItem):
configItem.setValue(value) configItem.setValue(value)
if self.file: if self.file:
self.save() await self.save()
else: else:
raise TypeError( raise TypeError(
f"Config item '{group}_{name}' is not a ConfigItem instance." f"Config item '{group}_{name}' is not a ConfigItem instance."
) )
def save(self): async def save(self):
"""保存配置""" """保存配置"""
if not self.file: if not self.file:
@@ -326,7 +326,7 @@ class ConfigBase:
self.file.parent.mkdir(parents=True, exist_ok=True) self.file.parent.mkdir(parents=True, exist_ok=True)
with self.file.open("w", encoding="utf-8") as f: with self.file.open("w", encoding="utf-8") as f:
json.dump(self.toDict(), f, ensure_ascii=False, indent=4) json.dump(await self.toDict(), f, ensure_ascii=False, indent=4)
class MultipleConfig: class MultipleConfig:
@@ -380,7 +380,7 @@ class MultipleConfig:
"""用户友好的字符串表示""" """用户友好的字符串表示"""
return f"MultipleConfig with {len(self.data)} items" return f"MultipleConfig with {len(self.data)} items"
def connect(self, path: Path): async def connect(self, path: Path):
""" """
将配置文件连接到指定配置文件 将配置文件连接到指定配置文件
@@ -407,9 +407,9 @@ class MultipleConfig:
except json.JSONDecodeError: except json.JSONDecodeError:
data = {} data = {}
self.load(data) await self.load(data)
def load(self, data: dict): async def load(self, data: dict):
""" """
从字典加载配置数据 从字典加载配置数据
@@ -443,7 +443,7 @@ class MultipleConfig:
if class_type.__name__ == type_name: if class_type.__name__ == type_name:
self.order.append(uuid.UUID(instance["uid"])) self.order.append(uuid.UUID(instance["uid"]))
self.data[self.order[-1]] = class_type() self.data[self.order[-1]] = class_type()
self.data[self.order[-1]].load(data[instance["uid"]]) await self.data[self.order[-1]].load(data[instance["uid"]])
break break
else: else:
@@ -451,9 +451,9 @@ class MultipleConfig:
raise ValueError(f"Unknown sub config type: {type_name}") raise ValueError(f"Unknown sub config type: {type_name}")
if self.file: if self.file:
self.save() await self.save()
def toDict(self): async def toDict(self):
""" """
将配置项转换为字典 将配置项转换为字典
@@ -467,10 +467,10 @@ class MultipleConfig:
] ]
} }
for uid, config in self.items(): for uid, config in self.items():
data[str(uid)] = config.toDict() data[str(uid)] = await config.toDict()
return data return data
def save(self): async def save(self):
"""保存配置""" """保存配置"""
if not self.file: if not self.file:
@@ -480,9 +480,9 @@ class MultipleConfig:
self.file.parent.mkdir(parents=True, exist_ok=True) self.file.parent.mkdir(parents=True, exist_ok=True)
with self.file.open("w", encoding="utf-8") as f: with self.file.open("w", encoding="utf-8") as f:
json.dump(self.toDict(), f, ensure_ascii=False, indent=4) json.dump(await self.toDict(), f, ensure_ascii=False, indent=4)
def add(self, config_type: type) -> tuple[uuid.UUID, ConfigBase]: async def add(self, config_type: type) -> tuple[uuid.UUID, ConfigBase]:
""" """
添加一个新的配置项 添加一个新的配置项
@@ -505,11 +505,11 @@ class MultipleConfig:
self.data[uid] = config_type() self.data[uid] = config_type()
if self.file: if self.file:
self.save() await self.save()
return uid, self.data[uid] return uid, self.data[uid]
def remove(self, uid: uuid.UUID): async def remove(self, uid: uuid.UUID):
""" """
移除配置项 移除配置项
@@ -526,9 +526,9 @@ class MultipleConfig:
self.order.remove(uid) self.order.remove(uid)
if self.file: if self.file:
self.save() await self.save()
def setOrder(self, order: List[uuid.UUID]): async def setOrder(self, order: List[uuid.UUID]):
""" """
设置配置项的顺序 设置配置项的顺序
@@ -544,7 +544,7 @@ class MultipleConfig:
self.order = order self.order = order
if self.file: if self.file:
self.save() await self.save()
def keys(self): def keys(self):
"""返回配置项的所有唯一标识符""" """返回配置项的所有唯一标识符"""

2
main.py
View File

@@ -34,7 +34,7 @@ def is_admin() -> bool:
return False return False
@logger.catch # @logger.catch
def main(): def main():
if is_admin(): if is_admin():