blsmedia/bot
2
0
Fork 0
Code Activity

🚸 (dify) Improve error display when streaming

Browse Source
This commit is contained in:
Baptiste Arnaud
2024-05-25 19:59:34 +02:00
parent e015385a7c
commit e1f1b58c1c
10 changed files with 126 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/bot-engine/apiHandlers/getMessageStream.ts
View File

@ -23,7 +23,14 @@ type Props = {
messages: OpenAI.Chat.ChatCompletionMessage[] | undefined
}
export const getMessageStream = async ({ sessionId, messages }: Props) => {
export const getMessageStream = async ({
sessionId,
messages,
}: Props): Promise<{
stream?: ReadableStream<any>
status?: number
message?: string
}> => {
const session = await getSession(sessionId)
if (!session?.state || !session.state.currentBlockId)
@ -130,13 +137,15 @@ export const getMessageStream = async ({ sessionId, messages }: Props) => {
})
},
}
const stream = await action.run.stream.run({
const { stream, httpError } = await action.run.stream.run({
credentials: decryptedCredentials,
options: deepParseVariables(
session.state.typebotsQueue[0].typebot.variables
)(block.options),
variables,
})
if (httpError) return httpError
if (!stream) return { status: 500, message: 'Could not create stream' }
return { stream }

2
packages/forge/blocks/anthropic/actions/createChatMessage.tsx
View File

@ -168,7 +168,7 @@ export const createChatMessage = createAction({
stream: true,
})
return AnthropicStream(response)
return { stream: AnthropicStream(response) }
},
},
},

170
packages/forge/blocks/difyAi/actions/createChatMessage.ts
View File

