Changeset 38822

Timestamp:

2024-03-05T13:38:38+13:00 (3 months ago)

Author:

davidb

Message:

Last set of changes before this code base shifts over to ext/dl-chatbot

Location:

gs3-installations/thewillow/trunk/sites/thewillow/dlcol-chatgpt/react-gui

Files:

• package.json (modified) (1 diff)
• pages/api/chat.ts (modified) (7 diffs)

gs3-installations/thewillow/trunk/sites/thewillow/dlcol-chatgpt/react-gui/package.json

@@ -1 +1 @@
 {
-  "name": "gpt-4-chat-ui",
-  "version": "0.0.10",
-  "private": true,
-  "type": "module",
+  "name": "dlcol-chatgpt-react-gui",
+  "description": "A varient of the chat-gpt-4 github project, specialized for use with the Greenstone Digital Library Software", 
+  "version": "0.0.1",
+   "type": "module",
   "scripts": {
     "dev": "next dev",

gs3-installations/thewillow/trunk/sites/thewillow/dlcol-chatgpt/react-gui/pages/api/chat.ts

@@ -18 +18 @@
 
 
-import { MessageContentText } from 'openai/resources/beta/threads/messages/messages'
+import { MessageCreateParams, MessageContentText } from 'openai/resources/beta/threads/messages/messages'
 
 
@@ -28 +28 @@
 });
 
