HumanSignal
diff --git a/‎docs/source/guide/custom_metric.md‎
Lines changed: 11 additions & 3 deletions b/‎docs/source/guide/custom_metric.md‎
Lines changed: 11 additions & 3 deletions
diff --git a/‎label_studio/data_manager/managers.py‎
Lines changed: 13 additions & 3 deletions b/‎label_studio/data_manager/managers.py‎
Lines changed: 13 additions & 3 deletions
@@ -107,7 +107,7 @@ Set up a custom agreement metric for a specific project in Label Studio Enterpri
 
 1. Within a project on the Label Studio UI, click **Settings**.
 2. Click **Quality**.
-3. Under **Annotation Agreement**:
+3. Under **Task agreement**:
     - **Metric name**: Use the drop-down menu to select **Custom agreement metric**.
     - **Lambda Tags**: Add tags to AWS Lambda function using the syntax `tag_name tag_value`.
     - **Lambda Prefix**: Select a Prefix.
@@ -140,13 +140,11 @@ Using your preferred method, create an AWS IAM role.
     "Version": "2012-10-17",
     "Statement": [
         {
-            "Sid": "VisualEditor0",
             "Effect": "Allow",
             "Action": "logs:CreateLogGroup",
             "Resource": "arn:aws:logs:*:YOUR_AWS_ACCOUNT:*"
         },
         {
-            "Sid": "VisualEditor1",
             "Effect": "Allow",
             "Action": [
                 "logs:CreateLogStream",
@@ -155,6 +153,16 @@ Using your preferred method, create an AWS IAM role.
             "Resource": [
                 "arn:aws:logs:*:YOUR_AWS_ACCOUNT:log-group:/aws/lambda/custom-metric-*"
             ]
+        },
+        {
+            "Effect": "Allow",
+            "Action": [
+                "logs:CreateLogGroup",
+                "logs:PutRetentionPolicy"
+            ],
+           "Resource": [
+               "arn:aws:logs:*:YOUR_AWS_ACCOUNT:log-group:/aws/lambda/custom-metric-*"
+           ]
         }
     ]
 }
 
@@ -708,30 +708,39 @@ def update_annotation_map(obj):
 
 class PreparedTaskManager(models.Manager):
     @staticmethod
-    def annotate_queryset(queryset, fields_for_evaluation=None, all_fields=False, request=None):
+    def annotate_queryset(
+        queryset, fields_for_evaluation=None, all_fields=False, excluded_fields_for_evaluation=None, request=None
+    ):
         annotations_map = get_annotations_map()
 
         if fields_for_evaluation is None:
             fields_for_evaluation = []
 
+        if excluded_fields_for_evaluation is None:
+            excluded_fields_for_evaluation = []
+
         first_task = queryset.first()
         project = None if first_task is None else first_task.project
 
         # db annotations applied only if we need them in ordering or filters
         for field in annotations_map.keys():
-            if field in fields_for_evaluation or all_fields:
+            # Include field if it's explicitly requested or all_fields=True, but exclude if it's in the exclusion list
+            if (field in fields_for_evaluation or all_fields) and field not in excluded_fields_for_evaluation:
                 queryset.project = project
                 queryset.request = request
                 function = annotations_map[field]
                 queryset = function(queryset)
 
         return queryset
 
-    def get_queryset(self, fields_for_evaluation=None, prepare_params=None, all_fields=False):
+    def get_queryset(
+        self, fields_for_evaluation=None, prepare_params=None, all_fields=False, excluded_fields_for_evaluation=None
+    ):
         """
         :param fields_for_evaluation: list of annotated fields in task
         :param prepare_params: filters, ordering, selected items
         :param all_fields: evaluate all fields for task
+        :param excluded_fields_for_evaluation: list of fields to exclude even when all_fields=True
         :param request: request for user extraction
         :return: task queryset with annotated fields
         """
@@ -740,6 +749,7 @@ def get_queryset(self, fields_for_evaluation=None, prepare_params=None, all_fiel
             queryset,
             fields_for_evaluation=fields_for_evaluation,
             all_fields=all_fields,
+            excluded_fields_for_evaluation=excluded_fields_for_evaluation,
             request=prepare_params.request,
         )