aider_gitea/__init__.py

@@ -103,11 +103,7 @@ class RepositoryConfig:
 class IssueResolution:
     success: bool
     pull_request_url: str | None = None
-    pull_request_id: int | None = None
+    pull_request_id: str | None = None
-
-    def __post_init__(self):
-        assert self.pull_request_id is None or isinstance(self.pull_request_id, int)
-        assert self.pull_request_url is None or isinstance(self.pull_request_url, str)
 
 
 def generate_branch_name(issue_number: str, issue_title: str) -> str:
@@ -287,8 +283,8 @@ def push_changes(
     # Extract PR number and URL if available
     return IssueResolution(
         True,
+        str(pr_response.get('number')),
         pr_response.get('html_url'),
-        int(pr_response.get('number')),
     )
 
 
@@ -387,9 +383,6 @@ def run_ollama_and_get_yes_or_no(cwd, initial_texts: list[str]) -> bool:
 
 
 def verify_solution(repository_path: Path, issue_content: str) -> bool:
-    if not EVALUATOR_MODEL:
-        return True
-
     summary = run_ollama(
         repository_path,
         [
@@ -509,21 +502,21 @@ def solve_issues_in_repository(
         title = issue.get('title', f'Issue {issue_number}')
         if seen_issues_db.has_seen(issue_url):
             logger.info('Skipping already processed issue #%s: %s', issue_number, title)
-        else:
+            continue
-            branch_name = generate_branch_name(issue_number, title)
-            with tempfile.TemporaryDirectory() as repository_path:
-                issue_resolution = solve_issue_in_repository(
-                    repository_config,
-                    Path(repository_path),
-                    branch_name,
-                    title,
-                    issue_description,
-                    issue_number,
-                    client,
-                )
 
-        # TODO: PR comment handling disabled for now due to missing functionality
+        branch_name = generate_branch_name(issue_number, title)
-        if False:
+        with tempfile.TemporaryDirectory() as repository_path:
+            issue_resolution = solve_issue_in_repository(
+                repository_config,
+                Path(repository_path),
+                branch_name,
+                title,
+                issue_description,
+                issue_number,
+                client,
+            )
+
+        if issue_resolution.success:
             # Handle unresolved pull request comments
             handle_pr_comments(
                 repository_config,
@@ -558,7 +551,7 @@ def solve_issues_in_repository(
 
 def handle_pr_comments(
     repository_config,
-    pr_number: int,
+    pr_number,
     branch_name,
     repository_path,
     client,

aider_gitea/__main__.py

@@ -45,16 +45,6 @@ def parse_args():
         default=300,
         help='Interval in seconds between checks in daemon mode (default: 300)',
     )
-    parser.add_argument(
-        '--aider-model',
-        help='Model to use for generating code (overrides default)',
-        default=None,
-    )
-    parser.add_argument(
-        '--evaluator-model',
-        help='Model to use for evaluating code (overrides default)',
-        default=None,
-    )
     return parser.parse_args()
 
 
@@ -62,14 +52,6 @@ def main():
     logging.basicConfig(level='INFO')
     args = parse_args()
 
-    # Override default models if provided
-    import aider_gitea as core
-
-    if args.aider_model:
-        core.CODE_MODEL = args.aider_model
-    if args.evaluator_model:
-        core.EVALUATOR_MODEL = args.evaluator_model
-
     seen_issues_db = SeenIssuesDB()
     client = GiteaClient(args.gitea_url, secrets.gitea_token())
 

aider_gitea/gitea_client.py

@@ -166,22 +166,6 @@ class GiteaClient:
         }
 
         response = self.session.post(url, json=json_data)
-        # If a pull request for this head/base already exists, return it instead of crashing
-        if response.status_code == 409:
-            logger.warning(
-                'Pull request already exists for head %s and base %s',
-                head,
-                base,
-            )
-            prs = self.get_pull_requests(owner, repo)
-            for pr in prs:
-                if (
-                    pr.get('head', {}).get('ref') == head
-                    and pr.get('base', {}).get('ref') == base
-                ):
-                    return pr
-            # fallback to raise if we can’t find it
-            response.raise_for_status()
         response.raise_for_status()
         return response.json()
 
@@ -208,14 +192,16 @@ class GiteaClient:
         response.raise_for_status()
         return response.text
 
-    def get_pull_requests(
+    def get_pull_request_comments(
         self,
         owner: str,
         repo: str,
-        state: str = 'open',
+        pr_number: str,
     ) -> list[dict]:
-        """Fetch pull requests for a repository."""
+        """
-        url = f'{self.gitea_url}/repos/{owner}/{repo}/pulls?state={state}'
+        Fetch comments for a pull request.
+        """
+        url = f'{self.gitea_url}/repos/{owner}/{repo}/pulls/{pr_number}/comments'
         response = self.session.get(url)
         response.raise_for_status()
         return response.json()