[fix] Address CodeRabbit review on stale-PR bot fix

Author: Eeshu-Yadav

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

@@ -19,7 +19,10 @@ def __init__(self):
         self.DAYS_BEFORE_STALE_WARNING = 7
         self.DAYS_BEFORE_UNASSIGN = 14
         self.DAYS_BEFORE_FINAL_FOLLOWUP = 60
-        self.bot_login = os.environ.get("BOT_USERNAME", "openwisp-companion") + "[bot]"
+        bot_username = os.environ.get("BOT_USERNAME", "openwisp-companion")
+        self.bot_login = (
+            bot_username if bot_username.endswith("[bot]") else f"{bot_username}[bot]"
+        )
 
     @staticmethod
     def _commit_activity_date_for_author(commit, pr_author):
@@ -164,34 +167,33 @@ def is_waiting_for_maintainer(
     def get_last_changes_requested(self, pr, all_reviews=None):
         """Timestamp of the latest CHANGES_REQUESTED that still represents
         a human reviewer's current stance, or ``None``.
+
+        Errors propagate so the caller can distinguish "no active block"
+        from "couldn't determine" and skip the PR.
         """
-        try:
-            if all_reviews is None:
-                all_reviews = list(pr.get_reviews())
-            # Bot reviews are advisory; COMMENTED does not change stance.
-            latest_per_reviewer = {}
-            for review in all_reviews:
-                if (
-                    not review.user
-                    or not review.submitted_at
-                    or review.user.type == "Bot"
-                    or review.state == "COMMENTED"
-                ):
-                    continue
-                current = latest_per_reviewer.get(review.user.login)
-                if current is None or review.submitted_at > current.submitted_at:
-                    latest_per_reviewer[review.user.login] = review
-            return max(
-                (
-                    review.submitted_at
-                    for review in latest_per_reviewer.values()
-                    if review.state == "CHANGES_REQUESTED"
-                ),
-                default=None,
-            )
-        except Exception as e:
-            print(f"Error getting reviews for PR #{pr.number}: {e}")
-            return None
+        if all_reviews is None:
+            all_reviews = list(pr.get_reviews())
+        # Bot reviews are advisory; COMMENTED does not change stance.
+        latest_per_reviewer = {}
+        for review in all_reviews:
+            if (
+                not review.user
+                or not review.submitted_at
+                or review.user.type == "Bot"
+                or review.state == "COMMENTED"
+            ):
+                continue
+            current = latest_per_reviewer.get(review.user.login)
+            if current is None or review.submitted_at > current.submitted_at:
+                latest_per_reviewer[review.user.login] = review
+        return max(
+            (
+                review.submitted_at
+                for review in latest_per_reviewer.values()
+                if review.state == "CHANGES_REQUESTED"
+            ),
+            default=None,
+        )
 
     def has_bot_comment(self, pr, comment_type, after_date=None, issue_comments=None):
         """Check if this bot has already posted a comment with the given

.github/actions/bot-autoassign/tests/test_stale_pr_bot.py

@@ -711,6 +711,40 @@ def test_pr_first_processed_past_60_days_marks_stale_only(
         mock_pr.add_to_labels.assert_called_once_with("stale")
         mock_pr.edit.assert_not_called()
 
+    @patch("stale_pr_bot.datetime")
+    def test_final_followup_fires_after_prior_stale_run(self, mock_datetime, bot_env):
+        mock_datetime.now.return_value = datetime(2024, 5, 10, tzinfo=timezone.utc)
+        mock_datetime.side_effect = lambda *a, **kw: datetime(*a, **kw)
+        bot = StalePRBot()
+        mock_pr = Mock()
+        mock_pr.body = ""
+        mock_pr.number = 7
+        mock_pr.user.login = "contributor"
+        cr_review = Mock()
+        cr_review.state = "CHANGES_REQUESTED"
+        cr_review.submitted_at = datetime(2024, 2, 1, tzinfo=timezone.utc)
+        cr_review.user.login = "maintainer"
+        cr_review.user.type = "User"
+        mock_pr.get_reviews.return_value = [cr_review]
+        mock_pr.get_commits.return_value = []
+        mock_pr.get_review_comments.return_value = []
+        stale_label = Mock()
+        stale_label.name = "stale"
+        mock_pr.get_labels.return_value = [stale_label]
+        prior_stale = Mock()
+        prior_stale.user.login = bot.bot_login
+        prior_stale.body = "<!-- bot:stale --> previous run"
+        prior_stale.created_at = datetime(2024, 5, 1, tzinfo=timezone.utc)
+        mock_pr.get_issue_comments.return_value = [prior_stale]
+        bot_env["repo"].get_pulls.return_value = [mock_pr]
+        bot.process_stale_prs()
+        bodies = [c[0][0] for c in mock_pr.create_issue_comment.call_args_list]
+        assert any("<!-- bot:final_followup -->" in b for b in bodies)
+        assert not any(
+            "<!-- bot:stale -->" in b and "previous run" not in b for b in bodies
+        )
+        mock_pr.edit.assert_not_called()
+
     @patch("stale_pr_bot.datetime")
     def test_clears_stale_label_when_contributor_responds(self, mock_datetime, bot_env):
         mock_datetime.now.return_value = datetime(2024, 2, 1, tzinfo=timezone.utc)