fix: fixes branch creation for create-pr tool

src/codegen/extensions/tools/github/create_pr.py

@@ -3,6 +3,8 @@
 import uuid
 from typing import Any
 
+from github import GithubException
+
 from codegen import Codebase
 
 
@@ -18,12 +20,25 @@
         Dict containing PR info, or error information if operation fails
     """
     try:
+        # Check for uncommitted changes and commit them
+        if len(codebase.get_diff()) == 0:
+            return {"error": "No changes to create a PR."}
+
+        # TODO: this is very jank. We should ideally check out the branch before
+        # making the changes, but it looks like `codebase.checkout` blows away
+        # all of your changes
+        codebase.git_commit(".")
+
         # If on default branch, create a new branch
         if codebase._op.git_cli.active_branch.name == codebase._op.default_branch:
             codebase.checkout(branch=f"{uuid.uuid4()}", create_if_missing=True)
 
         # Create the PR
-        pr = codebase.create_pr(title=title, body=body)
+        try:
+            pr = codebase.create_pr(title=title, body=body)
+        except GithubException as e:
+            print(e)
+            return {"error": "Failed to create PR. Check if the PR already exists."}
         return {
             "status": "success",
             "url": pr.html_url,

src/codegen/sdk/core/codebase.py

@@ -180,13 +180,13 @@
             main_project = ProjectConfig.from_path(repo_path, programming_language=ProgrammingLanguage(language.upper()) if language else None)
             projects = [main_project]
         else:
             main_project = projects[0]
 
         # Initialize codebase
         self._op = main_project.repo_operator
         self.viz = VisualizationManager(op=self._op)
         self.repo_path = Path(self._op.repo_path)
         self.ctx = CodebaseContext(projects, config=config, io=io, progress=progress)
         self.console = Console(record=True, soft_wrap=True)
 
     @noapidoc
@@ -202,7 +202,7 @@
         yield "nodes", len(self.ctx.nodes)
         yield "edges", len(self.ctx.edges)
 
     __rich_repr__.angular = ANGULAR_STYLE
 
     @property
     @deprecated("Please do not use the local repo operator directly")
@@ -244,8 +244,8 @@
 
     @noapidoc
     def _symbols(self, symbol_type: SymbolType | None = None) -> list[TSymbol | TClass | TFunction | TGlobalVar]:
         matches: list[Symbol] = self.ctx.get_nodes(NodeType.SYMBOL)
         return [x for x in matches if x.is_top_level and (symbol_type is None or x.symbol_type == symbol_type)]
 
     # =====[ Node Types ]=====
     @overload
@@ -254,7 +254,7 @@
     def files(self, *, extensions: Literal["*"]) -> list[File]: ...
     @overload
     def files(self, *, extensions: None = ...) -> list[TSourceFile]: ...
     @proxy_property
     def files(self, *, extensions: list[str] | Literal["*"] | None = None) -> list[TSourceFile] | list[File]:
         """A list property that returns all files in the codebase.
 
@@ -284,15 +284,15 @@
         return sort_editables(files, alphabetical=True, dedupe=False)
 
     @cached_property
     def codeowners(self) -> list["CodeOwner[TSourceFile]"]:
         """List all CodeOnwers in the codebase.
 
         Returns:
             list[CodeOwners]: A list of CodeOwners objects in the codebase.
         """
         if self.G.codeowners_parser is None:
             return []
         return CodeOwner.from_parser(self.G.codeowners_parser, lambda *args, **kwargs: self.files(*args, **kwargs))
 
     @property
     def directories(self) -> list[TDirectory]:
@@ -304,7 +304,7 @@
         Returns:
             list[TDirectory]: A list of Directory objects in the codebase.
         """
         return list(self.ctx.directories.values())
 
     @property
     def imports(self) -> list[TImport]:
@@ -740,7 +740,7 @@
     ####################################################################################################################
 
     def git_commit(self, message: str, *, verify: bool = False) -> GitCommit | None:
-        """Commits all staged changes to the codebase and git.
+        """Stages + commits all changes to the codebase and git.
 
         Args:
             message (str): The commit message
@@ -753,6 +753,8 @@
         if self._op.stage_and_commit_all_changes(message, verify):
             logger.info(f"Commited repository to {self._op.head_commit} on {self._op.get_active_branch_or_commit()}")
             return self._op.head_commit
+        else:
+            logger.info("No changes to commit")
         return None
 
     def commit(self, sync_graph: bool = True) -> None: