From a8e7ad0ff6fedb9722ea738593fcfeaee6a2daa4 Mon Sep 17 00:00:00 2001 From: Webifi Date: Fri, 25 Aug 2023 00:24:26 -0500 Subject: [PATCH] Keep loading prompt after summary --- src/lib/Chat.svelte | 2 ++ src/lib/providers/openai/request.svelte | 14 ++------------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/lib/Chat.svelte b/src/lib/Chat.svelte index b6dda0d..99921e1 100644 --- a/src/lib/Chat.svelte +++ b/src/lib/Chat.svelte @@ -313,6 +313,8 @@ } catch (e) { console.error('Error generating name suggestion', e, e.stack) } + chatRequest.updating = false + chatRequest.updatingMessage = '' if (response.hasError()) { addMessage(chatId, { role: 'error', diff --git a/src/lib/providers/openai/request.svelte b/src/lib/providers/openai/request.svelte index 66c47b4..2348b1a 100644 --- a/src/lib/providers/openai/request.svelte +++ b/src/lib/providers/openai/request.svelte @@ -37,8 +37,8 @@ export const chatRequest = async ( * We'll get the response a token at a time, as soon as they are ready */ chatResponse.onFinish(() => { - chatRequest.updating = false - chatRequest.updatingMessage = '' + // chatRequest.updating = false + // chatRequest.updatingMessage = '' }) fetchEventSource(getEndpoint(model), { ...fetchOptions, @@ -59,8 +59,6 @@ export const chatRequest = async ( } }, onclose () { - chatRequest.updating = false - chatRequest.updatingMessage = '' chatResponse.updateFromClose() }, onerror (err) { @@ -76,8 +74,6 @@ export const chatRequest = async ( } } }).catch(err => { - chatRequest.updating = false - chatRequest.updatingMessage = '' chatResponse.updateFromError(err.message) }) } else { @@ -90,9 +86,6 @@ export const chatRequest = async ( await chatRequest.handleError(response) } else { const json = await response.json() - // Remove updating indicator - chatRequest.updating = false - chatRequest.updatingMessage = '' chatResponse.updateFromSyncResponse(json) } } @@ -156,9 +149,6 @@ export const imageRequest = async ( await chatRequest.handleError(response) } else { const json = await response.json() - // Remove updating indicator - chatRequest.updating = false - chatRequest.updatingMessage = '' // console.log('image json', json, json?.data[0]) const images = json?.data.map(d => d.b64_json) chatResponse.updateImageFromSyncResponse(images, prompt, imageModel)