Skip to content

Commit 92bb115

Browse files
committed
materialize parameter parsing to disk
1 parent 29bccf4 commit 92bb115

2 files changed

Lines changed: 23 additions & 0 deletions

File tree

src/eval.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,10 @@ struct RunnerFilter {
191191

192192
const JS_RUNNER_FILE: &str = "eval-runner.ts";
193193
const PY_RUNNER_FILE: &str = "eval-runner.py";
194+
const JS_EVALUATOR_PARAMS_FILE: &str = "evaluator-params.ts";
194195
const JS_RUNNER_SOURCE: &str = include_str!("../scripts/eval-runner.ts");
195196
const PY_RUNNER_SOURCE: &str = include_str!("../scripts/eval-runner.py");
197+
const JS_EVALUATOR_PARAMS_SOURCE: &str = include_str!("../scripts/evaluator-params.ts");
196198

197199
struct SocketCleanupGuard {
198200
path: PathBuf,
@@ -2330,6 +2332,11 @@ fn prepare_js_runner_in_cwd() -> Result<PathBuf> {
23302332
cache_dir.display()
23312333
)
23322334
})?;
2335+
materialize_runner_script(
2336+
&cache_dir,
2337+
JS_EVALUATOR_PARAMS_FILE,
2338+
JS_EVALUATOR_PARAMS_SOURCE,
2339+
)?;
23332340
materialize_runner_script(&cache_dir, JS_RUNNER_FILE, JS_RUNNER_SOURCE)
23342341
}
23352342

@@ -2484,6 +2491,11 @@ fn prepare_eval_runners_in_dir(cache_dir: &Path) -> Result<(PathBuf, PathBuf)> {
24842491
)
24852492
})?;
24862493

2494+
materialize_runner_script(
2495+
cache_dir,
2496+
JS_EVALUATOR_PARAMS_FILE,
2497+
JS_EVALUATOR_PARAMS_SOURCE,
2498+
)?;
24872499
let js_runner = materialize_runner_script(cache_dir, JS_RUNNER_FILE, JS_RUNNER_SOURCE)?;
24882500
let py_runner = materialize_runner_script(cache_dir, PY_RUNNER_FILE, PY_RUNNER_SOURCE)?;
24892501
Ok((js_runner, py_runner))

src/functions/push.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@ const FUNCTIONS_JS_RUNNER_FILE: &str = "functions-runner.ts";
3939
const FUNCTIONS_JS_BUNDLER_FILE: &str = "functions-bundler.ts";
4040
const FUNCTIONS_PY_RUNNER_FILE: &str = "functions-runner.py";
4141
const RUNNER_COMMON_FILE: &str = "runner-common.ts";
42+
const EVALUATOR_PARAMS_FILE: &str = "evaluator-params.ts";
4243
const PYTHON_RUNNER_COMMON_FILE: &str = "python_runner_common.py";
4344
const FUNCTIONS_JS_RUNNER_SOURCE: &str = include_str!("../../scripts/functions-runner.ts");
4445
const FUNCTIONS_JS_BUNDLER_SOURCE: &str = include_str!("../../scripts/functions-bundler.ts");
4546
const FUNCTIONS_PY_RUNNER_SOURCE: &str = include_str!("../../scripts/functions-runner.py");
4647
const RUNNER_COMMON_SOURCE: &str = include_str!("../../scripts/runner-common.ts");
48+
const EVALUATOR_PARAMS_SOURCE: &str = include_str!("../../scripts/evaluator-params.ts");
4749
const PYTHON_RUNNER_COMMON_SOURCE: &str = include_str!("../../scripts/python_runner_common.py");
4850
const PYTHON_BASELINE_DEPS: &[&str] =
4951
&["pydantic", "braintrust", "autoevals", "requests", "openai"];
@@ -1062,6 +1064,15 @@ fn run_functions_runner(
10621064
reason: HardFailureReason::RunnerSpawnFailed,
10631065
message: format!("failed to materialize shared runner helper: {err}"),
10641066
})?;
1067+
let _evaluator_params = js_runner::materialize_runner_script_in_cwd(
1068+
"functions-runners",
1069+
EVALUATOR_PARAMS_FILE,
1070+
EVALUATOR_PARAMS_SOURCE,
1071+
)
1072+
.map_err(|err| FileFailure {
1073+
reason: HardFailureReason::RunnerSpawnFailed,
1074+
message: format!("failed to materialize evaluator params helper: {err}"),
1075+
})?;
10651076
let runner_script = js_runner::materialize_runner_script_in_cwd(
10661077
"functions-runners",
10671078
FUNCTIONS_JS_RUNNER_FILE,

0 commit comments

Comments
 (0)