Skip to content

feat: Update ChangeSet to always require a Selector #405

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
jsonbailey merged 9 commits into from
Feb 4, 2026
+16 −18
Merged

feat: Update ChangeSet to always require a Selector #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e151f86
chore: Minor cleanup
jsonbailey Jan 13, 2026
2cae5d4
have builder use no selector
jsonbailey Jan 13, 2026
48cc145
Merge branch 'main' into jb/sdk-1748/minor-changes
jsonbailey Jan 20, 2026
d90883e
ensure we stop the datasource
jsonbailey Jan 20, 2026
366ed32
fix failing test
jsonbailey Jan 20, 2026
355a02f
Merge branch 'main' into jb/sdk-1748/minor-changes
jsonbailey Feb 3, 2026
9774633
fix lint issue
jsonbailey Feb 3, 2026
892cb78
feat: Update ChangeSet to always require a Selector
jsonbailey Feb 3, 2026
57f5d00
Merge branch 'main' into jb/sdk-1748/always-require-selector
jsonbailey Feb 4, 2026
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
2 changes: 1 addition & 1 deletion ldclient/impl/datasourcev2/polling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def _poll(self, ss: SelectorStore) -> BasisResult:

basis = Basis(
change_set=change_set,
persist=change_set.selector is not None and change_set.selector.is_defined(),
persist=change_set.selector.is_defined(),
environment_id=env_id,
)

Expand Down
2 changes: 1 addition & 1 deletion ldclient/impl/datasystem/fdv2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ def _run_initializers(self, set_on_ready: Event):
self._store.apply(basis.change_set, basis.persist)

# Set ready event if an only if a selector is defined for the changeset
if basis.change_set.selector is not None and basis.change_set.selector.is_defined():
if basis.change_set.selector.is_defined():
set_on_ready.set()
return
except Exception as e:
Expand Down
4 changes: 2 additions & 2 deletions ldclient/impl/datasystem/store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def apply(self, change_set: ChangeSet, persist: bool) -> None:
log.error("Store: couldn't apply changeset: %s", str(e))

def _set_basis(
self, collections: Collections, selector: Optional[Selector], persist: bool
self, collections: Collections, selector: Selector, persist: bool
) -> None:
"""
Set the basis of the store. Any existing data is discarded.
Expand Down Expand Up @@ -310,7 +310,7 @@ def _set_basis(
self._send_change_events(affected_items)

def _apply_delta(
self, collections: Collections, selector: Optional[Selector], persist: bool
self, collections: Collections, selector: Selector, persist: bool
) -> None:
"""
Apply a delta update to the store.
Expand Down
2 changes: 1 addition & 1 deletion ldclient/interfaces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,7 +1346,7 @@ class ChangeSet:

intent_code: IntentCode
changes: List[Change]
selector: Optional[Selector]
selector: Selector


@dataclass(frozen=True)
Expand Down
8 changes: 3 additions & 5 deletions ldclient/testing/impl/datasourcev2/test_polling_payload_parsing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ def test_transfer_none():
change_set = result.value
assert change_set.intent_code == IntentCode.TRANSFER_NONE
assert len(change_set.changes) == 0
assert change_set.selector is not None
assert not change_set.selector.is_defined()


Expand All @@ -59,7 +58,7 @@ def test_transfer_full_with_empty_payload():
change_set = result.value
assert change_set.intent_code == IntentCode.TRANSFER_FULL
assert len(change_set.changes) == 0
assert change_set.selector is not None
assert change_set.selector.is_defined()
assert change_set.selector.state == "(p:5A46PZ79FQ9D08YYKT79DECDNV:461)"
assert change_set.selector.version == 461

Expand Down Expand Up @@ -87,7 +86,7 @@ def test_processes_put_object():
assert change_set.changes[0].version == 461
assert isinstance(change_set.changes[0].object, dict)

assert change_set.selector is not None
assert change_set.selector.is_defined()
assert change_set.selector.state == "(p:5A46PZ79FQ9D08YYKT79DECDNV:461)"
assert change_set.selector.version == 461

Expand All @@ -107,7 +106,7 @@ def test_processes_delete_object():
assert change_set.changes[0].version == 461
assert change_set.changes[0].object is None

assert change_set.selector is not None
assert change_set.selector.is_defined()
assert change_set.selector.state == "(p:5A46PZ79FQ9D08YYKT79DECDNV:461)"
assert change_set.selector.version == 461

Expand Down Expand Up @@ -169,7 +168,6 @@ def test_fdv1_payload_empty_flags_and_segments():
assert change_set.intent_code == IntentCode.TRANSFER_FULL
assert len(change_set.changes) == 0
# FDv1 doesn't use selectors
assert change_set.selector is not None
assert not change_set.selector.is_defined()


