Skip to content

fix: create PR tool checks out onto custom branch #470

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

Merged
merged 1 commit into from
Feb 13, 2025
Merged

fix: create PR tool checks out onto custom branch #470

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/codegen/extensions/langchain/tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Langchain tools for workspace operations."""

import json
import uuid
from typing import ClassVar, Literal, Optional

from langchain.tools import BaseTool
Expand Down Expand Up @@ -33,9 +34,9 @@
class ViewFileTool(BaseTool):
"""Tool for viewing file contents and metadata."""

name: ClassVar[str] = "view_file"

Check failure on line 37 in src/codegen/extensions/langchain/tools.py

View workflow job for this annotation

GitHub Actions / mypy 

error: Cannot override instance variable (previously declared on base class "BaseTool") with class variable  [misc]
description: ClassVar[str] = "View the contents and metadata of a file in the codebase"

Check failure on line 38 in src/codegen/extensions/langchain/tools.py

View workflow job for this annotation

GitHub Actions / mypy 

error: Cannot override instance variable (previously declared on base class "BaseTool") with class variable  [misc]
args_schema: ClassVar[type[BaseModel]] = ViewFileInput

Check failure on line 39 in src/codegen/extensions/langchain/tools.py

View workflow job for this annotation

GitHub Actions / mypy 

error: Cannot override instance variable (previously declared on base class "BaseTool") with class variable  [misc]
codebase: Codebase = Field(exclude=True)

def __init__(self, codebase: Codebase) -> None:
Expand All @@ -56,9 +57,9 @@
class ListDirectoryTool(BaseTool):
"""Tool for listing directory contents."""

name: ClassVar[str] = "list_directory"

Check failure on line 60 in src/codegen/extensions/langchain/tools.py

View workflow job for this annotation

GitHub Actions / mypy 

error: Cannot override instance variable (previously declared on base class "BaseTool") with class variable  [misc]
description: ClassVar[str] = "List contents of a directory in the codebase"

Check failure on line 61 in src/codegen/extensions/langchain/tools.py

View workflow job for this annotation

GitHub Actions / mypy 

error: Cannot override instance variable (previously declared on base class "BaseTool") with class variable  [misc]
args_schema: ClassVar[type[BaseModel]] = ListDirectoryInput

Check failure on line 62 in src/codegen/extensions/langchain/tools.py

View workflow job for this annotation

GitHub Actions / mypy 

error: Cannot override instance variable (previously declared on base class "BaseTool") with class variable  [misc]
codebase: Codebase = Field(exclude=True)

def __init__(self, codebase: Codebase) -> None:
Expand All @@ -79,9 +80,9 @@
class SearchTool(BaseTool):
"""Tool for searching the codebase."""

name: ClassVar[str] = "search"

Check failure on line 83 in src/codegen/extensions/langchain/tools.py

View workflow job for this annotation

GitHub Actions / mypy 

error: Cannot override instance variable (previously declared on base class "BaseTool") with class variable  [misc]
description: ClassVar[str] = "Search the codebase using text search"

Check failure on line 84 in src/codegen/extensions/langchain/tools.py

View workflow job for this annotation

GitHub Actions / mypy 

error: Cannot override instance variable (previously declared on base class "BaseTool") with class variable  [misc]
args_schema: ClassVar[type[BaseModel]] = SearchInput

Check failure on line 85 in src/codegen/extensions/langchain/tools.py

View workflow job for this annotation

GitHub Actions / mypy 

error: Cannot override instance variable (previously declared on base class "BaseTool") with class variable  [misc]
codebase: Codebase = Field(exclude=True)

def __init__(self, codebase: Codebase) -> None:
Expand All @@ -102,7 +103,7 @@
class EditFileTool(BaseTool):
"""Tool for editing files."""

name: ClassVar[str] = "edit_file"

Check failure on line 106 in src/codegen/extensions/langchain/tools.py

View workflow job for this annotation

GitHub Actions / mypy 

error: Cannot override instance variable (previously declared on base class "BaseTool") with class variable  [misc]
description: ClassVar[str] = "Edit a file by replacing its entire content"
args_schema: ClassVar[type[BaseModel]] = EditFileInput
codebase: Codebase = Field(exclude=True)
Expand Down Expand Up @@ -355,6 +356,9 @@
super().__init__(codebase=codebase)

def _run(self, title: str, body: str) -> str:
if self.codebase._op.git_cli.active_branch.name == self.codebase._op.default_branch:
# If the current checked out branch is the default branch, checkout onto a new branch
self.codebase.checkout(branch=f"{uuid.uuid4()}", create_if_missing=True)
pr = self.codebase.create_pr(title=title, body=body)
return pr.html_url

Expand Down