agent-hitch 0.2.4 → 0.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/adapters/providers/deepseek.js +3 -1
- package/dist/src/adapters/providers/deepseek.js.map +1 -1
- package/dist/src/adapters/providers/shared.js +3 -2
- package/dist/src/adapters/providers/shared.js.map +1 -1
- package/dist/src/backends/harbor/backend.js +21 -5
- package/dist/src/backends/harbor/backend.js.map +1 -1
- package/dist/src/backends/harbor/verifier-config.js +11 -0
- package/dist/src/backends/harbor/verifier-config.js.map +1 -0
- package/dist/src/cli/arguments.js +14 -0
- package/dist/src/cli/arguments.js.map +1 -1
- package/dist/src/cli/output.js +4 -1
- package/dist/src/cli/output.js.map +1 -1
- package/dist/src/evals/harbor-bridge-error.js +65 -0
- package/dist/src/evals/harbor-bridge-error.js.map +1 -0
- package/dist/src/evals/index.js +2 -2
- package/dist/src/evals/index.js.map +1 -1
- package/dist/src/evals/infrastructure-retry.js +181 -0
- package/dist/src/evals/infrastructure-retry.js.map +1 -0
- package/dist/src/evals/progress.js +3 -0
- package/dist/src/evals/progress.js.map +1 -1
- package/dist/src/evals/request.js +14 -1
- package/dist/src/evals/request.js.map +1 -1
- package/dist/src/evals/rerun-slots.js +103 -0
- package/dist/src/evals/rerun-slots.js.map +1 -0
- package/dist/src/evals/rerun.js +167 -148
- package/dist/src/evals/rerun.js.map +1 -1
- package/dist/src/evals/service.js +196 -84
- package/dist/src/evals/service.js.map +1 -1
- package/dist/src/evals/trial-import.js +52 -36
- package/dist/src/evals/trial-import.js.map +1 -1
- package/dist/src/evals/verifier-diagnostics.js +235 -0
- package/dist/src/evals/verifier-diagnostics.js.map +1 -0
- package/docs/schemas/eval-request.schema.json +2 -0
- package/integrations/harbor/hitch_harbor_agent.py +389 -40
- package/integrations/harbor/hitch_harbor_verifier.py +314 -0
- package/package.json +3 -2
|
@@ -34,7 +34,9 @@ export const deepseekAdapter = {
|
|
|
34
34
|
const args = ["--profile", "headless", ...request.agent_args];
|
|
35
35
|
const patchFile = await writeDeepseekRuntimePatch(request.model, runtime.run_directory, runtime.runtime_home);
|
|
36
36
|
args.push("--patch", patchFile);
|
|
37
|
-
|
|
37
|
+
// DSH parses argv once in the launcher and again in the headless app.
|
|
38
|
+
// Each parser consumes one terminator, leaving the prompt byte-exact.
|
|
39
|
+
args.push("--", "--", request.prompt);
|
|
38
40
|
return {
|
|
39
41
|
executable,
|
|
40
42
|
args,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deepseek.js","sourceRoot":"","sources":["../../../../src/adapters/providers/deepseek.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAExD,MAAM,CAAC,MAAM,eAAe,GAAsB;IAC9C,EAAE,EAAE,UAAU;IACd,YAAY,EAAE,kBAAkB;IAChC,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,qBAAqB;IAC/B,YAAY,EAAE,CAAC,WAAW,CAAC;IAC3B,gBAAgB,EAAE;QAChB,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE;QACzF,MAAM,EAAE;YACN,IAAI,EAAE,KAAK;YACX,GAAG,EAAE,qDAAqD;YAC1D,QAAQ,EAAE;gBACR,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,mBAAmB,CAAC,EAAE;gBAC9D,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE;aAC/C;YACD,UAAU,EAAE,qBAAqB;SAClC;KACF;IACD,YAAY,EAAE;QACZ,eAAe,EAAE,IAAI;QACrB,SAAS,EAAE,KAAK;QAChB,wEAAwE;QACxE,uEAAuE;QACvE,sEAAsE;QACtE,mBAAmB,EAAE,IAAI;QACzB,sBAAsB,EAAE,IAAI;QAC5B,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,KAAK;QACb,eAAe,EAAE,IAAI;QACrB,eAAe,EAAE,IAAI;KACtB;IACD,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,EAAE;QAC7C,MAAM,IAAI,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAC9G,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"deepseek.js","sourceRoot":"","sources":["../../../../src/adapters/providers/deepseek.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAExD,MAAM,CAAC,MAAM,eAAe,GAAsB;IAC9C,EAAE,EAAE,UAAU;IACd,YAAY,EAAE,kBAAkB;IAChC,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,qBAAqB;IAC/B,YAAY,EAAE,CAAC,WAAW,CAAC;IAC3B,gBAAgB,EAAE;QAChB,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE;QACzF,MAAM,EAAE;YACN,IAAI,EAAE,KAAK;YACX,GAAG,EAAE,qDAAqD;YAC1D,QAAQ,EAAE;gBACR,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,mBAAmB,CAAC,EAAE;gBAC9D,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE;aAC/C;YACD,UAAU,EAAE,qBAAqB;SAClC;KACF;IACD,YAAY,EAAE;QACZ,eAAe,EAAE,IAAI;QACrB,SAAS,EAAE,KAAK;QAChB,wEAAwE;QACxE,uEAAuE;QACvE,sEAAsE;QACtE,mBAAmB,EAAE,IAAI;QACzB,sBAAsB,EAAE,IAAI;QAC5B,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,KAAK;QACb,eAAe,EAAE,IAAI;QACrB,eAAe,EAAE,IAAI;KACtB;IACD,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,EAAE;QAC7C,MAAM,IAAI,GAAG,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAC9G,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAChC,sEAAsE;QACtE,sEAAsE;QACtE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACtC,OAAO;YACL,UAAU;YACV,IAAI;YACJ,KAAK,EAAE,EAAE;YACT,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7E,CAAC;IACJ,CAAC;IACD,aAAa,CAAC,IAAI,EAAE,KAAK;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACxD,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC;QAC7B,OAAO,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;CACJ,CAAC"}
|
|
@@ -51,6 +51,8 @@ export async function writeDeepseekRuntimePatch(value, runDirectory, runtimeHome
|
|
|
51
51
|
exitCode: 6,
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
|
+
const configDirectory = path.join(runDirectory, "config");
|
|
55
|
+
await mkdir(configDirectory, { recursive: true });
|
|
54
56
|
const rows = [{
|
|
55
57
|
id: "session-persistence-jsonl",
|
|
56
58
|
config: {
|
|
@@ -71,8 +73,7 @@ export async function writeDeepseekRuntimePatch(value, runDirectory, runtimeHome
|
|
|
71
73
|
}
|
|
72
74
|
rows.push({ id: "agent-default-model", config: { provider, model } });
|
|
73
75
|
}
|
|
74
|
-
const file = path.join(
|
|
75
|
-
await mkdir(path.dirname(file), { recursive: true });
|
|
76
|
+
const file = path.join(configDirectory, "deepseek-runtime.json");
|
|
76
77
|
await writeFile(file, `${JSON.stringify(rows, null, 2)}\n`, { mode: 0o600 });
|
|
77
78
|
return file;
|
|
78
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/adapters/providers/shared.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/adapters/providers/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,14 @@ import path from "node:path";
|
|
|
5
5
|
import { HitchError, atomicWriteJSON, consumeLines, detectVersion, ensureDir, fingerprintExecutable, invalidInput, packageRoot, readJSON, sha256JSON, statePaths, terminateProcess } from "../../foundation/index.js";
|
|
6
6
|
import { harborDatasetConfig } from "./dataset-config.js";
|
|
7
7
|
import { HARBOR_CREDENTIAL_ENV, locateHarbor } from "./tools.js";
|
|
8
|
+
import { harborVerifierConfig } from "./verifier-config.js";
|
|
8
9
|
const BRIDGE_DIRECTORY = path.join(packageRoot(), "integrations", "harbor");
|
|
9
10
|
export const DEFAULT_HARBOR_TRIAL_BUNDLE_GRACE_MS = 2_000;
|
|
10
|
-
export async function runHarborBackend({ evalId, evalDirectory, backendDirectory: requestedBackendDirectory, taskNames, request, root, resolvedRevision, runtimeDirectory, runtimeId, preparedArtifact, localTransport, env = process.env, harborExecutable, signal, emit = () => { }, onTrialSettled, trialBundleGraceMs = DEFAULT_HARBOR_TRIAL_BUNDLE_GRACE_MS, }) {
|
|
11
|
+
export async function runHarborBackend({ evalId, evalDirectory, backendDirectory: requestedBackendDirectory, taskNames, logicalAttempt, request, root, resolvedRevision, runtimeDirectory, runtimeId, preparedArtifact, localTransport, env = process.env, harborExecutable, signal, emit = () => { }, onTrialSettled, trialBundleGraceMs = DEFAULT_HARBOR_TRIAL_BUNDLE_GRACE_MS, }) {
|
|
11
12
|
const backendDirectory = await ensureDir(requestedBackendDirectory ?? path.join(evalDirectory, "harbor"));
|
|
13
|
+
if (logicalAttempt !== undefined && (!Number.isSafeInteger(logicalAttempt) || logicalAttempt < 1)) {
|
|
14
|
+
throw invalidInput("Harbor logical attempt must be a positive safe integer");
|
|
15
|
+
}
|
|
12
16
|
const harnessArtifactCacheDirectory = await ensureDir(path.join(statePaths(root).store, "harbor-artifacts"));
|
|
13
17
|
const executable = await discoverHarbor(harborExecutable, root, env);
|
|
14
18
|
const version = await detectVersion(executable, ["--version"]);
|
|
@@ -28,11 +32,18 @@ export async function runHarborBackend({ evalId, evalDirectory, backendDirectory
|
|
|
28
32
|
localTransport,
|
|
29
33
|
backendDirectory,
|
|
30
34
|
...(taskNames === undefined ? {} : { taskNames }),
|
|
35
|
+
...(logicalAttempt === undefined ? {} : { logicalAttempt }),
|
|
31
36
|
jobName,
|
|
32
37
|
env,
|
|
33
38
|
});
|
|
34
39
|
await atomicWriteJSON(configPath, config);
|
|
35
|
-
emit({
|
|
40
|
+
emit({
|
|
41
|
+
type: "eval.backend.started",
|
|
42
|
+
backend: "harbor",
|
|
43
|
+
executable,
|
|
44
|
+
version: version || null,
|
|
45
|
+
...(logicalAttempt === undefined ? {} : { logical_attempt: logicalAttempt }),
|
|
46
|
+
});
|
|
36
47
|
if (!Number.isSafeInteger(trialBundleGraceMs) || trialBundleGraceMs < 0)
|
|
37
48
|
throw invalidInput("Harbor trial bundle grace must be a non-negative integer");
|
|
38
49
|
const monitor = onTrialSettled === undefined
|
|
@@ -60,6 +71,7 @@ export async function runHarborBackend({ evalId, evalDirectory, backendDirectory
|
|
|
60
71
|
process_exit_code: invocation.code,
|
|
61
72
|
signal: invocation.signal,
|
|
62
73
|
result_available: rawResult !== null,
|
|
74
|
+
...(logicalAttempt === undefined ? {} : { logical_attempt: logicalAttempt }),
|
|
63
75
|
});
|
|
64
76
|
return {
|
|
65
77
|
backend: {
|
|
@@ -158,7 +170,10 @@ async function attachTrialResults(jobDirectory, jobResult) {
|
|
|
158
170
|
}
|
|
159
171
|
return { ...jobResult, trial_results: trialResults };
|
|
160
172
|
}
|
|
161
|
-
export async function buildHarborJobConfig({ evalId, request, resolvedRevision, runtimeDirectory, runtimeId, preparedArtifact, harnessArtifactCacheDirectory, localTransport, backendDirectory, taskNames, jobName = "job", env = process.env, }) {
|
|
173
|
+
export async function buildHarborJobConfig({ evalId, request, resolvedRevision, runtimeDirectory, runtimeId, preparedArtifact, harnessArtifactCacheDirectory, localTransport, backendDirectory, taskNames, logicalAttempt, jobName = "job", env = process.env, }) {
|
|
174
|
+
if (logicalAttempt !== undefined && (!Number.isSafeInteger(logicalAttempt) || logicalAttempt < 1)) {
|
|
175
|
+
throw invalidInput("Harbor logical attempt must be a positive safe integer");
|
|
176
|
+
}
|
|
162
177
|
const timeoutSeconds = request.timeout_ms > 0 ? Math.ceil(request.timeout_ms / 1_000) : null;
|
|
163
178
|
const setupTimeoutSeconds = request.setup_timeout_ms > 0 ? Math.ceil(request.setup_timeout_ms / 1_000) : null;
|
|
164
179
|
const agent = {
|
|
@@ -176,6 +191,7 @@ export async function buildHarborJobConfig({ evalId, request, resolvedRevision,
|
|
|
176
191
|
benchmark_revision: request.benchmark_revision,
|
|
177
192
|
verifier: "dataset",
|
|
178
193
|
}),
|
|
194
|
+
...(logicalAttempt === undefined ? {} : { logical_attempt: logicalAttempt }),
|
|
179
195
|
} : {}),
|
|
180
196
|
harness_ref: lockedHarnessRef(resolvedRevision),
|
|
181
197
|
revision_identity: resolvedRevision.identity,
|
|
@@ -218,7 +234,6 @@ export async function buildHarborJobConfig({ evalId, request, resolvedRevision,
|
|
|
218
234
|
} : {}),
|
|
219
235
|
hitch_timeout_ms: request.timeout_ms,
|
|
220
236
|
agent_args: request.agent_args,
|
|
221
|
-
workdir: "/app",
|
|
222
237
|
},
|
|
223
238
|
env: credentialEnvironment(request.pass_env, env),
|
|
224
239
|
include_logs: ["hitch-*"],
|
|
@@ -230,9 +245,10 @@ export async function buildHarborJobConfig({ evalId, request, resolvedRevision,
|
|
|
230
245
|
return compact({
|
|
231
246
|
job_name: jobName,
|
|
232
247
|
jobs_dir: backendDirectory,
|
|
233
|
-
n_attempts: request.attempts,
|
|
248
|
+
n_attempts: logicalAttempt === undefined ? request.attempts : 1,
|
|
234
249
|
n_concurrent_trials: request.max_concurrent,
|
|
235
250
|
environment: { type: "docker", delete: true },
|
|
251
|
+
verifier: harborVerifierConfig(request),
|
|
236
252
|
agents: [agent],
|
|
237
253
|
datasets: [await harborDatasetConfig(request.dataset, taskNames)],
|
|
238
254
|
tasks: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../../src/backends/harbor/backend.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"backend.js","sourceRoot":"","sources":["../../../../src/backends/harbor/backend.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/** Configure conservative retries around Harbor's ordinary task verifier. */
|
|
2
|
+
export function harborVerifierConfig(request) {
|
|
3
|
+
return {
|
|
4
|
+
import_path: "hitch_harbor_verifier:HitchRetryingVerifier",
|
|
5
|
+
kwargs: {
|
|
6
|
+
infrastructure_retries: request.infrastructure_retries,
|
|
7
|
+
infrastructure_retry_backoff_ms: request.infrastructure_retry_backoff_ms,
|
|
8
|
+
},
|
|
9
|
+
};
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=verifier-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verifier-config.js","sourceRoot":"","sources":["../../../../src/backends/harbor/verifier-config.ts"],"names":[],"mappings":"AAEA,6EAA6E;AAC7E,MAAM,UAAU,oBAAoB,CAAC,OAAoB;IACvD,OAAO;QACL,WAAW,EAAE,6CAA6C;QAC1D,MAAM,EAAE;YACN,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;YACtD,+BAA+B,EAAE,OAAO,CAAC,+BAA+B;SACzE;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -69,6 +69,8 @@ export function parseEvalRequest(args) {
|
|
|
69
69
|
const model = takeOption(args, "--model") || "";
|
|
70
70
|
const attempts = positiveInteger(takeOption(args, "--attempts") || 1, "--attempts");
|
|
71
71
|
const maxConcurrent = positiveInteger(takeOption(args, "--max-concurrent") || DEFAULT_MAX_CONCURRENT, "--max-concurrent");
|
|
72
|
+
const infrastructureRetries = takeOption(args, "--infrastructure-retries");
|
|
73
|
+
const infrastructureRetryBackoff = takeOption(args, "--infrastructure-retry-backoff");
|
|
72
74
|
const timeoutValue = takeOption(args, "--timeout");
|
|
73
75
|
const setupTimeoutValue = takeOption(args, "--setup-timeout");
|
|
74
76
|
const agentArgs = takeRepeatedOption(args, "--agent-arg");
|
|
@@ -84,12 +86,24 @@ export function parseEvalRequest(args) {
|
|
|
84
86
|
model,
|
|
85
87
|
attempts,
|
|
86
88
|
max_concurrent: maxConcurrent,
|
|
89
|
+
infrastructure_retries: infrastructureRetries === undefined
|
|
90
|
+
? undefined
|
|
91
|
+
: nonNegativeInteger(infrastructureRetries, "--infrastructure-retries"),
|
|
92
|
+
infrastructure_retry_backoff_ms: infrastructureRetryBackoff === undefined
|
|
93
|
+
? undefined
|
|
94
|
+
: parseDuration(infrastructureRetryBackoff),
|
|
87
95
|
timeout_ms: timeoutValue === undefined ? undefined : parseDuration(timeoutValue),
|
|
88
96
|
setup_timeout_ms: setupTimeoutValue === undefined ? undefined : parseDuration(setupTimeoutValue),
|
|
89
97
|
agent_args: agentArgs,
|
|
90
98
|
pass_env: passEnv,
|
|
91
99
|
};
|
|
92
100
|
}
|
|
101
|
+
function nonNegativeInteger(value, name) {
|
|
102
|
+
const parsed = Number(value);
|
|
103
|
+
if (!Number.isSafeInteger(parsed) || parsed < 0)
|
|
104
|
+
throw invalidInput(`${name} must be a non-negative integer`);
|
|
105
|
+
return parsed;
|
|
106
|
+
}
|
|
93
107
|
export function takeOption(args, name) {
|
|
94
108
|
const index = args.indexOf(name);
|
|
95
109
|
if (index < 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arguments.js","sourceRoot":"","sources":["../../../src/cli/arguments.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"arguments.js","sourceRoot":"","sources":["../../../src/cli/arguments.ts"],"names":[],"mappings":"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"}
|
package/dist/src/cli/output.js
CHANGED
|
@@ -48,7 +48,7 @@ Usage:
|
|
|
48
48
|
hitch compare model|harness [filters] [--reference-run <run-id>] [--json]
|
|
49
49
|
hitch eval setup harbor [--version <version>] [--python <path>] [--force] [--json]
|
|
50
50
|
hitch eval doctor [--harbor <path>] [--python <path>] [--docker <path>] [--json]
|
|
51
|
-
hitch eval run [--backend harbor] --dataset <ref> --harness <immutable-ref> [--model <id>] [--attempts <n>] [--eval-id <eval-id>]
|
|
51
|
+
hitch eval run [--backend harbor] --dataset <ref> --harness <immutable-ref> [--model <id>] [--attempts <n>] [--infrastructure-retries <n>] [--eval-id <eval-id>]
|
|
52
52
|
hitch eval rerun <eval-id> (--invalid | --task <name> [--task <name> ...]) [--output json]
|
|
53
53
|
hitch eval list [--json]
|
|
54
54
|
hitch eval inspect <eval-id> [--json]
|
|
@@ -72,6 +72,9 @@ Eval:
|
|
|
72
72
|
Use --pass-env NAME for extra credentials.
|
|
73
73
|
Every eval references a shared read-only controller runtime bundle by SHA-256 id
|
|
74
74
|
(see 'hitch eval inspect' for the runtime storage kind).
|
|
75
|
+
Eval attempts are stable logical task/attempt slots; rerun repairs only invalid or missing slots.
|
|
76
|
+
Verifier infrastructure failures are retried once by default; use --infrastructure-retries 0 to disable.
|
|
77
|
+
--task selects every invalid or missing attempt for the named task.
|
|
75
78
|
|
|
76
79
|
Trajectory and feedback:
|
|
77
80
|
Structured adapters preserve provider-native events plus a DSH-compatible canonical view
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../src/cli/output.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,MAAM,UAAU,aAAa,CAAC,QAAkH;IAC9I,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;IAC/E,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;IACjF,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;AACtE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,MAA8O,EAAE,KAAa,EAAE,MAAc;IAClT,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,SAAS,CAAC;QACR,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,YAAY,KAAK,EAAE,CAAC,CAAC;QACzD,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YACvB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,YAAY,KAAK,kBAAkB,WAAW,EAAE,CAAC,CAAC;gBACpG,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC;gBAC7B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;oBACrE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;gBACpC,CAAC;gBACD,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,WAAW,CAAC,CAAC;YACnF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAK,KAA6B,CAAC,MAAM,KAAK,GAAG;oBAAE,MAAM,KAAK,CAAC;YACjE,CAAC;QACH,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,MAAM,KAAK,MAAM;gBAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAC3F,OAAO,MAAM,CAAC,MAAiC,CAAC;QAClD,CAAC;QACD,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,OAAO
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../../src/cli/output.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,MAAM,UAAU,aAAa,CAAC,QAAkH;IAC9I,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC;IAC/E,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC;IACjF,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;AACtE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,MAA8O,EAAE,KAAa,EAAE,MAAc;IAClT,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,SAAS,CAAC;QACR,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,YAAY,KAAK,EAAE,CAAC,CAAC;QACzD,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YACvB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,YAAY,KAAK,kBAAkB,WAAW,EAAE,CAAC,CAAC;gBACpG,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC;gBAC7B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;oBACrE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;gBACpC,CAAC;gBACD,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,WAAW,CAAC,CAAC;YACnF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAK,KAA6B,CAAC,MAAM,KAAK,GAAG;oBAAE,MAAM,KAAK,CAAC;YACjE,CAAC;QACH,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,MAAM,KAAK,MAAM;gBAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAC3F,OAAO,MAAM,CAAC,MAAiC,CAAC;QAClD,CAAC;QACD,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6DR,CAAC;AACF,CAAC"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { lstat, readFile } from "node:fs/promises";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
const HITCH_BRIDGE_ERROR_MAX_BYTES = 64 * 1024;
|
|
4
|
+
const HITCH_BRIDGE_ERROR_MESSAGE_MAX_BYTES = 2048;
|
|
5
|
+
const HITCH_BRIDGE_ERROR_CODES = new Set([
|
|
6
|
+
"hitch_workdir_invalid",
|
|
7
|
+
"hitch_process_failed",
|
|
8
|
+
"hitch_result_missing",
|
|
9
|
+
"hitch_result_not_file",
|
|
10
|
+
"hitch_result_read_failed",
|
|
11
|
+
"hitch_result_empty",
|
|
12
|
+
"hitch_result_invalid_json",
|
|
13
|
+
"hitch_result_schema_invalid",
|
|
14
|
+
"hitch_result_run_id_mismatch",
|
|
15
|
+
"hitch_revision_identity_mismatch",
|
|
16
|
+
"hitch_run_bundle_export_failed",
|
|
17
|
+
"hitch_result_artifact_copy_failed",
|
|
18
|
+
]);
|
|
19
|
+
/** Read a Harbor bridge diagnostic as untrusted, bounded evidence. */
|
|
20
|
+
export async function readHarborBridgeError(trialDirectory) {
|
|
21
|
+
const source = path.join(trialDirectory, "agent", "hitch-bridge-error.json");
|
|
22
|
+
try {
|
|
23
|
+
const info = await lstat(source);
|
|
24
|
+
if (!info.isFile() || info.size <= 0 || info.size > HITCH_BRIDGE_ERROR_MAX_BYTES)
|
|
25
|
+
return null;
|
|
26
|
+
const raw = await readFile(source, "utf8");
|
|
27
|
+
const value = JSON.parse(raw);
|
|
28
|
+
if (!value || typeof value !== "object" || Array.isArray(value))
|
|
29
|
+
return null;
|
|
30
|
+
const diagnostic = value;
|
|
31
|
+
if (diagnostic.schema_version !== "1")
|
|
32
|
+
return null;
|
|
33
|
+
if (typeof diagnostic.code !== "string" || !HITCH_BRIDGE_ERROR_CODES.has(diagnostic.code))
|
|
34
|
+
return null;
|
|
35
|
+
if (typeof diagnostic.message !== "string" || !diagnostic.message.trim())
|
|
36
|
+
return null;
|
|
37
|
+
if (Buffer.byteLength(diagnostic.message, "utf8") > HITCH_BRIDGE_ERROR_MESSAGE_MAX_BYTES)
|
|
38
|
+
return null;
|
|
39
|
+
return { code: diagnostic.code, message: bridgeErrorMessage(diagnostic), raw };
|
|
40
|
+
}
|
|
41
|
+
catch {
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
function bridgeErrorMessage(diagnostic) {
|
|
46
|
+
const message = diagnostic.message;
|
|
47
|
+
if (!message.includes("no diagnostic output"))
|
|
48
|
+
return message;
|
|
49
|
+
const process = diagnostic.process;
|
|
50
|
+
if (!process || typeof process !== "object" || Array.isArray(process))
|
|
51
|
+
return message;
|
|
52
|
+
const evidence = process;
|
|
53
|
+
const tail = [evidence.stderr_tail, evidence.stdout_tail]
|
|
54
|
+
.find((value) => typeof value === "string" && value.trim());
|
|
55
|
+
if (!tail)
|
|
56
|
+
return message;
|
|
57
|
+
return boundedUtf8Tail(message.replace(/no diagnostic output/g, tail.trim()), HITCH_BRIDGE_ERROR_MESSAGE_MAX_BYTES);
|
|
58
|
+
}
|
|
59
|
+
function boundedUtf8Tail(value, maxBytes) {
|
|
60
|
+
const encoded = Buffer.from(value, "utf8");
|
|
61
|
+
if (encoded.byteLength <= maxBytes)
|
|
62
|
+
return value;
|
|
63
|
+
return encoded.subarray(encoded.byteLength - maxBytes).toString("utf8").replace(/^\uFFFD+/, "");
|
|
64
|
+
}
|
|
65
|
+
//# sourceMappingURL=harbor-bridge-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"harbor-bridge-error.js","sourceRoot":"","sources":["../../../src/evals/harbor-bridge-error.ts"],"names":[],"mappings":"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"}
|
package/dist/src/evals/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export { DEFAULT_EVAL_SETUP_TIMEOUT_MS, DEFAULT_EVAL_TIMEOUT_MS, newEvalId, resolveBenchmarkReference, resolveLocalDatasetTaskIds, validateEvalId, validateEvalRequest } from "./request.js";
|
|
1
|
+
export { DEFAULT_EVAL_SETUP_TIMEOUT_MS, DEFAULT_EVAL_TIMEOUT_MS, DEFAULT_INFRASTRUCTURE_RETRIES, DEFAULT_INFRASTRUCTURE_RETRY_BACKOFF_MS, newEvalId, resolveBenchmarkReference, resolveLocalDatasetTaskIds, validateEvalId, validateEvalRequest } from "./request.js";
|
|
2
2
|
export { runEval } from "./service.js";
|
|
3
3
|
export { inspectEval, listEvals } from "./records.js";
|
|
4
4
|
export { importEvalTrialRun, importEvalTrialRuns, validateEvalTrialReferences } from "./trial-import.js";
|
|
5
5
|
export { createEvalProgress, evalTrialKey, mergeEvalProgressTrial, readEvalProgress, replaceInvalidEvalProgressTrial, writeEvalProgress } from "./progress.js";
|
|
6
|
-
export { rerunEval, selectRerunTasks } from "./rerun.js";
|
|
6
|
+
export { rerunEval, selectRerunTasks, selectRerunTrialSlots } from "./rerun.js";
|
|
7
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/evals/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,uBAAuB,EAAE,SAAS,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/evals/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,uBAAuB,EAAE,8BAA8B,EAAE,uCAAuC,EAAE,SAAS,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGtQ,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAEzG,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,+BAA+B,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAC/J,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC"}
|
|
@@ -0,0 +1,181 @@
|
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import { setTimeout as delay } from "node:timers/promises";
|
|
3
|
+
import { runHarborBackend } from "../backends/index.js";
|
|
4
|
+
import { HitchError } from "../foundation/index.js";
|
|
5
|
+
import { importEvalTrialRun, importEvalTrialRuns, TrialBundlePendingError, validateEvalTrialReferences } from "./trial-import.js";
|
|
6
|
+
import { replaceInvalidEvalProgressTrial, writeEvalProgress } from "./progress.js";
|
|
7
|
+
const INFRASTRUCTURE_REASONS = new Set([
|
|
8
|
+
"infrastructure_failure",
|
|
9
|
+
"verifier_infrastructure_failure",
|
|
10
|
+
"verifier_result_missing",
|
|
11
|
+
]);
|
|
12
|
+
// Verifier failures are retried inside the original live Harbor trial by the
|
|
13
|
+
// custom verifier wrapper. Starting another Harbor trial would execute the
|
|
14
|
+
// candidate agent again, so only non-verifier trial infrastructure failures
|
|
15
|
+
// are eligible for this outer retry path.
|
|
16
|
+
const RETRYABLE_TRIAL_INFRASTRUCTURE_REASONS = new Set([
|
|
17
|
+
"infrastructure_failure",
|
|
18
|
+
]);
|
|
19
|
+
export async function runInfrastructureRetries(options) {
|
|
20
|
+
let progress = options.progress;
|
|
21
|
+
let retryCandidates = retryableInfrastructureTrials(options.initialRefs);
|
|
22
|
+
const runs = [];
|
|
23
|
+
for (let retry = 1; retry <= options.request.infrastructure_retries && retryCandidates.length > 0; retry += 1) {
|
|
24
|
+
if (options.signal?.aborted)
|
|
25
|
+
break;
|
|
26
|
+
const retryTriggers = [...retryCandidates];
|
|
27
|
+
const taskNames = [...new Set(retryCandidates.map((ref) => ref.task_id))].sort();
|
|
28
|
+
const backoffMs = options.request.infrastructure_retry_backoff_ms * retry;
|
|
29
|
+
options.sink.emit({
|
|
30
|
+
type: "eval.infrastructure-retry.scheduled",
|
|
31
|
+
attempt: options.logicalAttempt,
|
|
32
|
+
retry,
|
|
33
|
+
tasks: taskNames,
|
|
34
|
+
backoff_ms: backoffMs,
|
|
35
|
+
});
|
|
36
|
+
if (backoffMs > 0) {
|
|
37
|
+
if (options.signal)
|
|
38
|
+
await delay(backoffMs, undefined, { signal: options.signal });
|
|
39
|
+
else
|
|
40
|
+
await delay(backoffMs);
|
|
41
|
+
}
|
|
42
|
+
if (options.signal?.aborted)
|
|
43
|
+
break;
|
|
44
|
+
const backendDirectory = path.join(options.evalDirectory, "infrastructure-retries", `retry-${String(retry).padStart(4, "0")}`, options.request.attempts === 1 ? "harbor" : attemptDirectoryName(options.logicalAttempt));
|
|
45
|
+
const harborJobDirectory = path.join(backendDirectory, "job");
|
|
46
|
+
const retryRefs = [];
|
|
47
|
+
const selectedTasks = new Set(taskNames);
|
|
48
|
+
const publish = async (ref) => {
|
|
49
|
+
if (ref.attempt !== options.logicalAttempt || !selectedTasks.has(ref.task_id)) {
|
|
50
|
+
throw new HitchError(`Harbor infrastructure retry returned an unselected trial: ${ref.task_id}#${ref.attempt}`, {
|
|
51
|
+
code: "eval_infrastructure_retry_trial_mismatch",
|
|
52
|
+
exitCode: 12,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
const existing = retryRefs.find((current) => current.trial_id === ref.trial_id);
|
|
56
|
+
if (existing) {
|
|
57
|
+
if (JSON.stringify(existing) !== JSON.stringify(ref))
|
|
58
|
+
throw new Error(`infrastructure retry trial identity changed: ${ref.trial_id}`);
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
retryRefs.push(ref);
|
|
62
|
+
await validateEvalTrialReferences(options.root, options.evalId, [ref], {
|
|
63
|
+
benchmarkId: options.request.benchmark_id,
|
|
64
|
+
benchmarkRevision: options.request.benchmark_revision,
|
|
65
|
+
});
|
|
66
|
+
if (ref.observation_status === "valid") {
|
|
67
|
+
progress = replaceInvalidEvalProgressTrial(progress, ref);
|
|
68
|
+
await writeEvalProgress(options.evalDirectory, progress);
|
|
69
|
+
}
|
|
70
|
+
options.sink.emit({
|
|
71
|
+
type: ref.observation_status === "valid"
|
|
72
|
+
? "eval.infrastructure-retry.repaired"
|
|
73
|
+
: "eval.infrastructure-retry.failed",
|
|
74
|
+
attempt: options.logicalAttempt,
|
|
75
|
+
retry,
|
|
76
|
+
task_id: ref.task_id,
|
|
77
|
+
trial_id: ref.trial_id,
|
|
78
|
+
run_id: ref.run_id,
|
|
79
|
+
observation_status: ref.observation_status,
|
|
80
|
+
...(ref.invalid_reason ? { invalid_reason: ref.invalid_reason } : {}),
|
|
81
|
+
generation: progress.generation,
|
|
82
|
+
});
|
|
83
|
+
};
|
|
84
|
+
const run = await runHarborBackend({
|
|
85
|
+
evalId: options.evalId,
|
|
86
|
+
evalDirectory: options.evalDirectory,
|
|
87
|
+
backendDirectory,
|
|
88
|
+
logicalAttempt: options.logicalAttempt,
|
|
89
|
+
taskNames,
|
|
90
|
+
request: { ...options.request, attempts: 1 },
|
|
91
|
+
root: options.root,
|
|
92
|
+
resolvedRevision: options.resolvedRevision,
|
|
93
|
+
runtimeDirectory: options.controllerRuntime.directory,
|
|
94
|
+
runtimeId: options.controllerRuntime.runtime_id,
|
|
95
|
+
preparedArtifact: options.preparedArtifact,
|
|
96
|
+
...(options.localTransport ? { localTransport: options.localTransport } : {}),
|
|
97
|
+
env: options.env,
|
|
98
|
+
...(options.harborExecutable !== undefined ? { harborExecutable: options.harborExecutable } : {}),
|
|
99
|
+
...(options.signal ? { signal: options.signal } : {}),
|
|
100
|
+
...(options.trialBundleGraceMs === undefined ? {} : { trialBundleGraceMs: options.trialBundleGraceMs }),
|
|
101
|
+
emit: (event) => options.sink.emit({ ...event, infrastructure_retry: retry, logical_attempt: options.logicalAttempt }),
|
|
102
|
+
onTrialSettled: async (trial, context) => {
|
|
103
|
+
try {
|
|
104
|
+
const ref = await importEvalTrialRun({
|
|
105
|
+
root: options.root,
|
|
106
|
+
evalId: options.evalId,
|
|
107
|
+
evalDirectory: options.evalDirectory,
|
|
108
|
+
harborJobDirectory,
|
|
109
|
+
expectedAttempt: options.logicalAttempt,
|
|
110
|
+
request: options.request,
|
|
111
|
+
resolvedRevision: options.resolvedRevision,
|
|
112
|
+
benchmarkId: options.request.benchmark_id,
|
|
113
|
+
benchmarkRevision: options.request.benchmark_revision,
|
|
114
|
+
runtimeId: options.controllerRuntime.runtime_id,
|
|
115
|
+
requireCompleteMarker: true,
|
|
116
|
+
allowMissingBundleDiagnostic: context.bundleWaitExpired,
|
|
117
|
+
}, trial, retryRefs.length, retryRefs);
|
|
118
|
+
await publish(ref);
|
|
119
|
+
return true;
|
|
120
|
+
}
|
|
121
|
+
catch (error) {
|
|
122
|
+
if (error instanceof TrialBundlePendingError)
|
|
123
|
+
return false;
|
|
124
|
+
throw error;
|
|
125
|
+
}
|
|
126
|
+
},
|
|
127
|
+
});
|
|
128
|
+
const terminalRefs = await importEvalTrialRuns({
|
|
129
|
+
root: options.root,
|
|
130
|
+
evalId: options.evalId,
|
|
131
|
+
evalDirectory: options.evalDirectory,
|
|
132
|
+
harborJobDirectory,
|
|
133
|
+
expectedAttempt: options.logicalAttempt,
|
|
134
|
+
request: options.request,
|
|
135
|
+
resolvedRevision: options.resolvedRevision,
|
|
136
|
+
benchmarkId: options.request.benchmark_id,
|
|
137
|
+
benchmarkRevision: options.request.benchmark_revision,
|
|
138
|
+
runtimeId: options.controllerRuntime.runtime_id,
|
|
139
|
+
rawResult: run.rawResult,
|
|
140
|
+
}, retryRefs);
|
|
141
|
+
for (const ref of terminalRefs)
|
|
142
|
+
await publish(ref);
|
|
143
|
+
if (run.rawResult !== null)
|
|
144
|
+
assertBackendTrialSet(run.rawResult, retryRefs);
|
|
145
|
+
runs.push({ attempt: options.logicalAttempt, retry, tasks: taskNames, triggers: retryTriggers, refs: retryRefs, run });
|
|
146
|
+
options.sink.emit({
|
|
147
|
+
type: "eval.infrastructure-retry.completed",
|
|
148
|
+
attempt: options.logicalAttempt,
|
|
149
|
+
retry,
|
|
150
|
+
tasks: taskNames,
|
|
151
|
+
repaired_tasks: retryRefs.filter((ref) => ref.observation_status === "valid").map((ref) => ref.task_id).sort(),
|
|
152
|
+
remaining_tasks: retryableInfrastructureTrials(retryRefs).map((ref) => ref.task_id).sort(),
|
|
153
|
+
});
|
|
154
|
+
if (run.backend.process_exit_code !== 0 || run.rawResult === null || options.stopAfterResult?.(run.rawResult))
|
|
155
|
+
break;
|
|
156
|
+
retryCandidates = retryableInfrastructureTrials(retryRefs);
|
|
157
|
+
}
|
|
158
|
+
return { progress, runs };
|
|
159
|
+
}
|
|
160
|
+
export function retryableInfrastructureTrials(trials) {
|
|
161
|
+
return trials.filter((trial) => trial.observation_status === "invalid"
|
|
162
|
+
&& trial.invalid_reason !== undefined
|
|
163
|
+
&& RETRYABLE_TRIAL_INFRASTRUCTURE_REASONS.has(trial.invalid_reason));
|
|
164
|
+
}
|
|
165
|
+
export function infrastructureFailureTrials(trials) {
|
|
166
|
+
return trials.filter((trial) => trial.observation_status === "invalid"
|
|
167
|
+
&& trial.invalid_reason !== undefined
|
|
168
|
+
&& INFRASTRUCTURE_REASONS.has(trial.invalid_reason));
|
|
169
|
+
}
|
|
170
|
+
function assertBackendTrialSet(rawResult, refs) {
|
|
171
|
+
const trials = Array.isArray(rawResult.trial_results) ? rawResult.trial_results : [];
|
|
172
|
+
const backendIds = new Set(trials.map((trial) => typeof trial.trial_name === "string" ? trial.trial_name : null).filter((value) => value !== null));
|
|
173
|
+
const refIds = new Set(refs.map((ref) => ref.trial_id));
|
|
174
|
+
if (backendIds.size !== trials.length || backendIds.size !== refIds.size || [...backendIds].some((id) => !refIds.has(id))) {
|
|
175
|
+
throw new Error("Harbor infrastructure retry trial set does not match published eval progress");
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
function attemptDirectoryName(attempt) {
|
|
179
|
+
return `attempt-${String(attempt).padStart(4, "0")}`;
|
|
180
|
+
}
|
|
181
|
+
//# sourceMappingURL=infrastructure-retry.js.map
|