From 3b99b7bd2bfa09153cee914477d9826a9c902f47 Mon Sep 17 00:00:00 2001 From: Kyle Corbitt Date: Fri, 14 Jul 2023 17:43:52 -0700 Subject: [PATCH] remove the default value for PromptVariant.model We should be explicit about setting the appropriate model so it always matches the constructFn. --- .../migration.sql | 2 ++ prisma/schema.prisma | 20 +++++++++---------- prisma/seed.ts | 2 ++ prisma/seedDemo.ts | 5 +++++ 4 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 prisma/migrations/20230715004031_remove_default_value_for_model/migration.sql diff --git a/prisma/migrations/20230715004031_remove_default_value_for_model/migration.sql b/prisma/migrations/20230715004031_remove_default_value_for_model/migration.sql new file mode 100644 index 0000000..58b2828 --- /dev/null +++ b/prisma/migrations/20230715004031_remove_default_value_for_model/migration.sql @@ -0,0 +1,2 @@ +-- AlterTable +ALTER TABLE "PromptVariant" ALTER COLUMN "model" DROP DEFAULT; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 6e0d22c..9de878d 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -30,7 +30,7 @@ model PromptVariant { label String constructFn String - model String @default("gpt-3.5-turbo") + model String uiId String @default(uuid()) @db.Uuid visible Boolean @default(true) @@ -39,10 +39,10 @@ model PromptVariant { experimentId String @db.Uuid experiment Experiment @relation(fields: [experimentId], references: [id], onDelete: Cascade) - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt - scenarioVariantCells ScenarioVariantCell[] - EvaluationResult EvaluationResult[] + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt + scenarioVariantCells ScenarioVariantCell[] + EvaluationResult EvaluationResult[] @@index([uiId]) } @@ -59,8 +59,8 @@ model TestScenario { experimentId String @db.Uuid experiment Experiment @relation(fields: [experimentId], references: [id], onDelete: Cascade) - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt scenarioVariantCells ScenarioVariantCell[] } @@ -90,7 +90,7 @@ model ScenarioVariantCell { output Json? // TODO: Remove once migration is complete statusCode Int? errorMessage String? - timeToComplete Int? @default(0) // TODO: Remove once migration is complete + timeToComplete Int? @default(0) // TODO: Remove once migration is complete retryTime DateTime? streamingChannel String? retrievalStatus CellRetrievalStatus @default(COMPLETE) @@ -116,14 +116,14 @@ model ModelOutput { inputHash String output Json - timeToComplete Int @default(0) + timeToComplete Int @default(0) promptTokens Int? completionTokens Int? createdAt DateTime @default(now()) updatedAt DateTime @updatedAt - scenarioVariantCellId String @db.Uuid + scenarioVariantCellId String @db.Uuid scenarioVariantCell ScenarioVariantCell @relation(fields: [scenarioVariantCellId], references: [id], onDelete: Cascade) @@unique([scenarioVariantCellId]) diff --git a/prisma/seed.ts b/prisma/seed.ts index d3d4986..af8f17b 100644 --- a/prisma/seed.ts +++ b/prisma/seed.ts @@ -36,6 +36,7 @@ await prisma.promptVariant.createMany({ experimentId, label: "Prompt Variant 1", sortIndex: 0, + model: "gpt-3.5-turbo-0613", constructFn: `prompt = { model: "gpt-3.5-turbo-0613", messages: [{ role: "user", content: "What is the capital of {{country}}?" }], @@ -46,6 +47,7 @@ await prisma.promptVariant.createMany({ experimentId, label: "Prompt Variant 2", sortIndex: 1, + model: "gpt-3.5-turbo-0613", constructFn: `prompt = { model: "gpt-3.5-turbo-0613", messages: [ diff --git a/prisma/seedDemo.ts b/prisma/seedDemo.ts index a2213e0..d86bb78 100644 --- a/prisma/seedDemo.ts +++ b/prisma/seedDemo.ts @@ -12,6 +12,7 @@ await prisma.promptVariant.createMany({ { experimentId: functionCallsExperiment.id, label: "No Fn Calls", + model: "gpt-3.5-turbo-0613", constructFn: `prompt = { model: "gpt-3.5-turbo-0613", messages: [ @@ -30,6 +31,7 @@ await prisma.promptVariant.createMany({ { experimentId: functionCallsExperiment.id, label: "Fn Calls", + model: "gpt-3.5-turbo-0613", constructFn: `prompt = { model: "gpt-3.5-turbo-0613", messages: [ @@ -92,6 +94,7 @@ await prisma.promptVariant.createMany({ experimentId: redditExperiment.id, label: "3.5 Base", sortIndex: 0, + model: "gpt-3.5-turbo-0613", constructFn: `prompt = { model: "gpt-3.5-turbo-0613", messages: [ @@ -107,6 +110,7 @@ await prisma.promptVariant.createMany({ experimentId: redditExperiment.id, label: "4 Base", sortIndex: 1, + model: "gpt-3.5-turbo-0613", constructFn: `prompt = { model: "gpt-4-0613", messages: [ @@ -122,6 +126,7 @@ await prisma.promptVariant.createMany({ experimentId: redditExperiment.id, label: "3.5 CoT + Functions", sortIndex: 2, + model: "gpt-3.5-turbo-0613", constructFn: `prompt = { model: "gpt-3.5-turbo-0613", messages: [