Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
赵月辉
/
fastgpt-migrated
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Unverified
Commit
176c5a4d
authored
May 30, 2023
by
archer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: prompts filter
parent
0cde9a10
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
5 deletions
+10
-5
src/pages/api/chat/chat.ts
+4
-2
src/pages/api/chat/shareChat/chat.ts
+4
-2
src/pages/api/openapi/chat/chat.ts
+1
-1
src/service/utils/chat/openai.ts
+1
-0
No files found.
src/pages/api/chat/chat.ts
View file @
176c5a4d
...
@@ -129,7 +129,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
...
@@ -129,7 +129,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
);
);
// 发出 chat 请求
// 发出 chat 请求
const
{
streamResponse
}
=
await
modelServiceToolMap
[
model
.
chat
.
chatModel
].
chatCompletion
({
const
{
streamResponse
,
responseMessages
}
=
await
modelServiceToolMap
[
model
.
chat
.
chatModel
].
chatCompletion
({
apiKey
:
userOpenAiKey
||
systemAuthKey
,
apiKey
:
userOpenAiKey
||
systemAuthKey
,
temperature
:
+
temperature
,
temperature
:
+
temperature
,
messages
:
prompts
,
messages
:
prompts
,
...
@@ -147,7 +149,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
...
@@ -147,7 +149,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
model
:
model
.
chat
.
chatModel
,
model
:
model
.
chat
.
chatModel
,
res
,
res
,
chatResponse
:
streamResponse
,
chatResponse
:
streamResponse
,
prompts
prompts
:
responseMessages
});
});
// save chat
// save chat
...
...
src/pages/api/chat/shareChat/chat.ts
View file @
176c5a4d
...
@@ -88,7 +88,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
...
@@ -88,7 +88,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
);
);
// 发出请求
// 发出请求
const
{
streamResponse
}
=
await
modelServiceToolMap
[
model
.
chat
.
chatModel
].
chatCompletion
({
const
{
streamResponse
,
responseMessages
}
=
await
modelServiceToolMap
[
model
.
chat
.
chatModel
].
chatCompletion
({
apiKey
:
userOpenAiKey
||
systemAuthKey
,
apiKey
:
userOpenAiKey
||
systemAuthKey
,
temperature
:
+
temperature
,
temperature
:
+
temperature
,
messages
:
prompts
,
messages
:
prompts
,
...
@@ -106,7 +108,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
...
@@ -106,7 +108,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
model
:
model
.
chat
.
chatModel
,
model
:
model
.
chat
.
chatModel
,
res
,
res
,
chatResponse
:
streamResponse
,
chatResponse
:
streamResponse
,
prompts
prompts
:
responseMessages
});
});
res
.
end
();
res
.
end
();
...
...
src/pages/api/openapi/chat/chat.ts
View file @
176c5a4d
...
@@ -140,7 +140,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
...
@@ -140,7 +140,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
model
:
model
.
chat
.
chatModel
,
model
:
model
.
chat
.
chatModel
,
res
,
res
,
chatResponse
:
streamResponse
,
chatResponse
:
streamResponse
,
prompts
prompts
:
responseMessages
});
});
res
.
end
();
res
.
end
();
return
{
return
{
...
...
src/service/utils/chat/openai.ts
View file @
176c5a4d
...
@@ -104,6 +104,7 @@ export const openAiStreamResponse = async ({
...
@@ -104,6 +104,7 @@ export const openAiStreamResponse = async ({
obj
:
ChatRoleEnum
.
AI
,
obj
:
ChatRoleEnum
.
AI
,
value
:
responseContent
value
:
responseContent
});
});
const
totalTokens
=
modelToolMap
[
model
].
countTokens
({
const
totalTokens
=
modelToolMap
[
model
].
countTokens
({
messages
:
finishMessages
messages
:
finishMessages
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment