Merge main into refactor/segment-change-requests-cleanup

Author: emyller

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "2.199.0"
+  ".": "2.200.0"
 }

CHANGELOG.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## [2.200.0](https://github.com/Flagsmith/flagsmith/compare/v2.199.0...v2.200.0) (2025-11-11)
+
+
+### Features
+
+* add pylon chat ([#6214](https://github.com/Flagsmith/flagsmith/issues/6214)) ([7a5f64d](https://github.com/Flagsmith/flagsmith/commit/7a5f64dd4643012c0e9b691316de326c1478f89e))
+* added-query-param-to-get-segment-feature-states ([#6156](https://github.com/Flagsmith/flagsmith/issues/6156)) ([9ad82d5](https://github.com/Flagsmith/flagsmith/commit/9ad82d53818eecb6cda44de9cf61a9d5be3ae46e))
+* context values - implement multi-select dropdown on envs ([#6239](https://github.com/Flagsmith/flagsmith/issues/6239)) ([331cd9e](https://github.com/Flagsmith/flagsmith/commit/331cd9eadf74e62bb5809dd9f279b97df8f54589))
+* trigger FLAG_UPDATED webhooks for v2 versioning environments ([#6240](https://github.com/Flagsmith/flagsmith/issues/6240)) ([94afd46](https://github.com/Flagsmith/flagsmith/commit/94afd46a263172b11b9e212aa23cbe55bc644e20))
+
+
+### Bug Fixes
+
+* added-tags-in-approval-has-permissions ([#6227](https://github.com/Flagsmith/flagsmith/issues/6227)) ([d4229a9](https://github.com/Flagsmith/flagsmith/commit/d4229a9f9a6aec01e201b5c43b13d0d738153b97))
+* metrics endpoint identity overrides ([#6159](https://github.com/Flagsmith/flagsmith/issues/6159)) ([b44cf42](https://github.com/Flagsmith/flagsmith/commit/b44cf4258f3e518e79448805dba08aab1a51e333))
+* Pin firefox version ([#6244](https://github.com/Flagsmith/flagsmith/issues/6244)) ([3f8b260](https://github.com/Flagsmith/flagsmith/commit/3f8b260832b9e964d2f4480394491bc83d35e34f))
+* properly deal with context values dropdown ([#6222](https://github.com/Flagsmith/flagsmith/issues/6222)) ([bca5744](https://github.com/Flagsmith/flagsmith/commit/bca5744614ccaca1b9eeec648748eca741eb8f0e))
+* resolve flaky test due to non-deterministic variation ordering ([#6269](https://github.com/Flagsmith/flagsmith/issues/6269)) ([f8a3381](https://github.com/Flagsmith/flagsmith/commit/f8a3381120649276440987dbe4bb7daf05fa6bc8))
+* Revert "infra: Remove PGP key from SaaS build" ([#6197](https://github.com/Flagsmith/flagsmith/issues/6197)) ([db16264](https://github.com/Flagsmith/flagsmith/commit/db162648b30105ae123bcb2b86be628a7f5535ea))
+* segment change request warning shows on all segments ([#6255](https://github.com/Flagsmith/flagsmith/issues/6255)) ([560a04d](https://github.com/Flagsmith/flagsmith/commit/560a04d0e8c40314e4bac4e0216d4b0360b324bf))
+* show whitespace warnings for IN operator comma-separated values ([#6203](https://github.com/Flagsmith/flagsmith/issues/6203)) ([1b75a10](https://github.com/Flagsmith/flagsmith/commit/1b75a10d0b951c8db30ce4a9322b9eb81ee11288))
+* **sse_stream_access_logs:** Add timeout ([#6198](https://github.com/Flagsmith/flagsmith/issues/6198)) ([4d15821](https://github.com/Flagsmith/flagsmith/commit/4d1582119cad72ea817c64bdfd22125d17c7a6a5))
+* switched-allow-context-values-to-disabled ([#6216](https://github.com/Flagsmith/flagsmith/issues/6216)) ([f95a4f6](https://github.com/Flagsmith/flagsmith/commit/f95a4f6f47b37b2b747a1fc58ff496e82aca3a64))
+
+
+### Infrastructure (Flagsmith SaaS Only)
+
+* Remove PGP key from SaaS build ([#6194](https://github.com/Flagsmith/flagsmith/issues/6194)) ([9b43a37](https://github.com/Flagsmith/flagsmith/commit/9b43a379de18f0ddf18d7de470f94e9cb8531bf2))
+
+
+### Dependency Updates
+
+* bump django from 4.2.25 to 4.2.26 in /api ([#6249](https://github.com/Flagsmith/flagsmith/issues/6249)) ([4e474f1](https://github.com/Flagsmith/flagsmith/commit/4e474f1e7615fa40691da102354e7e8498a579b9))
+* Bump flagsmith-common from 2.2.2 to 2.2.3 ([#6235](https://github.com/Flagsmith/flagsmith/issues/6235)) ([7474ba9](https://github.com/Flagsmith/flagsmith/commit/7474ba9961912be68cae6605179b3dc5a7b02605))
+* Bump flagsmith-common from 2.2.3 to 2.2.4 ([#6237](https://github.com/Flagsmith/flagsmith/issues/6237)) ([5926910](https://github.com/Flagsmith/flagsmith/commit/5926910729572f5ff6f330f9c309ae78f5f38f29))
+* bump flagsmith-common to 2.2.2 ([#6225](https://github.com/Flagsmith/flagsmith/issues/6225)) ([786cbd9](https://github.com/Flagsmith/flagsmith/commit/786cbd9d09605a35c3df5044b1fad099ed9eba91))
+* bump flagsmith-workflows to 3.1.0 ([#6140](https://github.com/Flagsmith/flagsmith/issues/6140)) ([33ad626](https://github.com/Flagsmith/flagsmith/commit/33ad6265af25e9887f2c158ccc381db449dabf06))
+* update flagsmith js client dependency ([#6257](https://github.com/Flagsmith/flagsmith/issues/6257)) ([c4b5a4a](https://github.com/Flagsmith/flagsmith/commit/c4b5a4a97bd1416bdd870a0fce5bceac731edb23))
+* update flagsmith-common 2.2.6 ([#6267](https://github.com/Flagsmith/flagsmith/issues/6267)) ([64aa842](https://github.com/Flagsmith/flagsmith/commit/64aa842e6ec7f5ac283ae3bb3171983bfcfe6f77))
+
 ## [2.199.0](https://github.com/Flagsmith/flagsmith/compare/v2.198.1...v2.199.0) (2025-10-22)
 
 

api/environments/models.py

@@ -635,9 +635,9 @@ def generate_webhook_feature_state_data(
         environment: Environment,
         enabled: bool,
         value: typing.Union[str, int, bool, type(None)],  # type: ignore[valid-type]
-        identity_id: typing.Union[int, str] = None,  # type: ignore[assignment]
-        identity_identifier: str = None,  # type: ignore[assignment]
-        feature_segment: FeatureSegment = None,  # type: ignore[assignment]
+        identity_id: int | str | None = None,
+        identity_identifier: str | None = None,
+        feature_segment: FeatureSegment | None = None,
     ) -> dict:  # type: ignore[type-arg]
         if (identity_id or identity_identifier) and not (
             identity_id and identity_identifier

api/features/tasks.py

@@ -90,7 +90,7 @@ def _get_feature_state_webhook_data(feature_state, previous=False):  # type: ign
         enabled=feature_state.enabled,
         value=feature_state_value,
         identity_id=feature_state.identity_id,
-        identity_identifier=getattr(feature_state.identity, "identifier", None),  # type: ignore[arg-type]
+        identity_identifier=getattr(feature_state.identity, "identifier", None),
         feature_segment=feature_state.feature_segment,
     )
 

api/features/versioning/tasks.py

@@ -23,9 +23,12 @@
 )
 from features.versioning.versioning_service import (
     get_environment_flags_queryset,
+    get_updated_feature_states_for_version,
 )
 from users.models import FFAdminUser
-from webhooks.webhooks import WebhookEventType, call_environment_webhooks
+from webhooks import mappers as webhook_mappers
+from webhooks.tasks import call_environment_webhooks, call_organisation_webhooks
+from webhooks.webhooks import WebhookEventType
 
 if typing.TYPE_CHECKING:
     from environments.models import Environment
@@ -131,6 +134,98 @@ def _create_initial_feature_versions(environment: "Environment"):  # type: ignor
         )
 
 
+def _trigger_feature_state_webhooks_for_version(
+    environment_feature_version: EnvironmentFeatureVersion,
+) -> None:
+    """
+    Trigger FLAG_UPDATED webhooks for feature states that have changed in the newly published version.
+
+    This allows webhook consumers to receive granular per-featurestate updates in the same
+    format as non-versioned environments, while NEW_VERSION_PUBLISHED serves as a
+    summary event.
+    """
+    from environments.models import Webhook
+
+    # Get metadata from the version
+    assert environment_feature_version.published_at is not None
+    timestamp = webhook_mappers.datetime_to_webhook_timestamp(
+        environment_feature_version.published_at
+    )
+    changed_by = webhook_mappers.user_or_key_to_changed_by(
+        user=environment_feature_version.published_by,
+        api_key=environment_feature_version.published_by_api_key,
+    )
+
+    changed_feature_states = get_updated_feature_states_for_version(
+        environment_feature_version
+    )
+
+    # Get previous version for retrieving previous states
+    previous_version = environment_feature_version.get_previous_version()
+    previous_feature_states_map = {}
+    if previous_version:
+        for fs in previous_version.feature_states.all():
+            segment_id = fs.feature_segment.segment_id if fs.feature_segment else None
+            key = (fs.identity_id, segment_id)
+            previous_feature_states_map[key] = fs
+
+    # Trigger FLAG_UPDATED webhooks for each changed feature state
+    for feature_state in changed_feature_states:
+        # Get the current state data
+        assert feature_state.environment is not None
+        new_state = Webhook.generate_webhook_feature_state_data(
+            feature_state.feature,
+            environment=feature_state.environment,
+            enabled=feature_state.enabled,
+            value=feature_state.get_feature_state_value(),
+            identity_id=feature_state.identity_id,
+            identity_identifier=getattr(feature_state.identity, "identifier", None),
+            feature_segment=feature_state.feature_segment,
+        )
+
+        # Build webhook data
+        data = {
+            "new_state": new_state,
+            "changed_by": changed_by,
+            "timestamp": timestamp,
+        }
+
+        # Add previous state if it exists
+        segment_id = (
+            feature_state.feature_segment.segment_id
+            if feature_state.feature_segment
+            else None
+        )
+        key = (feature_state.identity_id, segment_id)
+        previous_fs = previous_feature_states_map.get(key)
+
+        if previous_fs:
+            assert previous_fs.environment is not None
+            previous_state = Webhook.generate_webhook_feature_state_data(
+                previous_fs.feature,
+                environment=previous_fs.environment,
+                enabled=previous_fs.enabled,
+                value=previous_fs.get_feature_state_value(),
+                identity_id=previous_fs.identity_id,
+                identity_identifier=getattr(previous_fs.identity, "identifier", None),
+                feature_segment=previous_fs.feature_segment,
+            )
+            data["previous_state"] = previous_state
+
+        # Trigger webhooks
+        call_environment_webhooks(
+            environment_id=environment_feature_version.environment_id,
+            data=data,
+            event_type=WebhookEventType.FLAG_UPDATED.value,
+        )
+
+        call_organisation_webhooks(
+            organisation_id=environment_feature_version.environment.project.organisation_id,
+            data=data,
+            event_type=WebhookEventType.FLAG_UPDATED.value,
+        )
+
+
 @register_task_handler()
 def trigger_update_version_webhooks(environment_feature_version_uuid: str) -> None:
     environment_feature_version = EnvironmentFeatureVersion.objects.get(
@@ -140,6 +235,10 @@ def trigger_update_version_webhooks(environment_feature_version_uuid: str) -> No
         logger.exception("Feature version has not been published.")
         return
 
+    # Trigger FLAG_UPDATED webhooks for any feature states that have changed
+    _trigger_feature_state_webhooks_for_version(environment_feature_version)
+
+    # Then trigger the NEW_VERSION_PUBLISHED webhook as a summary event
     data = environment_feature_version_webhook_schema.dump(environment_feature_version)
     call_environment_webhooks(
         environment_id=environment_feature_version.environment_id,

api/features/versioning/versioning_service.py

@@ -101,6 +101,52 @@ def get_current_live_environment_feature_version(
     )
 
 
+def get_updated_feature_states_for_version(
+    version: EnvironmentFeatureVersion,
+) -> list[FeatureState]:
+    """
+    Returns feature states that changed compared to the previous version.
+    """
+
+    def get_match_key(fs: FeatureState) -> tuple[int | None, int | None]:
+        segment_id = fs.feature_segment.segment_id if fs.feature_segment else None
+        return (fs.identity_id, segment_id)
+
+    def multivariate_values_changed(
+        fs: FeatureState, previous_fs: FeatureState
+    ) -> bool:
+        current_mv_values = {
+            mv.multivariate_feature_option_id: mv.percentage_allocation
+            for mv in fs.multivariate_feature_state_values.all()
+        }
+        previous_mv_values = {
+            mv.multivariate_feature_option_id: mv.percentage_allocation
+            for mv in previous_fs.multivariate_feature_state_values.all()
+        }
+        return current_mv_values != previous_mv_values
+
+    previous_version = version.get_previous_version()
+    previous_feature_states_map = (
+        {get_match_key(fs): fs for fs in previous_version.feature_states.all()}
+        if previous_version
+        else {}
+    )
+
+    changed_feature_states = []
+    for feature_state in version.feature_states.all():
+        previous_fs = previous_feature_states_map.get(get_match_key(feature_state))
+
+        if previous_fs is None or (
+            feature_state.enabled != previous_fs.enabled
+            or feature_state.get_feature_state_value()
+            != previous_fs.get_feature_state_value()
+            or multivariate_values_changed(feature_state, previous_fs)
+        ):
+            changed_feature_states.append(feature_state)
+
+    return changed_feature_states
+
+
 def _get_feature_states_queryset(
     environment: "Environment",
     feature_name: str | None = None,