Merge pull request #5 from mathspace/remove-ramping

Remove ramp up and ramp down support from schedule configuration

Author: msmans

src/feafea/__init__.py

@@ -879,23 +879,9 @@ def from_dict(c: DictConfig, ignore_undefined_refs: bool = False) -> CompiledCon
                 end = _unix_seconds_from_tz_time(r["schedule"]["end"])
                 if start >= end:
                     raise ValueError("start must be before end")
-                ramp_up = _seconds_from_human_duration(r["schedule"].get("ramp_up", "0m"))
-                ramp_down = _seconds_from_human_duration(r["schedule"].get("ramp_down", "0m"))
-                if ramp_up + ramp_down > end - start:
-                    raise ValueError("ramp_up + ramp_down must be less than end - start")
                 py_common += [f"if attributes['__now'] < {start!r}: return None"]
                 py_common += [f"if attributes['__now'] >= {end!r}: return None"]
 
-                if ramp_up > 0 or ramp_down > 0:
-                    schedule_seed = rule_name + "\0schedule"
-                    py_common = [f"schedule_target_percent = _hash_percent(target_id, seed={schedule_seed!r})"]
-                if ramp_up > 0:
-                    py_common += [f"ramp_up_percent = 100 * (attributes['__now'] - {start!r}) / {ramp_up!r}"]
-                    py_common += ["if schedule_target_percent >= ramp_up_percent: return None"]
-                if ramp_down > 0:
-                    py_common += [f"ramp_down_percent = 100 * ({end!r} - attributes['__now']) / {ramp_down!r}"]
-                    py_common += ["if schedule_target_percent >= ramp_down_percent: return None"]
-
             # Compile the flag independent rule.
 
             lines = ["def a(target_id, attributes):"]

src/feafea/config_schema.json

@@ -127,12 +127,6 @@
                 },
                 "end": {
                   "type": "string"
-                },
-                "ramp_up": {
-                  "type": "string"
-                },
-                "ramp_down": {
-                  "type": "string"
                 }
               },
               "required": ["start", "end"]

tests/test_configs.py

@@ -258,42 +258,6 @@ def test_valid_schedule(self):
                 ev = cc.flags["a"].eval("", {"__now": ts})
                 self.assertEqual(ev.variant, expected)
 
-    def test_valid_schedule_ramp(self):
-        cc = CompiledConfig.from_dict(
-            {
-                "flags": {
-                    "ramp": {
-                        "variants": [1, 2],
-                        "default": 1,
-                    },
-                },
-                "rules": {
-                    "r1": {
-                        "variants": {"ramp": 2},
-                        "schedule": {
-                            "start": "2024-03-12 00:00:00Z",  # 1710201600
-                            "end": "2024-03-12 10:00:00Z",  # 1710237600
-                            "ramp_up": "1h",
-                            "ramp_down": "2h",
-                        },
-                    },
-                },
-            }
-        )
-
-        non_default_count = 0
-        for i in range(10000):
-            v = cc.flags["ramp"].eval(str(i), {"__now": 1710201600 + 360}).variant  # 6m after start (or 10% into 1 hour)
-            if v == 2:
-                non_default_count += 1
-        self.assertAlmostEqual(non_default_count / 10000, 0.1, delta=0.02)
-
-        non_default_count = 0
-        for i in range(10000):
-            v = cc.flags["ramp"].eval(str(i), {"__now": 1710237600 - 7200 + 720}).variant  # 12m after start of ramp down
-            if v == 2:
-                non_default_count += 1
-        self.assertAlmostEqual(non_default_count / 10000, 0.9, delta=0.02)
 
 
 class TestInvalidConfigs(unittest.TestCase):
@@ -370,11 +334,6 @@ def test_invalid_rules_def(self):
             ({"variants": {"a": 2}, "schedule": {"start": "2024-10-10 10:10:10", "end": "2024-10-10 20:20:20"}}, ValueError, "Timezone missing"),
             ({"variants": {"a": 2}, "schedule": {"start": "2024-10-10 20:10:10Z", "end": "2024-10-10 10:20:20Z"}}, ValueError, "start must be before end"),
             ({"variants": {"a": 2}, "schedule": {"start": "2024-10-10 10:10:10Z", "end": "2024-10-10 10:10:10Z"}}, ValueError, "start must be before end"),
-            (
-                {"variants": {"a": 2}, "schedule": {"start": "2024-10-10 10:10:00Z", "end": "2024-10-10 10:20:00Z", "ramp_up": "8m", "ramp_down": "8m"}},
-                ValueError,
-                r"ramp_up \+ ramp_down must be less than end - start",
-            ),
         ]
 
         for case, expected_err, regex in cases:

tests/test_configs_undefined_refs.py

@@ -203,43 +203,6 @@ def test_valid_schedule(self):
                 ev = cc.flags["a"].eval("", {"__now": ts})
                 self.assertEqual(ev.variant, expected)
 
-    def test_valid_schedule_ramp(self):
-        cc = CompiledConfig_from_dict(
-            {
-                "flags": {
-                    "ramp": {
-                        "variants": [1, 2],
-                        "default": 1,
-                    },
-                },
-                "rules": {
-                    "r1": {
-                        "variants": {"ramp": 2},
-                        "schedule": {
-                            "start": "2024-03-12 00:00:00Z",  # 1710201600
-                            "end": "2024-03-12 10:00:00Z",  # 1710237600
-                            "ramp_up": "1h",
-                            "ramp_down": "2h",
-                        },
-                    },
-                },
-            },
-        )
-
-        non_default_count = 0
-        for i in range(10000):
-            v = cc.flags["ramp"].eval(str(i), {"__now": 1710201600 + 360}).variant  # 6m after start (or 10% into 1 hour)
-            if v == 2:
-                non_default_count += 1
-        self.assertAlmostEqual(non_default_count / 10000, 0.1, delta=0.02)
-
-        non_default_count = 0
-        for i in range(10000):
-            v = cc.flags["ramp"].eval(str(i), {"__now": 1710237600 - 7200 + 720}).variant  # 12m after start of ramp down
-            if v == 2:
-                non_default_count += 1
-        self.assertAlmostEqual(non_default_count / 10000, 0.9, delta=0.02)
-
 
 class TestInvalidConfigs(unittest.TestCase):
     def test_invalid_flag_def(self):
@@ -312,11 +275,6 @@ def test_invalid_rules_def(self):
             ({"variants": {"a": 2}, "schedule": {"start": "2024-10-10 10:10:10", "end": "2024-10-10 20:20:20"}}, ValueError, "Timezone missing"),
             ({"variants": {"a": 2}, "schedule": {"start": "2024-10-10 20:10:10Z", "end": "2024-10-10 10:20:20Z"}}, ValueError, "start must be before end"),
             ({"variants": {"a": 2}, "schedule": {"start": "2024-10-10 10:10:10Z", "end": "2024-10-10 10:10:10Z"}}, ValueError, "start must be before end"),
-            (
-                {"variants": {"a": 2}, "schedule": {"start": "2024-10-10 10:10:00Z", "end": "2024-10-10 10:20:00Z", "ramp_up": "8m", "ramp_down": "8m"}},
-                ValueError,
-                r"ramp_up \+ ramp_down must be less than end - start",
-            ),
         ]
 
         for case, expected_err, regex in cases: