ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-07-23 13:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: save system prompt

Browse Source
This commit is contained in:
archer
2023-05-02 14:06:10 +08:00
parent b0d414ac12
commit 90456301d2
10 changed files with 104 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/api/fetch.ts
View File

@@ -1,4 +1,6 @@
import { getToken } from '../utils/user';
import { SYSTEM_PROMPT_PREFIX } from '@/constants/chat';
interface StreamFetchProps {
url: string;
data: any;
@@ -6,7 +8,7 @@ interface StreamFetchProps {
abortSignal: AbortController;
}
export const streamFetch = ({ url, data, onMessage, abortSignal }: StreamFetchProps) =>
new Promise<string>(async (resolve, reject) => {
new Promise<{ responseText: string; systemPrompt: string }>(async (resolve, reject) => {
try {
const res = await fetch(url, {
method: 'POST',
@@ -19,15 +21,22 @@ export const streamFetch = ({ url, data, onMessage, abortSignal }: StreamFetchPr
});
const reader = res.body?.getReader();
if (!reader) return;
if (res.status !== 200) {
console.log(res);
return reject('chat error');
}
const decoder = new TextDecoder();
let responseText = '';
let systemPrompt = '';
const read = async () => {
try {
const { done, value } = await reader?.read();
if (done) {
if (res.status === 200) {
resolve(responseText);
resolve({ responseText, systemPrompt });
} else {
const parseError = JSON.parse(responseText);
reject(parseError?.message || '请求异常');
@@ -36,12 +45,19 @@ export const streamFetch = ({ url, data, onMessage, abortSignal }: StreamFetchPr
return;
}
const text = decoder.decode(value).replace(/<br\/>/g, '\n');
res.status === 200 && onMessage(text);
responseText += text;
// check system prompt
if (text.startsWith(SYSTEM_PROMPT_PREFIX)) {
systemPrompt = text.replace(SYSTEM_PROMPT_PREFIX, '');
} else {
responseText += text;
onMessage(text);
}
read();
} catch (err: any) {
if (err?.message === 'The user aborted a request.') {
return resolve(responseText);
return resolve({ responseText, systemPrompt });
}
reject(typeof err === 'string' ? err : err?.message || '请求异常');
}

1
src/constants/chat.ts Normal file
View File

@@ -0,0 +1 @@
export const SYSTEM_PROMPT_PREFIX = 'SYSTEM_PROMPT:';

6
src/pages/api/chat/chat.ts
View File

@@ -41,7 +41,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
await connectToDatabase();
let startTime = Date.now();
const { model, content, userApiKey, systemKey, userId } = await authChat({
const { model, showModelDetail, content, userApiKey, systemKey, userId } = await authChat({
modelId,
chatId,
authorization
@@ -120,7 +120,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
const { responseContent } = await gpt35StreamResponse({
res,
stream,
chatResponse
chatResponse,
systemPrompt:
showModelDetail && filterPrompts[0].role === 'system' ? filterPrompts[0].content : ''
});
// 只有使用平台的 key 才计费

3
src/pages/api/chat/init.ts
View File

@@ -48,7 +48,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
$project: {
_id: '$content._id',
obj: '$content.obj',
value: '$content.value'
value: '$content.value',
systemPrompt: '$content.systemPrompt'
}
}
]);

3
src/pages/api/chat/saveChat.ts
View File

@@ -26,7 +26,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
const content = prompts.map((item) => ({
_id: new mongoose.Types.ObjectId(item._id),
obj: item.obj,
value: item.value
value: item.value,
systemPrompt: item.systemPrompt
}));
await authModel({ modelId, userId, authOwner: false });

62
src/pages/chat/index.tsx
View File

@@ -16,7 +16,13 @@ import {
MenuButton,
MenuList,
MenuItem,
Image
Image,
Button,
Modal,
ModalOverlay,
ModalContent,
ModalBody,
ModalCloseButton
} from '@chakra-ui/react';
import { useToast } from '@/hooks/useToast';
import { useScreen } from '@/hooks/useScreen';
@@ -29,7 +35,7 @@ import { streamFetch } from '@/api/fetch';
import Icon from '@/components/Icon';
import MyIcon from '@/components/Icon';
import { throttle } from 'lodash';
import mongoose from 'mongoose';
import { Types } from 'mongoose';
const SlideBar = dynamic(() => import('./components/SlideBar'));
const Empty = dynamic(() => import('./components/Empty'));
@@ -67,7 +73,8 @@ const Chat = ({ modelId, chatId }: { modelId: string; chatId: string }) => {
history: []
}); // 聊天框整体数据
const [inputVal, setInputVal] = useState(''); // 输入的内容
const [inputVal, setInputVal] = useState(''); // user input prompt
const [showSystemPrompt, setShowSystemPrompt] = useState('');
const isChatting = useMemo(
() => chatData.history[chatData.history.length - 1]?.status === 'loading',
@@ -199,7 +206,7 @@ const Chat = ({ modelId, chatId }: { modelId: string; chatId: string }) => {
};
// 流请求，获取数据
const responseText = await streamFetch({
const { responseText, systemPrompt } = await streamFetch({
url: '/api/chat/chat',
data: {
prompt,
@@ -228,7 +235,7 @@ const Chat = ({ modelId, chatId }: { modelId: string; chatId: string }) => {
}
let newChatId = '';
// 保存对话信息
// save chat record
try {
newChatId = await postSaveChat({
modelId,
@@ -242,7 +249,8 @@ const Chat = ({ modelId, chatId }: { modelId: string; chatId: string }) => {
{
_id: prompts[1]._id,
obj: 'AI',
value: responseText
value: responseText,
systemPrompt
}
]
});
@@ -266,7 +274,8 @@ const Chat = ({ modelId, chatId }: { modelId: string; chatId: string }) => {
if (index !== state.history.length - 1) return item;
return {
...item,
status: 'finish'
status: 'finish',
systemPrompt
};
})
}));
@@ -300,13 +309,13 @@ const Chat = ({ modelId, chatId }: { modelId: string; chatId: string }) => {
const newChatList: ChatSiteItemType[] = [
...chatData.history,
{
_id: String(new mongoose.Types.ObjectId()),
_id: String(new Types.ObjectId()),
obj: 'Human',
value: val,
status: 'finish'
},
{
_id: String(new mongoose.Types.ObjectId()),
_id: String(new Types.ObjectId()),
obj: 'AI',
value: '',
status: 'loading'
@@ -492,10 +501,24 @@ const Chat = ({ modelId, chatId }: { modelId: string; chatId: string }) => {
</Menu>
<Box flex={'1 0 0'} w={0} overflow={'hidden'}>
{item.obj === 'AI' ? (
<Markdown
source={item.value}
isChatting={isChatting && index === chatData.history.length - 1}
/>
<>
<Markdown
source={item.value}
isChatting={isChatting && index === chatData.history.length - 1}
/>
{item.systemPrompt && (
<Button
size={'xs'}
mt={2}
fontWeight={'normal'}
colorScheme={'gray'}
variant={'outline'}
onClick={() => setShowSystemPrompt(item.systemPrompt || '')}
>
查看提示词
</Button>
)}
</>
) : (
<Box className="markdown" whiteSpace={'pre-wrap'}>
<Box as={'p'}>{item.value}</Box>
@@ -617,6 +640,19 @@ const Chat = ({ modelId, chatId }: { modelId: string; chatId: string }) => {
</Box>
</Box>
</Flex>
{/* system prompt show modal */}
{
<Modal isOpen={!!showSystemPrompt} onClose={() => setShowSystemPrompt('')}>
<ModalOverlay />
<ModalContent maxW={'min(90vw, 600px)'} pr={2} maxH={'80vh'} overflowY={'auto'}>
<ModalCloseButton />
<ModalBody pt={10} fontSize={'sm'} whiteSpace={'pre-wrap'} textAlign={'justify'}>
{showSystemPrompt}
</ModalBody>
</ModalContent>
</Modal>
}
</Flex>
);
};

4
src/service/models/chat.ts
View File

@@ -41,6 +41,10 @@ const ChatSchema = new Schema({
value: {
type: String,
required: true
},
systemPrompt: {
type: String,
default: ''
}
}
],

12
src/service/utils/auth.ts
View File

@@ -75,7 +75,7 @@ export const authModel = async ({
};
}
return { model };
return { model, showModelDetail: model.share.isShareDetail || userId === String(model.userId) };
};
// 获取对话校验
@@ -91,7 +91,12 @@ export const authChat = async ({
const userId = await authToken(authorization);
// 获取 model 数据
const { model } = await authModel({ modelId, userId, authOwner: false, reserveDetail: true });
const { model, showModelDetail } = await authModel({
modelId,
userId,
authOwner: false,
reserveDetail: true
});
// 聊天内容
let content: ChatItemSimpleType[] = [];
@@ -124,7 +129,8 @@ export const authChat = async ({
systemKey,
content,
userId,
model
model,
showModelDetail
};
};

13
src/service/utils/openai.ts
View File

@@ -7,6 +7,7 @@ import { User } from '../models/user';
import { formatPrice } from '@/utils/user';
import { embeddingModel } from '@/constants/model';
import { pushGenerateVectorBill } from '../events/pushBill';
import { SYSTEM_PROMPT_PREFIX } from '@/constants/chat';
/* 获取用户 api 的 openai 信息 */
export const getUserApiOpenai = async (userId: string) => {
@@ -110,11 +111,13 @@ export const openaiCreateEmbedding = async ({
export const gpt35StreamResponse = ({
res,
stream,
chatResponse
chatResponse,
systemPrompt = ''
}: {
res: NextApiResponse;
stream: PassThrough;
chatResponse: any;
systemPrompt?: string;
}) =>
new Promise<{ responseContent: string }>(async (resolve, reject) => {
try {
@@ -144,8 +147,8 @@ export const gpt35StreamResponse = ({
}
};
const decoder = new TextDecoder();
try {
const decoder = new TextDecoder();
const parser = createParser(onParse);
for await (const chunk of chatResponse.data as any) {
if (stream.destroyed) {
@@ -157,6 +160,12 @@ export const gpt35StreamResponse = ({
} catch (error) {
console.log('pipe error', error);
}
// push system prompt
!stream.destroyed &&
systemPrompt &&
stream.push(`${SYSTEM_PROMPT_PREFIX}${systemPrompt.replace(/\n/g, '<br/>')}`);
// close stream
!stream.destroyed && stream.push(null);
stream.destroy();

1
src/types/chat.d.ts vendored
View File

@@ -1,6 +1,7 @@
export type ChatItemSimpleType = {
obj: 'Human' | 'AI' | 'SYSTEM';
value: string;
systemPrompt?: string;
};
export type ChatItemType = {
_id: string;