Skip to content

Ssrc update #861

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
merged 3 commits into from
Feb 12, 2025
Merged

Ssrc update #861

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7e3d29
Fixing percentage lowebound issues
Jan 27, 2025
247523f
Updating logs
Feb 7, 2025
795538a
Fixing lint issues
Feb 7, 2025
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
63 changes: 41 additions & 22 deletions firebase_admin/remote_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ def evaluate_percent_condition(self, percent_condition,
True if the condition is met, False otherwise.
"""
if not context.get('randomization_id'):
logger.warning("Missing randomization ID for percent condition.")
logger.warning("Missing randomization_id in context for evaluating percent condition.")
return False

seed = percent_condition.get('seed')
Expand All @@ -442,8 +442,8 @@ def evaluate_percent_condition(self, percent_condition,
logger.warning("Missing percent operator for percent condition.")
return False
if micro_percent_range:
norm_percent_upper_bound = micro_percent_range.get('microPercentUpperBound')
norm_percent_lower_bound = micro_percent_range.get('microPercentLowerBound')
norm_percent_upper_bound = micro_percent_range.get('microPercentUpperBound') or 0
norm_percent_lower_bound = micro_percent_range.get('microPercentLowerBound') or 0
else:
norm_percent_upper_bound = 0
norm_percent_lower_bound = 0
Expand Down Expand Up @@ -503,7 +503,7 @@ def evaluate_custom_signal_condition(self, custom_signal_condition,
actual_custom_signal_value = context.get(custom_signal_key) or {}

if not actual_custom_signal_value:
logger.warning("Custom signal value not found in context: %s", custom_signal_key)
logger.debug("Custom signal value not found in context: %s", custom_signal_key)
return False

if custom_signal_operator == CustomSignalOperator.STRING_CONTAINS.value:
Expand All @@ -525,53 +525,65 @@ def evaluate_custom_signal_condition(self, custom_signal_condition,

# For numeric operators only one target value is allowed.
if custom_signal_operator == CustomSignalOperator.NUMERIC_LESS_THAN.value:
return self._compare_numbers(target_custom_signal_values[0],
return self._compare_numbers(custom_signal_key,
target_custom_signal_values[0],
actual_custom_signal_value,
lambda r: r < 0)
if custom_signal_operator == CustomSignalOperator.NUMERIC_LESS_EQUAL.value:
return self._compare_numbers(target_custom_signal_values[0],
return self._compare_numbers(custom_signal_key,
target_custom_signal_values[0],
actual_custom_signal_value,
lambda r: r <= 0)
if custom_signal_operator == CustomSignalOperator.NUMERIC_EQUAL.value:
return self._compare_numbers(target_custom_signal_values[0],
return self._compare_numbers(custom_signal_key,
target_custom_signal_values[0],
actual_custom_signal_value,
lambda r: r == 0)
if custom_signal_operator == CustomSignalOperator.NUMERIC_NOT_EQUAL.value:
return self._compare_numbers(target_custom_signal_values[0],
return self._compare_numbers(custom_signal_key,
target_custom_signal_values[0],
actual_custom_signal_value,
lambda r: r != 0)
if custom_signal_operator == CustomSignalOperator.NUMERIC_GREATER_THAN.value:
return self._compare_numbers(target_custom_signal_values[0],
return self._compare_numbers(custom_signal_key,
target_custom_signal_values[0],
actual_custom_signal_value,
lambda r: r > 0)
if custom_signal_operator == CustomSignalOperator.NUMERIC_GREATER_EQUAL.value:
return self._compare_numbers(target_custom_signal_values[0],
return self._compare_numbers(custom_signal_key,
target_custom_signal_values[0],
actual_custom_signal_value,
lambda r: r >= 0)

# For semantic operators only one target value is allowed.
if custom_signal_operator == CustomSignalOperator.SEMANTIC_VERSION_LESS_THAN.value:
return self._compare_semantic_versions(target_custom_signal_values[0],
return self._compare_semantic_versions(custom_signal_key,
target_custom_signal_values[0],
actual_custom_signal_value,
lambda r: r < 0)
if custom_signal_operator == CustomSignalOperator.SEMANTIC_VERSION_LESS_EQUAL.value:
return self._compare_semantic_versions(target_custom_signal_values[0],
return self._compare_semantic_versions(custom_signal_key,
target_custom_signal_values[0],
actual_custom_signal_value,
lambda r: r <= 0)
if custom_signal_operator == CustomSignalOperator.SEMANTIC_VERSION_EQUAL.value:
return self._compare_semantic_versions(target_custom_signal_values[0],
return self._compare_semantic_versions(custom_signal_key,
target_custom_signal_values[0],
actual_custom_signal_value,
lambda r: r == 0)
if custom_signal_operator == CustomSignalOperator.SEMANTIC_VERSION_NOT_EQUAL.value:
return self._compare_semantic_versions(target_custom_signal_values[0],
return self._compare_semantic_versions(custom_signal_key,
target_custom_signal_values[0],
actual_custom_signal_value,
lambda r: r != 0)
if custom_signal_operator == CustomSignalOperator.SEMANTIC_VERSION_GREATER_THAN.value:
return self._compare_semantic_versions(target_custom_signal_values[0],
return self._compare_semantic_versions(custom_signal_key,
target_custom_signal_values[0],
actual_custom_signal_value,
lambda r: r > 0)
if custom_signal_operator == CustomSignalOperator.SEMANTIC_VERSION_GREATER_EQUAL.value:
return self._compare_semantic_versions(target_custom_signal_values[0],
return self._compare_semantic_versions(custom_signal_key,
target_custom_signal_values[0],
actual_custom_signal_value,
lambda r: r >= 0)
logger.warning("Unknown custom signal operator: %s", custom_signal_operator)
Expand All @@ -597,22 +609,25 @@ def _compare_strings(self, target_values, actual_value, predicate_fn) -> bool:
return True
return False

def _compare_numbers(self, target_value, actual_value, predicate_fn) -> bool:
def _compare_numbers(self, custom_signal_key, target_value, actual_value, predicate_fn) -> bool:
try:
target = float(target_value)
actual = float(actual_value)
result = -1 if actual < target else 1 if actual > target else 0
return predicate_fn(result)
except ValueError:
logger.warning("Invalid numeric value for comparison.")
logger.warning("Invalid numeric value for comparison for custom signal key %s.",
custom_signal_key)
return False

def _compare_semantic_versions(self, target_value, actual_value, predicate_fn) -> bool:
def _compare_semantic_versions(self, custom_signal_key,
target_value, actual_value, predicate_fn) -> bool:
"""Compares the actual semantic version value of a signal against a target value.
Calls the predicate function with -1, 0, 1 if actual is less than, equal to,
or greater than target.

Args:
custom_signal_key: The custom singal for which the evaluation is being performed.
target_values: A list of target string values.
actual_value: The actual value to compare, which can be a string or number.
predicate_fn: A function that takes an integer (-1, 0, or 1) and returns a boolean.
Expand All @@ -621,13 +636,15 @@ def _compare_semantic_versions(self, target_value, actual_value, predicate_fn) -
bool: True if the predicate function returns True for the result of the comparison,
False otherwise.
"""
return self._compare_versions(str(actual_value),
return self._compare_versions(custom_signal_key, str(actual_value),
str(target_value), predicate_fn)

def _compare_versions(self, sem_version_1, sem_version_2, predicate_fn) -> bool:
def _compare_versions(self, custom_signal_key,
sem_version_1, sem_version_2, predicate_fn) -> bool:
"""Compares two semantic version strings.

Args:
custom_signal_key: The custom singal for which the evaluation is being performed.
sem_version_1: The first semantic version string.
sem_version_2: The second semantic version string.
predicate_fn: A function that takes an integer and returns a boolean.
Expand All @@ -651,7 +668,9 @@ def _compare_versions(self, sem_version_1, sem_version_2, predicate_fn) -> bool:
return predicate_fn(1)
return predicate_fn(0)
except ValueError:
logger.warning("Invalid semantic version format for comparison.")
logger.warning(
"Invalid semantic version format for comparison for custom signal key %s.",
custom_signal_key)
return False

async def get_server_template(app: App = None, default_config: Optional[Dict[str, str]] = None):
Expand Down