Merge branch 'master' into feature/709-flag-invalid-prs

Author: prathmeshkulkarni-coder

.github/actions/bot-autoassign/base.py

@@ -1,6 +1,7 @@
 import os
 
-from github import Github
+from github import Github, GithubException
+from utils import extract_all_linked_issues
 
 MAINTAINER_ROLES = frozenset({"OWNER", "MEMBER", "COLLABORATOR"})
 DEFAULT_EXCLUDE_PR_AUTHORS = "dependabot[bot]"
@@ -22,7 +23,6 @@ def __init__(self):
         self.bot_login = (
             bot_username if bot_username.endswith("[bot]") else f"{bot_username}[bot]"
         )
-
         if self.github_token and self.repository_name:
             try:
                 self.github = Github(self.github_token)
@@ -52,69 +52,87 @@ def _project_title_key(cls, title: str) -> str:
 
     def get_issue_projects(self, owner, repo_name, issue_number):
         query = """
-        query($owner: String!, $repo: String!, $issueNumber: Int!) {
+        query($owner: String!, $repo: String!, $issueNumber: Int!, $cursor: String) {
           repository(owner: $owner, name: $repo) {
             issue(number: $issueNumber) {
-              projectItems(first: 10) {
+              projectItems(first: 100, after: $cursor) {
                 nodes {
                   project {
                     title
                   }
                 }
+                pageInfo {
+                  hasNextPage
+                  endCursor
+                }
               }
             }
           }
         }
         """
-        variables = {"owner": owner, "repo": repo_name, "issueNumber": issue_number}
-        headers, result = self.github.requester.graphql_query(query, variables)
-        print(f"DEBUG: Raw GraphQL response: {result}")
+        projects = []
+        has_next_page = True
+        cursor = None
+
+        while has_next_page:
+            variables = {
+                "owner": owner,
+                "repo": repo_name,
+                "issueNumber": issue_number,
+                "cursor": cursor,
+            }
+            headers, result = self.github.requester.graphql_query(query, variables)
 
-        if "errors" in result:
-            raise ValueError(f"GraphQL API Permission Error: {result['errors']}")
+            if "errors" in result:
+                raise ValueError(f"GraphQL API Permission Error: {result['errors']}")
+
+            repo_data = result.get("data", {}).get("repository")
+            if not repo_data:
+                raise ValueError(
+                    f"GraphQL could not access repository {owner}/{repo_name}; "
+                    "possible GitHub API or permission error"
+                )
+
+            issue_node = repo_data.get("issue")
+            if issue_node is None:
+                raise ValueError(
+                    f"GraphQL could not access issue {owner}/{repo_name}#{issue_number}; "
+                    "possible GitHub API or permission error"
+                )
+
+            project_items = issue_node.get("projectItems")
+            if project_items is None:
+                raise ValueError(
+                    f"GraphQL could not read project assignments for "
+                    f"{owner}/{repo_name}#{issue_number}; "
+                    "possible GitHub API or permission error"
+                )
+
+            nodes = project_items.get("nodes") or []
+            for node in nodes:
+                if not node:
+                    continue
+                project = node.get("project") or {}
+                title = project.get("title")
+                if title:
+                    projects.append(self._normalize_project_title(title))
+
+            page_info = project_items.get("pageInfo") or {}
+            has_next_page = page_info.get("hasNextPage", False)
+            cursor = page_info.get("endCursor")
 
