Merge branch 'main' into chore/remove-heap-mixpanel

Author: kyle-ssg

api/audit/constants.py

@@ -67,8 +67,13 @@
 
 
 RELEASE_PIPELINE_CREATED_MESSAGE = "Release Pipeline: %s created"
+RELEASE_PIPELINE_CLONED_MESSAGE = "Release Pipeline: %s cloned"
+RELEASE_PIPELINE_UPDATED_MESSAGE = "Release Pipeline: %s updated"
 RELEASE_PIPELINE_PUBLISHED_MESSAGE = "Release Pipeline: %s published"
-# TODO: Add audit log for pipeline update
+RELEASE_PIPELINE_UNPUBLISHED_MESSAGE = "Release Pipeline: %s Converted to Draft"
 RELEASE_PIPELINE_DELETED_MESSAGE = "Release Pipeline: %s deleted"
 RELEASE_PIPELINE_FEATURE_ADDED_MESSAGE = "Feature: %s added to Release Pipeline: %s"
+RELEASE_PIPELINE_FEATURE_REMOVED_MESSAGE = (
+    "Feature: %s removed from Release Pipeline: %s"
+)
 FEATURE_STATE_UPDATED_BY_RELEASE_PIPELINE_MESSAGE = "Flag state / Remote config updated for feature: %s by Release pipeline: %s (stage: %s)"

api/core/constants.py

@@ -8,3 +8,4 @@
 FLAGSMITH_SIGNATURE_HEADER = "X-Flagsmith-Signature"
 
 FLAGSMITH_UPDATED_AT_HEADER = "X-Flagsmith-Document-Updated-At"
+SDK_ENVIRONMENT_KEY_HEADER = "X_ENVIRONMENT_KEY"

api/environments/dynamodb/wrappers/identity_wrapper.py

@@ -7,9 +7,10 @@
 from boto3.dynamodb.conditions import Attr, Key
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
+from flag_engine.context.mappers import map_environment_identity_to_context
 from flag_engine.environments.models import EnvironmentModel
 from flag_engine.identities.models import IdentityModel
-from flag_engine.segments.evaluator import get_identity_segments
+from flag_engine.segments.evaluator import get_context_segments
 from rest_framework.exceptions import NotFound
 
 from edge_api.identities.search import EdgeIdentitySearchData
