Skip to content

fix: fix Codebase.from_repo #771

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
caroljung-cg merged 2 commits into from
Mar 6, 2025
Merged

fix: fix Codebase.from_repo #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8404f6
fix: fix Codebase.from_repo
caroljung-cg Mar 6, 2025
7ee6a61
fix test
caroljung-cg Mar 6, 2025
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
7 changes: 5 additions & 2 deletions src/codegen/sdk/core/codebase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from codegen.configs.models.secrets import SecretsConfig
from codegen.git.repo_operator.repo_operator import RepoOperator
from codegen.git.schemas.enums import CheckoutResult, SetupOption
from codegen.git.schemas.repo_config import RepoConfig
from codegen.git.utils.pr_review import CodegenPR
from codegen.sdk._proxy import proxy_property
from codegen.sdk.ai.client import get_openai_client
Expand Down Expand Up @@ -1343,15 +1344,17 @@ def from_repo(
repo_path = os.path.join(tmp_dir, repo)
repo_url = f"https://github.com/{repo_full_name}.git"
logger.info(f"Will clone {repo_url} to {repo_path}")
access_token = secrets.github_token if secrets else None

try:
# Use RepoOperator to fetch the repository
logger.info("Cloning repository...")
if commit is None:
repo_operator = RepoOperator.create_from_repo(repo_path=repo_path, url=repo_url)
repo_config = RepoConfig.from_repo_path(repo_path)
repo_config.full_name = repo_full_name
repo_operator = RepoOperator(repo_config=repo_config, access_token=access_token, setup_option=setup_option)
else:
# Ensure the operator can handle remote operations
access_token = secrets.github_token if secrets else None
repo_operator = RepoOperator.create_from_commit(repo_path=repo_path, commit=commit, url=repo_url, full_name=repo_full_name, access_token=access_token)
logger.info("Clone completed successfully")

Expand Down
3 changes: 2 additions & 1 deletion tests/integration/codegen/git/codebase/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

import pytest

from codegen.git.schemas.enums import SetupOption
from codegen.sdk.core.codebase import Codebase


@pytest.fixture
def codebase(tmpdir):
os.chdir(tmpdir)
codebase = Codebase.from_repo(repo_full_name="codegen-sh/Kevin-s-Adventure-Game", tmp_dir=tmpdir, language="python")
codebase = Codebase.from_repo(repo_full_name="codegen-sh/Kevin-s-Adventure-Game", tmp_dir=tmpdir, language="python", setup_option=SetupOption.PULL_OR_CLONE)
yield codebase
Loading