feat: BROS-502: flag_set with organization parameter and organization.id, ff for bypassing plugin verification (#8588)

Co-authored-by: Raul Martin <raul@humansignal.com>
Co-authored-by: luarmr <luarmr@users.noreply.github.com>

Author: makseq

label_studio/core/feature_flags/base.py

@@ -17,6 +17,7 @@
 logger = logging.getLogger(__name__)
 
 get_user_repr = load_func(settings.FEATURE_FLAGS_GET_USER_REPR)
+get_user_repr_from_organization = load_func(settings.FEATURE_FLAGS_GET_USER_REPR_FROM_ORGANIZATION)
 
 
 def get_feature_file_path():
@@ -69,7 +70,7 @@ def get_feature_file_path():
     client = ldclient.get()
 
 
-def flag_set(feature_flag, user=None, override_system_default=None):
+def flag_set(feature_flag, user=None, override_system_default=None, organization=None):
     """Use this method to check whether this flag is set ON to the current user, to split the logic on backend
     For example,
     ```
@@ -97,14 +98,18 @@ def flag_set(feature_flag, user=None, override_system_default=None):
         if request and getattr(request, 'user', None) and request.user.is_authenticated:
             user = request.user
 
+    if organization is None:
+        user_dict = get_user_repr(user)
+    else:
+        user_dict = get_user_repr_from_organization(organization)
+
     env_value = get_bool_env(feature_flag, default=None)
     if env_value is not None:
         return env_value
     if override_system_default is not None:
         system_default = override_system_default
     else:
         system_default = settings.FEATURE_FLAGS_DEFAULT_VALUE
-    user_dict = get_user_repr(user)
     return client.variation(feature_flag, user_dict, system_default)
 
 

label_studio/core/feature_flags/tests/test_base.py

@@ -0,0 +1,49 @@
+from label_studio.core.feature_flags.base import flag_set
+from label_studio.core.feature_flags.utils import get_user_repr_from_organization
+
+
+def test_get_user_repr_from_organization_owner_email_and_org_id(django_user_model):
+    # Create a minimal organization-like object
+    class Org:
+        def __init__(self, id, email):
+            self.id = id
+
+            class CreatedBy:
+                def __init__(self, email):
+                    self.email = email
+
+            self.created_by = CreatedBy(email)
+
+    org = Org(123, 'owner@example.com')
+
+    ctx = get_user_repr_from_organization(org)
+
+    assert ctx['key'] == 'owner@example.com'
+    assert ctx['custom']['organization'] == 'owner@example.com'
+    assert ctx['custom']['organization_id'] == 123
+
+
+def test_flag_set_with_organization_context_env_override(monkeypatch, settings):
+    # Ensure offline mode/env control for deterministic behavior
+    settings.FEATURE_FLAGS_OFFLINE = True
+
+    # Use env override path for flag resolution
+    monkeypatch.setenv('fflag_feat_test_org_targeting', 'true')
+
+    class Org:
+        def __init__(self, id, email):
+            self.id = id
+
+            class CreatedBy:
+                def __init__(self, email):
+                    self.email = email
+
+            self.created_by = CreatedBy(email)
+
+    org = Org(42, 'owner@example.com')
+
+    assert flag_set('fflag_feat_test_org_targeting', organization=org, override_system_default=False) is True
+
+    # Unset env should fall back to override_system_default=False
+    monkeypatch.delenv('fflag_feat_test_org_targeting', raising=False)
+    assert flag_set('fflag_feat_test_org_targeting', organization=org, override_system_default=False) is False

label_studio/core/feature_flags/utils.py

@@ -1,11 +1,32 @@
 def get_user_repr(user):
     """Turn user object into dict with required properties"""
     if user.is_anonymous:
-        return {'key': str(user), 'custom': {'organization': None}}
+        return {'key': str(user), 'custom': {'organization': None, 'organization_id': None}}
     user_data = {'email': user.email}
     user_data['key'] = user_data['email']
     if user.active_organization is not None:
-        user_data['custom'] = {'organization': user.active_organization.created_by.email}
+        user_data['custom'] = {
+            'organization': user.active_organization.created_by.email,
+            'organization_id': user.active_organization.id,
+        }
     else:
-        user_data['custom'] = {'organization': None}
+        user_data['custom'] = {'organization': None, 'organization_id': None}
     return user_data
+
+
+def get_user_repr_from_organization(organization):
+    """Turn organization object into its owner dict"""
+    if organization is None:
+        return {
+            'key': 'none',
+            'custom': {'organization': None, 'organization_id': None},
+        }
+
+    email = organization.created_by.email if organization.created_by else None
+    return {
+        'key': email,
+        'custom': {
+            'organization': email,
+            'organization_id': organization.id,
+        },
+    }

label_studio/core/settings/base.py

@@ -634,6 +634,7 @@
 PROJECT_IMPORT_PERMISSION = 'projects.permissions.ProjectImportPermission'
 DELETE_TASKS_ANNOTATIONS_POSTPROCESS = None
 FEATURE_FLAGS_GET_USER_REPR = 'core.feature_flags.utils.get_user_repr'
+FEATURE_FLAGS_GET_USER_REPR_FROM_ORGANIZATION = 'core.feature_flags.utils.get_user_repr_from_organization'
 
 # Test factories
 ORGANIZATION_FACTORY = 'organizations.tests.factories.OrganizationFactory'