|
@@ -136,10 +136,6 @@ class ConfigModel(ConfigBase):
|
|
|
dokan: Dokan = Field(default_factory=Dokan)
|
|
dokan: Dokan = Field(default_factory=Dokan)
|
|
|
abyss_shadows: AbyssShadows = Field(default_factory=AbyssShadows)
|
|
abyss_shadows: AbyssShadows = Field(default_factory=AbyssShadows)
|
|
|
|
|
|
|
|
- # @validator('script')
|
|
|
|
|
- # def script_validator(cls, v):
|
|
|
|
|
- # if v is None:
|
|
|
|
|
- # return Script()
|
|
|
|
|
|
|
|
|
|
def __init__(self, config_name: str=None) -> None:
|
|
def __init__(self, config_name: str=None) -> None:
|
|
|
"""
|
|
"""
|
|
@@ -227,7 +223,7 @@ class ConfigModel(ConfigBase):
|
|
|
|
|
|
|
|
:return:
|
|
:return:
|
|
|
"""
|
|
"""
|
|
|
- self.write_json(self.config_name, self.dict())
|
|
|
|
|
|
|
+ self.write_json(self.config_name, self.model_dump())
|
|
|
|
|
|
|
|
@staticmethod
|
|
@staticmethod
|
|
|
def type(key: str) -> str:
|
|
def type(key: str) -> str:
|
|
@@ -245,16 +241,6 @@ class ConfigModel(ConfigBase):
|
|
|
classname = re.findall(r"'([^']*)'", field_type)[0]
|
|
classname = re.findall(r"'([^']*)'", field_type)[0]
|
|
|
return classname
|
|
return classname
|
|
|
|
|
|
|
|
- # @root_validator
|
|
|
|
|
- # def on_on_property_change(cls, values):
|
|
|
|
|
- # """
|
|
|
|
|
- # 当属性改变时保存
|
|
|
|
|
- # :param values:
|
|
|
|
|
- # :return:
|
|
|
|
|
- # """
|
|
|
|
|
- # logger.info(f'property change auto save')
|
|
|
|
|
- # cls.save()
|
|
|
|
|
-
|
|
|
|
|
@staticmethod
|
|
@staticmethod
|
|
|
def deep_get(obj, keys: str, default=None):
|
|
def deep_get(obj, keys: str, default=None):
|
|
|
"""
|
|
"""
|
|
@@ -300,21 +286,20 @@ class ConfigModel(ConfigBase):
|
|
|
logger.warning(f'{task} is no inexistence')
|
|
logger.warning(f'{task} is no inexistence')
|
|
|
return {}
|
|
return {}
|
|
|
|
|
|
|
|
- def properties_groups(sch) -> dict:
|
|
|
|
|
- properties = {}
|
|
|
|
|
- for key, value in sch["properties"].items():
|
|
|
|
|
- properties[key] = re.search(r"/([^/]+)$", value['$ref']).group(1)
|
|
|
|
|
- return properties
|
|
|
|
|
-
|
|
|
|
|
def extract_groups(sch):
|
|
def extract_groups(sch):
|
|
|
# 从schema 中提取未解析的group的数据
|
|
# 从schema 中提取未解析的group的数据
|
|
|
- properties = properties_groups(sch)
|
|
|
|
|
|
|
+ # properties = properties_groups(sch)
|
|
|
|
|
+ results = {}
|
|
|
|
|
+ properties = {}
|
|
|
|
|
+ for key, value in sch["properties"].items():
|
|
|
|
|
+ if 'items' in value:
|
|
|
|
|
+ properties[key] = re.search(r"/([^/]+)$", value['items']['$ref']).group(1)
|
|
|
|
|
+ else:
|
|
|
|
|
+ properties[key] = re.search(r"/([^/]+)$", value['$ref']).group(1)
|
|
|
|
|
|
|
|
- result = {}
|
|
|
|
|
for key, value in properties.items():
|
|
for key, value in properties.items():
|
|
|
- result[key] = sch["definitions"][value]
|
|
|
|
|
-
|
|
|
|
|
- return result
|
|
|
|
|
|
|
+ results[key] = sch["$defs"][value]
|
|
|
|
|
+ return results
|
|
|
|
|
|
|
|
def merge_value(groups, jsons, definitions) -> list[dict]:
|
|
def merge_value(groups, jsons, definitions) -> list[dict]:
|
|
|
# 将 groups的参数,同导出的json一起合并, 用于前端显示
|
|
# 将 groups的参数,同导出的json一起合并, 用于前端显示
|
|
@@ -328,20 +313,26 @@ class ConfigModel(ConfigBase):
|
|
|
item["default"] = value["default"]
|
|
item["default"] = value["default"]
|
|
|
item["value"] = jsons[key] if key in jsons else value["default"]
|
|
item["value"] = jsons[key] if key in jsons else value["default"]
|
|
|
item["type"] = value["type"] if "type" in value else "enum"
|
|
item["type"] = value["type"] if "type" in value else "enum"
|
|
|
- if 'allOf' in value:
|
|
|
|
|
- # list
|
|
|
|
|
- enum_key = re.search(r"/([^/]+)$", value['allOf'][0]['$ref']).group(1)
|
|
|
|
|
|
|
+ if '$ref' in value: # list
|
|
|
|
|
+ enum_key = re.search(r"/([^/]+)$", value['$ref']).group(1)
|
|
|
item["enumEnum"] = definitions[enum_key]["enum"]
|
|
item["enumEnum"] = definitions[enum_key]["enum"]
|
|
|
- # TODO: 最大值最小值
|
|
|
|
|
|
|
+ # if 'allOf' in value:
|
|
|
|
|
+ # enum_key = re.search(r"/([^/]+)$", value['allOf'][0]['$ref']).group(1)
|
|
|
|
|
+ # item["enumEnum"] = definitions[enum_key]["enum"]
|
|
|
result.append(item)
|
|
result.append(item)
|
|
|
return result
|
|
return result
|
|
|
|
|
|
|
|
- schema = task.schema()
|
|
|
|
|
|
|
+ schema = task.model_json_schema()
|
|
|
groups = extract_groups(schema)
|
|
groups = extract_groups(schema)
|
|
|
|
|
+ groups_value = groups.copy()
|
|
|
|
|
|
|
|
result: dict[str, list] = {}
|
|
result: dict[str, list] = {}
|
|
|
- for key, value in task.dict().items():
|
|
|
|
|
- result[key] = merge_value(groups[key], value, schema["definitions"])
|
|
|
|
|
|
|
+ for key, value in task.model_dump().items():
|
|
|
|
|
+ if key not in groups:
|
|
|
|
|
+ for group_name in groups.keys():
|
|
|
|
|
+ if group_name in key:
|
|
|
|
|
+ groups_value[key] = groups[group_name]
|
|
|
|
|
+ result[key] = merge_value(groups_value[key], value, schema["$defs"])
|
|
|
|
|
|
|
|
return result
|
|
return result
|
|
|
|
|
|
|
@@ -375,9 +366,15 @@ class ConfigModel(ConfigBase):
|
|
|
|
|
|
|
|
task_object = getattr(self, task, None)
|
|
task_object = getattr(self, task, None)
|
|
|
group_object = getattr(task_object, group, None)
|
|
group_object = getattr(task_object, group, None)
|
|
|
|
|
+ if group_object is None: # deal list
|
|
|
|
|
+ matchs = re.findall(r'\d+', group)
|
|
|
|
|
+ index = int(matchs[-1]) - 1 if matchs else None
|
|
|
|
|
+ task_object_list = list(dict(task_object))
|
|
|
|
|
+ for k, v in dict(task_object).items():
|
|
|
|
|
+ if k not in group:
|
|
|
|
|
+ continue
|
|
|
|
|
+ group_object = v[index] if group_object is None else None
|
|
|
argument_object = getattr(group_object, argument, None)
|
|
argument_object = getattr(group_object, argument, None)
|
|
|
- # print(group_object)
|
|
|
|
|
- # print(argument_object)
|
|
|
|
|
|
|
|
|
|
if argument_object is None:
|
|
if argument_object is None:
|
|
|
logger.error(f'Set arg {task}.{group}.{argument}.{value} failed')
|
|
logger.error(f'Set arg {task}.{group}.{argument}.{value} failed')
|
|
@@ -428,6 +425,7 @@ class ConfigModel(ConfigBase):
|
|
|
data = self.read_json(self.config_name)
|
|
data = self.read_json(self.config_name)
|
|
|
super().__init__(**data)
|
|
super().__init__(**data)
|
|
|
|
|
|
|
|
|
|
+
|
|
|
if __name__ == "__main__":
|
|
if __name__ == "__main__":
|
|
|
try:
|
|
try:
|
|
|
c = ConfigModel("oas1")
|
|
c = ConfigModel("oas1")
|
|
@@ -435,5 +433,4 @@ if __name__ == "__main__":
|
|
|
print(e)
|
|
print(e)
|
|
|
c = ConfigModel()
|
|
c = ConfigModel()
|
|
|
|
|
|
|
|
- # c.save()
|
|
|
|
|
- print(c.script_task('Orochi'))
|
|
|
|
|
|
|
+ c.script_set_arg('Duel', 'test_list_2', 'switch_all_soul', 'false')
|