Expand Down
6 changes: 3 additions & 3 deletions ldclient/testing/impl/datasourcev2/test_polling_synchronizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def test_handles_empty_changeset():

assert valid.change_set is not None
assert len(valid.change_set.changes) == 0
assert valid.change_set.selector is not None
assert valid.change_set.selector.is_defined()
assert valid.change_set.selector.version == 300
assert valid.change_set.selector.state == "p:SOMETHING:300"
assert valid.change_set.intent_code == IntentCode.TRANSFER_FULL
Expand Down Expand Up @@ -175,7 +175,7 @@ def test_handles_put_objects():
assert valid.change_set.changes[0].key == "flag-key"
assert valid.change_set.changes[0].object == {"key": "flag-key"}
assert valid.change_set.changes[0].version == 100
assert valid.change_set.selector is not None
assert valid.change_set.selector.is_defined()
assert valid.change_set.selector.version == 300
assert valid.change_set.selector.state == "p:SOMETHING:300"
assert valid.change_set.intent_code == IntentCode.TRANSFER_FULL
Expand Down Expand Up @@ -205,7 +205,7 @@ def test_handles_delete_objects():
assert valid.change_set.changes[0].kind == ObjectKind.FLAG
assert valid.change_set.changes[0].key == "flag-key"
assert valid.change_set.changes[0].version == 101
assert valid.change_set.selector is not None
assert valid.change_set.selector.is_defined()
assert valid.change_set.selector.version == 300
assert valid.change_set.selector.state == "p:SOMETHING:300"
assert valid.change_set.intent_code == IntentCode.TRANSFER_FULL
Expand Down
10 changes: 5 additions & 5 deletions ldclient/testing/impl/datasourcev2/test_streaming_synchronizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def test_handles_empty_changeset(events): # pylint: disable=redefined-outer-nam

assert updates[0].change_set is not None
assert len(updates[0].change_set.changes) == 0
assert updates[0].change_set.selector is not None
assert updates[0].change_set.selector.is_defined()
assert updates[0].change_set.selector.version == 300
assert updates[0].change_set.selector.state == "p:SOMETHING:300"
assert updates[0].change_set.intent_code == IntentCode.TRANSFER_FULL
Expand Down Expand Up @@ -259,7 +259,7 @@ def test_handles_put_objects(events): # pylint: disable=redefined-outer-name
assert updates[0].change_set.changes[0].key == "flag-key"
assert updates[0].change_set.changes[0].object == {"key": "flag-key"}
assert updates[0].change_set.changes[0].version == 100
assert updates[0].change_set.selector is not None
assert updates[0].change_set.selector.is_defined()
assert updates[0].change_set.selector.version == 300
assert updates[0].change_set.selector.state == "p:SOMETHING:300"
assert updates[0].change_set.intent_code == IntentCode.TRANSFER_FULL
Expand Down Expand Up @@ -290,7 +290,7 @@ def test_handles_delete_objects(events): # pylint: disable=redefined-outer-name
assert updates[0].change_set.changes[0].kind == ObjectKind.FLAG
assert updates[0].change_set.changes[0].key == "flag-key"
assert updates[0].change_set.changes[0].version == 101
assert updates[0].change_set.selector is not None
assert updates[0].change_set.selector.is_defined()
assert updates[0].change_set.selector.version == 300
assert updates[0].change_set.selector.state == "p:SOMETHING:300"
assert updates[0].change_set.intent_code == IntentCode.TRANSFER_FULL
Expand All @@ -317,7 +317,7 @@ def test_swallows_goodbye(events): # pylint: disable=redefined-outer-name

assert updates[0].change_set is not None
assert len(updates[0].change_set.changes) == 0
assert updates[0].change_set.selector is not None
assert updates[0].change_set.selector.is_defined()
assert updates[0].change_set.selector.version == 300
assert updates[0].change_set.selector.state == "p:SOMETHING:300"
assert updates[0].change_set.intent_code == IntentCode.TRANSFER_FULL
Expand All @@ -344,7 +344,7 @@ def test_swallows_heartbeat(events): # pylint: disable=redefined-outer-name

assert updates[0].change_set is not None
assert len(updates[0].change_set.changes) == 0
assert updates[0].change_set.selector is not None
assert updates[0].change_set.selector.is_defined()
assert updates[0].change_set.selector.version == 300
assert updates[0].change_set.selector.state == "p:SOMETHING:300"
assert updates[0].change_set.intent_code == IntentCode.TRANSFER_FULL
Expand Down