Skip to content

Commit

Permalink
Resolver minor tweaks (#5461)
Browse files Browse the repository at this point in the history
  • Loading branch information
@enyst
enyst authored Dec 8, 2024
1 parent a7e4a7a commit 279e1d7
Show file tree
Hide file tree
Showing 5 changed files with 131 additions and 45 deletions.
41 changes: 38 additions & 3 deletions openhands/resolver/issue_definitions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,23 @@ def _download_issues_from_github(self) -> list[Any]:
params: dict[str, int | str] = {'state': 'open', 'per_page': 100, 'page': 1}
all_issues = []

# Get issues, page by page
while True:
response = requests.get(url, headers=headers, params=params)
response.raise_for_status()
issues = response.json()

# No more issues, break the loop
if not issues:
break

# Sanity check - the response is a list of dictionaries
if not isinstance(issues, list) or any(
[not isinstance(issue, dict) for issue in issues]
):
raise ValueError('Expected list of dictionaries from Github API.')

# Add the issues to the final list
all_issues.extend(issues)
assert isinstance(params['page'], int)
params['page'] += 1
Expand Down Expand Up @@ -107,7 +111,12 @@ def _extract_issue_references(self, body: str) -> list[int]:
def _get_issue_comments(
self, issue_number: int, comment_id: int | None = None
) -> list[str] | None:
"""Download comments for a specific issue from Github."""
"""Retrieve comments for a specific issue from Github.
Args:
issue_number: The ID of the issue to get comments for
comment_id: The ID of a single comment, if provided, otherwise all comments
"""
url = f'https://api.github.com/repos/{self.owner}/{self.repo}/issues/{issue_number}/comments'
headers = {
'Authorization': f'token {self.token}',
Expand All @@ -116,6 +125,7 @@ def _get_issue_comments(
params = {'per_page': 100, 'page': 1}
all_comments = []

# Get comments, page by page
while True:
response = requests.get(url, headers=headers, params=params)
response.raise_for_status()
Expand All @@ -124,6 +134,7 @@ def _get_issue_comments(
if not comments:
break

# If a single comment ID is provided, return only that comment
if comment_id:
matching_comment = next(
(
Expand All @@ -136,6 +147,7 @@ def _get_issue_comments(
if matching_comment:
return [matching_comment]
else:
# Otherwise, return all comments
all_comments.extend([comment['body'] for comment in comments])

params['page'] += 1
Expand All @@ -147,6 +159,10 @@ def get_converted_issues(
) -> list[GithubIssue]:
"""Download issues from Github.
Args:
issue_numbers: The numbers of the issues to download
comment_id: The ID of a single comment, if provided, otherwise all comments
Returns:
List of Github issues.
"""
Expand Down Expand Up @@ -203,14 +219,22 @@ def get_instruction(
prompt_template: str,
repo_instruction: str | None = None,
) -> tuple[str, list[str]]:
"""Generate instruction for the agent."""
"""Generate instruction for the agent.
Args:
issue: The issue to generate instruction for
prompt_template: The prompt template to use
repo_instruction: The repository instruction if it exists
"""

# Format thread comments if they exist
thread_context = ''
if issue.thread_comments:
thread_context = '\n\nIssue Thread Comments:\n' + '\n---\n'.join(
issue.thread_comments
)

# Extract image URLs from the issue body and thread comments
images = []
images.extend(self._extract_image_urls(issue.body))
images.extend(self._extract_image_urls(thread_context))
Expand All @@ -227,15 +251,22 @@ def get_instruction(
def guess_success(
self, issue: GithubIssue, history: list[Event]
) -> tuple[bool, None | list[bool], str]:
"""Guess if the issue is fixed based on the history and the issue description."""
"""Guess if the issue is fixed based on the history and the issue description.
Args:
issue: The issue to check
history: The agent's history
"""
last_message = history[-1].message

# Include thread comments in the prompt if they exist
issue_context = issue.body
if issue.thread_comments:
issue_context += '\n\nIssue Thread Comments:\n' + '\n---\n'.join(
issue.thread_comments
)

# Prepare the prompt
with open(
os.path.join(
os.path.dirname(__file__),
Expand All @@ -246,6 +277,7 @@ def guess_success(
template = jinja2.Template(f.read())
prompt = template.render(issue_context=issue_context, last_message=last_message)

# Get the LLM response and check for 'success' and 'explanation' in the answer
response = self.llm.completion(messages=[{'role': 'user', 'content': prompt}])

answer = response.choices[0].message.content.strip()
Expand Down Expand Up @@ -328,6 +360,7 @@ def __download_pr_metadata(

variables = {'owner': self.owner, 'repo': self.repo, 'pr': pull_number}

# Run the query
url = 'https://api.github.com/graphql'
headers = {
'Authorization': f'Bearer {self.token}',
Expand Down Expand Up @@ -394,10 +427,12 @@ def __download_pr_metadata(
review_thread['body'] + '\n'
) # Add each thread in a new line

# Source files on which the comments were made
file = review_thread.get('path')
if file and file not in files:
files.append(file)

# If the comment ID is not provided or the thread contains the comment ID, add the thread to the list
if comment_id is None or thread_contains_comment_id:
unresolved_thread = ReviewThread(comment=message, files=files)
review_threads.append(unresolved_thread)
Expand Down
69 changes: 60 additions & 9 deletions openhands/resolver/send_pull_request.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
import subprocess

import jinja2
import litellm
import requests

from openhands.core.config import LLMConfig
from openhands.core.logger import openhands_logger as logger
from openhands.llm.llm import LLM
from openhands.resolver.github_issue import GithubIssue
from openhands.resolver.io_utils import (
load_all_resolver_outputs,
Expand All @@ -20,6 +20,12 @@


def apply_patch(repo_dir: str, patch: str) -> None:
"""Apply a patch to a repository.
Args:
repo_dir: The directory containing the repository
patch: The patch to apply
"""
diffs = parse_patch(patch)
for diff in diffs:
if not diff.header.new_path:
Expand Down Expand Up @@ -112,6 +118,14 @@ def apply_patch(repo_dir: str, patch: str) -> None:
def initialize_repo(
output_dir: str, issue_number: int, issue_type: str, base_commit: str | None = None
) -> str:
"""Initialize the repository.
Args:
output_dir: The output directory to write the repository to
issue_number: The issue number to fix
issue_type: The type of the issue
base_commit: The base commit to checkout (if issue_type is pr)
"""
src_dir = os.path.join(output_dir, 'repo')
dest_dir = os.path.join(output_dir, 'patches', f'{issue_type}_{issue_number}')

Expand All @@ -124,6 +138,7 @@ def initialize_repo(
shutil.copytree(src_dir, dest_dir)
print(f'Copied repository to {dest_dir}')

# Checkout the base commit if provided
if base_commit:
result = subprocess.run(
f'git -C {dest_dir} checkout {base_commit}',
Expand All @@ -139,6 +154,13 @@ def initialize_repo(


def make_commit(repo_dir: str, issue: GithubIssue, issue_type: str) -> None:
"""Make a commit with the changes to the repository.
Args:
repo_dir: The directory containing the repository
issue: The issue to fix
issue_type: The type of the issue
"""
# Check if git username is set
result = subprocess.run(
f'git -C {repo_dir} config user.name',
Expand All @@ -158,25 +180,31 @@ def make_commit(repo_dir: str, issue: GithubIssue, issue_type: str) -> None:
)
print('Git user configured as openhands')

# Add all changes to the git index
result = subprocess.run(
f'git -C {repo_dir} add .', shell=True, capture_output=True, text=True
)
if result.returncode != 0:
print(f'Error adding files: {result.stderr}')
raise RuntimeError('Failed to add files to git')

# Check the status of the git index
status_result = subprocess.run(
f'git -C {repo_dir} status --porcelain',
shell=True,
capture_output=True,
text=True,
)

# If there are no changes, raise an error
if not status_result.stdout.strip():
print(f'No changes to commit for issue #{issue.number}. Skipping commit.')
raise RuntimeError('ERROR: Openhands failed to make code changes.')

# Prepare the commit message
commit_message = f'Fix {issue_type} #{issue.number}: {issue.title}'

# Commit the changes
result = subprocess.run(
['git', '-C', repo_dir, 'commit', '-m', commit_message],
capture_output=True,
Expand Down Expand Up @@ -206,12 +234,23 @@ def send_pull_request(
github_token: str,
github_username: str | None,
patch_dir: str,
llm_config: LLMConfig,
pr_type: str,
fork_owner: str | None = None,
additional_message: str | None = None,
target_branch: str | None = None,
) -> str:
"""Send a pull request to a GitHub repository.
Args:
github_issue: The issue to send the pull request for
github_token: The GitHub token to use for authentication
github_username: The GitHub username, if provided
patch_dir: The directory containing the patches to apply
pr_type: The type: branch (no PR created), draft or ready (regular PR created)
fork_owner: The owner of the fork to push changes to (if different from the original repo owner)
additional_message: The additional messages to post as a comment on the PR in json list format
target_branch: The target branch to create the pull request against (defaults to repository default branch)
"""
if pr_type not in ['branch', 'draft', 'ready']:
raise ValueError(f'Invalid pr_type: {pr_type}')

Expand All @@ -227,6 +266,7 @@ def send_pull_request(
branch_name = base_branch_name
attempt = 1

# Find a unique branch name
print('Checking if branch exists...')
while branch_exists(base_url, branch_name, headers):
attempt += 1
Expand Down Expand Up @@ -279,6 +319,7 @@ def send_pull_request(
print(f'Error pushing changes: {result.stderr}')
raise RuntimeError('Failed to push changes to the remote repository')

# Prepare the PR data: title and body
pr_title = f'Fix issue #{github_issue.number}: {github_issue.title}'
pr_body = f'This pull request fixes #{github_issue.number}.'
if additional_message:
Expand All @@ -290,13 +331,16 @@ def send_pull_request(
if pr_type == 'branch':
url = f'https://github.com/{push_owner}/{github_issue.repo}/compare/{branch_name}?expand=1'
else:
# Prepare the PR for the GitHub API
data = {
'title': pr_title, # No need to escape title for GitHub API
'body': pr_body,
'head': branch_name,
'base': base_branch,
'draft': pr_type == 'draft',
}

# Send the PR and get its URL to tell the user
response = requests.post(f'{base_url}/pulls', headers=headers, json=data)
if response.status_code == 403:
raise RuntimeError(
Expand All @@ -314,6 +358,13 @@ def send_pull_request(


def reply_to_comment(github_token: str, comment_id: str, reply: str):
"""Reply to a comment on a GitHub issue or pull request.
Args:
github_token: The GitHub token to use for authentication
comment_id: The ID of the comment to reply to
reply: The reply message to post
"""
# Opting for graphql as REST API doesn't allow reply to replies in comment threads
query = """
mutation($body: String!, $pullRequestReviewThreadId: ID!) {
Expand All @@ -327,6 +378,7 @@ def reply_to_comment(github_token: str, comment_id: str, reply: str):
}
"""

# Prepare the reply to the comment
comment_reply = f'Openhands fix success summary\n\n\n{reply}'
variables = {'body': comment_reply, 'pullRequestReviewThreadId': comment_id}
url = 'https://api.github.com/graphql'
Expand All @@ -335,6 +387,7 @@ def reply_to_comment(github_token: str, comment_id: str, reply: str):
'Content-Type': 'application/json',
}

# Send the reply to the comment
response = requests.post(
url, json={'query': query, 'variables': variables}, headers=headers
)
Expand Down Expand Up @@ -392,13 +445,14 @@ def update_existing_pull_request(
base_url = f'https://api.github.com/repos/{github_issue.owner}/{github_issue.repo}'
branch_name = github_issue.head_branch

# Push the changes to the existing branch
# Prepare the push command
push_command = (
f'git -C {patch_dir} push '
f'https://{github_username}:{github_token}@github.com/'
f'{github_issue.owner}/{github_issue.repo}.git {branch_name}'
)

# Push the changes to the existing branch
result = subprocess.run(push_command, shell=True, capture_output=True, text=True)
if result.returncode != 0:
print(f'Error pushing changes: {result.stderr}')
Expand All @@ -420,6 +474,7 @@ def update_existing_pull_request(

# Summarize with LLM if provided
if llm_config is not None:
llm = LLM(llm_config)
with open(
os.path.join(
os.path.dirname(__file__),
Expand All @@ -429,16 +484,13 @@ def update_existing_pull_request(
) as f:
template = jinja2.Template(f.read())
prompt = template.render(comment_message=comment_message)
response = litellm.completion(
model=llm_config.model,
response = llm.completion(
messages=[{'role': 'user', 'content': prompt}],
api_key=llm_config.api_key,
base_url=llm_config.base_url,
)
comment_message = response.choices[0].message.content.strip()

except (json.JSONDecodeError, TypeError):
comment_message = 'New OpenHands update'
comment_message = f'A new OpenHands update is available, but failed to parse or summarize the changes:\n{additional_message}'

# Post a comment on the PR
if comment_message:
Expand Down Expand Up @@ -514,7 +566,6 @@ def process_single_issue(
github_username=github_username,
patch_dir=patched_repo_dir,
pr_type=pr_type,
llm_config=llm_config,
fork_owner=fork_owner,
additional_message=resolver_output.success_explanation,
target_branch=target_branch,
Expand Down
Loading

0 comments on commit 279e1d7

Please sign in to comment.