Skip to content

handle done event #2289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ReynardoEW wants to merge 1 commit into
base: main
Choose a base branch
from
Open

handle done event #2289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 43 additions & 8 deletions src/containers/LlamaAI/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ async function fetchPromptResponse({
| 'title'
| 'message_id'
| 'reset'
| 'done'
content: string
stage?: string
sessionId?: string
Expand Down Expand Up @@ -139,14 +140,47 @@ async function fetchPromptResponse({
let chartData = null
let citations = null
let lineBuffer = ''
let lastEventTime = Date.now()
let sessionIdForRecovery: string | null = null

const recoveryInterval = setInterval(async () => {
const timeSinceLastEvent = Date.now() - lastEventTime
if (timeSinceLastEvent > 60000 && sessionIdForRecovery) {
try {
const recoveryResponse = await authorizedFetch(`${MCP_SERVER}/chatbot-agent/session/${sessionIdForRecovery}`)
if (recoveryResponse.ok) {
const sessionData = await recoveryResponse.json()
if (sessionData.messages && sessionData.messages.length > 0) {
const lastAssistantMessage = [...sessionData.messages].reverse().find(m => m.role === 'assistant')
if (lastAssistantMessage?.content) {
fullResponse = lastAssistantMessage.content
if (onProgress && !abortSignal?.aborted) {
onProgress({ type: 'token', content: lastAssistantMessage.content })
}
}
}
}
} catch (err) {}
clearInterval(recoveryInterval)
if (reader && !reader.closed) {
try { reader.cancel() } catch {}
}
}
}, 10000)

while (true) {
if (abortSignal?.aborted) {
clearInterval(recoveryInterval)
throw new Error('Request aborted')
}

const { done, value } = await reader.read()
if (done) break
if (done) {
clearInterval(recoveryInterval)
break
}

lastEventTime = Date.now()

const chunk = decoder.decode(value, { stream: true })

Expand All @@ -166,7 +200,13 @@ async function fetchPromptResponse({
try {
const data = JSON.parse(jsonStr)

if (data.type === 'token') {
if (data.type === 'done') {
if (onProgress && !abortSignal?.aborted) {
onProgress({ type: 'done', content: '' })
}
clearInterval(recoveryInterval)
break
} else if (data.type === 'token') {
fullResponse += data.content
if (onProgress && !abortSignal?.aborted) {
onProgress({ type: 'token', content: data.content })
Expand All @@ -180,6 +220,7 @@ async function fetchPromptResponse({
onProgress({ type: 'progress', content: data.content, stage: data.stage })
}
} else if (data.type === 'session') {
sessionIdForRecovery = data.sessionId
if (onProgress && !abortSignal?.aborted) {
onProgress({ type: 'session', content: '', sessionId: data.sessionId })
}
Expand Down Expand Up @@ -255,12 +296,6 @@ async function fetchPromptResponse({
} catch (releaseError) {}
}
throw new Error(error instanceof Error ? error.message : 'Failed to fetch prompt response')
} finally {
if (reader && !reader.closed) {
try {
reader.releaseLock()
} catch (releaseError) {}
}
}
}

Expand Down