-        repo_data = result.get("data", {}).get("repository")
-        if not repo_data:
-            raise ValueError(
-                f"GraphQL could not access repository {owner}/{repo_name}; "
-                "possible GitHub API or permission error"
-            )
-        issue_node = repo_data.get("issue")
-        if issue_node is None:
-            raise ValueError(
-                f"GraphQL could not access issue {owner}/{repo_name}#{issue_number}; "
-                "possible GitHub API or permission error"
-            )
-        project_items = issue_node.get("projectItems")
-        if project_items is None:
-            raise ValueError(
-                f"GraphQL could not read project assignments for "
-                f"{owner}/{repo_name}#{issue_number}; "
-                "possible GitHub API or permission error"
-            )
-        nodes = project_items.get("nodes") or []
-        projects = []
-        for node in nodes:
-            if not node:
-                continue
-            project = node.get("project") or {}
-            title = project.get("title")
-            if title:
-                projects.append(self._normalize_project_title(title))
         return projects
 
     def validate_pr_issues(self, pr):
         """Validate if a pull request is from an exempt user or references a validated issue."""
         if not self.github or not self.repository_name:
             print("GitHub client or repository name not initialized")
             return False
-
         pr_author = (
             pr.user.login
             if pr.user and isinstance(getattr(pr.user, "login", None), str)
             else ""
         )
-
         exclude_authors_env = os.environ.get(
             "EXCLUDE_PR_AUTHORS", DEFAULT_EXCLUDE_PR_AUTHORS
         )
@@ -124,39 +142,30 @@ def validate_pr_issues(self, pr):
         if pr_author in excluded_authors:
             print(f"Author {pr_author} is in the exclude list. Proceeding.")
             return True
-
         author_association = str(getattr(pr, "author_association", "") or "")
         if author_association in MAINTAINER_ROLES:
             print(
                 f"Author {pr_author} is exempt due to association: "
                 f"{author_association}. Proceeding."
             )
             return True
-
-        from utils import extract_all_linked_issues
-
         pr_body = pr.body if isinstance(pr.body, str) else ""
         linked_issues = extract_all_linked_issues(pr_body, self.repository_name)
         if not linked_issues:
             print("No linked issues found in PR body for external contributor.")
             return False
-
         current_org = self.repository_name.split("/")[0].lower()
         required_projects = {
             self._project_title_key(p) for p in REQUIRED_CONTRIBUTOR_PROJECTS
         }
-
         for owner, repo_name, issue_number in linked_issues:
             if owner.lower() != current_org:
                 print(
                     f"Issue {owner}/{repo_name}#{issue_number} does not belong "
                     f"to organization {current_org}, skipping validation."
                 )
                 continue
-
             try:
-                from github import GithubException
-
                 target_repo = self.github.get_repo(f"{owner}/{repo_name}")
                 issue = target_repo.get_issue(issue_number)
             except Exception as e:
@@ -167,19 +176,16 @@ def validate_pr_issues(self, pr):
                     continue
                 print(f"Error fetching issue {owner}/{repo_name}#{issue_number}: {e}")
                 raise
-
             if issue.pull_request:
                 print(
                     f"Reference {owner}/{repo_name}#{issue_number} is a pull request, skipping validation."
                 )
                 continue
-
             if issue.state != "open":
                 print(
                     f"Issue {owner}/{repo_name}#{issue_number} is not open, skipping validation."
                 )
                 continue
-
             issue_labels = [label.name.lower() for label in issue.labels]
             valid_labels = [
                 lbl for lbl in issue_labels if lbl not in INVALID_ISSUE_LABELS
@@ -195,22 +201,14 @@ def validate_pr_issues(self, pr):
                     "invalid/wontfix label, skipping validation."
                 )
                 continue
-
             try:
                 projects = self.get_issue_projects(owner, repo_name, issue_number)
             except Exception as e:
                 print(
                     f"Error fetching projects for issue {owner}/{repo_name}#{issue_number}: {e}"
                 )
                 raise
-
-            print(
-                f"DEBUG: Raw projects for {owner}/{repo_name}#{issue_number}: {projects}"
-            )
             project_keys = [self._project_title_key(p) for p in projects]
-            print(f"DEBUG: Normalized project keys: {project_keys}")
-            print(f"DEBUG: Required project keys: {required_projects}")
-
             has_valid_project = any(key in required_projects for key in project_keys)
             if has_valid_project:
                 print(
@@ -223,12 +221,10 @@ def validate_pr_issues(self, pr):
                     f"to any required project (found: {projects or 'none'}), "
                     "skipping validation."
                 )
