@prismatic-io/lux 0.0.2-preview.30 → 0.0.2-preview.32
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/lib/assertions/core/command-exits-zero.d.ts +1 -0
- package/lib/assertions/core/command-exits-zero.d.ts.map +1 -1
- package/lib/assertions/core/file-checks.d.ts +6 -0
- package/lib/assertions/core/file-checks.d.ts.map +1 -1
- package/lib/assertions/core/json-pointer-equals.d.ts +1 -0
- package/lib/assertions/core/json-pointer-equals.d.ts.map +1 -1
- package/lib/assertions/core/output-checks.d.ts +3 -0
- package/lib/assertions/core/output-checks.d.ts.map +1 -1
- package/lib/assertions/core/predicate.d.ts +1 -0
- package/lib/assertions/core/predicate.d.ts.map +1 -1
- package/lib/assertions/core/resource-checks.d.ts +6 -0
- package/lib/assertions/core/resource-checks.d.ts.map +1 -1
- package/lib/assertions/rubric/index.d.ts +2 -0
- package/lib/assertions/rubric/index.d.ts.map +1 -1
- package/lib/cli/output-schemas.d.ts +5 -3
- package/lib/cli/output-schemas.d.ts.map +1 -1
- package/lib/cli/output-schemas.js +1 -1
- package/lib/cli/output-schemas.js.map +1 -1
- package/lib/cli/program.d.ts.map +1 -1
- package/lib/cli/program.js +2 -1
- package/lib/cli/program.js.map +1 -1
- package/lib/cli/render/reporter.d.ts.map +1 -1
- package/lib/cli/render/reporter.js +9 -2
- package/lib/cli/render/reporter.js.map +1 -1
- package/lib/core/assertion.d.ts +5 -2
- package/lib/core/assertion.d.ts.map +1 -1
- package/lib/core/assertion.js +3 -1
- package/lib/core/assertion.js.map +1 -1
- package/lib/core/case.d.ts +5 -1
- package/lib/core/case.d.ts.map +1 -1
- package/lib/core/case.js +1 -0
- package/lib/core/case.js.map +1 -1
- package/lib/core/rubric.d.ts +1 -0
- package/lib/core/rubric.d.ts.map +1 -1
- package/lib/core/run.d.ts +1 -0
- package/lib/core/run.d.ts.map +1 -1
- package/lib/orchestrator/compare.d.ts +2 -2
- package/lib/orchestrator/compare.d.ts.map +1 -1
- package/lib/orchestrator/compare.js +7 -5
- package/lib/orchestrator/compare.js.map +1 -1
- package/lib/orchestrator/config.d.ts +2 -0
- package/lib/orchestrator/config.d.ts.map +1 -1
- package/lib/orchestrator/grader-experiment.d.ts +4 -2
- package/lib/orchestrator/grader-experiment.d.ts.map +1 -1
- package/lib/orchestrator/grading.d.ts.map +1 -1
- package/lib/orchestrator/grading.js +27 -31
- package/lib/orchestrator/grading.js.map +1 -1
- package/lib/orchestrator/list-runs.d.ts.map +1 -1
- package/lib/orchestrator/list-runs.js +4 -2
- package/lib/orchestrator/list-runs.js.map +1 -1
- package/lib/orchestrator/regrade.d.ts +2 -1
- package/lib/orchestrator/regrade.d.ts.map +1 -1
- package/package.json +1 -1
- package/skills/lux-answerer/SKILL.md +1 -1
- package/src/cli/output-schemas.ts +1 -1
- package/src/cli/program.ts +3 -1
- package/src/cli/render/reporter.ts +8 -2
- package/src/core/assertion.ts +3 -1
- package/src/core/case.ts +5 -1
- package/src/orchestrator/compare.ts +7 -5
- package/src/orchestrator/grading.ts +39 -28
- package/src/orchestrator/list-runs.ts +3 -2
- package/viewer/app.css +4 -0
- package/viewer/detail.js +14 -8
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AssertionResultSchema, guardRunObserver, valueHash, } from "../core/index.js";
|
|
2
2
|
import { validatePluginConfigAsync } from "./validate-plugin-config.js";
|
|
3
|
-
const FRAMEWORK_KEYS = new Set(["id", "type", "name", "weight", "threshold"]);
|
|
3
|
+
const FRAMEWORK_KEYS = new Set(["id", "type", "name", "weight", "threshold", "informational"]);
|
|
4
4
|
const shapeOf = (schema) => {
|
|
5
5
|
const shape = schema.shape;
|
|
6
6
|
return shape && typeof shape === "object" ? shape : null;
|
|
@@ -70,6 +70,27 @@ const assertionPassed = (result, threshold) => result.errorMessage === undefined
|
|
|
70
70
|
result.abstention === undefined &&
|
|
71
71
|
result.passed &&
|
|
72
72
|
result.score >= threshold;
|
|
73
|
+
const aggregateGrading = (entries, skippedAssertions, gradingIncomplete) => {
|
|
74
|
+
const requiredEntries = entries.filter((entry) => entry.passed !== null);
|
|
75
|
+
const incomplete = gradingIncomplete || requiredEntries.some((entry) => entry.errorMessage !== undefined);
|
|
76
|
+
const gradingAbstained = requiredEntries.some((entry) => entry.abstention !== undefined);
|
|
77
|
+
const scoredEntries = entries.filter((entry) => entry.errorMessage === undefined && entry.abstention === undefined);
|
|
78
|
+
const weightSum = scoredEntries.reduce((sum, entry) => sum + entry.weight, 0);
|
|
79
|
+
const weightedScoreSum = scoredEntries.reduce((sum, entry) => sum + entry.weight * entry.score, 0);
|
|
80
|
+
const hasVerdict = !incomplete && !gradingAbstained && weightSum > 0;
|
|
81
|
+
return {
|
|
82
|
+
schemaVersion: 1,
|
|
83
|
+
casePassed: hasVerdict && requiredEntries.length > 0
|
|
84
|
+
? requiredEntries.every((entry) => entry.passed)
|
|
85
|
+
: null,
|
|
86
|
+
caseScore: hasVerdict ? weightedScoreSum / weightSum : null,
|
|
87
|
+
assertions: entries,
|
|
88
|
+
...(skippedAssertions.length > 0 ? { skippedAssertions } : {}),
|
|
89
|
+
...(incomplete
|
|
90
|
+
? { incomplete: { exitReason: "error", phase: "grading" } }
|
|
91
|
+
: {}),
|
|
92
|
+
};
|
|
93
|
+
};
|
|
73
94
|
export const gradeRun = async (run, registry, observer, abortSignal, recordAssertion, modelAttempts, validatedConfigs, skipJudge = false) => {
|
|
74
95
|
const guardedObserver = guardRunObserver(observer);
|
|
75
96
|
const assertions = run.case.assertions ?? [];
|
|
@@ -78,11 +99,7 @@ export const gradeRun = async (run, registry, observer, abortSignal, recordAsser
|
|
|
78
99
|
}
|
|
79
100
|
const entries = [];
|
|
80
101
|
const skippedAssertions = [];
|
|
81
|
-
let weightedScoreSum = 0;
|
|
82
|
-
let weightSum = 0;
|
|
83
|
-
let allPassed = true;
|
|
84
102
|
let gradingIncomplete = false;
|
|
85
|
-
let gradingAbstained = false;
|
|
86
103
|
for (const [index, a] of assertions.entries()) {
|
|
87
104
|
if (skipJudge && a.type === "rubric") {
|
|
88
105
|
skippedAssertions.push({
|
|
@@ -146,7 +163,8 @@ export const gradeRun = async (run, registry, observer, abortSignal, recordAsser
|
|
|
146
163
|
id,
|
|
147
164
|
type: a.type,
|
|
148
165
|
name,
|
|
149
|
-
passed,
|
|
166
|
+
passed: a.informational ? null : passed,
|
|
167
|
+
...(a.informational ? { informational: true } : {}),
|
|
150
168
|
score: result.score,
|
|
151
169
|
weight,
|
|
152
170
|
threshold,
|
|
@@ -157,18 +175,6 @@ export const gradeRun = async (run, registry, observer, abortSignal, recordAsser
|
|
|
157
175
|
...(result.errorMessage !== undefined ? { errorMessage: result.errorMessage } : {}),
|
|
158
176
|
...(result.usage ? { usage: result.usage } : {}),
|
|
159
177
|
};
|
|
160
|
-
if (result.errorMessage !== undefined) {
|
|
161
|
-
gradingIncomplete = true;
|
|
162
|
-
}
|
|
163
|
-
else if (result.abstention !== undefined) {
|
|
164
|
-
gradingAbstained = true;
|
|
165
|
-
}
|
|
166
|
-
else {
|
|
167
|
-
if (!passed)
|
|
168
|
-
allPassed = false;
|
|
169
|
-
weightedScoreSum += weight * result.score;
|
|
170
|
-
weightSum += weight;
|
|
171
|
-
}
|
|
172
178
|
}
|
|
173
179
|
catch (err) {
|
|
174
180
|
const message = err instanceof Error ? err.message : String(err);
|
|
@@ -176,30 +182,20 @@ export const gradeRun = async (run, registry, observer, abortSignal, recordAsser
|
|
|
176
182
|
id,
|
|
177
183
|
type: a.type,
|
|
178
184
|
name,
|
|
179
|
-
passed: false,
|
|
185
|
+
passed: a.informational ? null : false,
|
|
186
|
+
...(a.informational ? { informational: true } : {}),
|
|
180
187
|
score: 0,
|
|
181
188
|
weight,
|
|
182
189
|
threshold,
|
|
183
190
|
durationMs: Date.now() - startedAt,
|
|
184
191
|
errorMessage: message,
|
|
185
192
|
};
|
|
186
|
-
gradingIncomplete = true;
|
|
187
193
|
}
|
|
188
194
|
entries.push(entry);
|
|
189
195
|
guardedObserver?.assertionEnd?.(progress, entry);
|
|
190
196
|
await recordAssertion?.(entry, index);
|
|
191
197
|
await modelAttempts?.complete(assertionAttemptIds);
|
|
192
198
|
}
|
|
193
|
-
|
|
194
|
-
return {
|
|
195
|
-
schemaVersion: 1,
|
|
196
|
-
casePassed: hasVerdict ? allPassed : null,
|
|
197
|
-
caseScore: hasVerdict ? weightedScoreSum / weightSum : null,
|
|
198
|
-
assertions: entries,
|
|
199
|
-
...(skippedAssertions.length > 0 ? { skippedAssertions } : {}),
|
|
200
|
-
...(gradingIncomplete
|
|
201
|
-
? { incomplete: { exitReason: "error", phase: "grading" } }
|
|
202
|
-
: {}),
|
|
203
|
-
};
|
|
199
|
+
return aggregateGrading(entries, skippedAssertions, gradingIncomplete);
|
|
204
200
|
};
|
|
205
201
|
//# sourceMappingURL=grading.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grading.js","sourceRoot":"","sources":["../../src/orchestrator/grading.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,qBAAqB,EAGrB,gBAAgB,EAIhB,SAAS,GACV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAExE,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"grading.js","sourceRoot":"","sources":["../../src/orchestrator/grading.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,qBAAqB,EAGrB,gBAAgB,EAIhB,SAAS,GACV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAExE,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC;AAE/F,MAAM,OAAO,GAAG,CAAC,MAAoB,EAAkC,EAAE;IACvE,MAAM,KAAK,GAAI,MAA8B,CAAC,KAAK,CAAC;IACpD,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAE,KAAiC,CAAC,CAAC,CAAC,IAAI,CAAC;AACxF,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAY,EAAE,MAAoB,EAAW,EAAE;IACtF,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,CAAC;IACrB,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,KAAK,CAAC,CAC9E,CAAC;AACJ,CAAC,CAAC;AAWF,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,UAAgC,EAChC,QAAkB,EACY,EAAE,CAChC,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;IAC9E,MAAM,cAAc,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACnD,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;IACxE,OAAO;QACL,IAAI;QACJ,aAAa,EACX,eAAe,IAAI,cAAc,IAAI,OAAO,cAAc,CAAC,aAAa,KAAK,QAAQ;YACnF,CAAC,CAAC,cAAc,CAAC,aAAa;YAC9B,CAAC,CAAC,IAAI;QACV,QAAQ,EAAE,cAAc,CAAC,QAAQ;KAClC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,UAAgC,EAChC,QAAkB,EACS,EAAE,CAC7B,4BAA4B,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC;IACnF,IAAI;IACJ,aAAa;CACd,CAAC,CAAC,CAAC;AAEN,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAOhC,EAAU,EAAE,CACX,SAAS,CAAC;IACR,UAAU,EAAE,KAAK,CAAC,UAAU;IAC5B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;IAC5C,UAAU,EAAE,KAAK,CAAC,UAAU;IAC5B,uBAAuB,EAAE,KAAK,CAAC,uBAAuB;IACtD,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,IAAI;IAC1C,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,KAAK;CACpC,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,UAAgC,EAChC,QAAkB,EACE,EAAE;IACtB,MAAM,SAAS,GAAc,EAAE,CAAC;IAChC,qEAAqE;IACrE,uEAAuE;IACvE,6DAA6D;IAC7D,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACtD,MAAM,cAAc,GAAG,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CACb,wCAAwC,KAAK,uDAAuD,SAAS,CAAC,IAAI,GAAG,CACtH,CAAC;QACJ,CAAC;QACD,SAAS,CAAC,IAAI,CACZ,MAAM,yBAAyB,CAC7B,cAAc,CAAC,YAAY,EAC3B,cAAc,CAAC,YAAY;YACzB,CAAC,CAAC,wBAAwB,CAAC,SAAS,EAAE,cAAc,CAAC,YAAY,CAAC;YAClE,CAAC,CAAC,SAAS,EACb,cAAc,SAAS,CAAC,IAAI,mBAAmB,KAAK,GAAG,CACxD,CACF,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,CAAY,EAAU,EAAE;IACjD,IAAI,CAAC,CAAC,IAAI;QAAE,OAAO,CAAC,CAAC,IAAI,CAAC;IAC1B,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;SAC7B,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,UAAU,CAAC;SACrE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;SACxE,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,MAAuB,EAAE,SAAiB,EAAW,EAAE,CAC9E,MAAM,CAAC,YAAY,KAAK,SAAS;IACjC,MAAM,CAAC,UAAU,KAAK,SAAS;IAC/B,MAAM,CAAC,MAAM;IACb,MAAM,CAAC,KAAK,IAAI,SAAS,CAAC;AAE5B,MAAM,gBAAgB,GAAG,CACvB,OAAgC,EAChC,iBAAkE,EAClE,iBAA0B,EACX,EAAE;IACjB,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;IACzE,MAAM,UAAU,GACd,iBAAiB,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC;IACzF,MAAM,gBAAgB,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC;IACzF,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAClC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,CAC9E,CAAC;IACF,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAC3C,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,EAChD,CAAC,CACF,CAAC;IACF,MAAM,UAAU,GAAG,CAAC,UAAU,IAAI,CAAC,gBAAgB,IAAI,SAAS,GAAG,CAAC,CAAC;IACrE,OAAO;QACL,aAAa,EAAE,CAAC;QAChB,UAAU,EACR,UAAU,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC;YACtC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;YAChD,CAAC,CAAC,IAAI;QACV,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI;QAC3D,UAAU,EAAE,OAAO;QACnB,GAAG,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,UAAU;YACZ,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,OAAgB,EAAE,KAAK,EAAE,SAAkB,EAAE,EAAE;YAC7E,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC3B,GAAQ,EACR,QAAkB,EAClB,QAAsB,EACtB,WAAyB,EACzB,eAAuF,EACvF,aAGC,EACD,gBAAqC,EACrC,SAAS,GAAG,KAAK,EACO,EAAE;IAC1B,MAAM,eAAe,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;IAC7C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;IACjF,CAAC;IAED,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,MAAM,iBAAiB,GAKlB,EAAE,CAAC;IACR,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAE9B,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QAC9C,IAAI,SAAS,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrC,iBAAiB,CAAC,IAAI,CAAC;gBACrB,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,KAAK,GAAG,CAAC,EAAE;gBACpC,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC;gBAC1B,MAAM,EAAE,gBAAgB;aACzB,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,oEAAoE;QACpE,yEAAyE;QACzE,IAAI,WAAW,EAAE,OAAO,EAAE,CAAC;YACzB,iBAAiB,GAAG,IAAI,CAAC;YACzB,MAAM;QACR,CAAC;QACD,MAAM,IAAI,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;QAC7B,qEAAqE;QACrE,yEAAyE;QACzE,mEAAmE;QACnE,mEAAmE;QACnE,+DAA+D;QAC/D,MAAM,SAAS,GAAG,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC;QACnC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,QAAQ,GAAsB;YAClC,KAAK;YACL,KAAK,EAAE,UAAU,CAAC,MAAM;YACxB,EAAE;YACF,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI;SACL,CAAC;QACF,eAAe,EAAE,cAAc,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,IAAI,KAA4B,CAAC;QACjC,MAAM,mBAAmB,GAAa,EAAE,CAAC;QAEzC,IAAI,CAAC;YACH,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;YAC1F,MAAM,SAAS,GAAG,gBAAgB;gBAChC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC;gBACzB,CAAC,CAAC,MAAM,yBAAyB,CAC7B,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,EACtE,cAAc,CAAC,CAAC,IAAI,GAAG,CACxB,CAAC;YACN,IAAI,gBAAgB,IAAI,KAAK,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC;gBACzD,MAAM,IAAI,KAAK,CAAC,kDAAkD,KAAK,GAAG,CAAC,CAAC;YAC9E,CAAC;YACD,8DAA8D;YAC9D,+DAA+D;YAC/D,MAAM,MAAM,GAAG,qBAAqB,CAAC,KAAK,CACxC,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAqB,EAAE,GAAG,EAAE;gBAC9C,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvC,GAAG,CAAC,aAAa;oBACf,CAAC,CAAC;wBACE,uBAAuB,EAAE,KAAK,EAAE,KAAc,EAAE,EAAE;4BAChD,mBAAmB,CAAC,IAAI,CAAC,MAAM,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;wBAC/D,CAAC;qBACF;oBACH,CAAC,CAAC,EAAE,CAAC;aACR,CAAC,CACH,CAAC;YACF,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAClD,KAAK,GAAG;gBACN,EAAE;gBACF,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,IAAI;gBACJ,MAAM,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;gBACvC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,MAAM;gBACN,SAAS;gBACT,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;gBAClC,GAAG,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpE,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,GAAG,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7E,GAAG,CAAC,MAAM,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnF,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACjD,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjE,KAAK,GAAG;gBACN,EAAE;gBACF,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,IAAI;gBACJ,MAAM,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;gBACtC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnD,KAAK,EAAE,CAAC;gBACR,MAAM;gBACN,SAAS;gBACT,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;gBAClC,YAAY,EAAE,OAAO;aACtB,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,eAAe,EAAE,YAAY,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACjD,MAAM,eAAe,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACtC,MAAM,aAAa,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IACrD,CAAC;IAED,OAAO,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;AACzE,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-runs.d.ts","sourceRoot":"","sources":["../../src/orchestrator/list-runs.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,QAAQ,EAEb,KAAK,aAAa,EAGlB,KAAK,aAAa,EAElB,KAAK,QAAQ,EAEb,KAAK,WAAW,EAKjB,MAAM,kBAAkB,CAAC;AAQ1B,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;IAC7C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,4BAA4B,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,aAAa,EAAE,WAAW,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;IACzD,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA8FF,eAAO,MAAM,QAAQ,aAAoB,MAAM,KAAG,OAAO,CAAC,SAAS,EAAE,CASpE,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,SAAS,EAAE,KAAG,MAyBnD,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;IAC3B,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7B,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IAC9B,MAAM,EAAE,QAAQ,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAAkB,MAAM,KAAG,OAAO,CAAC,QAAQ,EAAE,CACU,CAAC;AAiDrF,eAAO,MAAM,aAAa,WAChB,MAAM,YACL;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,KAClF,OAAO,CAAC,SAAS,CAiBnB,CAAC;
|
|
1
|
+
{"version":3,"file":"list-runs.d.ts","sourceRoot":"","sources":["../../src/orchestrator/list-runs.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,QAAQ,EAEb,KAAK,aAAa,EAGlB,KAAK,aAAa,EAElB,KAAK,QAAQ,EAEb,KAAK,WAAW,EAKjB,MAAM,kBAAkB,CAAC;AAQ1B,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;IAC7C,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,4BAA4B,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,aAAa,EAAE,WAAW,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;IACzD,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA8FF,eAAO,MAAM,QAAQ,aAAoB,MAAM,KAAG,OAAO,CAAC,SAAS,EAAE,CASpE,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,SAAS,EAAE,KAAG,MAyBnD,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;IAC3B,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7B,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IAC9B,MAAM,EAAE,QAAQ,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAAkB,MAAM,KAAG,OAAO,CAAC,QAAQ,EAAE,CACU,CAAC;AAiDrF,eAAO,MAAM,aAAa,WAChB,MAAM,YACL;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,KAClF,OAAO,CAAC,SAAS,CAiBnB,CAAC;AAgJF,eAAO,MAAM,eAAe,WAAY,SAAS,KAAG,MAQnD,CAAC"}
|
|
@@ -43,7 +43,7 @@ const summarizeRun = async (caseSlug, driverName, ts, runDir) => {
|
|
|
43
43
|
casePassed: grading?.casePassed ?? null,
|
|
44
44
|
caseScore: grading?.caseScore ?? null,
|
|
45
45
|
assertionPassed: passing,
|
|
46
|
-
assertionTotal: grading?.assertions.length ?? 0,
|
|
46
|
+
assertionTotal: grading?.assertions.filter((a) => a.passed !== null).length ?? 0,
|
|
47
47
|
...(readErrors.length > 0 ? { readErrors } : {}),
|
|
48
48
|
};
|
|
49
49
|
};
|
|
@@ -271,9 +271,11 @@ const appendGradingDetail = (lines, detail) => {
|
|
|
271
271
|
else if (detail.grading.casePassed === false)
|
|
272
272
|
status = "FAIL";
|
|
273
273
|
const score = detail.grading.caseScore !== null ? `${(detail.grading.caseScore * 100).toFixed(0)}%` : "—";
|
|
274
|
-
lines.push(`grading: ${status} (${score}, ${detail.grading.assertions.filter((a) => a.passed).length}/${detail.grading.assertions.length})`);
|
|
274
|
+
lines.push(`grading: ${status} (${score}, ${detail.grading.assertions.filter((a) => a.passed).length}/${detail.grading.assertions.filter((a) => a.passed !== null).length})`);
|
|
275
275
|
for (const a of detail.grading.assertions) {
|
|
276
276
|
let mark = a.passed ? "✓" : "✗";
|
|
277
|
+
if (a.passed === null)
|
|
278
|
+
mark = "ℹ informational";
|
|
277
279
|
if (a.abstention)
|
|
278
280
|
mark = "?";
|
|
279
281
|
const took = ` (${(a.durationMs / 1000).toFixed(1)}s)`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-runs.js","sourceRoot":"","sources":["../../src/orchestrator/list-runs.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"list-runs.js","sourceRoot":"","sources":["../../src/orchestrator/list-runs.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,8 @@ export declare const GradingSnapshotSchema: z.ZodObject<{
|
|
|
25
25
|
id: z.ZodExactOptional<z.ZodString>;
|
|
26
26
|
type: z.ZodString;
|
|
27
27
|
name: z.ZodString;
|
|
28
|
-
passed: z.ZodBoolean
|
|
28
|
+
passed: z.ZodNullable<z.ZodBoolean>;
|
|
29
|
+
informational: z.ZodExactOptional<z.ZodBoolean>;
|
|
29
30
|
score: z.ZodNumber;
|
|
30
31
|
weight: z.ZodNumber;
|
|
31
32
|
threshold: z.ZodNumber;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"regrade.d.ts","sourceRoot":"","sources":["../../src/orchestrator/regrade.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAIL,KAAK,QAAQ,EAMb,KAAK,QAAQ,EACb,KAAK,GAAG,EAKT,MAAM,kBAAkB,CAAC;AAc1B,eAAO,MAAM,+BAA+B,EAAG,CAAU,CAAC;AAE1D,eAAO,MAAM,qBAAqB
|
|
1
|
+
{"version":3,"file":"regrade.d.ts","sourceRoot":"","sources":["../../src/orchestrator/regrade.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAIL,KAAK,QAAQ,EAMb,KAAK,QAAQ,EACb,KAAK,GAAG,EAKT,MAAM,kBAAkB,CAAC;AAc1B,eAAO,MAAM,+BAA+B,EAAG,CAAU,CAAC;AAE1D,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAqBhC,CAAC;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AA2IpE,eAAO,MAAM,iBAAiB,WACpB,MAAM,iBACC,QAAQ,YACd;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,KAClC,OAAO,CAAC,GAAG,CA+Bb,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,WAC1B,MAAM,iBACC,QAAQ,KACtB,OAAO,CAAC,GAAG,CAuEb,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAe,GAAG,KAAG,OAAO,CAAC,IAAI,CAKvE,CAAC;AAyLF,eAAO,MAAM,UAAU,YAAmB;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,wFAAwF;IACxF,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ,KAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,eAAe,CAAA;CAAE,CAqDtD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prismatic-io/lux",
|
|
3
|
-
"version": "0.0.2-preview.
|
|
3
|
+
"version": "0.0.2-preview.32",
|
|
4
4
|
"description": "Coding-agent evaluation and improvement with deterministic assertions, optional LLM judges, and first-class human-in-the-loop runs.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://github.com/prismatic-io/lux",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
---
|
|
2
2
|
name: lux-answerer
|
|
3
|
-
version: 0.0.2-preview.
|
|
3
|
+
version: 0.0.2-preview.32
|
|
4
4
|
description: Play the persona for a running Lux orchestrator that uses the claude-code answerer. Read structured events on stdout, decide answers from persona + context, write JSON to its answer channel.
|
|
5
5
|
user-invocable: false
|
|
6
6
|
allowed-tools: Bash, Read
|
|
@@ -60,7 +60,7 @@ export const ViewOutputSchema = z.union([
|
|
|
60
60
|
z.object({ url: z.string(), runsRoot: z.string() }),
|
|
61
61
|
]);
|
|
62
62
|
const interrupts = z.object({ ask: z.number(), approve: z.number(), custom: z.number() });
|
|
63
|
-
const verdict = z.object({ passed: z.boolean(), score: z.number() }).nullable();
|
|
63
|
+
const verdict = z.object({ passed: z.boolean().nullable(), score: z.number() }).nullable();
|
|
64
64
|
const runComparison = z.object({
|
|
65
65
|
pathA: z.string(),
|
|
66
66
|
pathB: z.string(),
|
package/src/cli/program.ts
CHANGED
|
@@ -948,7 +948,9 @@ const runCommand = async (filters: string[], options: RunOptions, human = false)
|
|
|
948
948
|
caseScore: result.result?.grading?.caseScore ?? null,
|
|
949
949
|
assertionsPassed:
|
|
950
950
|
result.result?.grading?.assertions.filter((assertion) => assertion.passed).length ?? 0,
|
|
951
|
-
assertionsTotal:
|
|
951
|
+
assertionsTotal:
|
|
952
|
+
result.result?.grading?.assertions.filter((assertion) => assertion.passed !== null)
|
|
953
|
+
.length ?? 0,
|
|
952
954
|
})),
|
|
953
955
|
};
|
|
954
956
|
} finally {
|
|
@@ -121,7 +121,10 @@ const statusMark = (status: CaseStatus, theme: Theme): string => {
|
|
|
121
121
|
|
|
122
122
|
const assertionTally = (view: CaseView): string => {
|
|
123
123
|
const passed = view.assertions.filter((a) => a.passed).length;
|
|
124
|
-
const evaluated =
|
|
124
|
+
const evaluated =
|
|
125
|
+
view.assertions.length === 0
|
|
126
|
+
? "—"
|
|
127
|
+
: `${passed}/${view.assertions.filter((a) => a.passed !== null).length}`;
|
|
125
128
|
return view.skippedAssertions.length > 0
|
|
126
129
|
? `${evaluated} · ${view.skippedAssertions.length} skipped`
|
|
127
130
|
: evaluated;
|
|
@@ -162,6 +165,7 @@ const cell = (text: string, width: number): string => {
|
|
|
162
165
|
const scoreNote = (entry: GradingAssertionEntry): string => {
|
|
163
166
|
if (entry.errorMessage) return entry.errorMessage;
|
|
164
167
|
if (entry.abstention) return "insufficient evidence";
|
|
168
|
+
if (entry.passed === null) return `informational; score ${formatScore(entry.score)}`;
|
|
165
169
|
if (entry.passed) return "";
|
|
166
170
|
const score = formatScore(entry.score);
|
|
167
171
|
if (entry.threshold > 0) return `score ${score} < ${formatScore(entry.threshold)}`;
|
|
@@ -464,6 +468,7 @@ export class ConsoleReporter implements SuiteObserver {
|
|
|
464
468
|
);
|
|
465
469
|
for (const entry of view.assertions) {
|
|
466
470
|
let mark = entry.passed ? this.theme.green("✓") : this.theme.red("✗");
|
|
471
|
+
if (entry.passed === null) mark = this.theme.dim("ℹ");
|
|
467
472
|
if (entry.abstention) mark = this.theme.dim("?");
|
|
468
473
|
const duration = formatDuration(entry.durationMs).padStart(DURATION_COL);
|
|
469
474
|
const note = scoreNote(entry);
|
|
@@ -581,11 +586,12 @@ export class ConsoleReporter implements SuiteObserver {
|
|
|
581
586
|
const skippedAssertions = this.cases.flatMap((c) => c.skippedAssertions);
|
|
582
587
|
if (assertions.length > 0 || skippedAssertions.length > 0) {
|
|
583
588
|
const ok = assertions.filter((a) => a.passed).length;
|
|
584
|
-
const bad = assertions.
|
|
589
|
+
const bad = assertions.filter((a) => a.passed === false).length;
|
|
585
590
|
const tally = formatTally(
|
|
586
591
|
[
|
|
587
592
|
[ok, this.theme.green("passed")],
|
|
588
593
|
[bad, this.theme.red("failed")],
|
|
594
|
+
[assertions.filter((a) => a.passed === null).length, this.theme.dim("informational")],
|
|
589
595
|
[skippedAssertions.length, this.theme.dim("skipped")],
|
|
590
596
|
],
|
|
591
597
|
assertions.length + skippedAssertions.length,
|
package/src/core/assertion.ts
CHANGED
|
@@ -107,6 +107,7 @@ export const baseAssertionFields = {
|
|
|
107
107
|
weight: z.number().positive().optional(),
|
|
108
108
|
threshold: z.number().min(0).max(1).optional(),
|
|
109
109
|
name: z.string().optional(),
|
|
110
|
+
informational: z.boolean().optional(),
|
|
110
111
|
} as const;
|
|
111
112
|
|
|
112
113
|
export const defineAssertion = <S extends z.ZodObject>(
|
|
@@ -137,7 +138,8 @@ export const GradingAssertionEntrySchema = z.object({
|
|
|
137
138
|
id: z.exactOptional(z.string()),
|
|
138
139
|
type: z.string(),
|
|
139
140
|
name: z.string(),
|
|
140
|
-
passed: z.boolean(),
|
|
141
|
+
passed: z.boolean().nullable(),
|
|
142
|
+
informational: z.exactOptional(z.boolean()),
|
|
141
143
|
score: z.number(),
|
|
142
144
|
weight: z.number(),
|
|
143
145
|
threshold: z.number(),
|
package/src/core/case.ts
CHANGED
|
@@ -45,6 +45,7 @@ export const AssertionSchema = z
|
|
|
45
45
|
name: z.string().optional(),
|
|
46
46
|
weight: z.number().positive().optional(),
|
|
47
47
|
threshold: z.number().min(0).max(1).optional(),
|
|
48
|
+
informational: z.boolean().optional(),
|
|
48
49
|
})
|
|
49
50
|
.loose();
|
|
50
51
|
export type Assertion = z.infer<typeof AssertionSchema>;
|
|
@@ -83,7 +84,10 @@ export const EvalCaseSchema = EvalCaseObjectSchema
|
|
|
83
84
|
});
|
|
84
85
|
export type EvalCase = z.infer<typeof EvalCaseSchema>;
|
|
85
86
|
|
|
86
|
-
type AssertionPlanFields = Pick<
|
|
87
|
+
type AssertionPlanFields = Pick<
|
|
88
|
+
Assertion,
|
|
89
|
+
"id" | "name" | "threshold" | "weight" | "informational"
|
|
90
|
+
>;
|
|
87
91
|
type AssertionInputOf<Plugin> =
|
|
88
92
|
Plugin extends AssertionPlugin<Assertion, infer Input> ? Input & AssertionPlanFields : never;
|
|
89
93
|
|
|
@@ -39,8 +39,8 @@ export type GradingDelta = {
|
|
|
39
39
|
id: string;
|
|
40
40
|
type: string;
|
|
41
41
|
name: string;
|
|
42
|
-
before: { passed: boolean; score: number } | null;
|
|
43
|
-
after: { passed: boolean; score: number } | null;
|
|
42
|
+
before: { passed: boolean | null; score: number } | null;
|
|
43
|
+
after: { passed: boolean | null; score: number } | null;
|
|
44
44
|
status: "added" | "removed" | "improved" | "regressed" | "unchanged";
|
|
45
45
|
};
|
|
46
46
|
|
|
@@ -181,8 +181,10 @@ const computeGradingDeltas = (
|
|
|
181
181
|
} else {
|
|
182
182
|
status = "unchanged";
|
|
183
183
|
}
|
|
184
|
-
if (
|
|
185
|
-
|
|
184
|
+
if (ax?.passed !== null && bx?.passed !== null) {
|
|
185
|
+
if (status === "improved") improvements++;
|
|
186
|
+
if (status === "regressed") regressions++;
|
|
187
|
+
}
|
|
186
188
|
deltas.push({
|
|
187
189
|
id: name,
|
|
188
190
|
type: ax?.type ?? bx?.type ?? "unknown",
|
|
@@ -325,7 +327,7 @@ export const compareRuns = async (input: ComparisonInput): Promise<RunComparison
|
|
|
325
327
|
export const hasRegression = (cmp: RunComparison): boolean =>
|
|
326
328
|
cmp.caseMismatch.length > 0 ||
|
|
327
329
|
cmp.grading.regressions > 0 ||
|
|
328
|
-
cmp.grading.deltas.some((delta) => delta.status === "removed") ||
|
|
330
|
+
cmp.grading.deltas.some((delta) => delta.status === "removed" && delta.before?.passed !== null) ||
|
|
329
331
|
(cmp.grading.casePassedA === true && cmp.grading.casePassedB !== true);
|
|
330
332
|
|
|
331
333
|
const formatMismatchValue = (value: unknown): string => {
|
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
} from "../core/index.js";
|
|
16
16
|
import { validatePluginConfigAsync } from "./validate-plugin-config.js";
|
|
17
17
|
|
|
18
|
-
const FRAMEWORK_KEYS = new Set(["id", "type", "name", "weight", "threshold"]);
|
|
18
|
+
const FRAMEWORK_KEYS = new Set(["id", "type", "name", "weight", "threshold", "informational"]);
|
|
19
19
|
|
|
20
20
|
const shapeOf = (schema: z.ZodTypeAny): Record<string, unknown> | null => {
|
|
21
21
|
const shape = (schema as { shape?: unknown }).shape;
|
|
@@ -131,6 +131,39 @@ const assertionPassed = (result: AssertionResult, threshold: number): boolean =>
|
|
|
131
131
|
result.passed &&
|
|
132
132
|
result.score >= threshold;
|
|
133
133
|
|
|
134
|
+
const aggregateGrading = (
|
|
135
|
+
entries: GradingAssertionEntry[],
|
|
136
|
+
skippedAssertions: NonNullable<GradingReport["skippedAssertions"]>,
|
|
137
|
+
gradingIncomplete: boolean,
|
|
138
|
+
): GradingReport => {
|
|
139
|
+
const requiredEntries = entries.filter((entry) => entry.passed !== null);
|
|
140
|
+
const incomplete =
|
|
141
|
+
gradingIncomplete || requiredEntries.some((entry) => entry.errorMessage !== undefined);
|
|
142
|
+
const gradingAbstained = requiredEntries.some((entry) => entry.abstention !== undefined);
|
|
143
|
+
const scoredEntries = entries.filter(
|
|
144
|
+
(entry) => entry.errorMessage === undefined && entry.abstention === undefined,
|
|
145
|
+
);
|
|
146
|
+
const weightSum = scoredEntries.reduce((sum, entry) => sum + entry.weight, 0);
|
|
147
|
+
const weightedScoreSum = scoredEntries.reduce(
|
|
148
|
+
(sum, entry) => sum + entry.weight * entry.score,
|
|
149
|
+
0,
|
|
150
|
+
);
|
|
151
|
+
const hasVerdict = !incomplete && !gradingAbstained && weightSum > 0;
|
|
152
|
+
return {
|
|
153
|
+
schemaVersion: 1,
|
|
154
|
+
casePassed:
|
|
155
|
+
hasVerdict && requiredEntries.length > 0
|
|
156
|
+
? requiredEntries.every((entry) => entry.passed)
|
|
157
|
+
: null,
|
|
158
|
+
caseScore: hasVerdict ? weightedScoreSum / weightSum : null,
|
|
159
|
+
assertions: entries,
|
|
160
|
+
...(skippedAssertions.length > 0 ? { skippedAssertions } : {}),
|
|
161
|
+
...(incomplete
|
|
162
|
+
? { incomplete: { exitReason: "error" as const, phase: "grading" as const } }
|
|
163
|
+
: {}),
|
|
164
|
+
};
|
|
165
|
+
};
|
|
166
|
+
|
|
134
167
|
export const gradeRun = async (
|
|
135
168
|
run: Run,
|
|
136
169
|
registry: Registry,
|
|
@@ -157,11 +190,7 @@ export const gradeRun = async (
|
|
|
157
190
|
name: string;
|
|
158
191
|
reason: "judge-disabled";
|
|
159
192
|
}> = [];
|
|
160
|
-
let weightedScoreSum = 0;
|
|
161
|
-
let weightSum = 0;
|
|
162
|
-
let allPassed = true;
|
|
163
193
|
let gradingIncomplete = false;
|
|
164
|
-
let gradingAbstained = false;
|
|
165
194
|
|
|
166
195
|
for (const [index, a] of assertions.entries()) {
|
|
167
196
|
if (skipJudge && a.type === "rubric") {
|
|
@@ -232,7 +261,8 @@ export const gradeRun = async (
|
|
|
232
261
|
id,
|
|
233
262
|
type: a.type,
|
|
234
263
|
name,
|
|
235
|
-
passed,
|
|
264
|
+
passed: a.informational ? null : passed,
|
|
265
|
+
...(a.informational ? { informational: true } : {}),
|
|
236
266
|
score: result.score,
|
|
237
267
|
weight,
|
|
238
268
|
threshold,
|
|
@@ -243,29 +273,20 @@ export const gradeRun = async (
|
|
|
243
273
|
...(result.errorMessage !== undefined ? { errorMessage: result.errorMessage } : {}),
|
|
244
274
|
...(result.usage ? { usage: result.usage } : {}),
|
|
245
275
|
};
|
|
246
|
-
if (result.errorMessage !== undefined) {
|
|
247
|
-
gradingIncomplete = true;
|
|
248
|
-
} else if (result.abstention !== undefined) {
|
|
249
|
-
gradingAbstained = true;
|
|
250
|
-
} else {
|
|
251
|
-
if (!passed) allPassed = false;
|
|
252
|
-
weightedScoreSum += weight * result.score;
|
|
253
|
-
weightSum += weight;
|
|
254
|
-
}
|
|
255
276
|
} catch (err) {
|
|
256
277
|
const message = err instanceof Error ? err.message : String(err);
|
|
257
278
|
entry = {
|
|
258
279
|
id,
|
|
259
280
|
type: a.type,
|
|
260
281
|
name,
|
|
261
|
-
passed: false,
|
|
282
|
+
passed: a.informational ? null : false,
|
|
283
|
+
...(a.informational ? { informational: true } : {}),
|
|
262
284
|
score: 0,
|
|
263
285
|
weight,
|
|
264
286
|
threshold,
|
|
265
287
|
durationMs: Date.now() - startedAt,
|
|
266
288
|
errorMessage: message,
|
|
267
289
|
};
|
|
268
|
-
gradingIncomplete = true;
|
|
269
290
|
}
|
|
270
291
|
|
|
271
292
|
entries.push(entry);
|
|
@@ -274,15 +295,5 @@ export const gradeRun = async (
|
|
|
274
295
|
await modelAttempts?.complete(assertionAttemptIds);
|
|
275
296
|
}
|
|
276
297
|
|
|
277
|
-
|
|
278
|
-
return {
|
|
279
|
-
schemaVersion: 1,
|
|
280
|
-
casePassed: hasVerdict ? allPassed : null,
|
|
281
|
-
caseScore: hasVerdict ? weightedScoreSum / weightSum : null,
|
|
282
|
-
assertions: entries,
|
|
283
|
-
...(skippedAssertions.length > 0 ? { skippedAssertions } : {}),
|
|
284
|
-
...(gradingIncomplete
|
|
285
|
-
? { incomplete: { exitReason: "error" as const, phase: "grading" as const } }
|
|
286
|
-
: {}),
|
|
287
|
-
};
|
|
298
|
+
return aggregateGrading(entries, skippedAssertions, gradingIncomplete);
|
|
288
299
|
};
|
|
@@ -93,7 +93,7 @@ const summarizeRun = async (
|
|
|
93
93
|
casePassed: grading?.casePassed ?? null,
|
|
94
94
|
caseScore: grading?.caseScore ?? null,
|
|
95
95
|
assertionPassed: passing,
|
|
96
|
-
assertionTotal: grading?.assertions.length ?? 0,
|
|
96
|
+
assertionTotal: grading?.assertions.filter((a) => a.passed !== null).length ?? 0,
|
|
97
97
|
...(readErrors.length > 0 ? { readErrors } : {}),
|
|
98
98
|
};
|
|
99
99
|
};
|
|
@@ -365,10 +365,11 @@ const appendGradingDetail = (lines: string[], detail: RunDetail): void => {
|
|
|
365
365
|
const score =
|
|
366
366
|
detail.grading.caseScore !== null ? `${(detail.grading.caseScore * 100).toFixed(0)}%` : "—";
|
|
367
367
|
lines.push(
|
|
368
|
-
`grading: ${status} (${score}, ${detail.grading.assertions.filter((a) => a.passed).length}/${detail.grading.assertions.length})`,
|
|
368
|
+
`grading: ${status} (${score}, ${detail.grading.assertions.filter((a) => a.passed).length}/${detail.grading.assertions.filter((a) => a.passed !== null).length})`,
|
|
369
369
|
);
|
|
370
370
|
for (const a of detail.grading.assertions) {
|
|
371
371
|
let mark = a.passed ? "✓" : "✗";
|
|
372
|
+
if (a.passed === null) mark = "ℹ informational";
|
|
372
373
|
if (a.abstention) mark = "?";
|
|
373
374
|
const took = ` (${(a.durationMs / 1000).toFixed(1)}s)`;
|
|
374
375
|
const abstention = a.abstention ? " — insufficient evidence" : "";
|