Skip to content

fix: group contains rule and prompt #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shijinpjlab merged 1 commit into from
Jan 8, 2025
Merged

fix: group contains rule and prompt #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions dingo/model/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,11 @@ def apply_config(cls, custom_config: Optional[str|dict], eval_group: str = ''):
if v is not None:
setattr(config_default, k, v)
setattr(cls_llm, 'dynamic_config', config_default)
if GlobalConfig.config:
if GlobalConfig.config.rule_list or GlobalConfig.config.prompt_list:
if eval_group in Model.rule_groups or eval_group in Model.prompt_groups:
raise KeyError(f'eval group: [{eval_group}] already in Model, please input other name.')
if GlobalConfig.config and GlobalConfig.config.rule_list:
if eval_group in Model.rule_groups or eval_group in Model.prompt_groups:
raise KeyError(f'eval model: [{eval_group}] already in Model, please input other name.')

model: List[BaseRule] = []
for rule in GlobalConfig.config.rule_list:
assert isinstance(rule, str)
Expand All @@ -275,9 +276,6 @@ def apply_config(cls, custom_config: Optional[str|dict], eval_group: str = ''):
model.append(Model.rule_name_map[rule])
Model.rule_groups[eval_group] = model
if GlobalConfig.config and GlobalConfig.config.prompt_list:
if eval_group in Model.rule_groups or eval_group in Model.prompt_groups:
raise KeyError(f'eval model: [{eval_group}] already in Model, please input other name.')

model: List[BasePrompt] = []
for prompt in GlobalConfig.config.prompt_list:
assert isinstance(prompt, str)
Expand Down
Loading