Merge pull request #67 from RickCarlino/prod

* Update PostgreSQL ENVs
* Allow GPT-4 for approved users

example.env

@@ -24,7 +24,7 @@ GOOGLE_CLOUD_PROJECT=my-gcs-project-change-this
 #   -v ${PWD}/db:/var/lib/postgresql/data \
 #   -p 5432:5432 \
 #   postgres
-DATABASE_URL="postgres://prisma:your_password@localhost:5432/prisma_dev?schema=public"
+POSTGRES_URI="postgres://prisma:your_password@localhost:5432/prisma_dev?schema=public"
 # This is the path to the JSON file you downloaded from Google Cloud
 # Learn more at
 # https://cloud.google.com/docs/authentication/application-default-credentials#GAC

pages/study.tsx

@@ -120,10 +120,13 @@ function useQuizState(initialState: State) {
 }
 
 function Study(props: Props) {
-  const cardsById = props.quizzes.reduce((acc, quiz) => {
-    acc[quiz.quizId] = quiz;
-    return acc;
-  }, {} as Record<number, Quiz>);
+  const cardsById = props.quizzes.reduce(
+    (acc, quiz) => {
+      acc[quiz.quizId] = quiz;
+      return acc;
+    },
+    {} as Record<number, Quiz>,
+  );
   const settings = useUserSettings();
   const newState = newQuizState({
     cardsById,
@@ -199,10 +202,12 @@ function Study(props: Props) {
     };
     failProps.onDiscard = () => {
       if (f.rollbackData) {
-        rollbackGrade.mutateAsync({
-          id: f.id,
-          schedulingData: f.rollbackData,
-        }).then(clear);
+        rollbackGrade
+          .mutateAsync({
+            id: f.id,
+            schedulingData: f.rollbackData,
+          })
+          .then(clear);
       } else {
         alert("No rollback data found. This is a bug.");
       }

prisma/schema.prisma

@@ -8,7 +8,7 @@ generator client {
 
 datasource db {
   provider = "postgresql"
-  url      = env("DATABASE_URL")
+  url      = env("POSTGRES_URI")
 }
 
 model Account {

server/quiz-evaluators/listening.ts

@@ -10,8 +10,12 @@ export const listening: QuizEvaluator = async (ctx) => {
   const { userInput, card } = ctx;
   const { term, definition, langCode } = card;
   const tplData = { term, definition, langCode };
-  const content = template(PROMPT, tplData);
-  const listeningYN = await yesOrNo(userInput, content);
+  const question = template(PROMPT, tplData);
+  const listeningYN = await yesOrNo({
+    userInput,
+    question,
+    userID: ctx.userID,
+  });
 
   if (listeningYN.response === "no") {
     return {

server/quiz-evaluators/speaking.ts

@@ -23,29 +23,39 @@ const gradeGrammar = async (
   term: string,
   definition: string,
   langCode: string,
+  userID: string,
 ): Promise<YesOrNo> => {
   const tplData = {
     term,
     definition,
     langCode,
   };
-  const content = template(GRAMMAR_PROMPT, tplData);
-  const grammarYN = await yesOrNo(userInput, content);
+  const question = template(GRAMMAR_PROMPT, tplData);
+  const grammarYN = await yesOrNo({
+    userInput,
+    question,
+    userID,
+  });
   if (grammarYN.response === "no") {
     return grammarYN;
   }
 
-  const meaningYn = await yesOrNo(userInput, template(MEANING_PROMPT, tplData));
+  const meaningYn = await yesOrNo({
+    userInput,
+    question: template(MEANING_PROMPT, tplData),
+    userID,
+  });
 
   return meaningYn;
 };
 
-export const speaking: QuizEvaluator = async ({ userInput, card }) => {
+export const speaking: QuizEvaluator = async ({ userInput, card, userID }) => {
   const result = await gradeGrammar(
     userInput,
     card.term,
     card.definition,
     card.langCode,
+    userID,
   );
   if (result.response === "no") {
     console.log(`Fail`);

server/quiz-evaluators/types.ts

@@ -4,6 +4,7 @@ export type QuizEvaluatorInput = {
   quiz: Quiz;
   card: Card;
   userInput: string;
+  userID: string;
 };
 
 export type QuizEvaluatorOutput = {

server/routers/bulk-create-cards.ts

@@ -7,7 +7,10 @@ export const bulkCreateCards = procedure
     z.object({
       // Koala does not actually support Spanish.
       // It's a placeholder.
-      langCode: z.union([z.literal("ko"), z.literal("TODO: Support other langauges.")]),
+      langCode: z.union([
+        z.literal("ko"),
+        z.literal("TODO: Support other langauges."),
+      ]),
       input: z
         .array(
           z.object({

server/routers/get-next-quizzes.ts

@@ -34,8 +34,8 @@ export async function getLessonMeta(userId: string) {
         lt: currentDate,
       },
       firstReview: {
-        gt: 0
-      }
+        gt: 0,
+      },
     },
   });
 

server/routers/grade-quiz.ts

@@ -132,6 +132,7 @@ export const gradeQuiz = procedure
       quiz,
       card,
       userInput: transcript.text,
+      userID: user.id,
     });
     const now = new Date().getTime();
     const lastReview = quiz.lastReview;

server/routers/import-cards.ts

@@ -113,7 +113,9 @@ export async function setGrade(
       ...calculateSchedulingData(quiz, grade, now),
     },
   };
-  console.log(`(${data.data.id}) Update grade. Next review: ${timeUntil(data.data.nextReview)}`);
+  console.log(
+    `(${data.data.id}) Update grade. Next review: ${timeUntil(data.data.nextReview)}`,
+  );
   await prismaClient.quiz.update(data);
 }
 

server/routers/rollback-grade.ts

@@ -36,6 +36,8 @@ export const rollbackGrade = procedure
         lapses: Math.max(quiz.lapses - 1, 0),
       },
     };
-    console.log(`Rollback grade. Next review: ${timeUntil(data.data.nextReview)}`)
+    console.log(
+      `Rollback grade. Next review: ${timeUntil(data.data.nextReview)}`,
+    );
     prismaClient.quiz.update(data);
   });

utils/fetch-lesson.ts

@@ -5,7 +5,6 @@ import path from "path";
 import { draw, map, template } from "radash";
 import { errorReport } from "./error-report";
 import { prismaClient } from "@/server/prisma-client";
-import { timeUntil } from "./time-until";
 
 type LessonType = "listening" | "speaking";
 

utils/openai.ts

@@ -1,6 +1,7 @@
 import OpenAI from "openai";
 import { ChatCompletionCreateParamsNonStreaming } from "openai/resources";
 import { errorReport } from "./error-report";
+import { isApprovedUser } from "./is-approved-user";
 
 const apiKey = process.env.OPENAI_API_KEY;
 
@@ -54,11 +55,13 @@ const YES_OR_NO_FUNCTION = {
 };
 
 export type YesOrNo = { response: "yes" | "no"; whyNot?: string };
-
-export const yesOrNo = async (
-  userInput: string,
-  question: string,
-): Promise<YesOrNo> => {
+export type YesOrNoInput = {
+  userInput: string;
+  question: string;
+  userID: string;
+};
+export const yesOrNo = async (input: YesOrNoInput): Promise<YesOrNo> => {
+  const { userInput, question, userID } = input;
   console.log([userInput, question]);
   const grammarResp = await gptCall({
     messages: [
@@ -71,7 +74,7 @@ export const yesOrNo = async (
         content: question,
       },
     ],
-    model: "gpt-3.5-turbo",
+    model: isApprovedUser(userID) ? "gpt-4-turbo-preview" : "gpt-3.5-turbo",
     tools: [
       {
         type: "function",
@@ -80,6 +83,7 @@ export const yesOrNo = async (
     ],
     max_tokens: 300,
     temperature: 0.7,
+    user: userID,
     tool_choice: { type: "function", function: { name: "yes_or_no" } },
   });
   const jsonString =