feat: Enhance ephemeral review process with reasoning effort handling and retry logic
This commit is contained in:
@@ -31,21 +31,26 @@ def run_review_ephemeral(
|
||||
gitea = GiteaClient(settings)
|
||||
prompt, _diff_context, repo_cfg = prepare_review_prompt(settings, gitea, repo, pr_number, command)
|
||||
container_name = f"codex-review-{uuid.uuid4().hex[:12]}"
|
||||
install_and_run = _build_install_and_run_command(settings)
|
||||
extra_env: dict[str, str] = {}
|
||||
if settings.codex_auth_mode == "chatgpt":
|
||||
extra_env["CODEX_AUTH_JSON_B64"] = _load_codex_auth_json_b64(settings)
|
||||
cmd = _build_docker_command(settings, container_name=container_name, install_and_run=install_and_run)
|
||||
try:
|
||||
completed = subprocess.run(
|
||||
cmd,
|
||||
input=prompt,
|
||||
text=True,
|
||||
check=False,
|
||||
capture_output=True,
|
||||
timeout=settings.max_review_minutes * 60,
|
||||
env={**os.environ, **extra_env},
|
||||
completed = _run_ephemeral_container(
|
||||
settings,
|
||||
container_name=container_name,
|
||||
prompt=prompt,
|
||||
extra_env=extra_env,
|
||||
include_reasoning_effort=True,
|
||||
)
|
||||
if _needs_reasoning_effort_compat_retry(completed):
|
||||
logger.info("Ephemeral runner does not support --reasoning-effort; retrying without it.")
|
||||
completed = _run_ephemeral_container(
|
||||
settings,
|
||||
container_name=container_name,
|
||||
prompt=prompt,
|
||||
extra_env=extra_env,
|
||||
include_reasoning_effort=False,
|
||||
)
|
||||
if completed.returncode != 0:
|
||||
raise RuntimeError(_format_runner_failure(completed))
|
||||
parsed = _parse_codex_exec_stdout(completed.stdout)
|
||||
@@ -56,7 +61,28 @@ def run_review_ephemeral(
|
||||
return _ephemeral_runner_failure_result(exc, settings.codex_auth_mode), repo_cfg
|
||||
|
||||
|
||||
def _build_install_and_run_command(settings: Settings) -> str:
|
||||
def _run_ephemeral_container(
|
||||
settings: Settings,
|
||||
*,
|
||||
container_name: str,
|
||||
prompt: str,
|
||||
extra_env: dict[str, str],
|
||||
include_reasoning_effort: bool,
|
||||
) -> subprocess.CompletedProcess[str]:
|
||||
install_and_run = _build_install_and_run_command(settings, include_reasoning_effort=include_reasoning_effort)
|
||||
cmd = _build_docker_command(settings, container_name=container_name, install_and_run=install_and_run)
|
||||
return subprocess.run(
|
||||
cmd,
|
||||
input=prompt,
|
||||
text=True,
|
||||
check=False,
|
||||
capture_output=True,
|
||||
timeout=settings.max_review_minutes * 60,
|
||||
env={**os.environ, **extra_env},
|
||||
)
|
||||
|
||||
|
||||
def _build_install_and_run_command(settings: Settings, *, include_reasoning_effort: bool = True) -> str:
|
||||
steps = ["set -euo pipefail"]
|
||||
if settings.codex_auth_mode == "chatgpt":
|
||||
steps.extend(
|
||||
@@ -77,12 +103,19 @@ def _build_install_and_run_command(settings: Settings) -> str:
|
||||
codex_exec_parts = ["codex exec --skip-git-repo-check --json"]
|
||||
if model:
|
||||
codex_exec_parts.append(f"-m {shlex.quote(model)}")
|
||||
if reasoning_effort:
|
||||
if include_reasoning_effort and reasoning_effort:
|
||||
codex_exec_parts.append(f"--reasoning-effort {shlex.quote(reasoning_effort)}")
|
||||
steps.append(" ".join(codex_exec_parts))
|
||||
return "; ".join(steps)
|
||||
|
||||
|
||||
def _needs_reasoning_effort_compat_retry(completed: subprocess.CompletedProcess[str]) -> bool:
|
||||
if completed.returncode == 0:
|
||||
return False
|
||||
stderr_text = completed.stderr or ""
|
||||
return "unexpected argument '--reasoning-effort' found" in stderr_text
|
||||
|
||||
|
||||
def _build_docker_command(settings: Settings, *, container_name: str, install_and_run: str) -> list[str]:
|
||||
cmd = [
|
||||
"docker",
|
||||
|
||||
Reference in New Issue
Block a user