Add missing code to remove function

Author: iarspider

process_pr_v2.py

@@ -1822,12 +1822,10 @@ def should_ignore_issue(repo_config: types.ModuleType, repo: Any, issue: Any) ->
     if issue.title and re.match(BUILD_REL, issue.title):
         return True
 
-    # Check if body has ignore marker on first line
+    # Check if body has ignore marker anywhere
     if issue.body:
-        # Get first non-blank line
         try:
-            first_line = issue.body.split("\n", 1)[0].strip()
-            if first_line and RE_CMS_BOT_IGNORE.search(first_line):
+            if RE_CMS_BOT_IGNORE.search(issue.body):
                 return True
         except (AttributeError, TypeError):
             # issue.body may be None or not a string
@@ -1836,27 +1834,14 @@ def should_ignore_issue(repo_config: types.ModuleType, repo: Any, issue: Any) ->
     return False
 
 
-def should_ignore_pr_body(pr_body: str) -> bool:
-    """
-    Check if PR should be ignored based on description only.
-
-    Returns True if first non-blank line matches <cms-bot></cms-bot>.
-
-    Note: For full ignore checking including IGNORE_ISSUES and BUILD_REL,
-    use should_ignore_issue() instead.
-    """
-    first_line, _ = extract_command_line(pr_body or "")
-    if not first_line:
-        return False
-    return bool(RE_CMS_BOT_IGNORE.match(first_line))
-
-
 def should_notify_without_at(pr_body: str) -> bool:
     """
     Check if notifications should omit @ symbol.
 
-    Returns True if <notify></notify> is found anywhere in issue body.
+    Returns True if body contains <notify></notify> anywhere.
     """
+    if not pr_body:
+        return False
     return bool(RE_NOTIFY_NO_AT.search(pr_body))
 
 
@@ -1914,6 +1899,9 @@ class PRContext:
     pending_reactions: Dict[int, str] = field(default_factory=dict)  # comment_id -> reaction
     holds: List[Hold] = field(default_factory=list)  # Active holds on the PR
     pending_labels: Set[str] = field(default_factory=set)  # Labels to add
