Ruff after aider

.gitea/workflows/python-container.yml

@@ -1,7 +1,3 @@
-# WARNING!
-# THIS IS AN AUTOGENERATED FILE!
-# MANUAL CHANGES CAN AND WILL BE OVERWRITTEN!
-
 name: Build Python Container
 on:
   push:
@@ -10,72 +6,13 @@ on:
     paths-ignore: ['README.md', '.gitignore', 'LICENSE', 'CONVENTIONS.md', 'ruff.toml']
 
 jobs:
-  release-image:
-    runs-on: ubuntu-latest
-    container:
-      image: catthehacker/ubuntu:act-latest
-    env:
-      RUNNER_TOOL_CACHE: /toolcache
-    steps:
-      - run: apt-get update
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setting up SSH
-        if: ${{ hashFiles('requirements_private.txt') != '' }}
-        uses: https://github.com/shimataro/ssh-key-action@v2.5.1
-        with:
-          key: ${{ secrets.PIPELINE_WORKER_SSH_KEY }}
-          name: id_rsa
-          known_hosts: ${{ secrets.PIPELINE_WORKER_KNOWN_HOSTS }}
-          config: |
-            Host gitfub
-              HostName gitfub.space
-              User ${{ secrets.PIPY_REPO_USER }}
-
-      - name: Download private dependencies
-        if: ${{ hashFiles('requirements_private.txt') != '' }}
-        shell: bash
-        run: |
-          set -e
-          mkdir -p private_deps
-          cd private_deps
-          while IFS=$" " read -r -a dependency_spec
-          do
-            if test -n "${dependency_spec[1]}"
-            then
-              git clone -v --single-branch --no-tags "${dependency_spec[0]}" --branch "${dependency_spec[1]}"
-            else
-              git clone -v --single-branch --no-tags "${dependency_spec[0]}"
-            fi
-          done < ../requirements_private.txt
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to Docker Registry
-        uses: docker/login-action@v2
-        with:
-          registry: gitfub.space
-          username: ${{ secrets.PIPY_REPO_USER }}
-          password: ${{ secrets.PIPY_REPO_PASS }}
-
-      - name: Get Meta
-        id: meta
-        run: |
-          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
-          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: |
-            linux/amd64
-          push: true
-          tags: |
-            gitfub.space/jmaa/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
-            gitfub.space/jmaa/${{ steps.meta.outputs.REPO_NAME }}:latest
+  Package-Container:
+    uses: jmaa/workflows/.gitea/workflows/container.yaml@v6.21
+    with:
+      REGISTRY_DOMAIN: gitfub.space
+      REGISTRY_ORGANIZATION: jmaa
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.PIPY_REPO_USER }}
+      DOCKER_PASSWORD: ${{ secrets.PIPY_REPO_PASS }}
+      PIPELINE_WORKER_SSH_KEY: ${{ secrets.PIPELINE_WORKER_SSH_KEY }}
+      PIPELINE_WORKER_KNOWN_HOSTS: ${{ secrets.PIPELINE_WORKER_KNOWN_HOSTS }}

.gitea/workflows/python-package.yml

@@ -1,7 +1,3 @@
-# WARNING!
-# THIS IS AN AUTOGENERATED FILE!
-# MANUAL CHANGES CAN AND WILL BE OVERWRITTEN!
-
 name: Package Python
 on:
   push:
@@ -10,24 +6,11 @@ on:
     paths-ignore: ['README.md', '.gitignore', 'LICENSE', 'CONVENTIONS.md', 'ruff.toml']
 
 jobs:
