mirror of
https://github.com/labring/FastGPT.git
synced 2025-07-22 04:06:18 +00:00
Remove quote prompt in api request (#4724)
* chat completion add parsequote param (#4720) * chat completion add parsequote param * fix * perf: quote prompt --------- Co-authored-by: heheer <heheer@sealos.io>
This commit is contained in:
@@ -75,6 +75,7 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
|
||||
res,
|
||||
requestOrigin,
|
||||
stream = false,
|
||||
parseQuote = true,
|
||||
externalProvider,
|
||||
histories,
|
||||
node: { name, version },
|
||||
@@ -158,7 +159,8 @@ export const dispatchChatCompletion = async (props: ChatProps): Promise<ChatResp
|
||||
userChatInput,
|
||||
systemPrompt,
|
||||
userFiles,
|
||||
documentQuoteText
|
||||
documentQuoteText,
|
||||
parseQuote
|
||||
}),
|
||||
// Censor = true and system key, will check content
|
||||
(() => {
|
||||
@@ -450,7 +452,8 @@ async function getChatMessages({
|
||||
systemPrompt,
|
||||
userChatInput,
|
||||
userFiles,
|
||||
documentQuoteText
|
||||
documentQuoteText,
|
||||
parseQuote = true
|
||||
}: {
|
||||
model: LLMModelItemType;
|
||||
maxTokens?: number;
|
||||
@@ -467,13 +470,16 @@ async function getChatMessages({
|
||||
|
||||
userFiles: UserChatItemValueItemType['file'][];
|
||||
documentQuoteText?: string; // document quote
|
||||
parseQuote?: boolean;
|
||||
}) {
|
||||
// Dataset prompt ====>
|
||||
// User role or prompt include question
|
||||
const quoteRole =
|
||||
aiChatQuoteRole === 'user' || datasetQuotePrompt.includes('{{question}}') ? 'user' : 'system';
|
||||
|
||||
const datasetQuotePromptTemplate = datasetQuotePrompt || getQuotePrompt(version, quoteRole);
|
||||
const defaultQuotePrompt = getQuotePrompt(version, quoteRole, parseQuote);
|
||||
|
||||
const datasetQuotePromptTemplate = datasetQuotePrompt || defaultQuotePrompt;
|
||||
|
||||
// Reset user input, add dataset quote to user input
|
||||
const replaceInputValue =
|
||||
|
@@ -55,6 +55,7 @@ export async function dispatchDatasetSearch(
|
||||
runningUserInfo: { tmbId },
|
||||
histories,
|
||||
node,
|
||||
parseQuote = true,
|
||||
params: {
|
||||
datasets = [],
|
||||
similarity,
|
||||
@@ -266,7 +267,7 @@ export async function dispatchDatasetSearch(
|
||||
[DispatchNodeResponseKeyEnum.nodeResponse]: responseData,
|
||||
nodeDispatchUsages,
|
||||
[DispatchNodeResponseKeyEnum.toolResponses]: {
|
||||
prompt: getDatasetSearchToolResponsePrompt(),
|
||||
prompt: getDatasetSearchToolResponsePrompt(parseQuote),
|
||||
quotes: searchRes.map((item) => ({
|
||||
id: item.id,
|
||||
sourceName: item.sourceName,
|
||||
|
@@ -135,6 +135,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
|
||||
timezone,
|
||||
externalProvider,
|
||||
stream = false,
|
||||
parseQuote = true,
|
||||
version = 'v1',
|
||||
responseDetail = true,
|
||||
responseAllData = true,
|
||||
@@ -606,6 +607,7 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
|
||||
timezone,
|
||||
externalProvider,
|
||||
stream,
|
||||
parseQuote,
|
||||
node,
|
||||
runtimeNodes,
|
||||
runtimeEdges,
|
||||
|
Reference in New Issue
Block a user