+    pending_labels_to_remove: Set[str] = field(
+        default_factory=set
+    )  # Labels to remove (from type command)
     signing_categories: Set[str] = field(default_factory=set)  # Categories requiring signatures
     manually_assigned_categories: Set[str] = field(
         default_factory=set
@@ -3229,60 +3217,108 @@ def handle_file_count_override(context: PRContext, match: re.Match, comment: Any
 
 @command(
     "type",
-    r"^type (?P<label>[\w-]+)$",
-    description="Add a type label to the PR/Issue",
+    r"^type (?P<labels>[-+]?[\w-]+(,[-+]?[\w-]+)*)$",
+    description="Add/remove type labels on the PR/Issue",
 )
 def handle_type(context: PRContext, match: re.Match, comment: Any) -> bool:
     """
-    Handle type <label> command.
+    Handle type <labels> command.
 
-    Adds a non-blocking label to the PR/Issue. The label must be defined
+    Adds or removes non-blocking labels on the PR/Issue. Labels must be defined
     in TYPE_COMMANDS to be valid.
 
     Labels have two modes:
     - 'type': Only the last one applies (replaces previous type labels)
     - 'mtype': Accumulates (multiple can coexist)
 
+    Prefixes:
+    - No prefix or '+': Add the label
+    - '-': Remove the label
+
     Syntax:
-        type <label>
+        type <label>[,<label>...]
 
     Examples:
         type bug-fix
-        type new-feature
-        type documentation
+        type new-feature,urgent
+        type +bug-fix,-documentation
+        type -obsolete
     """
     user = comment.user.login
-    label = match.group("label")
+    labels_str = match.group("labels")
+    labels_raw = [l.strip() for l in labels_str.split(",")]
+
+    errors = []
+    labels_to_add = []
+    labels_to_remove = []
+
+    for label_raw in labels_raw:
+        if not label_raw:
+            continue
 
-    # Validate label is in TYPE_COMMANDS
-    if label not in TYPE_COMMANDS:
+        # Parse prefix
+        if label_raw.startswith("+"):
+            label = label_raw[1:]
+            action = "add"
+        elif label_raw.startswith("-"):
+            label = label_raw[1:]
+            action = "remove"
+        else:
+            label = label_raw
+            action = "add"
+
+        # Validate label is in TYPE_COMMANDS
+        if label not in TYPE_COMMANDS:
+            errors.append(label)
+            continue
+
+        if action == "add":
+            labels_to_add.append(label)
+        else:
+            labels_to_remove.append(label)
+
+    # Report errors if any
+    if errors:
         valid_labels = ", ".join(sorted(TYPE_COMMANDS.keys()))
-        context.messages.append(f"Invalid type label '{label}'. Valid labels: {valid_labels}")
-        logger.warning(f"Invalid type label: {label}")
+        context.messages.append(
+            f"Invalid type label(s): {', '.join(errors)}. Valid labels: {valid_labels}"
+        )
+        logger.warning(f"Invalid type labels: {errors}")
         return False
 
-    # Get label type (type or mtype)
-    # TYPE_COMMANDS[label] = [color, regexp, label_type]
-    label_info = TYPE_COMMANDS[label]
-    label_type = label_info[2] if len(label_info) > 2 else "mtype"
-
-    if label_type == "type":
-        # 'type' labels replace previous - remove other 'type' labels
-        type_labels_to_remove = set()
-        for existing_label in context.pending_labels:
-            if existing_label in TYPE_COMMANDS:
-                existing_info = TYPE_COMMANDS[existing_label]
-                existing_type = existing_info[2] if len(existing_info) > 2 else "mtype"
-                if existing_type == "type":
-                    type_labels_to_remove.add(existing_label)
-
-        context.pending_labels -= type_labels_to_remove
-        if type_labels_to_remove:
-            logger.debug(f"Removed previous type labels: {type_labels_to_remove}")
-
-    # Add the new label
-    context.pending_labels.add(label)
-    logger.info(f"Type label '{label}' ({label_type}) added by {user}")
+    # Process labels to add
+    for label in labels_to_add:
+        # Get label type (type or mtype)
+        # TYPE_COMMANDS[label] = [color, regexp, label_type]
+        label_info = TYPE_COMMANDS[label]
+        label_type = label_info[2] if len(label_info) > 2 else "mtype"
+
+        if label_type == "type":
+            # 'type' labels replace previous - remove other 'type' labels
+            type_labels_to_remove = set()
+            for existing_label in context.pending_labels:
+                if existing_label in TYPE_COMMANDS:
+                    existing_info = TYPE_COMMANDS[existing_label]
+                    existing_type = existing_info[2] if len(existing_info) > 2 else "mtype"
+                    if existing_type == "type":
+                        type_labels_to_remove.add(existing_label)
+
+            context.pending_labels -= type_labels_to_remove
+            if type_labels_to_remove:
+                logger.debug(f"Removed previous type labels: {type_labels_to_remove}")
+
+        # Add the new label (also remove from pending removal if it was there)
+        context.pending_labels.add(label)
+        context.pending_labels_to_remove.discard(label)
+        logger.info(f"Type label '{label}' ({label_type}) added by {user}")
+
+    # Process labels to remove
+    for label in labels_to_remove:
+        # Remove from pending adds if it was there
+        context.pending_labels.discard(label)
+        # Mark for removal from existing labels
+        context.pending_labels_to_remove.add(label)
+        logger.info(f"Type label '{label}' marked for removal by {user}")
 
     # Note: type commands are not cached - only signatures (+1/-1) are cached
     return True
@@ -5751,6 +5787,11 @@ def update_pr_status(context: PRContext) -> Tuple[Set[str], Set[str]]:
         if label not in old_labels:
             labels_to_add.add(label)
 
+    # Remove labels marked for removal via 'type -label' command
+    for label in context.pending_labels_to_remove:
+        if label in old_labels:
+            labels_to_remove.add(label)
+
     # Keep labels that aren't being removed
     for label in old_labels:
         if label not in labels_to_remove:
@@ -6757,6 +6798,7 @@ def process_pr(
                 "pr_state": None,
                 "categories": {},
                 "holds": [],
+                "labels": [],
                 "messages": [],
                 "tests_triggered": [],
             }
@@ -6776,6 +6818,7 @@ def process_pr(
             "pr_state": None,
             "categories": {},
             "holds": [],
+            "labels": [],
             "messages": [],
             "tests_triggered": [],
         }
@@ -6881,6 +6924,7 @@ def process_pr(
                     "pr_state": None,
                     "categories": {},
                     "holds": [],
+                    "labels": [],
                     "messages": [],
                     "tests_triggered": [],
                 }
@@ -6937,6 +6981,7 @@ def process_pr(
                         "pr_state": None,
                         "categories": {},
                         "holds": [],
+                        "labels": [],
                         "messages": [],
                         "tests_triggered": [],
                     }
@@ -7123,9 +7168,6 @@ def process_pr(
     pre_checks = signing_checks.pre_checks
     extra_checks = signing_checks.extra_checks
 
-    # Collect all labels
-    all_labels = set(context.pending_labels)
-
     # Return results
     return {
         "pr_number": issue.number,
@@ -7144,7 +7186,7 @@ def process_pr(
             for name, state in category_states.items()
         },
         "holds": [{"category": h.category, "user": h.user} for h in context.holds],
-        "labels": sorted(all_labels),
+        "labels": sorted(new_labels),
         "messages": context.messages,
         "status_message": status_message,
         "test_params": context.test_params,

tests/PRActionData/test_add_then_remove_same_label.json

@@ -0,0 +1,61 @@
+{
+  "test_name": "test_add_then_remove_same_label",
+  "action_count": 6,
+  "actions": [
+    {
+      "sequence": 1,
+      "action": "create_reaction",
+      "details": {
+        "comment_id": 100,
+        "reaction": "+1"
+      }
+    },
+    {
+      "sequence": 2,
+      "action": "create_reaction",
+      "details": {
+        "comment_id": 101,
+        "reaction": "+1"
+      }
+    },
+    {
+      "sequence": 3,
+      "action": "add_labels",
+      "details": {
+        "issue_number": 1,
+        "labels": [
+          "core-pending",
+          "pending-signatures",
+          "tests-pending"
+        ]
+      }
+    },
+    {
+      "sequence": 4,
+      "action": "create_comment",
+      "details": {
+        "issue_number": 1,
+        "body": "A new Pull Request was created by  @testuser.\n\n@Dr15Jones, @makortel, @smuzaffar can you please review it and eventually sign/assign? Thanks.\ncms-bot commands are listed <a href=\"http://cms-sw.github.io/cms-bot-cmssw-issues.html\">here</a>\n\n<!--welcome-->"
+      }
+    },
+    {
+      "sequence": 5,
+      "action": "create_status",
+      "details": {
+        "sha": "commit123",
+        "state": "pending",
+        "target_url": "",
+        "description": "Waiting for authorized user to issue the test command.",
+        "context": "bot/1/jenkins"
+      }
+    },
+    {
+      "sequence": 6,
+      "action": "create_comment",
+      "details": {
+        "issue_number": 1,
+        "body": "cms-bot internal usage<!-- {\"comments\":{},\"emoji\":{\"100\":\"+1\",\"101\":\"+1\"},\"fv\":{\"Package/Core/main.py::file_sha_123\":{\"cats\":[\"core\"],\"ts\":\"2025-12-12T11:00:00Z\"}}} -->"
+      }
+    }
+  ]
+}

tests/PRActionData/test_comma_separated_labels.json

@@ -0,0 +1,55 @@
+{
+  "test_name": "test_comma_separated_labels",
+  "action_count": 5,
+  "actions": [
+    {
+      "sequence": 1,
+      "action": "create_reaction",
+      "details": {
+        "comment_id": 100,
+        "reaction": "+1"
+      }
+    },
+    {
+      "sequence": 2,
+      "action": "add_labels",
+      "details": {
+        "issue_number": 1,
+        "labels": [
+          "core-pending",
+          "documentation",
+          "pending-signatures",
+          "root",
+          "tests-pending"
+        ]
+      }
+    },
+    {
+      "sequence": 3,
+      "action": "create_comment",
+      "details": {
+        "issue_number": 1,
+        "body": "A new Pull Request was created by  @testuser.\n\n@Dr15Jones, @makortel, @smuzaffar can you please review it and eventually sign/assign? Thanks.\ncms-bot commands are listed <a href=\"http://cms-sw.github.io/cms-bot-cmssw-issues.html\">here</a>\n\n<!--welcome-->"
+      }
+    },
+    {
+      "sequence": 4,
+      "action": "create_status",
+      "details": {
+        "sha": "commit123",
+        "state": "pending",
+        "target_url": "",
+        "description": "Waiting for authorized user to issue the test command.",
+        "context": "bot/1/jenkins"
+      }
+    },
+    {
+      "sequence": 5,
+      "action": "create_comment",
+      "details": {
+        "issue_number": 1,
+        "body": "cms-bot internal usage<!-- {\"comments\":{},\"emoji\":{\"100\":\"+1\"},\"fv\":{\"Package/Core/main.py::file_sha_123\":{\"cats\":[\"core\"],\"ts\":\"2025-12-12T11:00:00Z\"}}} -->"
+      }
+    }
+  ]
+}