Skip to content

Commit 150b086

Browse files
authored
Adapt batch evaluations for datasets v2 (#946)
1 parent 74ad2b4 commit 150b086

File tree

33 files changed

+1076
-478
lines changed

33 files changed

+1076
-478
lines changed

apps/web/src/actions/documents/runDocumentInBatchAction.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export const runDocumentInBatchAction = withDataset
3232
prompt: ctx.document.content,
3333
})
3434
const docParams = metadata.parameters
35+
// @ts-expect-error - dataset V2 are not send here yet
3536
const headers = ctx.dataset.fileMetadata.headers
3637
const paramKeys = Object.keys(parameters)
3738
Array.from(docParams).forEach((key) => {

apps/web/src/actions/evaluations/_helpers.ts

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,38 @@
1-
import { DatasetsRepository } from '@latitude-data/core/repositories'
1+
import {
2+
DatasetsRepository,
3+
DatasetsV2Repository,
4+
} from '@latitude-data/core/repositories'
25
import { z } from 'zod'
36
import { createServerActionProcedure } from 'zsa'
47

58
import { withDocument } from '../procedures'
9+
import { DatasetVersion } from '@latitude-data/constants'
10+
import { Dataset, DatasetV2 } from '@latitude-data/core/browser'
611

712
export const withDataset = createServerActionProcedure(withDocument)
8-
.input(z.object({ datasetId: z.number() }))
13+
.input(
14+
z.object({
15+
datasetId: z.number(),
16+
datasetVersion: z.nativeEnum(DatasetVersion),
17+
}),
18+
)
919
.handler(async ({ input, ctx }) => {
10-
const datasetsRepo = new DatasetsRepository(ctx.workspace.id)
11-
const dataset = await datasetsRepo
12-
.find(input.datasetId)
13-
.then((r) => r.unwrap())
20+
const datasetVersion = input.datasetVersion
21+
let response = { ...ctx, datasetVersion }
1422

15-
return { ...ctx, dataset }
23+
// DEPRECATED
24+
if (datasetVersion === DatasetVersion.V1) {
25+
const datasetsRepo = new DatasetsRepository(ctx.workspace.id)
26+
const dataset = await datasetsRepo
27+
.find(input.datasetId)
28+
.then((r) => r.unwrap())
29+
return { ...response, dataset: dataset as Dataset }
30+
}
31+
32+
const repo = new DatasetsV2Repository(ctx.workspace.id)
33+
const dataset = await repo.find(input.datasetId).then((r) => r.unwrap())
34+
35+
return { ...response, dataset: dataset as DatasetV2 }
1636
})
1737

1838
export const USER_DECIDED_TO_IGNORE_THIS_PARAMETER = -1

0 commit comments

Comments
 (0)