aider_gitea/__init__.py

@@ -304,7 +304,7 @@ def solve_issue_in_repository(
     run_cmd(['bash', '-c', RUFF_FORMAT_AND_AUTO_FIX], tmpdirname, check=False)
     run_cmd(['git', 'add', '.'], tmpdirname)
     run_cmd(['git', 'commit', '-m', 'Initial ruff pass'], tmpdirname, check=False)
-    
+
     # Save the commit hash after ruff but before aider
     result = subprocess.run(
         ['git', 'rev-parse', 'HEAD'],
@@ -340,9 +340,12 @@ def solve_issue_in_repository(
         text=True,
     )
     files_changed = result.stdout.strip()
-    
+
     if not files_changed:
-        logger.info('Aider did not make any changes beyond the initial ruff pass for issue #%s', issue_number)
+        logger.info(
+            'Aider did not make any changes beyond the initial ruff pass for issue #%s',
+            issue_number,
+        )
         return False
 
     # Push changes

aider_gitea/gitea_client.py

@@ -158,7 +158,13 @@ class GiteaClient:
             requests.HTTPError: If the API request fails.
         """
         url = f'{self.gitea_url}/repos/{owner}/{repo}/pulls'
-        json_data = {'title': title, 'body': body, 'head': head, 'base': base, 'labels': labels}
+        json_data = {
+            'title': title,
+            'body': body,
+            'head': head,
+            'base': base,
+            'labels': labels,
+        }
 
         response = self.session.post(url, json=json_data)
         response.raise_for_status()

test/test_solve_issue_in_repository.py

@@ -1,43 +1,43 @@
-import subprocess
-import tempfile
 from pathlib import Path
 from unittest.mock import MagicMock, patch
 
-import pytest
-
 from aider_gitea import solve_issue_in_repository
 
 
 class TestSolveIssueInRepository:
     def setup_method(self):
         self.args = MagicMock()
-        self.args.gitea_url = "https://gitea.example.com"
+        self.args.gitea_url = 'https://gitea.example.com'
-        self.args.owner = "test-owner"
+        self.args.owner = 'test-owner'
-        self.args.repo = "test-repo"
+        self.args.repo = 'test-repo'
-        self.args.base_branch = "main"
+        self.args.base_branch = 'main'
-        
-        self.gitea_client = MagicMock()
-        self.tmpdirname = Path("/tmp/test-repo")
-        self.branch_name = "issue-123-test-branch"
-        self.issue_title = "Test Issue"
-        self.issue_description = "This is a test issue"
-        self.issue_number = "123"
 
-    @patch('aider_gitea.secrets.llm_api_key', return_value="fake-api-key")
+        self.gitea_client = MagicMock()
+        self.tmpdirname = Path('/tmp/test-repo')
+        self.branch_name = 'issue-123-test-branch'
+        self.issue_title = 'Test Issue'
+        self.issue_description = 'This is a test issue'
+        self.issue_number = '123'
+
+    @patch('aider_gitea.secrets.llm_api_key', return_value='fake-api-key')
     @patch('aider_gitea.run_cmd')
     @patch('aider_gitea.push_changes')
     @patch('subprocess.run')
-    def test_solve_issue_with_aider_changes(self, mock_subprocess_run, mock_push_changes, mock_run_cmd, mock_llm_api_key):
+    def test_solve_issue_with_aider_changes(
+        self, mock_subprocess_run, mock_push_changes, mock_run_cmd, mock_llm_api_key,
+    ):
         # Setup mocks
         mock_run_cmd.return_value = True
         mock_push_changes.return_value = True
-        
+
         # Mock subprocess.run to return different commit hashes and file changes
         mock_subprocess_run.side_effect = [
-            MagicMock(stdout="abc123\n", returncode=0),  # First git rev-parse
+            MagicMock(stdout='abc123\n', returncode=0),  # First git rev-parse
-            MagicMock(stdout="file1.py\nfile2.py\n", returncode=0),  # git diff with changes
+            MagicMock(
+                stdout='file1.py\nfile2.py\n', returncode=0,
+            ),  # git diff with changes
         ]
-        
+
         # Call the function
         result = solve_issue_in_repository(
             self.args,
@@ -46,28 +46,30 @@ class TestSolveIssueInRepository:
             self.issue_title,
             self.issue_description,
             self.issue_number,
-            self.gitea_client
+            self.gitea_client,
         )
-        
+
         # Verify results
         assert result is True
         assert mock_run_cmd.call_count >= 8  # Verify all expected commands were run
         mock_push_changes.assert_called_once()
 
-    @patch('aider_gitea.secrets.llm_api_key', return_value="fake-api-key")
+    @patch('aider_gitea.secrets.llm_api_key', return_value='fake-api-key')
     @patch('aider_gitea.run_cmd')
     @patch('aider_gitea.push_changes')
     @patch('subprocess.run')
-    def test_solve_issue_without_aider_changes(self, mock_subprocess_run, mock_push_changes, mock_run_cmd, mock_llm_api_key):
+    def test_solve_issue_without_aider_changes(
+        self, mock_subprocess_run, mock_push_changes, mock_run_cmd, mock_llm_api_key,
+    ):
         # Setup mocks
         mock_run_cmd.return_value = True
-        
+
         # Mock subprocess.run to return same commit hash and no file changes
         mock_subprocess_run.side_effect = [
-            MagicMock(stdout="abc123\n", returncode=0),  # First git rev-parse
+            MagicMock(stdout='abc123\n', returncode=0),  # First git rev-parse
-            MagicMock(stdout="", returncode=0),  # git diff with no changes
+            MagicMock(stdout='', returncode=0),  # git diff with no changes
         ]
-        
+
         # Call the function
         result = solve_issue_in_repository(
             self.args,
@@ -76,9 +78,9 @@ class TestSolveIssueInRepository:
             self.issue_title,
             self.issue_description,
             self.issue_number,
-            self.gitea_client
+            self.gitea_client,
         )
-        
+
         # Verify results
         assert result is False
         assert mock_push_changes.call_count == 0  # push_changes should not be called