Merge branch 'perf/local-eval-regression' into feat/flags-context-values

# Conflicts:
#	flagsmith/local_evaluation.py

Author: khvn26

flagsmith/flagsmith.py

@@ -338,8 +338,6 @@ def get_identity_segments(
                 "Local evaluation required to obtain identity segments."
             )
 
-        # Identity overrides segments are left out: they aren't segments
-        # in Flagsmith, so they're never returned.
         context = map_context_and_identity_data_to_context(
             context=local_evaluation.context,
             identifier=identifier,
@@ -497,8 +495,6 @@ def _get_environment_flags_from_document(self) -> Flags:
         if (local_evaluation := self._local_evaluation) is None:
             raise TypeError("No environment present")
 
-        # Evaluated once per environment document. `Flag` instances are
-        # shared across calls; the mapping holding them is not.
         return Flags(
             flags=dict(local_evaluation.environment_flags),
             default_flag_handler=self.default_flag_handler,

flagsmith/local_evaluation.py

@@ -57,14 +57,7 @@ def _get_context_reads(rules: typing.Iterable[SegmentRule]) -> _ContextReads:
 
 
 class LocalEvaluation:
-    """Per-environment-document state for local evaluation.
-
-    Built once each time the environment document is refreshed, so the
-    work here is amortised across every evaluation until the next refresh.
-
-    Identity overrides are kept out of the context, by identifier. Each
-    identity is evaluated with its own identity overrides segment only.
-    """
+    """Per-environment-document state for local evaluation."""
 
     def __init__(
         self,

flagsmith/mappers.py

@@ -29,7 +29,6 @@
 )
 from flagsmith.utils.datetime import fromisoformat
 
-# Each identity is evaluated with its own identity overrides segment only.
 IDENTITY_OVERRIDES_SEGMENT_KEY = "identity_overrides"
 
 

tests/test_streaming_manager.py

@@ -7,6 +7,7 @@
 from pytest_mock import MockerFixture
 
 from flagsmith import Flagsmith
+from flagsmith.local_evaluation import LocalEvaluation
 from flagsmith.streaming_manager import EventStreamManager
 from flagsmith.types import StreamEvent
 
@@ -44,7 +45,7 @@ def test_environment_updates_on_recent_event(
     mocker.patch("flagsmith.Flagsmith.update_environment")
 
     flagsmith = Flagsmith(environment_key=server_api_key)
-    flagsmith._local_evaluation = MagicMock()
+    flagsmith._local_evaluation = MagicMock(spec=LocalEvaluation)
     flagsmith._environment_updated_at = environment_updated_at
     flagsmith.handle_stream_event(event=StreamEvent(updated_at=stream_updated_at))
     assert isinstance(flagsmith.update_environment, Mock)
@@ -60,7 +61,7 @@ def test_environment_does_not_update_on_past_event(
     mocker.patch("flagsmith.Flagsmith.update_environment")
 
     flagsmith = Flagsmith(environment_key=server_api_key)
-    flagsmith._local_evaluation = MagicMock()
+    flagsmith._local_evaluation = MagicMock(spec=LocalEvaluation)
     flagsmith._environment_updated_at = environment_updated_at
 
     flagsmith.handle_stream_event(event=StreamEvent(updated_at=stream_updated_at))
@@ -77,7 +78,7 @@ def test_environment_does_not_update_on_same_event(
     mocker.patch("flagsmith.Flagsmith.update_environment")
 
     flagsmith = Flagsmith(environment_key=server_api_key)
-    flagsmith._local_evaluation = MagicMock()
+    flagsmith._local_evaluation = MagicMock(spec=LocalEvaluation)
     flagsmith._environment_updated_at = environment_updated_at
 
     flagsmith.handle_stream_event(event=StreamEvent(updated_at=stream_updated_at))