fix: connected error (#318)

This commit is contained in:
Archer
2023-09-19 07:54:50 +08:00
committed by GitHub
parent 35f4deca76
commit 0a4a1def1e
8 changed files with 61 additions and 30 deletions

View File

@@ -665,6 +665,7 @@ const ChatBox = (
{...MessageCardStyle}
bg={'myBlue.300'}
borderRadius={'8px 0 8px 8px'}
textAlign={'left'}
>
<Box as={'p'}>{item.value}</Box>
</Card>

View File

@@ -182,7 +182,8 @@ export const ChatModule: FlowModuleTemplateType = {
type: FlowInputItemTypeEnum.custom,
label: '引用内容',
description: "对象数组格式,结构:\n [{q:'问题',a:'回答'}]",
valueType: FlowValueTypeEnum.kbQuote
valueType: FlowValueTypeEnum.kbQuote,
connected: false
},
Input_Template_History,
Input_Template_UserChatInput

View File

@@ -238,7 +238,7 @@ const AppEdit = ({ app, onCloseSettings }: Props) => {
position: item.position,
inputs: item.data.inputs.map((item) => ({
...item,
connected: item.type !== FlowInputItemTypeEnum.target
connected: item.connected ?? item.type !== FlowInputItemTypeEnum.target
})),
outputs: item.data.outputs.map((item) => ({
...item,

View File

@@ -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.');
}
const { filterQuoteQA, quoteText, hasQuoteOutput } = filterQuote({
const { filterQuoteQA, quoteText } = filterQuote({
quoteQA,
model: modelConstantsData,
quoteTemplate
@@ -91,8 +91,7 @@ export const dispatchChatCompletion = async (props: Record<string, any>): Promis
quotePrompt,
userChatInput,
systemPrompt,
limitPrompt,
hasQuoteOutput
limitPrompt
});
const { max_tokens } = getMaxTokens({
model: modelConstantsData,
@@ -219,8 +218,7 @@ function filterQuote({
return {
filterQuoteQA,
quoteText,
hasQuoteOutput: !!filterQuoteQA.find((item) => item.a)
quoteText
};
}
function getChatMessages({
@@ -230,8 +228,7 @@ function getChatMessages({
systemPrompt,
limitPrompt,
userChatInput,
model,
hasQuoteOutput
model
}: {
quotePrompt?: string;
quoteText: string;
@@ -240,9 +237,8 @@ function getChatMessages({
limitPrompt?: string;
userChatInput: string;
model: ChatModelItemType;
hasQuoteOutput: boolean;
}) {
const question = hasQuoteOutput
const question = quoteText
? replaceVariable(quotePrompt || defaultQuotePrompt, {
quote: quoteText,
question: userChatInput

View File

@@ -38,7 +38,7 @@ export const jsonRes = <T = any>(
}
// another error
let msg = message || error?.message;
let msg = error?.response?.statusText || error?.message || '请求错误';
if ((code < 200 || code >= 400) && !message) {
msg = error?.message || '请求错误';
if (typeof error === 'string') {
@@ -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') {
msg = error;
} else if (proxyError[error?.code]) {

View File

@@ -135,13 +135,13 @@ export const readDocContent = (file: File) =>
export const readCsvContent = async (file: File) => {
try {
const textArr = await readTxtContent(file);
const json = Papa.parse(textArr).data as string[][];
if (json.length === 0) {
const csvArr = Papa.parse(textArr).data as string[][];
if (csvArr.length === 0) {
throw new Error('csv 解析失败');
}
return {
header: json.shift()?.filter((item) => item) as string[],
data: json.map((item) => item?.filter((item) => item))
header: csvArr.shift() as string[],
data: csvArr.map((item) => item)
};
} catch (error) {
return Promise.reject('解析 csv 文件失败');