Skip to content

Commit 10ed840

Browse files
authored
fix: group contains rule and prompt
2 parents fde6029 + 97e512b commit 10ed840

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

dingo/model/model.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,11 @@ def apply_config(cls, custom_config: Optional[str|dict], eval_group: str = ''):
263263
if v is not None:
264264
setattr(config_default, k, v)
265265
setattr(cls_llm, 'dynamic_config', config_default)
266+
if GlobalConfig.config:
267+
if GlobalConfig.config.rule_list or GlobalConfig.config.prompt_list:
268+
if eval_group in Model.rule_groups or eval_group in Model.prompt_groups:
269+
raise KeyError(f'eval group: [{eval_group}] already in Model, please input other name.')
266270
if GlobalConfig.config and GlobalConfig.config.rule_list:
267-
if eval_group in Model.rule_groups or eval_group in Model.prompt_groups:
268-
raise KeyError(f'eval model: [{eval_group}] already in Model, please input other name.')
269-
270271
model: List[BaseRule] = []
271272
for rule in GlobalConfig.config.rule_list:
272273
assert isinstance(rule, str)
@@ -275,9 +276,6 @@ def apply_config(cls, custom_config: Optional[str|dict], eval_group: str = ''):
275276
model.append(Model.rule_name_map[rule])
276277
Model.rule_groups[eval_group] = model
277278
if GlobalConfig.config and GlobalConfig.config.prompt_list:
278-
if eval_group in Model.rule_groups or eval_group in Model.prompt_groups:
279-
raise KeyError(f'eval model: [{eval_group}] already in Model, please input other name.')
280-
281279
model: List[BasePrompt] = []
282280
for prompt in GlobalConfig.config.prompt_list:
283281
assert isinstance(prompt, str)

0 commit comments

Comments
 (0)