Merge pull request #15 from statsig-io/v0-16-8

v0.16.8

Author: kenny-statsig

statsig/evaluator.py

@@ -269,7 +269,6 @@ def __evaluate_delegate(self, user, rule, exposures):
 
  def __evaluate_condition(self, user, condition):
  value = None
-
  type = condition.get("type", "").upper()
  target = condition.get("targetValue")
  field = condition.get("field", "")
@@ -347,27 +346,27 @@ def __evaluate_condition(self, user, condition):
  return _ConfigEvaluation(False, val <= target)
  if op == "version_gt":
  res = self.__version_compare_helper(
- value, target, lambda a, b: self.__version_compare(a, b) > 0)
+ value, target, lambda result: result > 0)
  return _ConfigEvaluation(False, res)
  if op == "version_gte":
  res = self.__version_compare_helper(
- value, target, lambda a, b: self.__version_compare(a, b) >= 0)
+ value, target, lambda result: result >= 0)
  return _ConfigEvaluation(False, res)
  if op == "version_lt":
  res = self.__version_compare_helper(
- value, target, lambda a, b: self.__version_compare(a, b) < 0)
+ value, target, lambda result: result < 0)
  return _ConfigEvaluation(False, res)
  if op == "version_lte":
  res = self.__version_compare_helper(
- value, target, lambda a, b: self.__version_compare(a, b) <= 0)
+ value, target, lambda result: result <= 0)
  return _ConfigEvaluation(False, res)
  if op == "version_eq":
  res = self.__version_compare_helper(
- value, target, lambda a, b: self.__version_compare(a, b) == 0)
+ value, target, lambda result: result == 0)
  return _ConfigEvaluation(False, res)
  if op == "version_neq":
  res = self.__version_compare_helper(
- value, target, lambda a, b: self.__version_compare(a, b) != 0)
+ value, target, lambda result: result != 0)
  return _ConfigEvaluation(False, res)
  if op == "any":
  return _ConfigEvaluation(
@@ -482,8 +481,11 @@ def __get_unit_id(self, user, id_type):
  if id_type is not None and id_type.lower() != "userid":
  if user.custom_ids is None:
  return None
- return user.custom_ids.get(
- id_type, None) or user.custom_ids.get(id_type.lower(), None)
+ custom_id = user.custom_ids.get(
+ id_type, None)
+ if custom_id is not None:
+ return custom_id
+ return user.custom_ids.get(id_type.lower(), None)
  return user.user_id
 
  def __match_string_in_array(self, value, target, compare):
@@ -498,25 +500,28 @@ def __match_string_in_array(self, value, target, compare):
  return True
  return False
 
- def __version_compare(self, v1, v2):
+ def __version_compare(self, v1, v2, compare):
  p1 = v1.split(".")
  p2 = v2.split(".")
 
  i = 0
- while i < max(len(p1), len(p2)):
- c1 = 0
- c2 = 0
- if i < len(p1):
- c1 = int(float(p1[i]))
- if i < len(p2):
- c2 = int(float(p2[i]))
- if c1 < c2:
- return -1
- if c1 > c2:
- return 1
- i += 1
-
- return 0
+ try:
+ while i < max(len(p1), len(p2)):
+ c1 = 0
+ c2 = 0
+ if i < len(p1):
+ c1 = int(float(p1[i]))
+ if i < len(p2):
+ c2 = int(float(p2[i]))
+ if c1 < c2:
+ return compare(-1)
+ if c1 > c2:
+ return compare(1)
+ i += 1
+ except ValueError:
+ return False
+
+ return compare(0)
 
  def __version_compare_helper(self, v1, v2, compare):
  v1_str = self.__get_value_as_string(v1)
@@ -533,7 +538,7 @@ def __version_compare_helper(self, v1, v2, compare):
  if d2 > 0:
  v2_str = v2_str[0:d2]
 
- return compare(v1_str, v2_str)
+ return self.__version_compare(v1_str, v2_str, compare)
 
  def __get_value_as_string(self, input):
  if input is None:
@@ -564,16 +569,27 @@ def __get_from_user_agent(self, user, field):
  def __get_version_string(self, version):
  if version is None:
  return None
- major = version.get("major", "0")
+
+ major = self.__get_numeric_subver(version, "major")
  if major is None:
- major = "0"
- minor = version.get("minor", "0")
+ return None
+ minor = self.__get_numeric_subver(version, "minor")
  if minor is None:
- minor = "0"
- patch = version.get("patch", "0")
+ return None
+ patch = self.__get_numeric_subver(version, "patch")
  if patch is None:
- patch = "0"
- return major + "." + minor + "." + patch
+ return None
+ return str.format("{}.{}.{}", major, minor,patch)
+
+ def __get_numeric_subver(self, version, subver):
+ ver = version.get(subver, "0")
+ if ver is None:
+ return 0
+ try:
+ numeric = int(ver)
+ return numeric
+ except ValueError:
+ return None
 
  def __compare_dates(self, first, second, compare):
  if first is None and second is None:

statsig/version.py

@@ -1 +1 @@
-__version__ = '0.16.7'
+__version__ = '0.16.8'

testdata/download_config_specs_unique_conditions.json

@@ -0,0 +1,247 @@
+{
+ "dynamic_configs": [
+ {
+ "name": "test_config",
+ "type": "dynamic_config",
+ "salt": "50ad5c60-9e7a-42ce-86c6-c49035185b14",
+ "enabled": true,
+ "defaultValue": { "number": 4, "string": "default", "boolean": true },
+ "rules": [
+ {
+ "name": "1kNmlB23wylPFZi1M0Divl",
+ "groupName": "statsig email",
+ "passPercentage": 100,
+ "conditions": [
+ {
+ "type": "user_field",
+ "targetValue": ["@statsig.com"],
+ "operator": "str_contains_any",
+ "field": "email",
+ "additionalValues": {}
+ }
+ ],
+ "returnValue": { "number": 7, "string": "statsig", "boolean": false },
+ "id": "1kNmlB23wylPFZi1M0Divl",
+ "salt": "f2ac6975-174d-497e-be7f-599fea626132"
+ }
+ ]
+ }
+ ],
+ "feature_gates": [
+ {
+ "name": "python_ua_debug",
+ "type": "feature_gate",
+ "salt": "af8140b2-5eab-44da-b3d0-50326e69547e",
+ "enabled": true,
+ "defaultValue": false,
+ "rules": [
+ {
+ "name": "GrsHpfXdprNny0Ij23Gnt:100.00:1",
+ "groupName": "New Users less than 48H - iOS",
+ "passPercentage": 100,
+ "conditions": [
+ {
+ "type": "ua_based",
+ "targetValue": [
+ "Windows"
+ ],
+ "operator": "any",
+ "field": "os_name",
+ "additionalValues": {},
+ "isDeviceBased": false,
+ "idType": "userID"
+ },
+ {
+ "type": "ua_based",
+ "targetValue": "7.0",
+ "operator": "version_gte",
+ "field": "os_version",
+ "additionalValues": {},
+ "isDeviceBased": false,
+ "idType": "userID"
+ }
+ ],
+ "returnValue": true,
+ "id": "GrsHpfXdprNny0Ij23Gnt:100.00:1",
+ "salt": "14df24b4-729b-4fc5-96b9-764da38fd009",
+ "isDeviceBased": false,
+ "idType": "userID"
+ }
+ ],
+ "isDeviceBased": false,
+ "idType": "userID",
+ "entity": "feature_gate"
+ }
+ ],
+ "layer_configs": [
+ {
+ "name": "a_layer",
+ "type": "dynamic_config",
+ "salt": "f8aeba58-18fb-4f36-9bbd-4c611447a912",
+ "enabled": true,
+ "defaultValue": { "experiment_param": "control" },
+ "rules": [
+ {
+ "name": "experimentAssignment",
+ "groupName": "Experiment Assignment",
+ "passPercentage": 100,
+ "conditions": [
+ {
+ "type": "user_bucket",
+ "targetValue": [
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
+ 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
+ 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
+ 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+ 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214,
+ 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
+ 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240,
+ 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
+ 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266,
+ 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+ 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
+ 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+ 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
+ 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357,
+ 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370,
+ 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383,
+ 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396,
+ 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409,
+ 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422,
+ 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435,
+ 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448,
+ 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461,
+ 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474,
+ 475, 476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487,
+ 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500,
+ 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 513,
+ 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526,
+ 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539,
+ 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552,
+ 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, 564, 565,
+ 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578,
+ 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+ 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 603, 604,
+ 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617,
+ 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630,
+ 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643,
+ 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656,
+ 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669,
+ 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682,
+ 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695,
+ 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708,
+ 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721,
+ 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734,
+ 735, 736, 737, 738, 739, 740, 741, 742, 743, 744, 745, 746, 747,
+ 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760,
+ 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773,
+ 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786,
+ 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, 799,
+ 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, 812,
+ 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825,
+ 826, 827, 828, 829, 830, 831, 832, 833, 834, 835, 836, 837, 838,
+ 839, 840, 841, 842, 843, 844, 845, 846, 847, 848, 849, 850, 851,
+ 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, 863, 864,
+ 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877,
+ 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, 890,
+ 891, 892, 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, 903,
+ 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, 914, 915, 916,
+ 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928, 929,
+ 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942,
+ 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955,
+ 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967, 968,
+ 969, 970, 971, 972, 973, 974, 975, 976, 977, 978, 979, 980, 981,
+ 982, 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, 993, 994,
+ 995, 996, 997, 998, 999
+ ],
+ "operator": "any",
+ "field": null,
+ "additionalValues": {
+ "salt": "58d96daa-4d16-467a-b616-7232c45153f4"
+ },
+ "isDeviceBased": false,
+ "idType": "userID"
+ }
+ ],
+ "returnValue": {
+ "layer_param": true,
+ "second_layer_param": false
+ },
+ "id": "experimentAssignment",
+ "salt": "",
+ "isDeviceBased": false,
+ "idType": "userID",
+ "configDelegate": "sample_experiment"
+ }
+ ],
+ "isDeviceBased": false,
+ "idType": "userID",
+ "entity": "layer"
+ },
+ {
+ "name": "b_layer_no_alloc",
+ "type": "dynamic_config",
+ "salt": "3e361046-bc69-4dfd-bbb1-538afe609157",
+ "enabled": true,
+ "defaultValue": {
+ "b_param": "layer_default"
+ },
+ "rules": [],
+ "isDeviceBased": false,
+ "idType": "userID",
+ "entity": "layer"
+ },
+ {
+ "name": "c_layer_with_holdout",
+ "type": "dynamic_config",
+ "salt": "ab40c4af-947f-411e-9403-880393703507",
+ "enabled": true,
+ "defaultValue": {
+ "holdout_layer_param": "layer_default"
+ },
+ "rules": [
+ {
+ "name": "7d2E854TtGmfETdmJFip1L",
+ "groupName": "master_holdout",
+ "passPercentage": 100,
+ "conditions": [
+ {
+ "type": "pass_gate",
+ "targetValue": "always_on_gate",
+ "operator": "any",
+ "field": null,
+ "additionalValues": null,
+ "isDeviceBased": false,
+ "idType": "userID"
+ }
+ ],
+ "returnValue": {
+ "holdout_layer_param": "layer_default"
+ },
+ "id": "7d2E854TtGmfETdmJFip1L",
+ "salt": "",
+ "isDeviceBased": false,
+ "idType": "userID"
+ }
+ ],
+ "isDeviceBased": false,
+ "idType": "userID",
+ "entity": "layer"
+ }
+ ],
+ "has_updates": true,
+ "time": 1631638014811,
+ "id_lists": { "list_1": true, "list_2": true }
+}