-
);
}
\ No newline at end of file
diff --git a/vite/src/pages/flow_free.jsx b/vite/src/pages/flow_free.jsx
index 5f3f32f..a253d1a 100644
--- a/vite/src/pages/flow_free.jsx
+++ b/vite/src/pages/flow_free.jsx
@@ -53,6 +53,7 @@ export function FreeFlow(){
const { history, status, reset, sendMessage, setStatus, audioOutput, setAudioOutput, stop:stopChat, audioUrl, }=useChat();
+
const {
transcript,
finalTranscript,
@@ -61,6 +62,12 @@ export function FreeFlow(){
browserSupportsSpeechRecognition,
isMicrophoneAvailable,
}=useSpeechRecognition();
+
+
+ function resetData() {
+ setSummary(null);
+ reset();
+ }
function playAudio(url){
if(!url) return;
@@ -77,6 +84,7 @@ export function FreeFlow(){
console.error("Audio playback error:", error);
});
+
audio.onended = () => {
if(refCurrentCue.current?.type!='chat') onCueEnd();
else{
@@ -86,8 +94,11 @@ export function FreeFlow(){
refAudio.current = audio; // Store the new audio reference
audio.addEventListener("loadedmetadata", () => {
- if(refCurrentCue.current?.type!='chat')
+ if(refCurrentCue.current?.type!='chat' && refCurrentCue.current?.type!='user_input') {
refTimer.current?.restart(audio.duration*1000 || 0);
+ }else{
+ setChatStatus(()=>ChatStatus.System);
+ }
});
}
function playCue(cue) {
@@ -112,7 +123,8 @@ export function FreeFlow(){
resetTranscript();
console.log('Starting conversation...');
sendMessage();
- setChatWelcome(true);
+ setChatWelcome(true);
+ resetData(); // Reset data for new conversation
break;
case 'chat_end':
const message= refInput.current?.value?.trim();
@@ -135,6 +147,11 @@ export function FreeFlow(){
console.error('Error getting summary:', error);
});
break;
+ case 'user_input':
+ console.log('User input cue, setting chat status to User');
+ setChatStatus(ChatStatus.User); // Set chat status to User for user input cues
+ resetTranscript(); // Reset transcript for user input
+ break;
}
@@ -155,10 +172,10 @@ export function FreeFlow(){
if(cue.status){
sendOsc(OSC_ADDRESS.STATUS, cue.status); // Send OSC status message
}
- if(cue.type=='chat'){
- sendOsc(OSC_ADDRESS.COUNTDOWN, cue.duration || 0); // Send OSC countdown message
+ if(cue.type=='chat' || cue.type=='user_input') {
+ sendOsc(OSC_ADDRESS.COUNTDOWN, cue.duration || '0'); // Send OSC countdown message
}else{
- sendOsc(OSC_ADDRESS.COUNTDOWN, 0); // Reset countdown for non-chat cues
+ sendOsc(OSC_ADDRESS.COUNTDOWN, '0'); // Reset countdown for non-chat cues
}
}
@@ -321,56 +338,58 @@ export function FreeFlow(){
return (
-
-
- {data && Object.entries(data).map(([key, value], index) => (
-
- {refCurrentCue.current?.name}
+
+
+
-
+
-
+ {refCurrentCue.current?.name}
+
+
-
-
-
+
+
+ | ID | */} -Name | -Description | -Type | -Auto | -Audio / Due | -- | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {id} | */} -{name} | -{description} | -{EmojiType[type]} | -{auto ? '⤵️' : ''} | -{audioFile || props.duration} {props.callback && `<${props.callback}>`} | -- - | +
| ID | */} +Name | +Description | +Type | +Auto | +Audio / Due | +
|---|
+
+
+ {cuelist?.map(({id, name, description, type, auto, audioFile,...props}, index) => (
+
+ {/* {id} */}
+ {name}
+ {description}
+ {EmojiType[type]}
+ {auto ? '⤵️' : ''}
+ {audioFile || props.duration} {props.callback && `<${props.callback}>`}
+
+
+
+
+ ))}
+
+
{history?.map((msg, index) => (
+
@@ -387,7 +388,7 @@ export function Flow(){
- chat_status= {status}
-
+ ))}
- {refCurrentCue.current?.name}
+
+
+
-
+
-
+ {refCurrentCue.current?.name}
+
+
-
-
-
+
+
+ | ID | */} -Name | -Description | -Type | -Auto | -Audio / Due | -- | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {id} | */} -{name} | -{description} | -{EmojiType[type]} | -{auto ? '⤵️' : ''} | -{audioFile || props.duration} {props.callback && `<${props.callback}>`} | -- - | +
| ID | */} +Name | +Description | +Type | +Auto | +Audio / Due | +
|---|
+
+
+ {cuelist?.map(({id, name, description, type, auto, audioFile,...props}, index) => (
+
+ {/* {id} */}
+ {name}
+ {description}
+ {EmojiType[type]}
+ {auto ? '⤵️' : ''}
+ {audioFile || props.duration} {props.callback && `<${props.callback}>`}
+
+
+
+
+ ))}
+
+
{history?.map((msg, index) => (
+ )}
+
@@ -378,7 +397,7 @@ export function FreeFlow(){
{msg.prompt &&
))}
- {summary && {msg.prompt}
}
{JSON.stringify(summary)}
}
+ {summary && {summary?.result}
}
-
- {key=="speech_idle_time" ? (
-
- ):(
-
- )}
-
- ))}
-
-