From ddf7c4ed4de0435a1bc72d6d27c8ee040aa63564 Mon Sep 17 00:00:00 2001 From: codegen-bot Date: Wed, 12 Mar 2025 23:25:29 +0000 Subject: [PATCH 1/2] Handle repos that don't support draft PRs --- src/codegen/git/clients/git_repo_client.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/codegen/git/clients/git_repo_client.py b/src/codegen/git/clients/git_repo_client.py index e90735639..4330fffa7 100644 --- a/src/codegen/git/clients/git_repo_client.py +++ b/src/codegen/git/clients/git_repo_client.py @@ -205,7 +205,18 @@ def create_pull( # NOTE: return a read-only copy to prevent people from editing it return self.repo.get_pull(pr.number) except GithubException as ge: - logger.warning(f"Failed to create PR got GithubException\n\t{ge}") + # Check if the error is related to draft PRs not being supported + if draft and "Draft pull requests are not supported" in str(ge): + logger.info("Draft PRs not supported by this repository. Retrying without draft flag.") + try: + # Retry without the draft flag + pr = self.repo.create_pull(title=title or f"PR for {head_branch_name}", body=body or "", head=head_branch_name, base=base_branch_name, draft=False) + logger.info(f"Created non-draft pull request for head branch: {head_branch_name} at {pr.html_url}") + return self.repo.get_pull(pr.number) + except Exception as retry_e: + logger.warning(f"Failed to create non-draft PR:\n\t{retry_e}") + else: + logger.warning(f"Failed to create PR got GithubException\n\t{ge}") except Exception as e: logger.warning(f"Failed to create PR:\n\t{e}") @@ -441,4 +452,4 @@ def search_issues(self, query: str, **kwargs) -> list[Issue]: return self.gh_client.client.search_issues(query, **kwargs) def search_prs(self, query: str, **kwargs) -> list[PullRequest]: - return self.gh_client.client.search_issues(query, **kwargs) + return self.gh_client.client.search_issues(query, **kwargs) \ No newline at end of file From 10c4b951b920a24daec6d2fbf96f4f57f51f5453 Mon Sep 17 00:00:00 2001 From: "codegen-sh[bot]" <131295404+codegen-sh[bot]@users.noreply.github.com> Date: Wed, 12 Mar 2025 23:26:25 +0000 Subject: [PATCH 2/2] Automated pre-commit update --- src/codegen/git/clients/git_repo_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/codegen/git/clients/git_repo_client.py b/src/codegen/git/clients/git_repo_client.py index 4330fffa7..0aa2c3db5 100644 --- a/src/codegen/git/clients/git_repo_client.py +++ b/src/codegen/git/clients/git_repo_client.py @@ -452,4 +452,4 @@ def search_issues(self, query: str, **kwargs) -> list[Issue]: return self.gh_client.client.search_issues(query, **kwargs) def search_prs(self, query: str, **kwargs) -> list[PullRequest]: - return self.gh_client.client.search_issues(query, **kwargs) \ No newline at end of file + return self.gh_client.client.search_issues(query, **kwargs)