diff --git a/vite/public/cuelist_demo2.json b/vite/public/cuelist_demo2.json index c3fd2ae..69780a0 100644 --- a/vite/public/cuelist_demo2.json +++ b/vite/public/cuelist_demo2.json @@ -76,7 +76,7 @@ "description": "chat", "auto": true, "nextcue": 4.3, - "duration": 20, + "duration": 30, "status":"go" }, { @@ -96,8 +96,15 @@ "description": "call", "duration": 30, "auto": true, - "nextcue": 5.2, - "callback":"summary" + "nextcue": 5.11 + }, + { + "id":5.11, + "name":"Q5.11", + "type":"summary", + "auto":true, + "description":"summary", + "nextcue":5.2 }, { "id": 5.2, diff --git a/vite/src/pages/flow_free.jsx b/vite/src/pages/flow_free.jsx index 394bbd4..293c744 100644 --- a/vite/src/pages/flow_free.jsx +++ b/vite/src/pages/flow_free.jsx @@ -215,23 +215,23 @@ export function FreeFlow(){ setChatWelcome(false); setChatStatus(ChatStatus.Clear); break; - // case 'summary': - // console.log('Getting summary...'); + case 'summary': + console.log('Getting summary...'); - // setChatStatus(ChatStatus.Clear); // Set chat status to Processing - // getSummary(history.map(el=>`${el.role}:${el.content}`).join('\n'), data).then(summary_ => { + setChatStatus(ChatStatus.Clear); // Set chat status to Processing + getSummary(history.map(el=>`${el.role}:${el.content}`).join('\n'), data).then(summary_ => { - // console.log('Summary:', summary_); - // onCueEnd(); // End the current cue after getting summary + console.log('Summary:', summary_); + onCueEnd(); // End the current cue after getting summary - // setSummary(summary_?.result); - // refContainer.current.scrollTop = refContainer.current.scrollHeight; // Scroll to bottom + setSummary(summary_?.result); + refContainer.current.scrollTop = refContainer.current.scrollHeight; // Scroll to bottom - // }).catch(error => { - // console.error('Error getting summary:', error); - // }); + }).catch(error => { + console.error('Error getting summary:', error); + }); - // break; + break; case 'user_input': setChatStatus(ChatStatus.Message); // Set chat status to User resetTranscript(); // Reset transcript for user input @@ -306,21 +306,21 @@ export function FreeFlow(){ sendOsc(OSC_ADDRESS.HINT, ''); // Clear hint message } - if(cue.callback=='summary') { - console.log('Getting summary...'); + // if(cue.callback=='summary') { + // console.log('Getting summary...'); - getSummary(history.map(el=>`${el.role}:${el.content}`).join('\n'), data).then(summary_ => { + // getSummary(history.map(el=>`${el.role}:${el.content}`).join('\n'), data).then(summary_ => { - console.log('Summary:', summary_); - onCueEnd(); // End the current cue after getting summary + // console.log('Summary:', summary_); + // onCueEnd(); // End the current cue after getting summary - setSummary(summary_?.result); - refContainer.current.scrollTop = refContainer.current.scrollHeight; // Scroll to bottom + // setSummary(summary_?.result); + // refContainer.current.scrollTop = refContainer.current.scrollHeight; // Scroll to bottom - }).catch(error => { - console.error('Error getting summary:', error); - }); - } + // }).catch(error => { + // console.error('Error getting summary:', error); + // }); + // } refAudio.current?.pause(); // Pause any playing audio console.log('onCueEnd:', cue.id); diff --git a/vite/src/util/useUser.jsx b/vite/src/util/useUser.jsx index a64b686..8d76982 100644 --- a/vite/src/util/useUser.jsx +++ b/vite/src/util/useUser.jsx @@ -1,4 +1,4 @@ -import { createContext, useState, useEffect, useContext } from "react"; +import { createContext, useState, useEffect, useContext, use } from "react"; import moment from "moment"; import { updateUser } from "./backend"; @@ -28,12 +28,12 @@ export function UserProvider({children}) { return `${password||pass||''}_${userId}`; } function getDataId(){ - if(!userId) return `${moment().format('YYYYMM')}/${moment().format("MMDD")}/${sessionId==null? SessionTime[sessionId][0]:'no-sesion'}/testuser_${moment().format('hhmmss')}`; - return `${moment().format('YYYYMM')}/${moment().format("MMDD")}/${sessionId==null? SessionTime[sessionId][0]:'no-sesion'}/${userId}`; + if(!userId) return `${moment().format('YYYYMM')}/${moment().format("MMDD")}/${sessionId!=null? SessionTime[sessionId][0].replace(':',''):'no-session'}/testuser_${moment().format('hhmmss')}`; + return `${moment().format('YYYYMM')}/${moment().format("MMDD")}/${sessionId!=null? SessionTime[sessionId][0].replace(':',''):'no-session'}/${userId}`; } function getUploadFolder(){ - return `${moment().format("YYYYMM")}/${moment().format("MMDD")}/${sessionId==null? SessionTime[sessionId][0]:'no-session'}`; + return `${moment().format("YYYYMM")}/${moment().format("MMDD")}/${sessionId!=null? SessionTime[sessionId][0].replace(':',''):'no-session'}`; } function reset(){ @@ -103,6 +103,10 @@ export function UserProvider({children}) { }, [userId]); + useEffect(() => { + console.log("Session ID changed:", sessionId); + + }, [sessionId]); return (