Ruff after aider
All checks were successful
Run Python tests (through Pytest) / Test (push) Successful in 24s
Verify Python project can be installed, loaded and have version checked / Test (push) Successful in 22s

This commit is contained in:
Jon Michael Aanes 2025-04-15 23:38:17 +02:00
parent e32f53d485
commit 15bd83fc68
3 changed files with 46 additions and 35 deletions

View File

@ -232,17 +232,19 @@ def push_changes(
push_success = run_cmd(cmd, cwd, check=False) push_success = run_cmd(cmd, cwd, check=False)
if not push_success: if not push_success:
error_message = f"Failed to push branch `{branch_name}`. The changes could not be uploaded to the repository." error_message = f'Failed to push branch `{branch_name}`. The changes could not be uploaded to the repository.'
logger.error(error_message) logger.error(error_message)
try: try:
gitea_client.create_issue_comment( gitea_client.create_issue_comment(
owner=owner, owner=owner,
repo=repo, repo=repo,
issue_number=issue_number, issue_number=issue_number,
body=f"❌ **Automated Solution Failed**\n\n{error_message}\n\nPlease check repository permissions and try again." body=f'❌ **Automated Solution Failed**\n\n{error_message}\n\nPlease check repository permissions and try again.',
) )
except Exception as e: except Exception as e:
logger.exception(f"Failed to comment on issue #{issue_number} after push failure: {e}") logger.exception(
f'Failed to comment on issue #{issue_number} after push failure: {e}',
)
return False return False
# Then create the PR with the aider label # Then create the PR with the aider label
@ -258,18 +260,20 @@ def push_changes(
) )
return True return True
except Exception as e: 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." 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}") logger.exception(f'{error_message}: {e}')
try: try:
gitea_client.create_issue_comment( gitea_client.create_issue_comment(
owner=owner, owner=owner,
repo=repo, repo=repo,
issue_number=issue_number, issue_number=issue_number,
body=f"⚠️ **Partial Automation Success**\n\n{error_message}\n\n" 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." f"The changes are available in the branch `{branch_name}`, but you'll need to create the PR manually.",
) )
except Exception as comment_error: except Exception as comment_error:
logger.exception(f"Failed to comment on issue #{issue_number} after PR creation failure: {comment_error}") logger.exception(
f'Failed to comment on issue #{issue_number} after PR creation failure: {comment_error}',
)
return False return False

View File

@ -169,7 +169,9 @@ class GiteaClient:
response.raise_for_status() response.raise_for_status()
return response.json() return response.json()
def create_issue_comment(self, owner: str, repo: str, issue_number: str, body: str) -> dict: def create_issue_comment(
self, owner: str, repo: str, issue_number: str, body: str,
) -> dict:
"""Create a comment on an issue. """Create a comment on an issue.
Args: Args:

View File

@ -1,6 +1,5 @@
import pytest
from unittest.mock import MagicMock, patch
from pathlib import Path from pathlib import Path
from unittest.mock import MagicMock, patch
from aider_gitea import push_changes from aider_gitea import push_changes
@ -19,7 +18,9 @@ class TestIssueCommentOnFailure:
@patch('aider_gitea.has_commits_on_branch', return_value=True) @patch('aider_gitea.has_commits_on_branch', return_value=True)
@patch('aider_gitea.get_commit_messages', return_value=['Test commit']) @patch('aider_gitea.get_commit_messages', return_value=['Test commit'])
@patch('aider_gitea.run_cmd') @patch('aider_gitea.run_cmd')
def test_comment_on_push_failure(self, mock_run_cmd, mock_get_commit_messages, mock_has_commits): 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 # Setup run_cmd to fail on git push
mock_run_cmd.return_value = False mock_run_cmd.return_value = False
@ -32,7 +33,7 @@ class TestIssueCommentOnFailure:
self.base_branch, self.base_branch,
self.gitea_client, self.gitea_client,
self.owner, self.owner,
self.repo self.repo,
) )
# Verify result is False # Verify result is False
@ -44,18 +45,22 @@ class TestIssueCommentOnFailure:
assert kwargs['owner'] == self.owner assert kwargs['owner'] == self.owner
assert kwargs['repo'] == self.repo assert kwargs['repo'] == self.repo
assert kwargs['issue_number'] == self.issue_number assert kwargs['issue_number'] == self.issue_number
assert "Failed to push branch" in kwargs['body'] assert 'Failed to push branch' in kwargs['body']
assert "❌ **Automated Solution Failed**" in kwargs['body'] assert '❌ **Automated Solution Failed**' in kwargs['body']
@patch('aider_gitea.has_commits_on_branch', return_value=True) @patch('aider_gitea.has_commits_on_branch', return_value=True)
@patch('aider_gitea.get_commit_messages', return_value=['Test commit']) @patch('aider_gitea.get_commit_messages', return_value=['Test commit'])
@patch('aider_gitea.run_cmd') @patch('aider_gitea.run_cmd')
def test_comment_on_pr_creation_failure(self, mock_run_cmd, mock_get_commit_messages, mock_has_commits): 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 # Setup run_cmd to succeed on git push
mock_run_cmd.return_value = True mock_run_cmd.return_value = True
# Setup create_pull_request to fail # Setup create_pull_request to fail
self.gitea_client.create_pull_request.side_effect = Exception("PR creation failed") self.gitea_client.create_pull_request.side_effect = Exception(
'PR creation failed',
)
# Call push_changes # Call push_changes
result = push_changes( result = push_changes(
@ -66,7 +71,7 @@ class TestIssueCommentOnFailure:
self.base_branch, self.base_branch,
self.gitea_client, self.gitea_client,
self.owner, self.owner,
self.repo self.repo,
) )
# Verify result is False # Verify result is False
@ -78,6 +83,6 @@ class TestIssueCommentOnFailure:
assert kwargs['owner'] == self.owner assert kwargs['owner'] == self.owner
assert kwargs['repo'] == self.repo assert kwargs['repo'] == self.repo
assert kwargs['issue_number'] == self.issue_number assert kwargs['issue_number'] == self.issue_number
assert "Failed to create pull request" in kwargs['body'] assert 'Failed to create pull request' in kwargs['body']
assert "⚠️ **Partial Automation Success**" in kwargs['body'] assert '⚠️ **Partial Automation Success**' in kwargs['body']
assert self.branch_name in kwargs['body'] assert self.branch_name in kwargs['body']