feat: Add issue commenting for PR creation and push failures

This commit is contained in:
Jon Michael Aanes (aider) 2025-04-15 23:37:19 +02:00
parent 8a023a0501
commit 351817d6c7
3 changed files with 145 additions and 11 deletions

View File

@ -229,9 +229,24 @@ def push_changes(
# First push the branch without creating a PR
cmd = ['git', 'push', 'origin', branch_name, '--force']
run_cmd(cmd, cwd)
push_success = run_cmd(cmd, cwd, check=False)
if not push_success:
error_message = f"Failed to push branch `{branch_name}`. The changes could not be uploaded to the repository."
logger.error(error_message)
try:
gitea_client.create_issue_comment(
owner=owner,
repo=repo,
issue_number=issue_number,
body=f"❌ **Automated Solution Failed**\n\n{error_message}\n\nPlease check repository permissions and try again."
)
except Exception as e:
logger.exception(f"Failed to comment on issue #{issue_number} after push failure: {e}")
return False
# Then create the PR with the aider label
try:
gitea_client.create_pull_request(
owner=owner,
repo=repo,
@ -242,6 +257,20 @@ def push_changes(
labels=['aider'],
)
return True
except Exception as e:
error_message = f"Failed to create pull request for branch `{branch_name}`. The changes were pushed but the PR could not be created."
logger.exception(f"{error_message}: {e}")
try:
gitea_client.create_issue_comment(
owner=owner,
repo=repo,
issue_number=issue_number,
body=f"⚠️ **Partial Automation Success**\n\n{error_message}\n\n"
f"The changes are available in the branch `{branch_name}`, but you'll need to create the PR manually."
)
except Exception as comment_error:
logger.exception(f"Failed to comment on issue #{issue_number} after PR creation failure: {comment_error}")
return False
def has_commits_on_branch(cwd: Path, base_branch: str, current_branch: str) -> bool:

View File

@ -168,3 +168,25 @@ class GiteaClient:
response = self.session.post(url, json=json_data)
response.raise_for_status()
return response.json()
def create_issue_comment(self, owner: str, repo: str, issue_number: str, body: str) -> dict:
"""Create a comment on an issue.
Args:
owner (str): Owner of the repository.
repo (str): Name of the repository.
issue_number (str): The issue number to comment on.
body (str): The content of the comment.
Returns:
dict: The created comment data.
Raises:
requests.HTTPError: If the API request fails.
"""
url = f'{self.gitea_url}/repos/{owner}/{repo}/issues/{issue_number}/comments'
json_data = {'body': body}
response = self.session.post(url, json=json_data)
response.raise_for_status()
return response.json()

View File

@ -0,0 +1,83 @@
import pytest
from unittest.mock import MagicMock, patch
from pathlib import Path
from aider_gitea import push_changes
class TestIssueCommentOnFailure:
def setup_method(self):
self.cwd = Path('/tmp/test-repo')
self.branch_name = 'issue-123-test-branch'
self.issue_number = '123'
self.issue_title = 'Test Issue'
self.base_branch = 'main'
self.gitea_client = MagicMock()
self.owner = 'test-owner'
self.repo = 'test-repo'
@patch('aider_gitea.has_commits_on_branch', return_value=True)
@patch('aider_gitea.get_commit_messages', return_value=['Test commit'])
@patch('aider_gitea.run_cmd')
def test_comment_on_push_failure(self, mock_run_cmd, mock_get_commit_messages, mock_has_commits):
# Setup run_cmd to fail on git push
mock_run_cmd.return_value = False
# Call push_changes
result = push_changes(
self.cwd,
self.branch_name,
self.issue_number,
self.issue_title,
self.base_branch,
self.gitea_client,
self.owner,
self.repo
)
# Verify result is False
assert result is False
# Verify create_issue_comment was called with appropriate message
self.gitea_client.create_issue_comment.assert_called_once()
args, _ = self.gitea_client.create_issue_comment.call_args
assert args[0] == self.owner
assert args[1] == self.repo
assert args[2] == self.issue_number
assert "Failed to push branch" in args[3]
assert "❌ **Automated Solution Failed**" in args[3]
@patch('aider_gitea.has_commits_on_branch', return_value=True)
@patch('aider_gitea.get_commit_messages', return_value=['Test commit'])
@patch('aider_gitea.run_cmd')
def test_comment_on_pr_creation_failure(self, mock_run_cmd, mock_get_commit_messages, mock_has_commits):
# Setup run_cmd to succeed on git push
mock_run_cmd.return_value = True
# Setup create_pull_request to fail
self.gitea_client.create_pull_request.side_effect = Exception("PR creation failed")
# Call push_changes
result = push_changes(
self.cwd,
self.branch_name,
self.issue_number,
self.issue_title,
self.base_branch,
self.gitea_client,
self.owner,
self.repo
)
# Verify result is False
assert result is False
# Verify create_issue_comment was called with appropriate message
self.gitea_client.create_issue_comment.assert_called_once()
args, _ = self.gitea_client.create_issue_comment.call_args
assert args[0] == self.owner
assert args[1] == self.repo
assert args[2] == self.issue_number
assert "Failed to create pull request" in args[3]
assert "⚠️ **Partial Automation Success**" in args[3]
assert self.branch_name in args[3]