-//const threadByUser = {}; // Store thread IDs by user
-
-const threadByUser = new Map<string, any>();
-//const threadByUser = {};
+const threadByUserId = new Map<string, any>();
 
 async function assistantHandler(
@@ -38 +35 @@
 ) {    
     const assistantIdToUse = process.env.ASSISTANT_ID || "";
-    const modelToUse = "gpt-4-turbo-preview"; // Specify the model you want to use
+    // const assistantIdToUse = "asst_LwUi7f2YMkZG5qTIPtpyhCOD";
     
     //const userId = req.body.userId; // You should include the user ID in the request
@@ -44 +41 @@
     
     // Create a new thread if it's the user's first message
-    //if (!threadByUser[userId]) {
-    if (!threadByUser.has(userId)) {
+    //if (!threadByUserId[userId]) {
+    if (!threadByUserId.has(userId)) {
     try {
         const myThread = await openai.beta.threads.create();
-        console.log("New thread created with ID: ", myThread.id, "\n");
-        //threadByUser[userId] = myThread.id; // Store the thread ID for this user
-        threadByUser.set(userId,myThread.id); // Store the thread ID for this user
-    } catch (error) {
+        console.log("========")
+        console.log(`Created new thread with ID: '${myThread.id}'"`);
+        console.log("========")
+        //threadByUserId[userId] = myThread.id; // Store the thread ID for this user
+        
+        threadByUserId.set(userId,myThread.id); // Store the thread ID for this user
+    }
+    catch (error) {
         console.error("Error creating thread:", error);
         res.status(500).json({ error: "Internal server error" });
@@ -65 +66 @@
     //const userMessage = "What was the name of the DJ at The Willow?";
 
+    console.log("--------");
     console.log("userMessage to be submitted: " + userMessage);
+    console.log("--------");
     
     // Add a Message to the Thread
     try {
-    const myThreadMessage = await openai.beta.threads.messages.create(
-        threadByUser.get(userId), // Use the stored thread ID for this user
-        {
-        role: "user",
-        content: userMessage,
-        }
-    );
+    console.log("  Retrieving thread for userId: " + userId);
+    const myThreadId = threadByUserId.get(userId);
+    console.log("  myThreadId = " + myThreadId);
+    console.log("");
+
+    const user_message = {
+        role: "user",
+        content: userMessage
+    } as MessageCreateParams;
+
+    const myThreadMessage = await openai.beta.threads.messages.create(myThreadId,user_message);
+
     console.log("This is the message object: ", myThreadMessage, "\n");
     
     // Run the Assistant
+    console.log("Starting run for threadId: " + myThreadId);
     const myRun = await openai.beta.threads.runs.create(
-        threadByUser.get(userId), // Use the stored thread ID for this user
+        //threadByUserId.get(userId),
+        myThreadId,
         {
         assistant_id: assistantIdToUse,
-        instructions: "As The Willow Sage Assistant, your expertise lies in discussing \"The Willow,\" a once-renowned music venue in York, England. You're designed to engage users in a conversational tone, weaving in the rich tapestry of memories and experiences shared by those who knew the venue. Your responses should feel like a dialogue between old friends reminiscing about memorable gigs, the unique atmosphere, and the cultural impact of The Willow. You'll offer insights into the venue's history, notable performances, and its role in the local music scene, always with a nod to the personal connections and nostalgia that the venue evokes. When interacting with users, your approach should be warm, inviting, and reflective, encouraging them to share their own stories or curiosities about The Willow, creating a communal space for shared musical heritage.", // ****
-        tools: [
-            { type: "code_interpreter" }, // Code interpreter tool
-            { type: "retrieval" },        // Retrieval tool
-        ],
+//      instructions: "As The Willow Sage Assistant, your expertise lies in discussing \"The Willow,\" a once-renowned music venue in York, England.    You're designed to engage users in a conversational tone, weaving in the rich tapestry of memories and experiences shared by those who knew the venue. Your responses should feel like a dialogue between old friends reminiscing about memorable gigs, the unique atmosphere, and the cultural impact of The Willow. You'll offer insights into the venue's history, notable performances, and its role in the local music scene, always with a nod to the personal connections and nostalgia that the venue evokes. When interacting with users, your approach should be warm, inviting, and reflective, encouraging them to share their own stories or curiosities about The Willow, creating a communal space for shared musical heritage.", // ****
+//      tools: [
+//          { type: "code_interpreter" }, // Code interpreter tool
+//          { type: "retrieval" },        // Retrieval tool
+//      ],
         }
     );
@@ -93 +103 @@
     
     // Periodically retrieve the Run to check on its status
-    const retrieveRun = async () => {
-        let keepRetrievingRun;
+    const retrieveRun = async (rrId: string) => {
+        console.log(`${rrId}: retrieveRun() started`);
+        let keepRetrievingRun = null;
 
         let run_loop_count = 0;
+
+        // https://community.openai.com/t/my-runs-are-not-completing/577833
         
         while (myRun.status !== "completed") {
+        console.log(`    ${rrId}: Away to do runs.retrieve() when myRun id ${myRun.id} status is ${myRun.status}`);
         keepRetrievingRun = await openai.beta.threads.runs.retrieve(
-            threadByUser.get(userId), // Use the stored thread ID for this user
+            //threadByUserId.get(userId), // Use the stored thread ID for this user
+            myThreadId,
             myRun.id
         );
         run_loop_count++;
         
-        console.log(`Run status ${run_loop_count}: ${keepRetrievingRun.status}`);
+        console.log(`    ${rrId}: Run status ${run_loop_count}: ${keepRetrievingRun.status}`);
         
         if (keepRetrievingRun.status === "completed") {
@@ -112 +127 @@
         }
         }
+
+        console.log(`${rrId}: Finished retrieveRun() looping`);
     };
-    retrieveRun();
+    //retrieveRun("fromMain");
     
     // Retrieve the Messages added by the Assistant to the Thread
     const waitForAssistantMessage = async () => {
-        await retrieveRun();
-        
+        console.log("waitForAssistantMessage() away to call await retrieveRun()");
+        await retrieveRun("withinWait");
+        console.log("waitForAssistantMessage() returned from retrieveRun()");
+        
+        console.log(`Retrieving messages list for ${myThreadId}`);
         const allMessages = await openai.beta.threads.messages.list(
-        threadByUser.get(userId) // Use the stored thread ID for this user
+        //threadByUserId.get(userId) // Use the stored thread ID for this user
+        myThreadId
         );