github/OpenHands
1
1
Fork 0
mirror of https://github.com/All-Hands-AI/OpenHands.git synced 2026-04-29 03:00:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add git patch info to guess_success prompt (#5950)

Browse Source 
Co-authored-by: openhands <openhands@all-hands.dev>
This commit is contained in:
Graham Neubig
2025-01-04 10:56:50 +09:00
committed by GitHub
parent 510c1644dd
commit 5bdebac741
6 changed files with 217 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
openhands/resolver/issue_definitions.py
View File

@@ -37,9 +37,9 @@ class IssueHandlerInterface(ABC):
@abstractmethod
def guess_success(
self, issue: GithubIssue, history: list[Event]
self, issue: GithubIssue, history: list[Event], git_patch: str | None = None
) -> tuple[bool, list[bool] | None, str]:
"""Guess if the issue has been resolved based on the agent's output."""
"""Guess if the issue has been resolved based on the agent's output and git patch."""
pass
@@ -249,13 +249,14 @@ class IssueHandler(IssueHandlerInterface):
)
def guess_success(
self, issue: GithubIssue, history: list[Event]
self, issue: GithubIssue, history: list[Event], git_patch: str | None = None
) -> tuple[bool, None | list[bool], str]:
"""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
git_patch: Optional git patch showing the changes made
"""
last_message = history[-1].message
@@ -665,6 +666,7 @@ class PRHandler(IssueHandler):
review_thread: ReviewThread,
issues_context: str,
last_message: str,
git_patch: str | None = None,
) -> tuple[bool, str]:
"""Check if a review thread's feedback has been addressed."""
files_context = json.dumps(review_thread.files, indent=4)
@@ -683,6 +685,7 @@ class PRHandler(IssueHandler):
feedback=review_thread.comment,
files_context=files_context,
last_message=last_message,
git_patch=git_patch or 'No changes made yet',
)
return self._check_feedback_with_llm(prompt)
@@ -692,6 +695,7 @@ class PRHandler(IssueHandler):
thread_comments: list[str],
issues_context: str,
last_message: str,
git_patch: str | None = None,
) -> tuple[bool, str]:
"""Check if thread comments feedback has been addressed."""
thread_context = '\n---\n'.join(thread_comments)
@@ -708,6 +712,7 @@ class PRHandler(IssueHandler):
issue_context=issues_context,
thread_context=thread_context,
last_message=last_message,
git_patch=git_patch or 'No changes made yet',
)
return self._check_feedback_with_llm(prompt)
@@ -717,6 +722,7 @@ class PRHandler(IssueHandler):
review_comments: list[str],
issues_context: str,
last_message: str,
git_patch: str | None = None,
) -> tuple[bool, str]:
"""Check if review comments feedback has been addressed."""
review_context = '\n---\n'.join(review_comments)
@@ -733,15 +739,17 @@ class PRHandler(IssueHandler):
issue_context=issues_context,
review_context=review_context,
last_message=last_message,
git_patch=git_patch or 'No changes made yet',
)
return self._check_feedback_with_llm(prompt)
def guess_success(
self, issue: GithubIssue, history: list[Event]
self, issue: GithubIssue, history: list[Event], git_patch: str | None = None
) -> 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, issue description and git patch."""
last_message = history[-1].message
issues_context = json.dumps(issue.closing_issues, indent=4)
success_list = []
explanation_list = []
@@ -751,7 +759,7 @@ class PRHandler(IssueHandler):
for review_thread in issue.review_threads:
if issues_context and last_message:
success, explanation = self._check_review_thread(
review_thread, issues_context, last_message
review_thread, issues_context, last_message, git_patch
)
else:
success, explanation = False, 'Missing context or message'
@@ -761,7 +769,7 @@ class PRHandler(IssueHandler):
elif issue.thread_comments:
if issue.thread_comments and issues_context and last_message:
success, explanation = self._check_thread_comments(
issue.thread_comments, issues_context, last_message
issue.thread_comments, issues_context, last_message, git_patch
)
else:
success, explanation = (
@@ -774,7 +782,7 @@ class PRHandler(IssueHandler):
# Handle PRs with only review comments (no file-specific review comments or thread comments)
if issue.review_comments and issues_context and last_message:
success, explanation = self._check_review_comments(
issue.review_comments, issues_context, last_message
issue.review_comments, issues_context, last_message, git_patch
)
else:
success, explanation = (

3
openhands/resolver/prompts/guess_success/pr-feedback-check.jinja
View File

@@ -9,6 +9,9 @@ Feedback:
Files locations:
{{ files_context }}
Changes made (git patch):
{{ git_patch }}
Last message from AI agent:
{{ last_message }}

3
openhands/resolver/prompts/guess_success/pr-review-check.jinja
View File

@@ -6,6 +6,9 @@ Issue descriptions:
PR Review Comments:
{{ review_context }}
Changes made (git patch):
{{ git_patch }}
Last message from AI agent:
{{ last_message }}

3
openhands/resolver/prompts/guess_success/pr-thread-check.jinja
View File

@@ -6,6 +6,9 @@ Issue descriptions:
PR Thread Comments:
{{ thread_context }}
Changes made (git patch):
{{ git_patch }}
Last message from AI agent:
{{ last_message }}

4
openhands/resolver/resolve_issue.py
View File

@@ -244,9 +244,9 @@ async def process_issue(
else:
histories = [dataclasses.asdict(event) for event in state.history]
metrics = state.metrics.get() if state.metrics else None
# determine success based on the history and the issue description
# determine success based on the history, issue description and git patch
success, comment_success, result_explanation = issue_handler.guess_success(
issue, state.history
issue, state.history, git_patch
)
if issue_handler.issue_type == 'pr' and comment_success: