|
@@ -32,80 +32,39 @@ class DuelConfig(ConfigBase):
|
|
|
class Duel(ConfigBase):
|
|
class Duel(ConfigBase):
|
|
|
scheduler: Scheduler = Field(default_factory=Scheduler)
|
|
scheduler: Scheduler = Field(default_factory=Scheduler)
|
|
|
duel_config: DuelConfig = Field(default_factory=DuelConfig)
|
|
duel_config: DuelConfig = Field(default_factory=DuelConfig)
|
|
|
- test_list: list[DuelConfig]
|
|
|
|
|
|
|
+ # test_list: list[DuelConfig]
|
|
|
|
|
+ #
|
|
|
|
|
+ # @model_validator(mode='before')
|
|
|
|
|
+ # @classmethod
|
|
|
|
|
+ # def check_list(cls, data: dict) -> Any:
|
|
|
|
|
+ # if 'test_list' not in data:
|
|
|
|
|
+ # data['test_list'] = []
|
|
|
|
|
+ # for key, value in data.items():
|
|
|
|
|
+ # if isinstance(value, list):
|
|
|
|
|
+ # continue
|
|
|
|
|
+ # if 'test_list' not in key:
|
|
|
|
|
+ # continue
|
|
|
|
|
+ # try:
|
|
|
|
|
+ # DuelConfig(**value)
|
|
|
|
|
+ # data['test_list'].append(value)
|
|
|
|
|
+ # except ValidationError as e:
|
|
|
|
|
+ # pass
|
|
|
|
|
+ # # 补全list
|
|
|
|
|
+ # while len(data['test_list']) < data['scheduler']['priority']:
|
|
|
|
|
+ # data['test_list'].append(DuelConfig())
|
|
|
|
|
+ # return data
|
|
|
|
|
+ #
|
|
|
|
|
+ # @model_serializer()
|
|
|
|
|
+ # def serializer_model(self, value: Any) -> Dict[str, Any]:
|
|
|
|
|
+ # properties = self.__dict__
|
|
|
|
|
+ # data = {}
|
|
|
|
|
+ # for key,value in properties.items():
|
|
|
|
|
+ # if isinstance(value, list):
|
|
|
|
|
+ # for index, v in enumerate(value):
|
|
|
|
|
+ # data[f'{key}_{index+1}'] = v.model_dump()
|
|
|
|
|
+ # else:
|
|
|
|
|
+ # data[key] = value.model_dump()
|
|
|
|
|
+ # return data
|
|
|
|
|
|
|
|
- @model_validator(mode='before')
|
|
|
|
|
- @classmethod
|
|
|
|
|
- def check_list(cls, data: dict) -> Any:
|
|
|
|
|
- if 'test_list' not in data:
|
|
|
|
|
- data['test_list'] = []
|
|
|
|
|
- for key, value in data.items():
|
|
|
|
|
- if isinstance(value, list):
|
|
|
|
|
- continue
|
|
|
|
|
- if 'test_list' not in key:
|
|
|
|
|
- continue
|
|
|
|
|
- try:
|
|
|
|
|
- DuelConfig(**value)
|
|
|
|
|
- data['test_list'].append(value)
|
|
|
|
|
- except ValidationError as e:
|
|
|
|
|
- pass
|
|
|
|
|
- # 补全list
|
|
|
|
|
- while len(data['test_list']) < data['scheduler']['priority']:
|
|
|
|
|
- data['test_list'].append(DuelConfig())
|
|
|
|
|
- return data
|
|
|
|
|
|
|
|
|
|
- @model_serializer()
|
|
|
|
|
- def serializer_model(self, value: Any) -> Dict[str, Any]:
|
|
|
|
|
- properties = self.__dict__
|
|
|
|
|
- data = {}
|
|
|
|
|
- for key,value in properties.items():
|
|
|
|
|
- if isinstance(value, list):
|
|
|
|
|
- for index, v in enumerate(value):
|
|
|
|
|
- data[f'{key}_{index+1}'] = v.model_dump()
|
|
|
|
|
- else:
|
|
|
|
|
- data[key] = value.model_dump()
|
|
|
|
|
- return data
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-if __name__ == "__main__":
|
|
|
|
|
- test_dict = {
|
|
|
|
|
- 'scheduler': {'enable': False,
|
|
|
|
|
- 'next_run': '2023-01-01T00:00:00',
|
|
|
|
|
- 'priority': 5,
|
|
|
|
|
- 'success_interval': '01 00:00:00',
|
|
|
|
|
- 'failure_interval': '01 00:00:00',
|
|
|
|
|
- 'server_update': '09:00:00',
|
|
|
|
|
- 'float_time': '00:00:00'
|
|
|
|
|
- },
|
|
|
|
|
- 'duel_config': {'switch_all_soul': False,
|
|
|
|
|
- 'limit_time': '00:30:00',
|
|
|
|
|
- 'target_score': 2000,
|
|
|
|
|
- 'honor_full_exit': False,
|
|
|
|
|
- 'green_enable': False,
|
|
|
|
|
- 'green_mark': 'green_left1'},
|
|
|
|
|
- # 'test_list': [
|
|
|
|
|
- # {'switch_all_soul': True,
|
|
|
|
|
- # 'limit_time': '00:30:00',
|
|
|
|
|
- # 'target_score': 2000,
|
|
|
|
|
- # 'honor_full_exit': False,
|
|
|
|
|
- # 'green_enable': False,
|
|
|
|
|
- # 'green_mark': 'green_left1'},
|
|
|
|
|
- # ],
|
|
|
|
|
- # 'duel_config1': {'switch_all_soul': False,
|
|
|
|
|
- # 'limit_time': '00:30:00',
|
|
|
|
|
- # 'target_score': 2000,
|
|
|
|
|
- # 'honor_full_exit': False,
|
|
|
|
|
- # 'green_enable': False,
|
|
|
|
|
- # 'green_mark': 'green_left1'},
|
|
|
|
|
- # 'duel_config2': {'switch_all_soul': False,
|
|
|
|
|
- # 'limit_time': '00:30:00',
|
|
|
|
|
- # 'target_score': 2000,
|
|
|
|
|
- # 'honor_full_exit': False,
|
|
|
|
|
- # 'green_enable': False,
|
|
|
|
|
- # 'green_mark': 'green_left1'},
|
|
|
|
|
-
|
|
|
|
|
- }
|
|
|
|
|
- import json
|
|
|
|
|
- c = Duel(**test_dict)
|
|
|
|
|
- # print(c.model_dump_json(indent=2))
|
|
|
|
|
- print(json.dumps(c.model_json_schema(), indent=2))
|
|
|