Skip to content

Feature/prerequisites #576

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
chillaq merged 12 commits into from
Jun 5, 2025
Merged

Feature/prerequisites #576

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c093206
Added models
chillaq May 29, 2025
8281dec
Added matcher
chillaq May 29, 2025
2214cd5
Updated evaluator
chillaq May 30, 2025
3692161
Merge pull request #570 from splitio/prereq-models
chillaq May 30, 2025
e153509
polish
chillaq May 30, 2025
488757f
Merge pull request #571 from splitio/prereq-matcher
chillaq May 30, 2025
249d9c6
Merge pull request #573 from splitio/T-FME-3998-prereq-evaluator
chillaq May 30, 2025
c174578
Updated localhostjson sync
chillaq Jun 3, 2025
de2f013
Updated integrations tests
chillaq Jun 3, 2025
c830bc3
Merge pull request #574 from splitio/T-FME-4182-prereq-localhost-json
chillaq Jun 5, 2025
971f9ed
Merge pull request #575 from splitio/T-FME-4178-prereq-integration
chillaq Jun 5, 2025
21635a8
Merge branch 'feature/rule-based-segment' into feature/prerequisites
chillaq Jun 5, 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
17 changes: 17 additions & 0 deletions tests/client/test_input_validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def test_get_treatment(self, mocker):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []
storage_mock = mocker.Mock(spec=SplitStorage)
storage_mock.fetch_many.return_value = {'some_feature': split_mock}
rbs_storage = mocker.Mock(spec=InMemoryRuleBasedSegmentStorage)
Expand Down Expand Up @@ -264,6 +265,7 @@ def test_get_treatment_with_config(self, mocker):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []

def _configs(treatment):
return '{"some": "property"}' if treatment == 'default_treatment' else None
Expand Down Expand Up @@ -819,6 +821,8 @@ def test_get_treatments(self, mocker):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []

