Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(autofix): Multiple changes #1641

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
+258 −181
Draft

feat(autofix): Multiple changes #1641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69d596b
working
jennmueng Dec 17, 2024
f8cb3fa
space
jennmueng Dec 17, 2024
f2b590d
quick fix
jennmueng Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/seer/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
)
from seer.automation.autofix.tasks import (
check_and_mark_if_timed_out,
continue_with_feedback,
get_autofix_state,
get_autofix_state_from_pr_id,
receive_user_message,
Expand Down Expand Up @@ -179,13 +180,16 @@ def autofix_update_endpoint(
receive_user_message(data)
elif data.payload.type == AutofixUpdateType.RESTART_FROM_POINT_WITH_FEEDBACK:
restart_from_point_with_feedback(data)
elif data.payload.type == AutofixUpdateType.CONTINUE_WITH_FEEDBACK:
continue_with_feedback(data)
elif data.payload.type == AutofixUpdateType.UPDATE_CODE_CHANGE:
update_code_change(data)
return AutofixEndpointResponse(started=True, run_id=data.run_id)


@json_api(blueprint, "/v1/automation/autofix/state")
def get_autofix_state_endpoint(data: AutofixStateRequest) -> AutofixStateResponse:

state = get_autofix_state(group_id=data.group_id, run_id=data.run_id)

if state:
Expand Down
195 changes: 97 additions & 98 deletions src/seer/automation/autofix/autofix_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ def __init__(
self.event_manager = event_manager
self.state = state

# TODO: Remove this when we no longer need the backwards compatibility.
self.event_manager.migrate_step_keys()

logger.info(f"AutofixContext initialized with run_id {self.run_id}")

@classmethod
Expand Down Expand Up @@ -211,116 +208,118 @@ def process_event_paths(self, event: EventDetails):

def commit_changes(
self,
*,
changes_step_id: str,
repo_external_id: str | None = None,
repo_id: int | None = None,
pr_to_comment_on_url: str | None = None,
):
state = self.state.get()
for codebase_state in state.codebases.values():

changes_step = state.find_step(id=changes_step_id)
if not changes_step:
if (
repo_external_id is None and repo_id is None
) or codebase_state.repo_external_id == repo_external_id:
changes_step = state.find_step(key="changes")
if not changes_step:
raise ValueError("Changes step not found")
changes_step = cast(ChangesStep, changes_step)
change_state, changes_state_index = next(
(
(change, i)
for i, change in enumerate(changes_step.changes)
if change.repo_external_id == codebase_state.repo_external_id
),
(None, None),
len(
list(
filter(lambda x: x.key == self.event_manager.changes_step.key, state.steps)
)
)
if codebase_state.file_changes and change_state and changes_state_index is not None:
key = codebase_state.repo_external_id or codebase_state.repo_id
== 1
):
# Backwards compatibility support for existing autofix runs with only 1 change and the frontend change has not gone out yet
changes_step = state.find_step(key=self.event_manager.changes_step.key)
else:
raise ValueError(f"Changes step {changes_step_id} not found")
changes_step = cast(ChangesStep, changes_step)

if key is None:
raise ValueError("Repo key not found")
if not repo_external_id:
if len(changes_step.codebase_changes) > 1:
raise ValueError("Multiple repos are affected, please provide a repo external id")
else:
repo_external_id = list(changes_step.codebase_changes.keys())[0]

repo_definition = self.repos_by_key().get(key)
codebase_change = changes_step.codebase_changes[repo_external_id]

if repo_definition is None:
raise ValueError(f"Repo definition not found for key {key}")
repo_definition = self.repos_by_key().get(repo_external_id)

repo_client = self.get_repo_client(
repo_external_id=repo_definition.external_id, type=RepoClientType.WRITE
)
if repo_definition is None:
raise ValueError(f"Repo definition not found for key {repo_external_id}")

branch_ref = repo_client.create_branch_from_changes(
pr_title=change_state.title,
file_patches=change_state.diff,
)
repo_client = self.get_repo_client(
repo_external_id=repo_definition.external_id, type=RepoClientType.WRITE
)

if branch_ref is None:
logger.warning("Failed to create branch from changes")
return None

pr_title = f"""🤖 {change_state.title}"""

ref_note = ""
org_slug = self.get_org_slug(state.request.organization_id)
if org_slug:
issue_url = f"https://sentry.io/organizations/{org_slug}/issues/{state.request.issue.id}/"
issue_link = (
f"[{state.request.issue.short_id}]({issue_url})"
if state.request.issue.short_id
else issue_url
)
suspect_pr_link = (
f", which was likely introduced in [this PR]({pr_to_comment_on_url})."
if pr_to_comment_on_url
else ""
)
ref_note = f"Fixes {issue_link}{suspect_pr_link}\n"

pr_description = textwrap.dedent(
"""\
👋 Hi there! This PR was automatically generated by Autofix 🤖
{user_line}

{ref_note}
{description}

If you have any questions or feedback for the Sentry team about this fix, please email [[email protected]](mailto:[email protected]) with the Run ID: {run_id}."""
).format(
run_id=state.run_id,
user_line=(
f"\nThis fix was triggered by {state.request.invoking_user.display_name}"
if state.request.invoking_user
else ""
),
description=change_state.description,
ref_note=ref_note,
)
branch_ref = repo_client.create_branch_from_changes(
pr_title=codebase_change.title,
file_patches=codebase_change.diff,
)

pr = repo_client.create_pr_from_branch(branch_ref, pr_title, pr_description)
if branch_ref is None:
logger.warning("Failed to create branch from changes")
return None

change_state.pull_request = CommittedPullRequestDetails(
pr_number=pr.number, pr_url=pr.html_url, pr_id=pr.id
)
pr_title = f"""🤖 {codebase_change.title}"""

ref_note = ""
org_slug = self.get_org_slug(state.request.organization_id)
if org_slug:
issue_url = (
f"https://sentry.io/organizations/{org_slug}/issues/{state.request.issue.id}/"
)
issue_link = (
f"[{state.request.issue.short_id}]({issue_url})"
if state.request.issue.short_id
else issue_url
)
suspect_pr_link = (
f", which was likely introduced in [this PR]({pr_to_comment_on_url})."
if pr_to_comment_on_url
else ""
)
ref_note = f"Fixes {issue_link}{suspect_pr_link}\n"

pr_description = textwrap.dedent(
"""\
👋 Hi there! This PR was automatically generated by Autofix 🤖
{user_line}

{ref_note}
{description}

If you have any questions or feedback for the Sentry team about this fix, please email [[email protected]](mailto:[email protected]) with the Run ID: {run_id}."""
).format(
run_id=state.run_id,
user_line=(
f"\nThis fix was triggered by {state.request.invoking_user.display_name}"
if state.request.invoking_user
else ""
),
description=codebase_change.description,
ref_note=ref_note,
)

pr = repo_client.create_pr_from_branch(branch_ref, pr_title, pr_description)

with self.state.update() as state:
step = cast(ChangesStep, state.steps[changes_step.index])
step.codebase_changes[repo_external_id].pull_request = CommittedPullRequestDetails(
pr_number=pr.number, pr_url=pr.html_url, pr_id=pr.id
)

with self.state.update() as state:
step = cast(ChangesStep, state.steps[changes_step.index])
step.changes[changes_state_index].pull_request = change_state.pull_request

with Session() as session:
pr_id_mapping = DbPrIdToAutofixRunIdMapping(
provider=repo_client.provider,
pr_id=pr.id,
run_id=state.run_id,
)
session.add(pr_id_mapping)
session.commit()

if (
pr_to_comment_on_url
): # for GitHub Copilot, leave a comment that the PR is made
repo_client.comment_pr_generated_for_copilot(
pr_to_comment_on_url=pr_to_comment_on_url,
new_pr_url=pr.html_url,
run_id=state.run_id,
)
with Session() as session:
pr_id_mapping = DbPrIdToAutofixRunIdMapping(
provider=repo_client.provider,
pr_id=pr.id,
run_id=state.run_id,
)
session.add(pr_id_mapping)
session.commit()

if pr_to_comment_on_url: # for GitHub Copilot, leave a comment that the PR is made
repo_client.comment_pr_generated_for_copilot(
pr_to_comment_on_url=pr_to_comment_on_url,
new_pr_url=pr.html_url,
run_id=state.run_id,
)

def comment_root_cause_on_pr(
self, pr_url: str, repo_definition: RepoDefinition, root_cause: str
Expand Down
17 changes: 16 additions & 1 deletion src/seer/automation/autofix/components/coding/component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import json
import logging
from typing import cast

from langfuse.decorators import observe
from pydantic import BaseModel
Expand All @@ -24,6 +25,7 @@
task_to_file_delete,
)
from seer.automation.autofix.components.root_cause.models import RootCauseAnalysisItem
from seer.automation.autofix.models import ChangesStep
from seer.automation.autofix.tools import BaseTools
from seer.automation.component import BaseComponent
from seer.automation.models import FileChange
Expand All @@ -39,7 +41,20 @@ class CodingComponent(BaseComponent[CodingRequest, CodingOutput]):

def _append_file_change(self, repo_external_id: str, file_change: FileChange):
with self.context.state.update() as cur:
cur.codebases[repo_external_id].file_changes.append(file_change)
# TODO: move this
last_changes_step = cur.find_or_add(self.context.event_manager.changes_step)
if last_changes_step.id != cur.steps[-1].id:
last_changes_step = cur.add_step(self.context.event_manager.changes_step)

if not last_changes_step:
raise ValueError("Last plan step not found")

last_changes_step = cast(ChangesStep, last_changes_step)

if repo_external_id not in last_changes_step.file_changes:
last_changes_step.file_changes[repo_external_id] = []

last_changes_step.file_changes[repo_external_id].append(file_change)

@observe(name="Incorrect diff fixer")
@ai_track(description="Incorrect diff fixer")
Expand Down
Loading
Loading