@@ -197,7 +197,7 @@ def get_float(self, key):
197
197
return self .get_value (key ).as_float ()
198
198
199
199
def get_value (self , key ):
200
- if self ._config_values [ key ] :
200
+ if key in self ._config_values :
201
201
return self ._config_values [key ]
202
202
return _Value ('static' )
203
203
@@ -454,10 +454,10 @@ def evaluate_custom_signal_condition(self, custom_signal_condition,
454
454
Returns:
455
455
True if the condition is met, False otherwise.
456
456
"""
457
- custom_signal_operator = custom_signal_condition .get ('custom_signal_operator ' ) or {}
458
- custom_signal_key = custom_signal_condition .get ('custom_signal_key ' ) or {}
457
+ custom_signal_operator = custom_signal_condition .get ('customSignalOperator ' ) or {}
458
+ custom_signal_key = custom_signal_condition .get ('customSignalKey ' ) or {}
459
459
target_custom_signal_values = (
460
- custom_signal_condition .get ('target_custom_signal_values ' ) or {})
460
+ custom_signal_condition .get ('targetCustomSignalValues ' ) or {})
461
461
462
462
if not all ([custom_signal_operator , custom_signal_key , target_custom_signal_values ]):
463
463
logger .warning ("Missing operator, key, or target values for custom signal condition." )
@@ -471,71 +471,71 @@ def evaluate_custom_signal_condition(self, custom_signal_condition,
471
471
logger .warning ("Custom signal value not found in context: %s" , custom_signal_key )
472
472
return False
473
473
474
- if custom_signal_operator == CustomSignalOperator .STRING_CONTAINS :
474
+ if custom_signal_operator == CustomSignalOperator .STRING_CONTAINS . value :
475
475
return self ._compare_strings (target_custom_signal_values ,
476
476
actual_custom_signal_value ,
477
477
lambda target , actual : target in actual )
478
- if custom_signal_operator == CustomSignalOperator .STRING_DOES_NOT_CONTAIN :
478
+ if custom_signal_operator == CustomSignalOperator .STRING_DOES_NOT_CONTAIN . value :
479
479
return not self ._compare_strings (target_custom_signal_values ,
480
480
actual_custom_signal_value ,
481
481
lambda target , actual : target in actual )
482
- if custom_signal_operator == CustomSignalOperator .STRING_EXACTLY_MATCHES :
482
+ if ( custom_signal_operator == CustomSignalOperator .STRING_EXACTLY_MATCHES . value ) :
483
483
return self ._compare_strings (target_custom_signal_values ,
484
484
actual_custom_signal_value ,
485
485
lambda target , actual : target .strip () == actual .strip ())
486
- if custom_signal_operator == CustomSignalOperator .STRING_CONTAINS_REGEX :
486
+ if custom_signal_operator == CustomSignalOperator .STRING_CONTAINS_REGEX . value :
487
487
return self ._compare_strings (target_custom_signal_values ,
488
488
actual_custom_signal_value ,
489
489
re .search )
490
490
491
491
# For numeric operators only one target value is allowed.
492
- if custom_signal_operator == CustomSignalOperator .NUMERIC_LESS_THAN :
492
+ if custom_signal_operator == CustomSignalOperator .NUMERIC_LESS_THAN . value :
493
493
return self ._compare_numbers (target_custom_signal_values [0 ],
494
494
actual_custom_signal_value ,
495
495
lambda r : r < 0 )
496
- if custom_signal_operator == CustomSignalOperator .NUMERIC_LESS_EQUAL :
496
+ if custom_signal_operator == CustomSignalOperator .NUMERIC_LESS_EQUAL . value :
497
497
return self ._compare_numbers (target_custom_signal_values [0 ],
498
498
actual_custom_signal_value ,
499
499
lambda r : r <= 0 )
500
- if custom_signal_operator == CustomSignalOperator .NUMERIC_EQUAL :
500
+ if custom_signal_operator == CustomSignalOperator .NUMERIC_EQUAL . value :
501
501
return self ._compare_numbers (target_custom_signal_values [0 ],
502
502
actual_custom_signal_value ,
503
503
lambda r : r == 0 )
504
- if custom_signal_operator == CustomSignalOperator .NUMERIC_NOT_EQUAL :
504
+ if custom_signal_operator == CustomSignalOperator .NUMERIC_NOT_EQUAL . value :
505
505
return self ._compare_numbers (target_custom_signal_values [0 ],
506
506
actual_custom_signal_value ,
507
507
lambda r : r != 0 )
508
- if custom_signal_operator == CustomSignalOperator .NUMERIC_GREATER_THAN :
508
+ if custom_signal_operator == CustomSignalOperator .NUMERIC_GREATER_THAN . value :
509
509
return self ._compare_numbers (target_custom_signal_values [0 ],
510
510
actual_custom_signal_value ,
511
511
lambda r : r > 0 )
512
- if custom_signal_operator == CustomSignalOperator .NUMERIC_GREATER_EQUAL :
512
+ if custom_signal_operator == CustomSignalOperator .NUMERIC_GREATER_EQUAL . value :
513
513
return self ._compare_numbers (target_custom_signal_values [0 ],
514
514
actual_custom_signal_value ,
515
515
lambda r : r >= 0 )
516
516
517
517
# For semantic operators only one target value is allowed.
518
- if custom_signal_operator == CustomSignalOperator .SEMANTIC_VERSION_LESS_THAN :
518
+ if custom_signal_operator == CustomSignalOperator .SEMANTIC_VERSION_LESS_THAN . value :
519
519
return self ._compare_semantic_versions (target_custom_signal_values [0 ],
520
520
actual_custom_signal_value ,
521
521
lambda r : r < 0 )
522
- if custom_signal_operator == CustomSignalOperator .SEMANTIC_VERSION_LESS_EQUAL :
522
+ if custom_signal_operator == CustomSignalOperator .SEMANTIC_VERSION_LESS_EQUAL . value :
523
523
return self ._compare_semantic_versions (target_custom_signal_values [0 ],
524
524
actual_custom_signal_value ,
525
525
lambda r : r <= 0 )
526
- if custom_signal_operator == CustomSignalOperator .SEMANTIC_VERSION_EQUAL :
526
+ if custom_signal_operator == CustomSignalOperator .SEMANTIC_VERSION_EQUAL . value :
527
527
return self ._compare_semantic_versions (target_custom_signal_values [0 ],
528
528
actual_custom_signal_value ,
529
529
lambda r : r == 0 )
530
- if custom_signal_operator == CustomSignalOperator .SEMANTIC_VERSION_NOT_EQUAL :
530
+ if custom_signal_operator == CustomSignalOperator .SEMANTIC_VERSION_NOT_EQUAL . value :
531
531
return self ._compare_semantic_versions (target_custom_signal_values [0 ],
532
532
actual_custom_signal_value ,
533
533
lambda r : r != 0 )
534
- if custom_signal_operator == CustomSignalOperator .SEMANTIC_VERSION_GREATER_THAN :
534
+ if custom_signal_operator == CustomSignalOperator .SEMANTIC_VERSION_GREATER_THAN . value :
535
535
return self ._compare_semantic_versions (target_custom_signal_values [0 ],
536
536
actual_custom_signal_value ,
537
537
lambda r : r > 0 )
538
- if custom_signal_operator == CustomSignalOperator .SEMANTIC_VERSION_GREATER_EQUAL :
538
+ if custom_signal_operator == CustomSignalOperator .SEMANTIC_VERSION_GREATER_EQUAL . value :
539
539
return self ._compare_semantic_versions (target_custom_signal_values [0 ],
540
540
actual_custom_signal_value ,
541
541
lambda r : r >= 0 )
0 commit comments