@@ -189,7 +190,12 @@ def get_segment_ids(
             environment = EnvironmentModel.model_validate(
                 environment_wrapper.get_item(identity.environment_api_key)
             )
-            segments = get_identity_segments(environment, identity)
+            context = map_environment_identity_to_context(
+                environment=environment,
+                identity=identity,
+                override_traits=None,
+            )
+            segments = get_context_segments(context, environment.project.segments)
             return [segment.id for segment in segments]
 
         return []

api/environments/identities/models.py

@@ -3,7 +3,8 @@
 
 from django.db import models
 from django.db.models import Prefetch, Q
-from flag_engine.segments.evaluator import evaluate_identity_in_segment
+from flag_engine.context.mappers import map_environment_identity_to_context
+from flag_engine.segments.evaluator import is_context_in_segment
 
 from environments.identities.managers import IdentityManager
 from environments.identities.traits.models import Trait
@@ -170,10 +171,15 @@ def get_segments(
         for segment in all_segments:
             engine_segment = map_segment_to_engine(segment)
 
-            if evaluate_identity_in_segment(
+            context = map_environment_identity_to_context(
+                environment=self.environment,
                 identity=engine_identity,
-                segment=engine_segment,
                 override_traits=engine_traits,
+            )
+
+            if is_context_in_segment(
+                context=context,
+                segment=engine_segment,
             ):
                 matching_segments.append(segment)
 

api/environments/identities/views.py

@@ -10,13 +10,14 @@
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_page
+from django.views.decorators.vary import vary_on_headers
 from drf_yasg.utils import swagger_auto_schema  # type: ignore[import-untyped]
 from rest_framework import status, viewsets
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
 from app.pagination import CustomPagination
-from core.constants import FLAGSMITH_UPDATED_AT_HEADER
+from core.constants import FLAGSMITH_UPDATED_AT_HEADER, SDK_ENVIRONMENT_KEY_HEADER
 from core.request_origin import RequestOrigin
 from edge_api.identities.tasks import forward_identity_request
 from environments.identities.models import Identity
@@ -161,6 +162,7 @@ class SDKIdentities(SDKAPIView):
         query_serializer=SDKIdentitiesQuerySerializer(),
         operation_id="identify_user",
     )
+    @method_decorator(vary_on_headers(SDK_ENVIRONMENT_KEY_HEADER))
     @method_decorator(
         cache_page(
             timeout=settings.GET_IDENTITIES_ENDPOINT_CACHE_SECONDS,

api/features/release_pipelines/core/models.py

@@ -7,16 +7,15 @@
 from audit.constants import (
     RELEASE_PIPELINE_CREATED_MESSAGE,
     RELEASE_PIPELINE_DELETED_MESSAGE,
-    RELEASE_PIPELINE_PUBLISHED_MESSAGE,
 )
-from audit.models import AuditLog
 from audit.related_object_type import RelatedObjectType
 from core.models import (
     SoftDeleteExportableModel,
     abstract_base_auditable_model_factory,
 )
 from features.release_pipelines.core.constants import MAX_PIPELINE_STAGES
 from features.release_pipelines.core.exceptions import InvalidPipelineStateError
+from features.versioning.models import EnvironmentFeatureVersion
 from projects.models import Project
 from users.models import FFAdminUser
 
@@ -72,7 +71,13 @@ def publish(self, published_by: FFAdminUser) -> None:
         self.published_at = timezone.now()
         self.published_by = published_by
         self.save()
-        self._create_pipeline_published_audit_log()
+
+    def unpublish(self, unpublished_by: FFAdminUser) -> None:
+        if self.published_at is None:
+            raise InvalidPipelineStateError("Pipeline is not published.")
+        self.published_at = None
+        self.published_by = None
+        self.save()
 
     def get_first_stage(self) -> "PipelineStage | None":
         return self.stages.order_by("order").first()
@@ -90,18 +95,15 @@ def get_delete_log_message(
     ) -> typing.Optional[str]:
         return RELEASE_PIPELINE_DELETED_MESSAGE % self.name
 
+    def has_feature_in_flight(self) -> bool:
+        has_feature_in_flight: bool = EnvironmentFeatureVersion.objects.filter(
+            published_at__isnull=True, pipeline_stage__in=self.stages.all()
+        ).exists()
+        return has_feature_in_flight
+
     def _get_project(self) -> Project:
         return self.project
 
-    def _create_pipeline_published_audit_log(self) -> None:
-        AuditLog.objects.create(
-            related_object_id=self.id,
-            related_object_type=RelatedObjectType.RELEASE_PIPELINE.name,
-            project=self._get_project(),
-            log=RELEASE_PIPELINE_PUBLISHED_MESSAGE % self.name,
-            author=self.published_by,
-        )
-
 
 class PipelineStage(models.Model):
     name = models.CharField(max_length=255)

api/features/views.py

@@ -10,6 +10,7 @@
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_page
+from django.views.decorators.vary import vary_on_headers
 from drf_yasg import openapi  # type: ignore[import-untyped]
 from drf_yasg.utils import swagger_auto_schema  # type: ignore[import-untyped]
 from rest_framework import mixins, serializers, status, viewsets
@@ -24,7 +25,7 @@
 from app.pagination import CustomPagination
 from app_analytics.analytics_db_service import get_feature_evaluation_data
 from app_analytics.influxdb_wrapper import get_multiple_event_list_for_feature
-from core.constants import FLAGSMITH_UPDATED_AT_HEADER
+from core.constants import FLAGSMITH_UPDATED_AT_HEADER, SDK_ENVIRONMENT_KEY_HEADER
 from core.request_origin import RequestOrigin
 from environments.authentication import EnvironmentKeyAuthentication
 from environments.identities.models import Identity
@@ -782,6 +783,7 @@ class SDKFeatureStates(GenericAPIView):  # type: ignore[type-arg]
         query_serializer=SDKFeatureStatesQuerySerializer(),
         responses={200: FeatureStateSerializerFull(many=True)},
     )
+    @method_decorator(vary_on_headers(SDK_ENVIRONMENT_KEY_HEADER))
     @method_decorator(
         cache_page(
             timeout=settings.GET_FLAGS_ENDPOINT_CACHE_SECONDS,

api/integrations/webhook/serializers.py

@@ -1,15 +1,19 @@
 import typing
 
 from django.db.models import Q
-from flag_engine.segments.evaluator import evaluate_identity_in_segment
+from flag_engine.segments.evaluator import is_context_in_segment
 from rest_framework import serializers
 
 from features.serializers import FeatureStateSerializerFull
 from integrations.common.serializers import (
     BaseEnvironmentIntegrationModelSerializer,
 )
 from segments.models import Segment
-from util.mappers.engine import map_identity_to_engine, map_segment_to_engine
+from util.mappers.engine import (
+    map_engine_identity_to_context,
+    map_identity_to_engine,
+    map_segment_to_engine,
+)
 
 from .models import WebhookConfiguration
 
@@ -33,8 +37,9 @@ def get_member(self, obj: Segment) -> bool:
             with_overrides=False,
         )
         engine_segment = map_segment_to_engine(obj)
-        return evaluate_identity_in_segment(
-            identity=engine_identity,
+        context = map_engine_identity_to_context(engine_identity)
+        return is_context_in_segment(
+            context=context,
             segment=engine_segment,
         )
 

api/poetry.lock

@@ -133,7 +133,7 @@ environs = "^14.1.1"
 django-lifecycle = "~1.2.4"
 drf-writable-nested = "~0.6.2"
 django-filter = "~2.4.0"
-flagsmith-flag-engine = "^5.3.0"
+flagsmith-flag-engine = "^5.4.3"
 boto3 = "~1.35.95"
 slack-sdk = "~3.9.0"
 asgiref = "~3.8.1"
@@ -207,7 +207,7 @@ flagsmith-split-testing = { git = "https://github.com/flagsmith/flagsmith-split-
 optional = true
 
 [tool.poetry.group.release-pipelines.dependencies]
-flagsmith-private = { git = "https://github.com/Flagsmith/flagsmith-private/", rev = "v0.1.0" }
+flagsmith-private = { git = "https://github.com/Flagsmith/flagsmith-private/", rev = "v0.2.1" }
 
 
 [tool.poetry.group.dev.dependencies]