Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions apps/cli/src/commands/eval/artifact-writer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,7 @@ function safeTargetId(target: string | undefined): string {
}

function getDataset(result: EvaluationResult): string | undefined {
const record = result as EvaluationResult & { eval_set?: string; evalSet?: string };
return result.dataset ?? record.eval_set ?? record.evalSet;
return result.dataset;
}

function buildArtifactSubdir(result: EvaluationResult): string {
Expand Down
2 changes: 1 addition & 1 deletion apps/cli/src/commands/pipeline/bench.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const evalBenchCommand = command({
const manifest = JSON.parse(await readFile(join(exportDir, 'manifest.json'), 'utf8'));
const testIds: string[] = manifest.test_ids;
const targetName: string = manifest.target?.name ?? 'unknown';
const evalSet: string = manifest.dataset ?? manifest.eval_set ?? '';
const evalSet: string = manifest.dataset ?? '';
const experiment: string | undefined = manifest.experiment;
const safeEvalSet = evalSet ? evalSet.replace(/[\/\\:*?"<>|]/g, '_') : '';

Expand Down
2 changes: 1 addition & 1 deletion apps/cli/src/commands/pipeline/grade.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const evalGradeCommand = command({
const manifestPath = join(exportDir, 'manifest.json');
const manifest = JSON.parse(await readFile(manifestPath, 'utf8'));
const testIds: string[] = manifest.test_ids;
const evalSet: string = manifest.dataset ?? manifest.eval_set ?? '';
const evalSet: string = manifest.dataset ?? '';
const safeEvalSet = evalSet ? evalSet.replace(/[\/\\:*?"<>|]/g, '_') : '';

let totalGraders = 0;
Expand Down
3 changes: 1 addition & 2 deletions apps/cli/src/commands/results/manifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export interface ResultManifestRecord {
readonly test_id?: string;
readonly eval_id?: string;
readonly dataset?: string;
readonly eval_set?: string; // deprecated alias for dataset
readonly experiment?: string;
readonly target?: string;
readonly score: number;
Expand Down Expand Up @@ -125,7 +124,7 @@ function hydrateManifestRecord(baseDir: string, record: ResultManifestRecord): E
return {
timestamp: record.timestamp,
testId,
dataset: record.dataset ?? record.eval_set,
dataset: record.dataset,
target: record.target,
score: record.score,
executionStatus: record.execution_status,
Expand Down
1 change: 0 additions & 1 deletion apps/cli/src/commands/trace/stats.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ function groupResults(results: RawResult[], groupBy?: string): GroupedResults[]
key = result.target ?? 'unknown';
break;
case 'dataset':
case 'eval-set':
key = result.dataset ?? 'unknown';
break;
case 'test-id':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ type EvalResult = {
timestamp?: string;
test_id?: string;
dataset?: string;
eval_set?: string; // backward compat
target?: string;
input?: string;
output_text?: string;
Expand Down Expand Up @@ -222,7 +221,7 @@ for (const line of rawResults) {
const output = {
timestamp: result.timestamp,
test_id: result.test_id,
dataset: result.dataset ?? result.eval_set,
dataset: result.dataset,
target: labelOverride ?? result.target ?? labelFromPath(resultsPath),
input: result.input,
output_text: result.output_text,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ const EvalTestSchema = z.object({
metadata: z.record(z.unknown()).optional(),
conversation_id: z.string().optional(),
dataset: z.string().optional(),
eval_set: z.string().optional(), // deprecated alias for dataset
note: z.string().optional(),
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6390,9 +6390,6 @@
"dataset": {
"type": "string"
},
"eval_set": {
"type": "string"
},
"note": {
"type": "string"
}
Expand Down Expand Up @@ -12704,9 +12701,6 @@
"dataset": {
"type": "string"
},
"eval_set": {
"type": "string"
},
"note": {
"type": "string"
}
Expand Down
Loading