Skip to content

fix(message): correct delta/message selection when both exist in stream #297

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
gene9831 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(message): correct delta/message selection when both exist in stream #297

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
16 changes: 15 additions & 1 deletion packages/kit/src/vue/message/useMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,14 @@ export const useMessage = (options: UseMessageOptions): UseMessageReturn => {
return Boolean(plugin.disabled)
}

// If object is not empty and at least one property converts to truthy boolean, return true
const objectDataIsValid = (obj: Record<string, unknown> | null | undefined) => {
if (!obj || Object.keys(obj).length === 0) {
return false
}
return Object.values(obj).some((value) => Boolean(value))
}

const executeRequest = async (responseProvider: UseMessageOptions['responseProvider'], abortSignal: AbortSignal) => {
setRequestState('processing', 'requesting')

Expand Down Expand Up @@ -210,7 +218,13 @@ export const useMessage = (options: UseMessageOptions): UseMessageReturn => {
message.metadata.updatedAt = Math.floor(Date.now() / 1000)
Object.assign(message.metadata, rest)

combileDeltaData(message, choice.message || choice.delta)
// choice.message 和 choice.delta 可能同时存在
let data = objectDataIsValid(choice.delta) ? choice.delta : choice.message
if (!data) {
data = choice.delta || choice.message || {}
}

combileDeltaData(message, data)
}

if (onCompletionChunk) {
Expand Down
Loading