bot: update

Signed-off-by: Akshat Kumar <[email protected]>

Author: Akshat8510

.github/scripts/check_advanced_requirement.sh

@@ -1,54 +1,80 @@
 #!/bin/bash
 set -euo pipefail
 
-# 1. Check for Exemptions (Triage, Committers, Maintainers)
-# Handle non-collaborator (404) and quote variables
-PERM_JSON=$(gh api "repos/$REPO/collaborators/$ASSIGNEE/permission" 2>/dev/null || echo '{"permission":"none"}')
-PERMISSION=$(echo "$PERM_JSON" | jq -r '.permission // "none"')
-
-if [[ "$PERMISSION" =~ ^(admin|write|triage)$ ]]; then
-  echo "User @$ASSIGNEE is a core member ($PERMISSION). Qualification check skipped."
-  exit 0
-fi
-
-# 2. Get counts of completed issues
-# Use -f q= for native URL encoding
-GFI_QUERY="repo:$REPO is:issue is:closed assignee:$ASSIGNEE -reason:\"not planned\" label:\"good first issue\""
-INT_QUERY="repo:$REPO is:issue is:closed assignee:$ASSIGNEE -reason:\"not planned\" label:\"intermediate\""
-
-GFI_COUNT=$(gh api "search/issues" -f q="$GFI_QUERY" --jq '.total_count' || echo "0")
-INT_COUNT=$(gh api "search/issues" -f q="$INT_QUERY" --jq '.total_count' || echo "0")
-
-# Robust numeric validation
-if ! [[ "$GFI_COUNT" =~ ^[0-9]+$ ]]; then GFI_COUNT=0; fi
-if ! [[ "$INT_COUNT" =~ ^[0-9]+$ ]]; then INT_COUNT=0; fi
-
-echo "Stats for @$ASSIGNEE: GFI: $GFI_COUNT, Intermediate: $INT_COUNT"
-
-# 3. Validation Logic
-if (( GFI_COUNT >= 1 )) && (( INT_COUNT >= 1 )); then
-  echo "Qualification met."
-  exit 0
-else
-  echo "Qualification failed. Revoking assignment."
+# Function to check a single user
+check_user() {
+  local user=$1
+  echo "Checking qualification for @$user..."
+
+  # 1. Permission exemption
+  PERM_JSON=$(gh api "repos/$REPO/collaborators/$user/permission" 2>/dev/null || echo '{"permission":"none"}')
+  PERMISSION=$(echo "$PERM_JSON" | jq -r '.permission // "none"')
+
+  if [[ "$PERMISSION" =~ ^(admin|write|triage)$ ]]; then
+    echo "User @$user is a core member ($PERMISSION). Qualification check skipped."
+    return 0
+  fi
+
+  # 2. Get counts
+  GFI_QUERY="repo:$REPO is:issue is:closed assignee:$user -reason:\"not planned\" label:\"good first issue\""
+  INT_QUERY="repo:$REPO is:issue is:closed assignee:$user -reason:\"not planned\" label:\"intermediate\""
+
+  GFI_COUNT=$(gh api "search/issues" -f q="$GFI_QUERY" --jq '.total_count' || echo "0")
+  INT_COUNT=$(gh api "search/issues" -f q="$INT_QUERY" --jq '.total_count' || echo "0")
+
+  if ! [[ "$GFI_COUNT" =~ ^[0-9]+$ ]]; then GFI_COUNT=0; fi
+  if ! [[ "$INT_COUNT" =~ ^[0-9]+$ ]]; then INT_COUNT=0; fi
 
-  # Quote variables to prevent word-splitting
-  gh issue edit "$ISSUE_NUMBER" --repo "$REPO" --remove-assignee "$ASSIGNEE"
+  # 3. Validation Logic
+  if (( GFI_COUNT >= 1 )) && (( INT_COUNT >= 1 )); then
+    echo "User @$user qualified."
+    return 0
+  else
+    echo "User @$user failed. Unassigning..."
 
-  # 4. Message Construction
-  MSG="Hi @$ASSIGNEE, I cannot assign you to this issue yet.
+    # CodeRabbit Improvement: Tailor the suggestion based on what is missing
+    if (( GFI_COUNT == 0 )); then
+      SUGGESTION="[good first issue](https://github.com/$REPO/labels/good%20first%20issue)"
+    else
+      SUGGESTION="[intermediate issue](https://github.com/$REPO/labels/intermediate)"
+    fi
+
+    # Remove the user
+    gh issue edit "$ISSUE_NUMBER" --repo "$REPO" --remove-assignee "$user"
+
+    # Post the tailored message
+    MSG="Hi @$user, I cannot assign you to this issue yet.
 
 **Why?**
-Advanced issues involve high-risk changes to the core codebase. They require significant testing and can impact automation and CI behavior. Because of this, we require developers to demonstrate familiarity with the repo first.
+Advanced issues involve high-risk changes to the core codebase. They require significant testing and can impact automation and CI behavior.
 
 **Requirement:**
 - Complete at least **1** 'good first issue' (You have: **$GFI_COUNT**)
 - Complete at least **1** 'intermediate' issue (You have: **$INT_COUNT**)
 
-Please feel free to pick up an [intermediate issue](https://github.com/$REPO/labels/intermediate) to get started! We look forward to your contributions."
+Please check out our **$SUGGESTION** tasks to build your experience first!"
+
+    gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "$MSG"
+  fi
+}
 
-  # Post the comment safely without printf formatting risks
-  gh issue comment "$ISSUE_NUMBER" --repo "$REPO" --body "$MSG"
+# --- Main Logic ---
+
+# Define a simple log function so the script doesn't crash
+log() {
+  echo "[advanced-check] $1"
+}
+
+# If TRIGGER_ASSIGNEE is set (from 'assigned' event), check just that person.
+# Otherwise (from 'labeled' event), check EVERYONE currently assigned.
+if [[ -n "${TRIGGER_ASSIGNEE:-}" ]]; then
+  check_user "$TRIGGER_ASSIGNEE"
+else
+  log "Checking all current assignees..."
+  # Fetch all current assignees using GitHub CLI
+  ASSIGNEES=$(gh issue view "$ISSUE_NUMBER" --repo "$REPO" --json assignees --jq '.assignees[].login')
 
-  exit 1
+  for user in $ASSIGNEES; do
+    check_user "$user"
+  done
 fi

.github/workflows/bot-advanced-check.yml

@@ -2,20 +2,17 @@ name: PythonBot - Advanced Requirement Check
 
 on:
   issues:
-    types: [assigned, labeled] # Added 'labeled' to catch label changes after assignment
+    types: [assigned, labeled]
 
-# Explicitly minimal permissions
 permissions:
   issues: write
 
-# Prevent duplicate runners/comments on the same issue
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.issue.number }}
   cancel-in-progress: true
 
 jobs:
   check-advanced-qualification:
-    # Skip the runner entirely if the issue isn't 'advanced'
     if: contains(github.event.issue.labels.*.name, 'advanced')
     runs-on: ubuntu-latest
     steps:
@@ -27,16 +24,9 @@ jobs:
       - name: Verify User Qualification
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # Handle cases where triggered by assignment or by adding a label to an assigned issue
-          ASSIGNEE: ${{ github.event.assignee.login || github.event.issue.assignee.login }}
+          TRIGGER_ASSIGNEE: ${{ github.event.assignee.login || '' }}
           ISSUE_NUMBER: ${{ github.event.issue.number }}
           REPO: ${{ github.repository }}
         run: |
-          # If no one is assigned, exit early
-          if [ -z "$ASSIGNEE" ]; then
-            echo "No assignee to check. Skipping."
-            exit 0
-          fi
-          
           chmod +x .github/scripts/check_advanced_requirement.sh
           ./.github/scripts/check_advanced_requirement.sh