-  Package-Python-And-Publish:
-    runs-on: ubuntu-latest
-    container:
-      image: node:21-bookworm
-    steps:
-      - name: Setting up Python ${{ env.PYTHON_VERSION }} for ${{runner.arch}} ${{runner.os}}
-        run: |
-           apt-get update
-           apt-get install -y python3 python3-pip
-      - name: Check out repository code
-        if: success()
-        uses: actions/checkout@v3
-      - name: Installing Python Dependencies
-        if: success()
-        run: python3 -m pip install --upgrade pip setuptools wheel build twine pytest --break-system-packages
-      - name: Build
-        if: success()
-        run: python3 -m build
-      - name: Publish
-        if: success()
-        run: python3 -m twine upload --repository-url "https://gitfub.space/api/packages/jmaa/pypi" -u ${{ secrets.PIPY_REPO_USER }} -p ${{ secrets.PIPY_REPO_PASS }} dist/*
+  Package:
+    uses: jmaa/workflows/.gitea/workflows/python-package.yaml@v6.21
+    with:
+      REGISTRY_DOMAIN: gitfub.space
+      REGISTRY_ORGANIZATION: jmaa
+    secrets:
+      PIPY_REPO_USER: ${{ secrets.PIPY_REPO_USER }}
+      PIPY_REPO_PASS: ${{ secrets.PIPY_REPO_PASS }}

.gitea/workflows/python-test.yml

@@ -1,7 +1,3 @@
-# WARNING!
-# THIS IS AN AUTOGENERATED FILE!
-# MANUAL CHANGES CAN AND WILL BE OVERWRITTEN!
-
 name: Run Python tests (through Pytest)
 
 on:

.gitea/workflows/python-version-check.yml

@@ -1,7 +1,3 @@
-# WARNING!
-# THIS IS AN AUTOGENERATED FILE!
-# MANUAL CHANGES CAN AND WILL BE OVERWRITTEN!
-
 name: Verify Python project can be installed, loaded and have version checked
 
 on:

CONVENTIONS.md

@@ -1,7 +1,3 @@
-<!-- WARNING! -->
-<!-- THIS IS AN AUTOGENERATED FILE! -->
-<!-- MANUAL CHANGES CAN AND WILL BE OVERWRITTEN! -->
-
 # Conventions
 
 When contributing code to this project, you MUST follow the requirements

README.md

@@ -1,6 +1,7 @@
-<!-- WARNING! -->
-<!-- THIS IS AN AUTOGENERATED FILE! -->
-<!-- MANUAL CHANGES CAN AND WILL BE OVERWRITTEN! -->
+<!---                   WARNING                    --->
+<!---        THIS IS AN AUTO-GENERATED FILE        --->
+<!---  MANUAL CHANGES CAN AND WILL BE OVERWRITTEN  --->
+
 
 
 # Aider Gitea
@@ -17,9 +18,6 @@ When such an issue is found, it:
 3. Runs tests and code quality checks.
 4. Creates a pull request with the solution.
 
-Inspired by [the AI workflows](https://github.com/oscoreio/ai-workflows/)
-project.
-
 ## Usage
 
 An application token must be supplied for the `gitea_token` secret. This must

aider_gitea/__init__.py

@@ -80,7 +80,6 @@ from pathlib import Path
 
 from . import secrets
 from ._version import __version__  # noqa: F401
-from .seen_issues_db import SeenIssuesDB
 
 logger = logging.getLogger(__name__)
 
@@ -103,11 +102,7 @@ class RepositoryConfig:
 class IssueResolution:
     success: bool
     pull_request_url: str | None = None
-    pull_request_id: int | 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)
+    pull_request_id: str | None = None
 
 
 def generate_branch_name(issue_number: str, issue_title: str) -> str:
@@ -134,21 +129,17 @@ def bash_cmd(*commands: str) -> str:
 
 
 AIDER_TEST = bash_cmd(
-    'echo "Setting up virtual environment"'
     'virtualenv venv',
-    'echo "Activating virtual environment"'
     'source venv/bin/activate',
-    'echo "Installing package"'
     'pip install -e .',
-    'echo "Testing package"'
     'pytest test',
 )
 
 RUFF_FORMAT_AND_AUTO_FIX = bash_cmd(
-    'ruff format --silent',
-    'ruff check --fix --ignore RUF022 --ignore PGH004 --silent',
-    'ruff format --silent',
-    'ruff check --fix --ignore RUF022 --ignore PGH004 --silent',
+    'ruff format',
+    'ruff check --fix --ignore RUF022 --ignore PGH004',
+    'ruff format',
+    'ruff check --fix --ignore RUF022 --ignore PGH004',
 )
 
 AIDER_LINT = bash_cmd(
@@ -158,20 +149,19 @@ AIDER_LINT = bash_cmd(
 )
 
 
-LLM_MESSAGE_FORMAT = """{issue}
+LLM_MESSAGE_FORMAT = """
+{issue}
 
-Go ahead with the changes you deem appropriate without waiting for explicit approval.
+# Solution Details
 
-Do not draft changes beforehand; produce changes only once prompted for a specific file.
+For code tasks:
+
+1. Create a plan for how to solve the issue.
+2. Write unit tests that proves that your solution works.
+3. Then, solve the issue by writing the required code.
 """
 
-CODE_MODEL = None
-EVALUATOR_MODEL = 'ollama/gemma3:27b'
-
-MODEL_EDIT_MODES = {
-        'ollama/qwen3:32b': 'diff',
-        'ollama/hf.co/unsloth/Qwen3-30B-A3B-GGUF:Q4_K_M': 'diff',
-}
+MODEL = None
 
 
 def create_aider_command(issue: str) -> list[str]:
@@ -181,47 +171,31 @@ def create_aider_command(issue: str) -> list[str]:
         'english',
         '--no-stream',
         '--no-analytics',
-        #'--no-check-update',
         '--test-cmd',
         AIDER_TEST,
         '--lint-cmd',
         AIDER_LINT,
         '--auto-test',
         '--no-auto-lint',
+        '--read',
+        'CONVENTIONS.md',
+        '--message',
+        LLM_MESSAGE_FORMAT.format(issue=issue),
         '--yes',
-        '--disable-playwright',
-        '--timeout',
-        str(10_000),
     ]
 
-    if edit_format := MODEL_EDIT_MODES.get(CODE_MODEL):
-        l.append('--edit-format')
-        l.append(edit_format)
-    del edit_format
-
     for key in secrets.llm_api_keys():
         l += ['--api-key', key]
 
-    if False:
-        l.append('--read')
-        l.append('CONVENTIONS.md')
-
     if True:
         l.append('--cache-prompts')
 
     if False:
         l.append('--architect')
 
-    if CODE_MODEL:
+    if MODEL:
         l.append('--model')
-        l.append(CODE_MODEL)
-
-        if CODE_MODEL.startswith('ollama/') and False:
-            l.append('--auto-lint')
-
-    if True:
-        l.append('--message')
-        l.append(LLM_MESSAGE_FORMAT.format(issue=issue))
+        l.append(MODEL)
 
     return l
 
@@ -251,17 +225,6 @@ def get_commit_messages(cwd: Path, base_branch: str, current_branch: str) -> lis
         return []
 
 
-def get_diff(cwd: Path, base_branch: str, current_branch: str) -> str:
-    result = subprocess.run(
-        ['git', 'diff', f'{base_branch}..{current_branch}', '--pretty=format:%s'],
-        check=True,
-        cwd=cwd,
-        capture_output=True,
-        text=True,
-    )
-    return result.stdout.strip()
-
-
 def push_changes(
     repository_config: RepositoryConfig,
     cwd: Path,
@@ -290,7 +253,23 @@ def push_changes(
 
     # First push the branch without creating a PR
     cmd = ['git', 'push', 'origin', branch_name, '--force']
-    run_cmd(cmd, cwd)
+    push_success = run_cmd(cmd, cwd, check=False)
+
+    if not push_success:
+        error_message = f'Failed to push branch `{branch_name}`. The changes could not be uploaded to the repository.'
+        logger.error(error_message)
+        try:
+            gitea_client.create_issue_comment(
+                owner=owner,
+                repo=repo,
+                issue_number=issue_number,
+                body=f'❌ **Automated Solution Failed**\n\n{error_message}\n\nPlease check repository permissions and try again.',
+            )
+        except Exception as e:
+            logger.exception(
+                f'Failed to comment on issue #{issue_number} after push failure: {e}',
+            )
+        return False
 
     # Then create the PR with the aider label
     pr_response = gitea_client.create_pull_request(
@@ -306,8 +285,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')),
     )
 
 
@@ -345,111 +324,12 @@ def run_cmd(cmd: list[str], cwd: Path | None = None, check=True) -> bool:
     return result.returncode == 0
 
 
-def issue_solution_round(repository_path, issue_content):
-    # Primary Aider command
-    aider_command = create_aider_command(issue_content)
-    aider_did_not_crash = run_cmd(
-        aider_command,
-        repository_path,
-        check=False,
-    )
-    if not aider_did_not_crash:
-        return aider_did_not_crash
-
-    # Auto-fix standard code quality stuff after aider
-    run_cmd(['bash', '-c', RUFF_FORMAT_AND_AUTO_FIX], repository_path, check=False)
-    run_cmd(['git', 'add', '.'], repository_path)
-    run_cmd(['git', 'commit', '-m', 'Ruff after aider'], repository_path, check=False)
-
-    return True
-
-def remove_thinking_tokens(text: str) -> str:
-    text = re.sub(r'^\s*<think>.*?</think>', '', text, flags=re.MULTILINE | re.DOTALL)
-    text = text.strip()
-    return text
-
-assert remove_thinking_tokens('<think>Hello</think>\nWorld\n') == 'World'
-assert remove_thinking_tokens('<think>\nHello\n</think>\nWorld\n') == 'World'
-assert remove_thinking_tokens('\n<think>\nHello\n</think>\nWorld\n') == 'World'
-
-def run_ollama(cwd: Path, texts: list[str]) -> str:
-    cmd = ['ollama', 'run', EVALUATOR_MODEL.removeprefix('ollama/')]
-    process = subprocess.Popen(
-        cmd,
-        cwd=cwd,
-        stdin=subprocess.PIPE,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        text=True,
-    )
-    stdout, stderr = process.communicate('\n'.join(texts))
-    stdout = remove_thinking_tokens(stdout)
-    return stdout
-
-
-def parse_yes_no_answer(text: str) -> bool | None:
-    interword = '\n \t.,?-'
-    text = text.lower().strip(interword)
-    words = text.split(interword)
-    if words[-1] in {'yes', 'agree'}:
-        return True
-    if words[-1] in {'no', 'disagree'}:
-        return False
-    return None
-
-assert parse_yes_no_answer('Yes.') == True
-assert parse_yes_no_answer('no') == False
-
-def run_ollama_and_get_yes_or_no(cwd, initial_texts: list[str]) -> bool:
-    texts = list(initial_texts)
-    texts.append('Think through your answer.')
-    while True:
-        response = run_ollama(cwd, texts)
-        yes_or_no = parse_yes_no_answer(response)
-        if yes_or_no is not None:
-            return yes_or_no
-        else:
-            texts.append(response)
-            texts.append('Please answer either "yes" or "no".')
-
-
-def verify_solution(repository_path: Path, issue_content: str) -> bool:
-    if not EVALUATOR_MODEL:
-        return True
-
-    summary = run_ollama(
-        repository_path,
-        [
-            'Concisely summarize following changeset',
-            get_diff(repository_path, 'main', 'HEAD'),
-        ],
-    )
-
-    return run_ollama_and_get_yes_or_no(
-        repository_path,
-        [
-            'Does this changeset accomplish the entire task?',
-            '# Change set',
-            summary,
-            '# Issue',
-            issue_content,
-        ],
-    )
-
-
-def get_head_commit_hash(repository_path: Path) -> str:
-    return subprocess.run(
-        ['git', 'rev-parse', 'HEAD'],
-        check=True,
-        cwd=repository_path,
-        capture_output=True,
-        text=True,
-    ).stdout.strip()
+SKIP_AIDER = False
 
 
 def solve_issue_in_repository(
     repository_config: RepositoryConfig,
-    repository_path: Path,
+    tmpdirname: Path,
     branch_name: str,
     issue_title: str,
     issue_description: str,
@@ -459,52 +339,72 @@ def solve_issue_in_repository(
     logger.info('### %s #####', issue_title)
 
     # Setup repository
-    run_cmd(['git', 'clone', repository_config.repo_url(), repository_path])
-    run_cmd(['bash', '-c', AIDER_TEST], repository_path)
-    run_cmd(['git', 'checkout', repository_config.base_branch], repository_path)
-    run_cmd(['git', 'checkout', '-b', branch_name], repository_path)
+    run_cmd(['git', 'clone', repository_config.repo_url(), tmpdirname])
+    run_cmd(['bash', '-c', AIDER_TEST], tmpdirname)
+    run_cmd(['git', 'checkout', repository_config.base_branch], tmpdirname)
+    run_cmd(['git', 'checkout', '-b', branch_name], tmpdirname)
 
     # Run initial ruff pass before aider
-    run_cmd(['bash', '-c', RUFF_FORMAT_AND_AUTO_FIX], repository_path, check=False)
-    run_cmd(['git', 'add', '.'], repository_path)
-    run_cmd(['git', 'commit', '-m', 'Initial ruff pass'], repository_path, check=False)
+    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'],
+        check=True,
+        cwd=tmpdirname,
+        capture_output=True,
+        text=True,
+    )
+    pre_aider_commit = result.stdout.strip()
 
     # Run aider
     issue_content = f'# {issue_title}\n{issue_description}'
-
-    while True:
-        # Save the commit hash after ruff but before aider
-        pre_aider_commit = get_head_commit_hash(repository_path)
-
-        # Run aider
-        aider_did_not_crash = issue_solution_round(repository_path, issue_content)
-        if not aider_did_not_crash:
-            logger.error('Aider invocation failed for issue #%s', issue_number)
-            return IssueResolution(False)
-
-        # Check if aider made any changes beyond the initial ruff pass
-        if not has_commits_on_branch(repository_path, pre_aider_commit, 'HEAD'):
-            logger.error(
-                'Aider did not make any changes beyond the initial ruff pass for issue #%s',
-                issue_number,
-            )
-            return IssueResolution(False)
-
-        # Push changes and create/update the pull request on every iteration
-        resolution = push_changes(
-            repository_config,
-            repository_path,
-            branch_name,
-            issue_number,
-            issue_title,
-            gitea_client,
+    if not SKIP_AIDER:
+        succeeded = run_cmd(
+            create_aider_command(issue_content),
+            tmpdirname,
+            check=False,
         )
-        if not resolution.success:
-            return resolution
+    else:
+        logger.warning('Skipping aider command (for testing)')
+        succeeded = True
+    if not succeeded:
+        logger.error('Aider invocation failed for issue #%s', issue_number)
+        return IssueResolution(False)
 
-        # Verify whether this is a satisfactory solution
-        if verify_solution(repository_path, issue_content):
-            return resolution
+    # Auto-fix standard code quality stuff after aider
+    run_cmd(['bash', '-c', RUFF_FORMAT_AND_AUTO_FIX], tmpdirname, check=False)
+    run_cmd(['git', 'add', '.'], tmpdirname)
+    run_cmd(['git', 'commit', '-m', 'Ruff after aider'], tmpdirname, check=False)
+
+    # Check if aider made any changes beyond the initial ruff pass
+    result = subprocess.run(
+        ['git', 'diff', pre_aider_commit, 'HEAD', '--name-only'],
+        check=True,
+        cwd=tmpdirname,
+        capture_output=True,
+        text=True,
+    )
+    files_changed = result.stdout.strip()
+
+    if not files_changed and not SKIP_AIDER:
+        logger.info(
+            'Aider did not make any changes beyond the initial ruff pass for issue #%s',
+            issue_number,
+        )
+        return IssueResolution(False)
+
+    # Push changes
+    return push_changes(
+        repository_config,
+        tmpdirname,
+        branch_name,
+        issue_number,
+        issue_title,
+        gitea_client,
+    )
 
 
 def solve_issues_in_repository(
@@ -536,18 +436,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:
-            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,
-                )
+            continue
+
+        branch_name = generate_branch_name(issue_number, title)
+        with tempfile.TemporaryDirectory() as tmpdirname:
+            issue_resolution = solve_issue_in_repository(
+                repository_config,
+                Path(tmpdirname),
+                branch_name,
+                title,
+                issue_description,
+                issue_number,
+                client,
+            )
+
+        if issue_resolution.success:
             seen_issues_db.mark_as_seen(issue_url, str(issue_number))
             seen_issues_db.update_pr_info(
                 issue_url,
@@ -559,107 +462,3 @@ def solve_issues_in_repository(
                 issue_resolution.pull_request_id,
                 issue_number,
             )
-
-        # TODO: PR comment handling disabled for now due to missing functionality
-        if False:
-            # 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,
-            )
-
-            # Handle failing pipelines
-            handle_failing_pipelines(
-                repository_config,
-                issue_resolution.pull_request_id,
-                branch_name,
-                Path(repository_path),
-                client,
-            )
-
-
-def handle_pr_comments(
-    repository_config,
-    pr_number: int,
-    branch_name,
-    repository_path,
-    client,
-    seen_issues_db,
-    issue_url,
-):
-    """Fetch unresolved PR comments and resolve them via aider."""
-    comments = client.get_pull_request_comments(
-        repository_config.owner,
-        repository_config.repo,
-        pr_number,
-    )
-    for comment in comments:
-        path = comment.get('path')
-        line = comment.get('line') or comment.get('position') or 0
-        file_path = repository_path / path
-        try:
-            lines = file_path.read_text().splitlines()
-            start = max(0, line - 3)
-            end = min(len(lines), line + 2)
-            context = '\n'.join(lines[start:end])
-        except Exception:
-            context = ''
-        body = comment.get('body', '')
-        issue = (
-            f'Resolve the following reviewer comment:\n{body}\n\n'
-            f'File: {path}\n\nContext:\n{context}'
-        )
-        # invoke aider on the comment context
-        issue_solution_round(repository_path, issue)
-        # commit and push changes for this comment
-        run_cmd(['git', 'add', path], repository_path, check=False)
-        run_cmd(
-            ['git', 'commit', '-m', f'Resolve comment {comment.get("id")}'],
-            repository_path,
-            check=False,
-        )
-        run_cmd(['git', 'push', 'origin', branch_name], repository_path, check=False)
-
-
-def handle_failing_pipelines(
-    repository_config: RepositoryConfig,
-    pr_number: str,
-    branch_name: str,
-    repository_path: Path,
-    client,
-) -> None:
-    """Fetch failing pipelines for the given PR and resolve them via aider."""
-    while True:
-        failed_runs = client.get_failed_pipelines(
-            repository_config.owner,
-            repository_config.repo,
-            pr_number,
-        )
-        if not failed_runs:
-            break
-        for run_id in failed_runs:
-            log = client.get_pipeline_log(
-                repository_config.owner,
-                repository_config.repo,
-                run_id,
-            )
-            lines = log.strip().split('\n')
-            context = '\n'.join(lines[-100:])
-            issue = f'Resolve the following failing pipeline run {run_id}:\n\n{context}'
-            issue_solution_round(repository_path, issue)
-            run_cmd(['git', 'add', '.'], repository_path, check=False)
-            run_cmd(
-                ['git', 'commit', '-m', f'Resolve pipeline {run_id}'],
-                repository_path,
-                check=False,
-            )
-            run_cmd(
-                ['git', 'push', 'origin', branch_name],
-                repository_path,
-                check=False,
-            )

aider_gitea/__main__.py

@@ -42,19 +42,9 @@ def parse_args():
     parser.add_argument(
         '--interval',
         type=int,
-        default=30,
+        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)',
-        required=True,
-    )
-    parser.add_argument(
-        '--evaluator-model',
-        help='Model to use for evaluating code (overrides default)',
-        default=None,
-    )
     return parser.parse_args()
 
 
@@ -62,12 +52,6 @@ def main():
     logging.basicConfig(level='INFO')
     args = parse_args()
 
-    # Override default models if provided
-    import aider_gitea as core
-
-    core.CODE_MODEL = args.aider_model
-    core.EVALUATOR_MODEL = args.evaluator_model
-
     seen_issues_db = SeenIssuesDB()
     client = GiteaClient(args.gitea_url, secrets.gitea_token())
 

aider_gitea/_version.py

@@ -1 +1 @@
-__version__ = '0.1.9'
+__version__ = '0.1.6'

aider_gitea/gitea_client.py

@@ -166,56 +166,33 @@ 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()
 
-    def get_failed_pipelines(self, owner: str, repo: str, pr_number: str) -> list[int]:
-        """Fetch pipeline runs for a PR and return IDs of failed runs."""
-        url = f'{self.gitea_url}/repos/{owner}/{repo}/actions/runs'
-        response = self.session.get(url)
-        response.raise_for_status()
-        runs = response.json().get('workflow_runs', [])
-        failed = []
-        for run in runs:
-            if any(
-                pr.get('number') == int(pr_number)
-                for pr in run.get('pull_requests', [])
-            ):
-                if run.get('conclusion') not in ('success',):
-                    failed.append(run.get('id'))
-        return failed
-
-    def get_pipeline_log(self, owner: str, repo: str, run_id: int) -> str:
-        """Download the logs for a pipeline run."""
-        url = f'{self.gitea_url}/repos/{owner}/{repo}/actions/runs/{run_id}/logs'
-        response = self.session.get(url)
-        response.raise_for_status()
-        return response.text
-
-    def get_pull_requests(
+    def create_issue_comment(
         self,
         owner: str,
         repo: str,
-        state: str = 'open',
-    ) -> list[dict]:
-        """Fetch pull requests for a repository."""
-        url = f'{self.gitea_url}/repos/{owner}/{repo}/pulls?state={state}'
-        response = self.session.get(url)
+        issue_number: str,
+        body: str,
+    ) -> dict:
+        """Create a comment on an issue.
+
+        Args:
+            owner (str): Owner of the repository.
+            repo (str): Name of the repository.
+            issue_number (str): The issue number to comment on.
+            body (str): The content of the comment.
+
+        Returns:
+            dict: The created comment data.
+
+        Raises:
+            requests.HTTPError: If the API request fails.
+        """
+        url = f'{self.gitea_url}/repos/{owner}/{repo}/issues/{issue_number}/comments'
+        json_data = {'body': body}
+
+        response = self.session.post(url, json=json_data)
         response.raise_for_status()
         return response.json()

aider_gitea/seen_issues_db.py

@@ -46,13 +46,6 @@ class SeenIssuesDB:
                     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
                 )
             """)
-            self.conn.execute("""
-                CREATE TABLE IF NOT EXISTS resolved_comments (
-                    issue_url TEXT,
-                    comment_id TEXT,
-                    PRIMARY KEY(issue_url, comment_id)
-                )
-            """)
 
     def mark_as_seen(
         self,

setup.py

@@ -1,6 +1,8 @@
-# WARNING!
-# THIS IS AN AUTOGENERATED FILE!
-# MANUAL CHANGES CAN AND WILL BE OVERWRITTEN!
+# WARNING
+#
+# THIS IS AN AUTOGENERATED FILE.
+#
+# MANUAL CHANGES CAN AND WILL BE OVERWRITTEN.
 
 import re
 
@@ -21,9 +23,6 @@ When such an issue is found, it:
 3. Runs tests and code quality checks.
 4. Creates a pull request with the solution.
 
-Inspired by [the AI workflows](https://github.com/oscoreio/ai-workflows/)
-project.
-
 ## Usage
 
 An application token must be supplied for the `gitea_token` secret. This must
@@ -86,8 +85,7 @@ A code automation tool that integrates Gitea with Aider to automatically solve i
 
 
 def parse_version_file(text: str) -> str:
-    text = re.sub('^#.*', '', text, flags=re.MULTILINE)
-    match = re.match(r'^\s*__version__\s*=\s*(["\'])([\d\.]+)\1$', text)
+    match = re.match(r'^__version__\s*=\s*(["\'])([\d\.]+)\1$', text)
     if match is None:
         msg = 'Malformed _version.py file!'
         raise Exception(msg)
@@ -113,6 +111,7 @@ setup(
     author='Jon Michael Aanes',
     author_email='jonjmaa@gmail.com',
     url='https://gitfub.space/Jmaa/' + PACKAGE_NAME,
+    packages=[PACKAGE_NAME],
     install_requires=REQUIREMENTS_MAIN,
     extras_require={
         'test': REQUIREMENTS_TEST,

test/test_issue_comment_on_failure.py

@@ -0,0 +1,94 @@
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+from aider_gitea import push_changes
+
+
+class TestIssueCommentOnFailure:
+    def setup_method(self):
+        self.cwd = Path('/tmp/test-repo')
+        self.branch_name = 'issue-123-test-branch'
+        self.issue_number = '123'
+        self.issue_title = 'Test Issue'
+        self.base_branch = 'main'
+        self.gitea_client = MagicMock()
+        self.owner = 'test-owner'
+        self.repo = 'test-repo'
+
+    @patch('aider_gitea.has_commits_on_branch', return_value=True)
+    @patch('aider_gitea.get_commit_messages', return_value=['Test commit'])
+    @patch('aider_gitea.run_cmd')
+    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
+        mock_run_cmd.return_value = False
+
+        # Call push_changes
+        result = push_changes(
+            self.cwd,
+            self.branch_name,
+            self.issue_number,
+            self.issue_title,
+            self.base_branch,
+            self.gitea_client,
+            self.owner,
+            self.repo,
+        )
+
+        # Verify result is False
+        assert result is False
+
+        # Verify create_issue_comment was called with appropriate message
+        self.gitea_client.create_issue_comment.assert_called_once()
+        args, kwargs = self.gitea_client.create_issue_comment.call_args
+        assert kwargs['owner'] == self.owner
+        assert kwargs['repo'] == self.repo
+        assert kwargs['issue_number'] == self.issue_number
+        assert 'Failed to push branch' in kwargs['body']
+        assert '❌ **Automated Solution Failed**' in kwargs['body']
+
+    @patch('aider_gitea.has_commits_on_branch', return_value=True)
+    @patch('aider_gitea.get_commit_messages', return_value=['Test commit'])
+    @patch('aider_gitea.run_cmd')
+    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
+        mock_run_cmd.return_value = True
+
+        # Setup create_pull_request to fail
+        self.gitea_client.create_pull_request.side_effect = Exception(
+            'PR creation failed',
+        )
+
+        # Call push_changes
+        result = push_changes(
+            self.cwd,
+            self.branch_name,
+            self.issue_number,
+            self.issue_title,
+            self.base_branch,
+            self.gitea_client,
+            self.owner,
+            self.repo,
+        )
+
+        # Verify result is False
+        assert result is False
+
+        # Verify create_issue_comment was called with appropriate message
+        self.gitea_client.create_issue_comment.assert_called_once()
+        args, kwargs = self.gitea_client.create_issue_comment.call_args
+        assert kwargs['owner'] == self.owner
+        assert kwargs['repo'] == self.repo
+        assert kwargs['issue_number'] == self.issue_number
+        assert 'Failed to create pull request' in kwargs['body']
+        assert '⚠️ **Partial Automation Success**' in kwargs['body']
+        assert self.branch_name in kwargs['body']

test/test_solve_issue_in_repository.py

@@ -0,0 +1,101 @@
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+from aider_gitea import IssueResolution, RepositoryConfig, solve_issue_in_repository
+
+REPOSITORY_CONFIG = RepositoryConfig(
+    gitea_url='https://gitea.example.com',
+    owner='test-owner',
+    repo='test-repo',
+    base_branch='main',
+)
+
+
+class TestSolveIssueInRepository:
+    def setup_method(self):
+        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_keys', 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,
+    ):
+        # Setup mocks
+        mock_run_cmd.return_value = True
+        mock_push_changes.return_value = IssueResolution(
+            True,
+            '456',
+            'https://gitea.example.com/test-owner/test-repo/pulls/456',
+        )
+
+        # 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='file1.py\nfile2.py\n',
+                returncode=0,
+            ),  # git diff with changes
+        ]
+
+        # Call the function
+        result = solve_issue_in_repository(
+            REPOSITORY_CONFIG,
+            self.tmpdirname,
+            self.branch_name,
+            self.issue_title,
+            self.issue_description,
+            self.issue_number,
+            self.gitea_client,
+        )
+
+        # Verify results
+        assert result.success 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_keys', 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,
+    ):
+        # Setup mocks
+        mock_run_cmd.return_value = True
+        mock_push_changes.return_value = IssueResolution(False, None, None)
+
+        # 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='', returncode=0),  # git diff with no changes
+        ]
+
+        # Call the function
+        result = solve_issue_in_repository(
+            REPOSITORY_CONFIG,
+            self.tmpdirname,
+            self.branch_name,
+            self.issue_title,
+            self.issue_description,
+            self.issue_number,
+            self.gitea_client,
+        )
+
+        # Verify results
+        assert result.success is False
+        assert mock_push_changes.call_count == 0  # push_changes should not be called