- {games.map((game) => {
+ {games.map(game => {
return (
- {game.gameType === "mcq" ? (
+ {game.gameType === 'mcq' ? (
) : (
@@ -33,16 +36,16 @@ const HistoryComponent = async ({ limit, userId }: Props) => {
+ href={`/statistics/${game.id}`}>
{game.topic}
+
Completed
{new Date(game.timeEnded ?? 0).toLocaleDateString()}
- {game.gameType === "mcq" ? "Multiple Choice" : "Open-Ended"}
+ {game.gameType === 'mcq' ? 'Multiple Choice' : 'Open-Ended'}
diff --git a/src/components/IncompleteGames.tsx b/src/components/IncompleteGames.tsx
new file mode 100644
index 0000000..aa3dd47
--- /dev/null
+++ b/src/components/IncompleteGames.tsx
@@ -0,0 +1,57 @@
+import {prisma} from '@/lib/db';
+import {Clock, CopyCheck, Edit2} from 'lucide-react';
+import Link from 'next/link';
+import React from 'react';
+
+type Props = {
+ limit: number;
+ userId: string;
+};
+
+const IncompleteGames = async ({limit, userId}: Props) => {
+ const games = await prisma.game.findMany({
+ take: limit,
+ where: {
+ userId,
+ timeEnded: null, // fetch all the games that are not completed
+ },
+ orderBy: {
+ timeStarted: 'desc',
+ },
+ });
+ return (
+
+ {games.map(game => {
+ return (
+
+
+ {game.gameType === 'mcq' ? (
+
+ ) : (
+
+ )}
+
+ // Redirect them to go and complete the game
+
+ {game.topic}
+
Incomplete
+
+
+
+ {new Date(game.timeEnded ?? 0).toLocaleDateString()}
+
+
+ {game.gameType === 'mcq' ? 'Multiple Choice' : 'Open-Ended'}
+
+
+
+
+ );
+ })}
+
+ );
+};
+
+export default IncompleteGames;
diff --git a/src/lib/gpt.ts b/src/lib/gpt.ts
index e5dfbc7..b45f2f8 100644
--- a/src/lib/gpt.ts
+++ b/src/lib/gpt.ts
@@ -1,9 +1,8 @@
-import { Configuration, OpenAIApi } from "openai";
+import OpenAI from 'openai';
-const configuration = new Configuration({
+const openai = new OpenAI({
apiKey: process.env.OPENAI_API_KEY,
});
-const openai = new OpenAIApi(configuration);
interface OutputFormat {
[key: string]: string | string[] | OutputFormat;
@@ -13,12 +12,12 @@ export async function strict_output(
system_prompt: string,
user_prompt: string | string[],
output_format: OutputFormat,
- default_category: string = "",
+ default_category: string = '',
output_value_only: boolean = false,
- model: string = "gpt-3.5-turbo",
+ model: string = 'gpt-3.5-turbo',
temperature: number = 1,
num_tries: number = 3,
- verbose: boolean = false
+ verbose: boolean = false,
): Promise<
{
question: string;
@@ -33,11 +32,11 @@ export async function strict_output(
const list_output: boolean = /\[.*?\]/.test(JSON.stringify(output_format));
// start off with no error message
- let error_msg: string = "";
+ let error_msg: string = '';
for (let i = 0; i < num_tries; i++) {
let output_format_prompt: string = `\nYou are to output the following in json format: ${JSON.stringify(
- output_format
+ output_format,
)}. \nDo not put quotation marks or escape character \\ in the output fields.`;
if (list_output) {
@@ -55,31 +54,31 @@ export async function strict_output(
}
// Use OpenAI to get a response
- const response = await openai.createChatCompletion({
+ const response = await openai.chat.completions.create({
temperature: temperature,
model: model,
messages: [
{
- role: "system",
+ role: 'system',
content: system_prompt + output_format_prompt + error_msg,
},
- { role: "user", content: user_prompt.toString() },
+ {role: 'user', content: user_prompt.toString()},
],
});
let res: string =
- response.data.choices[0].message?.content?.replace(/'/g, '"') ?? "";
+ response.choices[0].message?.content?.replace(/'/g, '"') ?? '';
// ensure that we don't replace away apostrophes in text
res = res.replace(/(\w)"(\w)/g, "$1'$2");
if (verbose) {
console.log(
- "System prompt:",
- system_prompt + output_format_prompt + error_msg
+ 'System prompt:',
+ system_prompt + output_format_prompt + error_msg,
);
- console.log("\nUser prompt:", user_prompt);
- console.log("\nGPT response:", res);
+ console.log('\nUser prompt:', user_prompt);
+ console.log('\nGPT response:', res);
}
// try-catch block to ensure output format is adhered to
@@ -88,7 +87,7 @@ export async function strict_output(
if (list_input) {
if (!Array.isArray(output)) {
- throw new Error("Output format not in a list of json");
+ throw new Error('Output format not in a list of json');
}
} else {
output = [output];
@@ -119,8 +118,8 @@ export async function strict_output(
output[index][key] = default_category;
}
// if the output is a description format, get only the label
- if (output[index][key].includes(":")) {
- output[index][key] = output[index][key].split(":")[0];
+ if (output[index][key].includes(':')) {
+ output[index][key] = output[index][key].split(':')[0];
}
}
}
@@ -138,8 +137,8 @@ export async function strict_output(
return list_input ? output : output[0];
} catch (e) {
error_msg = `\n\nResult: ${res}\n\nError message: ${e}`;
- console.log("An exception occurred:", e);
- console.log("Current invalid json format:", res);
+ console.log('An exception occurred:', e);
+ console.log('Current invalid json format:', res);
}
}