add rule break support #73
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Flynnon
suggested changes
May 10, 2021
risk_models/rule.py
Outdated
| @@ -26,6 +26,7 @@ def __init__(self, d): | |||
| self.id = d['id'] | |||
| self.uuid = d['uuid'] | |||
| self.name = d['title'] | |||
| self.allow_break = d['allow_break'], | |||
There was a problem hiding this comment.
另外是，需要兼容一下旧配置，此处应该给个默认值False
server/query.py
Outdated
| control, weight = calculate_rule(rule_id, req_body, rules=rules, ac=ac) | ||
| result = {'control': control, 'weight': weight} | ||
| control, weight, custom = calculate_rule(rule_id, req_body, rules=rules, ac=ac) | ||
| result = {'control': control, 'weight': weight, 'custom': custom} |
There was a problem hiding this comment.
这个custom在目前的设计中不应该返回给业务方，这个主要是后续客服人员看的
www/rule/forms.py
Outdated
| class RulesForm(BaseForm): | ||
| title = forms.CharField(label=_(u"规则名称")) | ||
| describe = forms.CharField(required=False, label=_(u"规则描述"), | ||
| widget=forms.Textarea) | ||
| status = forms.ChoiceField(label=_(u"状态"), choices=STATUS_CHOICES) | ||
| #allow_break = PrettyCheckboxField(label=_(u"允许策略短路"), widget=PrettyCheckboxWidget()) |
There was a problem hiding this comment.
这个 PrettyCheckboxField 如果没有用到的话，连同上面的一起全部删掉吧，减少无效代码量
Flynnon
reviewed
May 11, 2021
risk_models/rule.py
Outdated
| @@ -26,7 +26,7 @@ def __init__(self, d): | |||
| self.id = d['id'] | |||
| self.uuid = d['uuid'] | |||
| self.name = d['title'] | |||
| self.allow_break = d['allow_break'], | |||
| self.allow_break = d['allow_break'] if 'allow_break' in d else False | |||
There was a problem hiding this comment.
这个直接 d.get('auto_break', False) 就可以
Flynnon
reviewed
May 11, 2021
www/rule/views.py
Outdated
| @@ -265,6 +265,7 @@ def get_rule(self): | |||
| x[2] for x in rule['strategy_list'] if len(x) == 3) | |||
| rule['strategy_list_str'] = json.dumps(rule['strategy_list']) | |||
| data['rule_list'] = rule_list | |||
| data['allow_break'] = d['allow_break'] if 'allow_break' in d else False | |||
There was a problem hiding this comment.
这种也是，使用 d.get('auto_break', False) 更简略一些, 保险起见也可以d.get('auto_break') or False
added 2 commits
May 11, 2021 20:17
…hit strategy after a break logic
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Increase the strategy short-circuit switch, allowing the subsequent strategy execution to be interrupted when the strategy hits