Skip to content

Commit 5d87ebf

Browse files
caroljung-cgcodegen-bot
authored andcommitted
wip
1 parent 8e34b3a commit 5d87ebf

File tree

3 files changed

+22
-13
lines changed

3 files changed

+22
-13
lines changed

src/codegen/runner/clients/codebase_client.py

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from codegen.git.schemas.repo_config import RepoConfig
66
from codegen.runner.clients.server_client import LocalServerClient
77
from codegen.runner.models.apis import SANDBOX_SERVER_PORT
8+
from codegen.shared.configs.session_configs import config
89

910
logger = logging.getLogger(__name__)
1011

@@ -22,15 +23,23 @@ def __init__(self, repo_config: RepoConfig, git_access_token: str | None, host:
2223
self.git_access_token = git_access_token
2324
super().__init__(server_path=RUNNER_SERVER_PATH, host=host, port=port)
2425

25-
def _get_envs(self):
26+
def _get_envs(self) -> dict:
2627
envs = super()._get_envs()
27-
envs.update(
28-
{
29-
"CODEGEN_REPOSITORY__REPO_PATH": self.repo_config.repo_path,
30-
"CODEGEN_REPOSITORY__REPO_NAME": self.repo_config.name,
31-
"CODEGEN_REPOSITORY__FULL_NAME": self.repo_config.full_name,
32-
"CODEGEN_REPOSITORY__LANGUAGE": self.repo_config.language.value,
33-
"CODEGEN_SECRETS__GITHUB_TOKEN": self.git_access_token,
34-
}
35-
)
28+
codebase_envs = {
29+
"CODEGEN_REPOSITORY__REPO_PATH": self.repo_config.repo_path,
30+
"CODEGEN_REPOSITORY__REPO_NAME": self.repo_config.name,
31+
"CODEGEN_REPOSITORY__FULL_NAME": self.repo_config.full_name,
32+
"CODEGEN_REPOSITORY__LANGUAGE": self.repo_config.language.value,
33+
}
34+
if self.git_access_token is not None:
35+
codebase_envs["CODEGEN_SECRETS__GITHUB_TOKEN"] = self.git_access_token
36+
37+
envs.update(codebase_envs)
3638
return envs
39+
40+
41+
if __name__ == "__main__":
42+
test_config = RepoConfig.from_repo_path("/Users/caroljung/git/codegen/codegen-agi")
43+
test_config.full_name = "codegen-sh/codegen-agi"
44+
client = CodebaseClient(test_config, config.secrets.github_token)
45+
print(client.healthcheck())

src/codegen/runner/clients/server_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __del__(self):
3636
self._process.terminate()
3737
self._process.wait()
3838

39-
def _get_envs(self):
39+
def _get_envs(self) -> dict:
4040
return os.environ.copy()
4141

4242
def _start_server(self, server_path: str) -> None:
@@ -57,7 +57,7 @@ def _start_server(self, server_path: str) -> None:
5757
)
5858
self._wait_for_server()
5959

60-
def _wait_for_server(self, timeout: int = 60, interval: float = 0.1) -> None:
60+
def _wait_for_server(self, timeout: int = 10, interval: float = 0.1) -> None:
6161
"""Wait for the server to start by polling the health endpoint"""
6262
start_time = time.time()
6363
while (time.time() - start_time) < timeout:

src/codegen/runner/sandbox/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ async def lifespan(server: FastAPI):
3939
global runner
4040

4141
try:
42-
server_info = ServerInfo(repo_name=config.repository.full_name)
42+
server_info = ServerInfo(repo_name=config.repository.full_name or config.repository.repo_name)
4343
logger.info(f"Starting up sandbox fastapi server for repo_name={server_info.repo_name}")
4444
repo_config = RepoConfig(
4545
name=config.repository.repo_name,

0 commit comments

Comments
 (0)