-
         return False
 
     def get_bot_comment(self, pr, comment_type, after_date=None, issue_comments=None):
         """Get the comment of this bot with the given marker if it exists.
-
         If ``after_date`` is provided, only considers comments posted after that date.
         """
         try:
@@ -251,7 +247,6 @@ def get_bot_comment(self, pr, comment_type, after_date=None, issue_comments=None
 
     def has_bot_comment(self, pr, comment_type, after_date=None, issue_comments=None):
         """Check if PR already has a specific type of bot comment.
-
         Uses HTML markers. If ``after_date`` is provided,
         only considers comments posted after that date.
         """
@@ -277,11 +272,14 @@ def get_invalid_unvalidated_issue_comment(self, pr_author):
             "request.\n\n"
             "An issue is considered validated when it is open, has an appropriate "
             "label other than `invalid` or `wontfix`, and is assigned to one of "
-            "the OpenWISP contributor project boards mentioned in the "
-            "contributing guidelines.\n\n"
-            "Please see the OpenWISP policy on unsolicited and AI-assisted "
-            "contributions:\n"
-            "https://openwisp.io/docs/dev/general/code-of-conduct.html\n\n"
+            "the project boards mentioned in the "
+            "[OpenWISP Contributing Guidelines]"
+            "(https://openwisp.io/docs/dev/developer/contributing.html).\n\n"
+            "Please see the [OpenWISP Anti AI Spam Policy]"
+            "(https://openwisp.io/docs/dev/general/code-of-conduct.html).\n\n"
+            "Feel free to join the [OpenWISP dev chatroom]"
+            "(https://matrix.to/#/#openwisp_development:gitter.im) "
+            "to coordinate with the development team.\n\n"
             "If this is not resolved within 24 hours, this pull request "
             "will be closed automatically. "
             "Thank you for your understanding."

.github/actions/bot-autoassign/issue_assignment_bot.py

@@ -40,7 +40,6 @@ def get_contributing_guidelines_url(self):
 
     def detect_issue_type(self, issue):
         """Analyzes labels, title and body.
-
         Returns 'bug', 'feature', or None.
         """
         bug_keywords = [
@@ -365,11 +364,9 @@ def auto_assign_issues_from_pr(self, pr_number, pr_author, pr_body, max_issues=1
 
     def unassign_issues_from_pr(self, pr_body, pr_author):
         """Unassign linked issues from PR author"""
-
         if not self.repo:
             print("GitHub client not initialized")
             return []
-
         try:
             return unassign_linked_issues_helper(
                 self.repo, self.repository_name, pr_body, pr_author
@@ -442,17 +439,16 @@ def handle_pull_request(self):
                 else:
                     self.unassign_issues_from_pr(pr_body, pr_author)
                 return True
-
             if action in ["opened", "reopened", "edited", "ready_for_review"]:
-                self.auto_assign_issues_from_pr(pr_number, pr_author, pr_body)
                 pr_obj = self.repo.get_pull(pr_number)
                 is_valid = self.validate_pr_issues(pr_obj)
+                if is_valid:
+                    self.auto_assign_issues_from_pr(pr_number, pr_author, pr_body)
                 labels_lower = set()
                 try:
                     labels_lower = {label.name.lower() for label in pr_obj.labels}
                 except (TypeError, AttributeError):
                     pass
-
                 if is_valid:
                     if "invalid" in labels_lower:
                         pr_obj.remove_from_labels("invalid")
@@ -461,7 +457,6 @@ def handle_pull_request(self):
                     if "invalid" not in labels_lower:
                         pr_obj.add_to_labels("invalid")
                         print(f"Added 'invalid' label to PR #{pr_number}")
-
                     if not self.has_bot_comment(pr_obj, "invalid_unvalidated_issue"):
                         comment_body = self.get_invalid_unvalidated_issue_comment(
                             pr_author