Skip to content

Commit d1de5b5

Browse files
ozayr-zaviarozayr-zaviar
authored
refactor: moved validated forced decision to decision service (#369)
* moved validate forced decision * headers updated * comments addressed
1 parent 3dc944c commit d1de5b5

File tree

3 files changed

+68
-68
lines changed

3 files changed

+68
-68
lines changed

‎optimizely/decision_service.py‎

Lines changed: 63 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2017-2021, Optimizely
1+
# Copyright 2017-2022, Optimizely
22
# Licensed under the Apache License, Version 2.0 (the "License");
33
# you may not use this file except in compliance with the License.
44
# You may obtain a copy of the License at
@@ -378,8 +378,8 @@ def get_variation_for_rollout(self, project_config, feature, user):
378378
# check forced decision first
379379
rule = rollout_rules[index]
380380
optimizely_decision_context = OptimizelyUserContext.OptimizelyDecisionContext(feature.key, rule.key)
381-
forced_decision_variation, reasons_received = user.find_validated_forced_decision(
382-
optimizely_decision_context)
381+
forced_decision_variation, reasons_received = self.validated_forced_decision(
382+
project_config, optimizely_decision_context, user)
383383
decide_reasons += reasons_received
384384

385385
if forced_decision_variation:
@@ -464,8 +464,8 @@ def get_variation_for_feature(self, project_config, feature, user_context, optio
464464
optimizely_decision_context = OptimizelyUserContext.OptimizelyDecisionContext(feature.key,
465465
experiment.key)
466466

467-
forced_decision_variation, reasons_received = user_context.find_validated_forced_decision(
468-
optimizely_decision_context)
467+
forced_decision_variation, reasons_received = self.validated_forced_decision(
468+
project_config, optimizely_decision_context, user_context)
469469
decide_reasons += reasons_received
470470

471471
if forced_decision_variation:
@@ -489,3 +489,61 @@ def get_variation_for_feature(self, project_config, feature, user_context, optio
489489
if rollout_variation_reasons:
490490
decide_reasons += rollout_variation_reasons
491491
return variation, decide_reasons
492+
493+
def validated_forced_decision(self, project_config, decision_context, user_context):
494+
"""
495+
Gets forced decisions based on flag key, rule key and variation.
496+
497+
Args:
498+
project_config: a project config
499+
decision context: a decision context
500+
user_context context: a user context
501+
502+
Returns:
503+
Variation of the forced decision.
504+
"""
505+
reasons = []
506+
507+
forced_decision = user_context.get_forced_decision(decision_context)
508+
509+
flag_key = decision_context.flag_key
510+
rule_key = decision_context.rule_key
511+
512+
if forced_decision:
513+
if not project_config:
514+
return None, reasons
515+
variation = project_config.get_flag_variation(flag_key, 'key', forced_decision.variation_key)
516+
if variation:
517+
if rule_key:
518+
user_has_forced_decision = enums.ForcedDecisionLogs \
519+
.USER_HAS_FORCED_DECISION_WITH_RULE_SPECIFIED.format(forced_decision.variation_key,
520+
flag_key,
521+
rule_key,
522+
user_context.user_id)
523+
524+
else:
525+
user_has_forced_decision = enums.ForcedDecisionLogs \
526+
.USER_HAS_FORCED_DECISION_WITHOUT_RULE_SPECIFIED.format(forced_decision.variation_key,
527+
flag_key,
528+
user_context.user_id)
529+
530+
reasons.append(user_has_forced_decision)
531+
user_context.logger.info(user_has_forced_decision)
532+
533+
return variation, reasons
534+
535+
else:
536+
if rule_key:
537+
user_has_forced_decision_but_invalid = enums.ForcedDecisionLogs \
538+
.USER_HAS_FORCED_DECISION_WITH_RULE_SPECIFIED_BUT_INVALID.format(flag_key,
539+
rule_key,
540+
user_context.user_id)
541+
else:
542+
user_has_forced_decision_but_invalid = enums.ForcedDecisionLogs \
543+
.USER_HAS_FORCED_DECISION_WITHOUT_RULE_SPECIFIED_BUT_INVALID.format(flag_key,
544+
user_context.user_id)
545+
546+
reasons.append(user_has_forced_decision_but_invalid)
547+
user_context.logger.info(user_has_forced_decision_but_invalid)
548+
549+
return None, reasons

‎optimizely/optimizely.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2016-2021, Optimizely
1+
# Copyright 2016-2022, Optimizely
22
# Licensed under the Apache License, Version 2.0 (the "License");
33
# you may not use this file except in compliance with the License.
44
# You may obtain a copy of the License at
@@ -1036,7 +1036,9 @@ def _decide(self, user_context, key, decide_options=None):
10361036

10371037
# Check forced decisions first
10381038
optimizely_decision_context = OptimizelyUserContext.OptimizelyDecisionContext(flag_key=key, rule_key=rule_key)
1039-
forced_decision_response = user_context.find_validated_forced_decision(optimizely_decision_context)
1039+
forced_decision_response = self.decision_service.validated_forced_decision(config,
1040+
optimizely_decision_context,
1041+
user_context)
10401042
variation, decision_reasons = forced_decision_response
10411043
reasons += decision_reasons
10421044

‎optimizely/optimizely_user_context.py‎

Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2021, Optimizely and contributors
1+
# Copyright 2021-2022, Optimizely and contributors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
1616
import copy
1717
import threading
1818

19-
from .helpers import enums
20-
2119

2220
class OptimizelyUserContext(object):
2321
"""
@@ -225,61 +223,3 @@ def find_forced_decision(self, decision_context):
225223

226224
# must allow None to be returned for the Flags only case
227225
return self.forced_decisions_map.get(decision_context)
228-
229-
def find_validated_forced_decision(self, decision_context):
230-
"""
231-
Gets forced decisions based on flag key, rule key and variation.
232-
233-
Args:
234-
decision context: a decision context
235-
236-
Returns:
237-
Variation of the forced decision.
238-
"""
239-
reasons = []
240-
241-
forced_decision = self.find_forced_decision(decision_context)
242-
243-
flag_key = decision_context.flag_key
244-
rule_key = decision_context.rule_key
245-
246-
if forced_decision:
247-
# we use config here so we can use get_flag_variation() function which is defined in project_config
248-
# otherwise we would us self.client instead of config
249-
config = self.client.config_manager.get_config() if self.client else None
250-
if not config:
251-
return None, reasons
252-
variation = config.get_flag_variation(flag_key, 'key', forced_decision.variation_key)
253-
if variation:
254-
if rule_key:
255-
user_has_forced_decision = enums.ForcedDecisionLogs \
256-
.USER_HAS_FORCED_DECISION_WITH_RULE_SPECIFIED.format(forced_decision.variation_key,
257-
flag_key,
258-
rule_key,
259-
self.user_id)
260-
261-
else:
262-
user_has_forced_decision = enums.ForcedDecisionLogs \
263-
.USER_HAS_FORCED_DECISION_WITHOUT_RULE_SPECIFIED.format(forced_decision.variation_key,
264-
flag_key,
265-
self.user_id)
266-
267-
reasons.append(user_has_forced_decision)
268-
self.logger.info(user_has_forced_decision)
269-
270-
return variation, reasons
271-
272-
else:
273-
if rule_key:
274-
user_has_forced_decision_but_invalid = enums.ForcedDecisionLogs \
275-
.USER_HAS_FORCED_DECISION_WITH_RULE_SPECIFIED_BUT_INVALID.format(flag_key,
276-
rule_key,
277-
self.user_id)
278-
else:
279-
user_has_forced_decision_but_invalid = enums.ForcedDecisionLogs \
280-
.USER_HAS_FORCED_DECISION_WITHOUT_RULE_SPECIFIED_BUT_INVALID.format(flag_key, self.user_id)
281-
282-
reasons.append(user_has_forced_decision_but_invalid)
283-
self.logger.info(user_has_forced_decision_but_invalid)
284-
285-
return None, reasons

0 commit comments

Comments
 (0)