Jmaa/aider-gitea
1
0
Fork 0
Code Issues 10 Pull Requests 3 Actions Activity

Do not push branch if the aider invocation fails #28

Closed
Jmaa wants to merge 2 commits from jmaa/issue-23-do-not-push-branch-if-the-aider-invocation-fails into main
pull from: jmaa/issue-23-do-not-push-branch-if-the-aider-invocation-fails
merge into: Jmaa:main
Conversation 0 Commits 2 Files Changed 1 +10 -3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3af97ab8f6 - Show all commits

13
aider_gitea/__main__.py
View File

@ -211,9 +211,9 @@ def has_commits_on_branch(cwd: Path, base_branch: str, current_branch: str) -> b
return False return False
def run_cmd(cmd: list[str], cwd: Path | None = None, check=True) -> None: def run_cmd(cmd: list[str], cwd: Path | None = None, check=True) -> subprocess.CompletedProcess:
print(cmd) print(cmd)
subprocess.run(cmd, check=check, cwd=cwd) return subprocess.run(cmd, check=check, cwd=cwd)
def solve_issue_in_repository( def solve_issue_in_repository(
@ -236,7 +236,14 @@ def solve_issue_in_repository(
run_cmd(['git', 'checkout', '-b', branch_name], tmpdirname) run_cmd(['git', 'checkout', '-b', branch_name], tmpdirname)
# Run aider # Run aider
run_cmd(create_aider_command(f'# {issue_title}\n{issue_description}'), tmpdirname) try:
aider_result = run_cmd(create_aider_command(f'# {issue_title}\n{issue_description}'), tmpdirname)
if aider_result.returncode != 0:
logger.error(f"Aider invocation failed for issue #{issue_number}")
return False
except subprocess.CalledProcessError:
logger.exception(f"Aider invocation failed with an exception for issue #{issue_number}")
return False
# Auto-fix standard code quality stuff # Auto-fix standard code quality stuff
run_cmd(['bash', '-c', RUFF_FORMAT_AND_AUTO_FIX], tmpdirname, check=False) run_cmd(['bash', '-c', RUFF_FORMAT_AND_AUTO_FIX], tmpdirname, check=False)