@ -3,7 +3,7 @@ import { isDefined, isEmpty, isNotEmpty } from '@typebot.io/lib'
import { auth } from '../auth'
import { defaultBaseUrl } from '../constants'
import { Chunk } from '../types'
import ky from 'ky'
import ky, { HTTPError } from 'ky'
import { deprecatedCreateChatMessageOptions } from '../deprecated'
export const createChatMessage = createAction({
@ -68,77 +68,94 @@ export const createChatMessage = createAction({
const existingDifyConversationId = conversationVariableId
? variables.get(conversationVariableId)
: conversation_id
const response = await ky(
(apiEndpoint ?? defaultBaseUrl) + '/v1/chat-messages',
{
method: 'POST',
headers: {
Authorization: `Bearer ${apiKey}`,
'Content-Type': 'application/json',
},
body: JSON.stringify({
inputs:
inputs?.reduce((acc, { key, value }) => {
if (isEmpty(key) || isEmpty(value)) return acc
return {
...acc,
[key]: value,
}
}, {}) ?? {},
query,
response_mode: 'streaming',
conversation_id: existingDifyConversationId,
user,
files: [],
try {
const response = await ky(
(apiEndpoint ?? defaultBaseUrl) + '/v1/chat-messages',
{
method: 'POST',
headers: {
Authorization: `Bearer ${apiKey}`,
'Content-Type': 'application/json',
},
body: JSON.stringify({
inputs:
inputs?.reduce((acc, { key, value }) => {
if (isEmpty(key) || isEmpty(value)) return acc
return {
...acc,
[key]: value,
}
}, {}) ?? {},
query,
response_mode: 'streaming',
conversation_id: existingDifyConversationId,
user,
files: [],
}),
}
)
const reader = response.body?.getReader()
if (!reader) return {}
return {
stream: new ReadableStream({
async start(controller) {
try {
await processDifyStream(reader, {
onDone: () => {
controller.close()
},
onMessage: (message) => {
controller.enqueue(
new TextEncoder().encode(
'0:"' + message.replace(/"/g, '\\"') + '"\n'
)
)
},
onMessageEnd({ totalTokens, conversationId }) {
if (
conversationVariableId &&
isNotEmpty(conversationId) &&
isEmpty(existingDifyConversationId?.toString())
)
variables.set(conversationVariableId, conversationId)
if ((responseMapping?.length ?? 0) === 0) return
responseMapping?.forEach((mapping) => {
if (!mapping.variableId) return
if (
mapping.item === 'Conversation ID' &&
isNotEmpty(conversationId) &&
isEmpty(existingDifyConversationId?.toString())
)
variables.set(mapping.variableId, conversationId)
if (mapping.item === 'Total Tokens')
variables.set(mapping.variableId, totalTokens)
})
},
})
} catch (e) {
console.error(e)
controller.error(e) // Properly closing the stream with an error
}
},
}),
}
)
const reader = response.body?.getReader()
if (!reader) return
return new ReadableStream({
async start(controller) {
try {
await processDifyStream(reader, {
onDone: () => {
controller.close()
},
onMessage: (message) => {
controller.enqueue(
new TextEncoder().encode('0:"' + message + '"\n')
)
},
onMessageEnd({ totalTokens, conversationId }) {
if (
conversationVariableId &&
isNotEmpty(conversationId) &&
isEmpty(existingDifyConversationId?.toString())
)
variables.set(conversationVariableId, conversationId)
if ((responseMapping?.length ?? 0) === 0) return
responseMapping?.forEach((mapping) => {
if (!mapping.variableId) return
if (
mapping.item === 'Conversation ID' &&
isNotEmpty(conversationId) &&
isEmpty(existingDifyConversationId?.toString())
)
variables.set(mapping.variableId, conversationId)
if (mapping.item === 'Total Tokens')
variables.set(mapping.variableId, totalTokens)
})
},
})
} catch (e) {
console.error(e)
controller.error(e) // Properly closing the stream with an error
} catch (err) {
if (err instanceof HTTPError) {
return {
httpError: {
status: err.response.status,
message: await err.response.text(),
},
}
},
})
}
console.error(err)
return {}
}
},
},
server: async ({
@ -243,12 +260,15 @@ export const createChatMessage = createAction({
if (item === 'Total Tokens')
variables.set(mapping.variableId, totalTokens)
})
} catch (error) {
logs.add({
status: 'error',
description: 'Failed to create chat message',
})
console.error(error)
} catch (err) {
if (err instanceof HTTPError) {
return logs.add({
status: 'error',
description: err.message,
details: await err.response.text(),
})
}
console.error(err)
}
},
},

4
packages/forge/blocks/mistral/actions/createChatCompletion.ts
View File

@ -139,7 +139,7 @@ export const createChatCompletion = createAction({
(res) => res.item === 'Message content' || !res.item
)?.variableId,
run: async ({ credentials: { apiKey }, options, variables }) => {
if (!options.model) return
if (!options.model) return {}
const model = createMistral({
apiKey,
})(options.model)
@ -149,7 +149,7 @@ export const createChatCompletion = createAction({
messages: parseMessages({ options, variables }),
})
return response.toAIStream()
return { stream: response.toAIStream() }
},
},
},

5
packages/forge/blocks/openRouter/actions/createChatCompletion.tsx
View File

@ -62,11 +62,12 @@ export const createChatCompletion = createAction({
}),
stream: {
getStreamVariableId: getChatCompletionStreamVarId,
run: (params) =>
runChatCompletionStream({
run: async (params) => ({
stream: await runChatCompletionStream({
...params,
config: { baseUrl: defaultOpenRouterOptions.baseUrl },
}),
}),
},
},
})

5
packages/forge/blocks/openai/actions/askAssistant.tsx
View File

@ -142,8 +142,8 @@ export const askAssistant = createAction({
getStreamVariableId: ({ responseMapping }) =>
responseMapping?.find((m) => !m.item || m.item === 'Message')
?.variableId,
run: async ({ credentials, options, variables }) =>
createAssistantStream({
run: async ({ credentials, options, variables }) => ({
stream: await createAssistantStream({
apiKey: credentials.apiKey,
assistantId: options.assistantId,
message: options.message,
@ -154,6 +154,7 @@ export const askAssistant = createAction({
functions: options.functions,
responseMapping: options.responseMapping,
}),
}),
},
server: async ({
credentials: { apiKey },

5
packages/forge/blocks/openai/actions/createChatCompletion.tsx
View File

@ -86,14 +86,15 @@ export const createChatCompletion = createAction({
}),
stream: {
getStreamVariableId: getChatCompletionStreamVarId,
run: (params) =>
runChatCompletionStream({
run: async (params) => ({
stream: await runChatCompletionStream({
...params,
config: {
baseUrl: defaultOpenAIOptions.baseUrl,
defaultModel: defaultOpenAIOptions.model,
},
}),
}),
},
},
})

5
packages/forge/blocks/togetherAi/actions/createChatCompletion.tsx
View File

@ -45,11 +45,12 @@ export const createChatCompletion = createAction({
}),
stream: {
getStreamVariableId: getChatCompletionStreamVarId,
run: (params) =>
runChatCompletionStream({
run: async (params) => ({
stream: await runChatCompletionStream({
...params,
config: { baseUrl: defaultTogetherOptions.baseUrl },
}),
}),
},
},
})

5
packages/forge/core/types.ts
View File

@ -64,7 +64,10 @@ export type ActionDefinition<
credentials: CredentialsFromAuthDef<A>
options: z.infer<BaseOptions> & z.infer<Options>
variables: VariableStore
}) => Promise<ReadableStream<any> | undefined>
}) => Promise<{
stream?: ReadableStream<any>
httpError?: { status: number; message: string }
}>
}
web?: {
displayEmbedBubble?: {