Commit 0a4a1def by Archer Committed by GitHub

fix: connected error (#318)

parent 35f4deca
...@@ -665,6 +665,7 @@ const ChatBox = ( ...@@ -665,6 +665,7 @@ const ChatBox = (
{...MessageCardStyle} {...MessageCardStyle}
bg={'myBlue.300'} bg={'myBlue.300'}
borderRadius={'8px 0 8px 8px'} borderRadius={'8px 0 8px 8px'}
textAlign={'left'}
> >
<Box as={'p'}>{item.value}</Box> <Box as={'p'}>{item.value}</Box>
</Card> </Card>
......
...@@ -182,7 +182,8 @@ export const ChatModule: FlowModuleTemplateType = { ...@@ -182,7 +182,8 @@ export const ChatModule: FlowModuleTemplateType = {
type: FlowInputItemTypeEnum.custom, type: FlowInputItemTypeEnum.custom,
label: '引用内容', label: '引用内容',
description: "对象数组格式,结构:\n [{q:'问题',a:'回答'}]", description: "对象数组格式,结构:\n [{q:'问题',a:'回答'}]",
valueType: FlowValueTypeEnum.kbQuote valueType: FlowValueTypeEnum.kbQuote,
connected: false
}, },
Input_Template_History, Input_Template_History,
Input_Template_UserChatInput Input_Template_UserChatInput
......
...@@ -238,7 +238,7 @@ const AppEdit = ({ app, onCloseSettings }: Props) => { ...@@ -238,7 +238,7 @@ const AppEdit = ({ app, onCloseSettings }: Props) => {
position: item.position, position: item.position,
inputs: item.data.inputs.map((item) => ({ inputs: item.data.inputs.map((item) => ({
...item, ...item,
connected: item.type !== FlowInputItemTypeEnum.target connected: item.connected ?? item.type !== FlowInputItemTypeEnum.target
})), })),
outputs: item.data.outputs.map((item) => ({ outputs: item.data.outputs.map((item) => ({
...item, ...item,
......
...@@ -69,7 +69,7 @@ export const dispatchChatCompletion = async (props: Record<string, any>): Promis ...@@ -69,7 +69,7 @@ export const dispatchChatCompletion = async (props: Record<string, any>): Promis
return Promise.reject('The chat model is undefined, you need to select a chat model.'); return Promise.reject('The chat model is undefined, you need to select a chat model.');
} }
const { filterQuoteQA, quoteText, hasQuoteOutput } = filterQuote({ const { filterQuoteQA, quoteText } = filterQuote({
quoteQA, quoteQA,
model: modelConstantsData, model: modelConstantsData,
quoteTemplate quoteTemplate
...@@ -91,8 +91,7 @@ export const dispatchChatCompletion = async (props: Record<string, any>): Promis ...@@ -91,8 +91,7 @@ export const dispatchChatCompletion = async (props: Record<string, any>): Promis
quotePrompt, quotePrompt,
userChatInput, userChatInput,
systemPrompt, systemPrompt,
limitPrompt, limitPrompt
hasQuoteOutput
}); });
const { max_tokens } = getMaxTokens({ const { max_tokens } = getMaxTokens({
model: modelConstantsData, model: modelConstantsData,
...@@ -219,8 +218,7 @@ function filterQuote({ ...@@ -219,8 +218,7 @@ function filterQuote({
return { return {
filterQuoteQA, filterQuoteQA,
quoteText, quoteText
hasQuoteOutput: !!filterQuoteQA.find((item) => item.a)
}; };
} }
function getChatMessages({ function getChatMessages({
...@@ -230,8 +228,7 @@ function getChatMessages({ ...@@ -230,8 +228,7 @@ function getChatMessages({
systemPrompt, systemPrompt,
limitPrompt, limitPrompt,
userChatInput, userChatInput,
model, model
hasQuoteOutput
}: { }: {
quotePrompt?: string; quotePrompt?: string;
quoteText: string; quoteText: string;
...@@ -240,9 +237,8 @@ function getChatMessages({ ...@@ -240,9 +237,8 @@ function getChatMessages({
limitPrompt?: string; limitPrompt?: string;
userChatInput: string; userChatInput: string;
model: ChatModelItemType; model: ChatModelItemType;
hasQuoteOutput: boolean;
}) { }) {
const question = hasQuoteOutput const question = quoteText
? replaceVariable(quotePrompt || defaultQuotePrompt, { ? replaceVariable(quotePrompt || defaultQuotePrompt, {
quote: quoteText, quote: quoteText,
question: userChatInput question: userChatInput
......
...@@ -38,7 +38,7 @@ export const jsonRes = <T = any>( ...@@ -38,7 +38,7 @@ export const jsonRes = <T = any>(
} }
// another error // another error
let msg = message || error?.message; let msg = error?.response?.statusText || error?.message || '请求错误';
if ((code < 200 || code >= 400) && !message) { if ((code < 200 || code >= 400) && !message) {
msg = error?.message || '请求错误'; msg = error?.message || '请求错误';
if (typeof error === 'string') { if (typeof error === 'string') {
...@@ -81,7 +81,7 @@ export const sseErrRes = (res: NextApiResponse, error: any) => { ...@@ -81,7 +81,7 @@ export const sseErrRes = (res: NextApiResponse, error: any) => {
}); });
} }
let msg = error?.message || '请求错误'; let msg = error?.response?.statusText || error?.message || '请求错误';
if (typeof error === 'string') { if (typeof error === 'string') {
msg = error; msg = error;
} else if (proxyError[error?.code]) { } else if (proxyError[error?.code]) {
......
...@@ -135,13 +135,13 @@ export const readDocContent = (file: File) => ...@@ -135,13 +135,13 @@ export const readDocContent = (file: File) =>
export const readCsvContent = async (file: File) => { export const readCsvContent = async (file: File) => {
try { try {
const textArr = await readTxtContent(file); const textArr = await readTxtContent(file);
const json = Papa.parse(textArr).data as string[][]; const csvArr = Papa.parse(textArr).data as string[][];
if (json.length === 0) { if (csvArr.length === 0) {
throw new Error('csv 解析失败'); throw new Error('csv 解析失败');
} }
return { return {
header: json.shift()?.filter((item) => item) as string[], header: csvArr.shift() as string[],
data: json.map((item) => item?.filter((item) => item)) data: csvArr.map((item) => item)
}; };
} catch (error) { } catch (error) {
return Promise.reject('解析 csv 文件失败'); return Promise.reject('解析 csv 文件失败');
......
...@@ -4,7 +4,7 @@ description: 'FastGPT 从旧版本升级到 V4.4.2 操作指南' ...@@ -4,7 +4,7 @@ description: 'FastGPT 从旧版本升级到 V4.4.2 操作指南'
icon: 'upgrade' icon: 'upgrade'
draft: false draft: false
toc: true toc: true
weight: 994 weight: 993
--- ---
## 执行初始化 API ## 执行初始化 API
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment