dev-strender's picture
feat: switch demo to FT + Opus article review (pipeline_exp_261021_ft_hybrid)
3dfc93b verified
Raw History Blame Contribute Delete
5.71 kB
"""pnpm ์‹คํ–‰ โ€” ํ•œ ๊ณณ (๊ณ„ํš 2026-09-27 L6 ยง2.6 ยท D-L6-13 ยท ๊ฒ€ํ†  F8).
`run_pnpm` ์€ ํ›…์ด pnpm ์„ ๋ถ€๋ฅด๋Š” **์œ ์ผํ•œ** ์ง„์ž…์ ์ด๋‹ค. ๋‘ ๊ฐ€์ง€๋ฅผ ์—ฌ๊ธฐ์„œ ๊ณ ์ •ํ•œ๋‹ค:
- **ํ”„๋กœ์„ธ์Šค ๊ทธ๋ฃน์งธ ์ฃฝ์ด๊ธฐ.** `subprocess.run(timeout=)` ์€ ์ง๊ณ„ pnpm ๋งŒ ์ฃฝ์—ฌ `tsx` ์†์ž๊ฐ€ hub ์„ธ์…˜ advisory lock ์„ ์ฅ” ์ฑ„
๋‚จ๋Š”๋‹ค. ์ƒˆ ์„ธ์…˜(`start_new_session=True`)์œผ๋กœ ๋„์šฐ๊ณ  ํ•œ๋„๋ฅผ ๋„˜๊ธฐ๋ฉด `os.killpg`(SIGTERM โ†’ ์œ ์˜ˆ ๋’ค SIGKILL) ํ•œ ๋’ค
`TimeoutExpired` ๋ฅผ ๋‚ธ๋‹ค โ€” ์—ฐ๊ฒฐ์ด ๋‹ซํ˜€ ์„œ๋ฒ„๊ฐ€ ์ž ๊ธˆ์„ ํ‘ผ๋‹ค.
- **ํ—ˆ์šฉ ๋ชฉ๋ก(๋ฆฌ๋ทฐ ์ง€์  2).** argv ๋Š” `hub_leg.build_hub_argv` ๊ฐ€ ๋งŒ๋“œ๋Š” ๋ชจ์–‘ ๊ทธ๋Œ€๋กœ์—ฌ์•ผ ํ•œ๋‹ค โ€” ๊ณ ์ • ๋จธ๋ฆฌ
`pnpm --silent --fail-if-no-match --filter @poc/eval-store hub ingest` ๋’ค์— ์•Œ๋ ค์ง„ ์ ์žฌ ์˜ต์…˜(`--case`ยท`--expect-run`ยท
`--repo`ยท`--mirror`ยท`--index` ๊ฐ’ ํ•˜๋‚˜์”ฉ, ํ™•์ธ ํ”Œ๋ž˜๊ทธ)๋งŒ. ๋‹ค๋ฅธ ํŒจํ‚ค์ง€ยท`exec`ยท๋‹ค๋ฅธ hub ํ•˜์œ„ ๋ช…๋ น(ํŒŒ๊ดด ๋ช…๋ น ํฌํ•จ)ยท๋ ˆ๊ฑฐ์‹œ ์ ์žฌ
์˜ต์…˜ยท๋‘ ๋ฒˆ์งธ `hub` ๋Š” ๋ชจ๋‘ `ValueError` ๋‹ค. ํ›…์€ ์ ์žฌ ํ•˜๋‚˜๋งŒ ๋ถ€๋ฅธ๋‹ค(D-M2-4 (b) ยท ๊ณ„ํš ยง0.4-6).
- **์‹คํ–‰๋ถ€๋Š” ๋น„๊ณต๊ฐœ**(`_run_group`, ๋ฆฌ๋ทฐ ์ง€์  3ยท6) โ€” ํ—ˆ์šฉ ๋ชฉ๋ก ์—†์ด argv ๋ฅผ ๋Œ๋ฆฌ๋ฏ€๋กœ ์ด ๋ชจ๋“ˆ ๋ฐ–์—์„œ ๋ถ€๋ฅด์ง€ ์•Š๋Š”๋‹ค
(`test_scaffold.py` ๊ฐ€ ์†Œ์Šค๋กœ ๋ง‰๋Š”๋‹ค). ์‹œํ—˜์€ ๊ทธ๋ฃน kill ํ™•์ธ์—๋งŒ ์“ด๋‹ค.
ํ…Œ์ŠคํŠธ tripwire(D-L6-13): `SE/tests/conftest.py` ๊ฐ€ ์ด ๋ชจ๋“ˆ์˜ `run_pnpm` ์„ "ํ˜ธ์ถœ๋˜๋ฉด `pytest.fail`" ๋กœ ๋ฐ”๊พผ๋‹ค. ๊ทธ๋Ÿฌ๋‹ˆ ํ˜ธ์ถœ์ž๋Š”
๋ฐ˜๋“œ์‹œ **๋ชจ๋“ˆ ์†์„ฑ์œผ๋กœ** ๋ถ€๋ฅธ๋‹ค โ€” `from solar_eval.hub_hook import proc; proc.run_pnpm(...)`. ํ•จ์ˆ˜๋ฅผ ์ด๋ฆ„์œผ๋กœ import ํ•˜๋ฉด
ํŒจ์น˜๋ฅผ ๋น„์ผœ ๊ฐ„๋‹ค(`test_scaffold.py` ๊ฐ€ ์†Œ์Šค ํ…์ŠคํŠธ๋กœ ๋ง‰๋Š”๋‹ค).
"""
from __future__ import annotations
import os
import signal
import subprocess
from collections.abc import Mapping, Sequence
from pathlib import Path
from solar_eval.hub_hook.optin import CONFIRM_FLAG
from solar_eval.hub_hook.types import HUB_PACKAGE_FILTER
PNPM = "pnpm"
#: ํ›…์ด ๋ถ€๋ฅผ ์ˆ˜ ์žˆ๋Š” ์œ ์ผํ•œ ๋ช…๋ น ๋จธ๋ฆฌ โ€” pnpm ์ „์—ญ ์˜ต์…˜ + ์ ์žฌ ํ•˜๋‚˜(ยง2.6 argv).
ALLOWED_ARGV_HEAD = (
PNPM, "--silent", "--fail-if-no-match", "--filter", HUB_PACKAGE_FILTER, "hub", "ingest",
) # fmt: skip
#: ๋จธ๋ฆฌ ๋’ค์— ์˜ฌ ์ˆ˜ ์žˆ๋Š” ๊ฐ’ ์˜ต์…˜(๊ฐ’ ํ•˜๋‚˜์”ฉ โ€” ๊ฐ’์€ `-` ๋กœ ์‹œ์ž‘ํ•˜์ง€ ์•Š๋Š”๋‹ค).
ALLOWED_VALUE_OPTIONS = frozenset({"--case", "--expect-run", "--repo", "--mirror", "--index"})
#: ๋จธ๋ฆฌ ๋’ค์— ์˜ฌ ์ˆ˜ ์žˆ๋Š” ํ”Œ๋ž˜๊ทธ.
ALLOWED_FLAGS = frozenset({CONFIRM_FLAG})
#: SIGTERM ๋’ค SIGKILL ๊นŒ์ง€ ๊ธฐ๋‹ค๋ฆฌ๋Š” ์ดˆ.
KILL_GRACE_SECONDS = 5.0
def run_pnpm(
argv: Sequence[str],
*,
cwd: Path,
env: Mapping[str, str] | None = None,
timeout: float,
) -> subprocess.CompletedProcess[str]:
"""ํ—ˆ์šฉ ๋ชฉ๋ก์„ ํ†ต๊ณผํ•œ pnpm argv ๋ฅผ ์ƒˆ ์„ธ์…˜์œผ๋กœ ๋Œ๋ฆฐ๋‹ค. ํ•œ๋„ ์ดˆ๊ณผ๋Š” ๊ทธ๋ฃน์งธ ์ฃฝ์ด๊ณ  `TimeoutExpired`.
`FileNotFoundError`(pnpm ์—†์Œ)๋Š” ๊ทธ๋Œ€๋กœ ๋‚ธ๋‹ค โ€” ํ˜ธ์ถœ์ž(hub ๋‹ค๋ฆฌ)๊ฐ€ `pnpm_missing` ์œผ๋กœ ๋ฐ”๊พผ๋‹ค.
"""
check_pnpm_argv(argv)
return _run_group(argv, cwd=cwd, env=env, timeout=timeout)
def check_pnpm_argv(argv: Sequence[str]) -> None:
"""๊ณ ์ • ๋จธ๋ฆฌ + ์•Œ๋ ค์ง„ ์ ์žฌ ์˜ต์…˜๋งŒ์ธ argv ๊ฐ€ ์•„๋‹ˆ๋ฉด `ValueError`(๋ฌธ๊ตฌ์— ๊ฐ’์„ ์‹ฃ์ง€ ์•Š๋Š”๋‹ค)."""
args = list(argv)
head = len(ALLOWED_ARGV_HEAD)
if tuple(args[:head]) != ALLOWED_ARGV_HEAD:
raise ValueError("run_pnpm: argv must start with the fixed eval-store 'hub ingest' head")
rest = args[head:]
index = 0
while index < len(rest):
token = rest[index]
if token in ALLOWED_FLAGS:
index += 1
continue
if token not in ALLOWED_VALUE_OPTIONS:
raise ValueError(f"run_pnpm: argument #{head + index} is not an allowed ingest option")
value = rest[index + 1] if index + 1 < len(rest) else None
if not value or value.startswith("-"):
raise ValueError(f"run_pnpm: option {token} needs a value")
index += 2
def _run_group(
argv: Sequence[str],
*,
cwd: Path,
env: Mapping[str, str] | None = None,
timeout: float,
) -> subprocess.CompletedProcess[str]:
"""argv ๋ฅผ ์ƒˆ ํ”„๋กœ์„ธ์Šค ๊ทธ๋ฃน์œผ๋กœ ๋Œ๋ฆฌ๊ณ  ์ถœ๋ ฅ์„ ๋ชจ์€๋‹ค(ํ—ˆ์šฉ ๋ชฉ๋ก ์—†์Œ โ€” `run_pnpm` ์˜ ์‹คํ–‰๋ถ€, ๋ชจ๋“ˆ ๋ฐ–์—์„œ ๋ถ€๋ฅด์ง€ ์•Š๋Š”๋‹ค)."""
process = subprocess.Popen(
list(argv),
cwd=str(cwd),
env=None if env is None else dict(env),
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
start_new_session=True,
)
try:
stdout, stderr = process.communicate(timeout=timeout)
except subprocess.TimeoutExpired:
stdout, stderr = _kill_group(process)
raise subprocess.TimeoutExpired(list(argv), timeout, stdout, stderr) from None
except BaseException:
# KeyboardInterrupt ๋“ฑ โ€” ์†์ž๊ฐ€ ์ž ๊ธˆ์„ ์ฅ” ์ฑ„ ๋‚จ์ง€ ์•Š๊ฒŒ ๊ทธ๋ฃน์„ ์ •๋ฆฌํ•˜๊ณ  ๊ทธ๋Œ€๋กœ ์˜ฌ๋ฆฐ๋‹ค.
_kill_group(process)
raise
return subprocess.CompletedProcess(list(argv), process.returncode, stdout, stderr)
def _kill_group(process: subprocess.Popen[str]) -> tuple[str, str]:
"""SIGTERM โ†’ ์œ ์˜ˆ โ†’ SIGKILL. ๋‚จ์€ ์ถœ๋ ฅ์„ ๋Œ๋ ค์ค€๋‹ค."""
_signal_group(process, signal.SIGTERM)
try:
return process.communicate(timeout=KILL_GRACE_SECONDS)
except subprocess.TimeoutExpired:
_signal_group(process, signal.SIGKILL)
return process.communicate()
def _signal_group(process: subprocess.Popen[str], sig: signal.Signals) -> None:
try:
os.killpg(process.pid, sig)
except ProcessLookupError:
# ์ด๋ฏธ ๋๋‚œ ๊ทธ๋ฃน โ€” ๋ณด๋‚ผ ๊ณณ์ด ์—†๋‹ค.
return