This commit is contained in:
Archer
2023-10-23 15:05:13 +08:00
committed by GitHub
parent d37433eacd
commit bf6dbfb245
9 changed files with 61 additions and 38 deletions

View File

@@ -18,7 +18,7 @@ export async function hasSameValue({
const { rows: existsRows } = await PgClient.query(`
SELECT COUNT(*) > 0 AS exists
FROM ${PgDatasetTableName}
WHERE md5(q)=md5('${q}') AND md5(a)=md5('${a}') collection_id='${collectionId}'
WHERE md5(q)=md5('${q}') AND md5(a)=md5('${a}') AND collection_id='${collectionId}'
`);
const exists = existsRows[0]?.exists || false;

View File

@@ -110,23 +110,30 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
temperature = Math.max(temperature, 0.01);
const ai = getAIApi(user.openaiAccount, 480000);
const response = await ai.chat.completions.create({
model,
temperature,
max_tokens,
stream,
messages: [
...(modelConstantsData.defaultSystemChatPrompt
? [
{
role: ChatCompletionRequestMessageRoleEnum.System,
content: modelConstantsData.defaultSystemChatPrompt
}
]
: []),
...messages
]
});
const response = await ai.chat.completions.create(
{
model,
temperature,
max_tokens,
stream,
messages: [
...(modelConstantsData.defaultSystemChatPrompt
? [
{
role: ChatCompletionRequestMessageRoleEnum.System,
content: modelConstantsData.defaultSystemChatPrompt
}
]
: []),
...messages
]
},
{
headers: {
Accept: 'application/json, text/plain, */*'
}
}
);
const { answerText, totalTokens, completeMessages } = await (async () => {
if (stream) {
@@ -355,7 +362,6 @@ async function streamResponse({
readStream: stream
});
let answer = '';
for await (const part of stream) {
if (res.closed) {
stream.controller?.abort();

View File

@@ -42,13 +42,15 @@ export const dispatchAppRequest = async (props: Record<string, any>): Promise<Re
return Promise.reject('App not found');
}
responseWrite({
res,
event: detail ? sseResponseEventEnum.answer : undefined,
data: textAdaptGptResponse({
text: '\n'
})
});
if (stream) {
responseWrite({
res,
event: detail ? sseResponseEventEnum.answer : undefined,
data: textAdaptGptResponse({
text: '\n'
})
});
}
const { responseData, answerText } = await dispatchModules({
res,