From f9a13896f9faf77648e8f0a5caca8b4278b6124e Mon Sep 17 00:00:00 2001 From: Jon Michael Aanes Date: Wed, 23 Apr 2025 22:24:47 +0200 Subject: [PATCH 1/2] Initial ruff pass --- aider_gitea/gitea_client.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aider_gitea/gitea_client.py b/aider_gitea/gitea_client.py index 751b2ea..f1e0cdc 100644 --- a/aider_gitea/gitea_client.py +++ b/aider_gitea/gitea_client.py @@ -169,7 +169,9 @@ class GiteaClient: # If a pull request for this head/base already exists, return it instead of crashing if response.status_code == 422: logger.warning( - 'Pull request already exists for head %s and base %s', head, base, + 'Pull request already exists for head %s and base %s', + head, + base, ) prs = self.get_pull_requests(owner, repo) for pr in prs: -- 2.45.1 From 5595c0bbca9e7746b97eb0b0d7b2c41b3afccf4c Mon Sep 17 00:00:00 2001 From: "Jon Michael Aanes (aider)" Date: Wed, 23 Apr 2025 22:25:47 +0200 Subject: [PATCH 2/2] refactor: handle PR comments only after marking issues as seen --- aider_gitea/__init__.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/aider_gitea/__init__.py b/aider_gitea/__init__.py index 4f356a5..9ce207f 100644 --- a/aider_gitea/__init__.py +++ b/aider_gitea/__init__.py @@ -517,16 +517,6 @@ def solve_issues_in_repository( ) if issue_resolution.success: - # Handle unresolved pull request comments - handle_pr_comments( - repository_config, - issue_resolution.pull_request_id, - branch_name, - Path(repository_path), - client, - seen_issues_db, - issue_url, - ) seen_issues_db.mark_as_seen(issue_url, str(issue_number)) seen_issues_db.update_pr_info( issue_url, @@ -538,6 +528,16 @@ def solve_issues_in_repository( issue_resolution.pull_request_id, issue_number, ) + # Handle unresolved pull request comments + handle_pr_comments( + repository_config, + issue_resolution.pull_request_id, + branch_name, + Path(repository_path), + client, + seen_issues_db, + issue_url, + ) def handle_pr_comments( -- 2.45.1