storage_mock = mocker.Mock(spec=SplitStorage)
storage_mock.fetch_many.return_value = {
'some_feature': split_mock
Expand Down Expand Up @@ -965,6 +969,7 @@ def test_get_treatments_with_config(self, mocker):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []

storage_mock = mocker.Mock(spec=SplitStorage)
storage_mock.fetch_many.return_value = {
Expand Down Expand Up @@ -1113,6 +1118,7 @@ def test_get_treatments_by_flag_set(self, mocker):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []
storage_mock = mocker.Mock(spec=InMemorySplitStorage)
storage_mock.fetch_many.return_value = {
'some_feature': split_mock
Expand Down Expand Up @@ -1231,6 +1237,7 @@ def test_get_treatments_by_flag_sets(self, mocker):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []
storage_mock = mocker.Mock(spec=InMemorySplitStorage)
storage_mock.fetch_many.return_value = {
'some_feature': split_mock
Expand Down Expand Up @@ -1358,6 +1365,7 @@ def _configs(treatment):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []
storage_mock = mocker.Mock(spec=InMemorySplitStorage)
storage_mock.fetch_many.return_value = {
'some_feature': split_mock
Expand Down Expand Up @@ -1481,6 +1489,7 @@ def _configs(treatment):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []
storage_mock = mocker.Mock(spec=InMemorySplitStorage)
storage_mock.fetch_many.return_value = {
'some_feature': split_mock
Expand Down Expand Up @@ -1632,6 +1641,7 @@ async def test_get_treatment(self, mocker):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []
storage_mock = mocker.Mock(spec=SplitStorage)
async def fetch_many(*_):
return {
Expand Down Expand Up @@ -1889,6 +1899,7 @@ async def test_get_treatment_with_config(self, mocker):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []

def _configs(treatment):
return '{"some": "property"}' if treatment == 'default_treatment' else None
Expand Down Expand Up @@ -2423,6 +2434,7 @@ async def test_get_treatments(self, mocker):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []
storage_mock = mocker.Mock(spec=SplitStorage)
async def get(*_):
return split_mock
Expand Down Expand Up @@ -2586,6 +2598,7 @@ async def test_get_treatments_with_config(self, mocker):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []

storage_mock = mocker.Mock(spec=SplitStorage)
async def get(*_):
Expand Down Expand Up @@ -2749,6 +2762,7 @@ async def test_get_treatments_by_flag_set(self, mocker):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []
storage_mock = mocker.Mock(spec=SplitStorage)
async def get(*_):
return split_mock
Expand Down Expand Up @@ -2893,6 +2907,7 @@ async def test_get_treatments_by_flag_sets(self, mocker):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []
storage_mock = mocker.Mock(spec=SplitStorage)
async def get(*_):
return split_mock
Expand Down Expand Up @@ -3048,6 +3063,7 @@ def _configs(treatment):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []
storage_mock = mocker.Mock(spec=SplitStorage)
async def get(*_):
return split_mock
Expand Down Expand Up @@ -3195,6 +3211,7 @@ def _configs(treatment):
conditions_mock = mocker.PropertyMock()
conditions_mock.return_value = []
type(split_mock).conditions = conditions_mock
type(split_mock).prerequisites = []
storage_mock = mocker.Mock(spec=SplitStorage)
async def get(*_):
return split_mock
Expand Down
48 changes: 46 additions & 2 deletions tests/integration/files/splitChanges.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"userDefinedSegmentMatcherData": null,
"whitelistMatcherData": {
"whitelist": [
"whitelisted_user"
"whitelisted_user",
"user1234"
]
}
}
Expand Down Expand Up @@ -394,7 +395,50 @@
"configurations": {},
"sets": [],
"impressionsDisabled": false
}
},
{
"orgId": null,
"environment": null,
"trafficTypeId": null,
"trafficTypeName": null,
"name": "prereq_feature",
"seed": 1699838640,
"status": "ACTIVE",
"killed": false,
"changeNumber": 123,
"defaultTreatment": "off_default",
"conditions": [
{
"conditionType": "ROLLOUT",
"matcherGroup": {
"combiner": "AND",
"matchers": [
{
"matcherType": "ALL_KEYS",
"negate": false,
"userDefinedSegmentMatcherData": null,
"whitelistMatcherData": null
}
]
},
"partitions": [
{
"treatment": "on",
"size": 100
},
{
"treatment": "off",
"size": 0
}
]
}
],
"sets": [],
"prerequisites": [
{"n": "regex_test", "ts": ["on"]},
{"n": "whitelist_feature", "ts": ["off"]}
]
}
],
"s": -1,
"t": 1457726098069
Expand Down
28 changes: 24 additions & 4 deletions tests/integration/test_client_e2e.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,16 @@ def _get_treatment(factory, skip_rbs=False):
if not isinstance(factory._recorder._impressions_manager._strategy, StrategyNoneMode):
_validate_last_impressions(client, ('rbs_feature_flag', 'mauro@split.io', 'off'))

# test prerequisites matcher
assert client.get_treatment('abc4', 'prereq_feature') == 'on'
if not isinstance(factory._recorder._impressions_manager._strategy, StrategyNoneMode):
_validate_last_impressions(client, ('prereq_feature', 'abc4', 'on'))

# test prerequisites matcher
assert client.get_treatment('user1234', 'prereq_feature') == 'off_default'
if not isinstance(factory._recorder._impressions_manager._strategy, StrategyNoneMode):
_validate_last_impressions(client, ('prereq_feature', 'user1234', 'off_default'))

def _get_treatment_with_config(factory):
"""Test client.get_treatment_with_config()."""
try:
Expand Down Expand Up @@ -460,8 +470,8 @@ def _manager_methods(factory, skip_rbs=False):
assert len(manager.splits()) == 7
return

assert len(manager.split_names()) == 8
assert len(manager.splits()) == 8
assert len(manager.split_names()) == 9
assert len(manager.splits()) == 9

class InMemoryDebugIntegrationTests(object):
"""Inmemory storage-based integration tests."""
Expand Down Expand Up @@ -4458,6 +4468,16 @@ async def _get_treatment_async(factory, skip_rbs=False):

if skip_rbs:
return

# test prerequisites matcher
assert await client.get_treatment('abc4', 'prereq_feature') == 'on'
if not isinstance(factory._recorder._impressions_manager._strategy, StrategyNoneMode):
await _validate_last_impressions_async(client, ('prereq_feature', 'abc4', 'on'))

# test prerequisites matcher
assert await client.get_treatment('user1234', 'prereq_feature') == 'off_default'
if not isinstance(factory._recorder._impressions_manager._strategy, StrategyNoneMode):
await _validate_last_impressions_async(client, ('prereq_feature', 'user1234', 'off_default'))

# test rule based segment matcher
assert await client.get_treatment('bilal@split.io', 'rbs_feature_flag', {'email': 'bilal@split.io'}) == 'on'
Expand Down Expand Up @@ -4758,5 +4778,5 @@ async def _manager_methods_async(factory, skip_rbs=False):
assert len(await manager.splits()) == 7
return

assert len(await manager.split_names()) == 8
assert len(await manager.splits()) == 8
assert len(await manager.split_names()) == 9
assert len(await manager.splits()) == 9