Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion flagsmith/flagsmith.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,14 @@ def _get_environment_flags_from_document(self) -> Flags:
if self._evaluation_context is None:
raise TypeError("No environment present")

evaluation_result = engine.get_evaluation_result(self._evaluation_context)
# Omit segments from evaluation context for environment flags
# as they are only relevant for identity-specific evaluations
context_without_segments = self._evaluation_context.copy()
context_without_segments.pop("segments", None)

evaluation_result = engine.get_evaluation_result(
context=context_without_segments,
)

return Flags.from_evaluation_result(
evaluation_result=evaluation_result,
Expand Down
72 changes: 72 additions & 0 deletions tests/test_flagsmith.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,41 @@ def test_get_environment_flags_uses_local_environment_when_available(
assert all_flags[0].value == "some-value"


def test_get_environment_flags_omits_segments_from_evaluation_context(
mocker: MockerFixture,
local_eval_flagsmith: Flagsmith,
evaluation_context: SDKEvaluationContext,
) -> None:
# Given
mock_get_evaluation_result = mocker.patch(
"flagsmith.flagsmith.engine.get_evaluation_result",
autospec=True,
)

expected_evaluation_result = {
"flags": {
"some_feature": {
"name": "some_feature",
"enabled": True,
"value": "some-feature-state-value",
"metadata": {"id": 1},
}
},
"segments": [],
}

mock_get_evaluation_result.return_value = expected_evaluation_result

# When
local_eval_flagsmith.get_environment_flags()

# Then
# Verify segments are not present in the context passed to the engine
context_without_segments = evaluation_context.copy()
context_without_segments.pop("segments", None)
mock_get_evaluation_result.assert_called_once_with(context=context_without_segments)


@responses.activate()
def test_get_identity_flags_calls_api_when_no_local_environment_no_traits(
flagsmith: Flagsmith, identities_json: str
Expand Down Expand Up @@ -191,6 +226,43 @@ def test_get_identity_flags_uses_local_environment_when_available(
assert identity_flags[0].value == "some-feature-state-value"


def test_get_identity_flags_includes_segments_in_evaluation_context(
mocker: MockerFixture,
local_eval_flagsmith: Flagsmith,
) -> None:
# Given
mock_get_evaluation_result = mocker.patch(
"flagsmith.flagsmith.engine.get_evaluation_result",
autospec=True,
)

expected_evaluation_result = {
"flags": {
"some_feature": {
"name": "some_feature",
"enabled": True,
"value": "some-feature-state-value",
"metadata": {"id": 1},
}
},
"segments": [],
}

identifier = "identifier"
traits = {"some_trait": "some_value"}

mock_get_evaluation_result.return_value = expected_evaluation_result

# When
local_eval_flagsmith.get_identity_flags(identifier, traits)

# Then
# Verify segments are present in the context passed to the engine for identity flags
call_args = mock_get_evaluation_result.call_args
context = call_args[1]["context"]
assert "segments" in context


@responses.activate()
def test_get_identity_flags__transient_identity__calls_expected(
flagsmith: Flagsmith,
Expand Down