MurasameNoa/chatgpt-plugin
1
0
Fork 0
mirror of https://github.com/ikechan8370/chatgpt-plugin.git synced 2025-12-17 05:47:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 遗漏提交

Browse source
This commit is contained in:
ikechan8370 2025-01-30 11:43:07 +08:00
parent 4b9dd0395d
commit 6442e371ee
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
utils/openai/chatgpt-api.ts
View file

@ -182,6 +182,7 @@ export class ChatGPTAPI {
conversationId, conversationId,
parentMessageId: messageId, parentMessageId: messageId,
text: '', text: '',
thinking_text: '',
functionCall: undefined, functionCall: undefined,
toolCalls: undefined, toolCalls: undefined,
conversation: [] conversation: []
@ -261,6 +262,7 @@ export class ChatGPTAPI {
} else { } else {
result.delta = delta.content result.delta = delta.content
if (delta?.content) result.text += delta.content if (delta?.content) result.text += delta.content
if (delta?.reasoning_content) result.thinking_text += delta.reasoning_content
} }
if (delta.role) { if (delta.role) {
result.role = delta.role result.role = delta.role
@ -290,14 +292,14 @@ export class ChatGPTAPI {
const msg = `OpenAI error ${ const msg = `OpenAI error ${
res.status || res.statusText res.status || res.statusText
}: ${reason}` }: ${reason}`
const error = new types.ChatGPTError(msg, { cause: res }) const error = new types.ChatGPTError(msg)
error.statusCode = res.status error.statusCode = res.status
error.statusText = res.statusText error.statusText = res.statusText
return reject(error) return reject(error)
} }
const response: types.openai.CreateChatCompletionResponse = const response: types.openai.CreateChatCompletionResponse =
await res.json() (await res.json()) as types.openai.CreateChatCompletionResponse
if (this._debug) { if (this._debug) {
console.log(response) console.log(response)
} }
@ -314,6 +316,8 @@ export class ChatGPTAPI {
result.functionCall = message.function_call result.functionCall = message.function_call
} else if (message.tool_calls) { } else if (message.tool_calls) {
result.functionCall = message.tool_calls.map(tool => tool.function)[0] result.functionCall = message.tool_calls.map(tool => tool.function)[0]
} else if (message.reasoning_content) {
result.thinking_text = message.reasoning_content
} }
if (message.role) { if (message.role) {
result.role = message.role result.role = message.role
@ -379,18 +383,22 @@ export class ChatGPTAPI {
} }
} }
// @ts-ignore
get apiKey(): string { get apiKey(): string {
return this._apiKey return this._apiKey
} }
// @ts-ignore
set apiKey(apiKey: string) { set apiKey(apiKey: string) {
this._apiKey = apiKey this._apiKey = apiKey
} }
// @ts-ignore
get apiOrg(): string { get apiOrg(): string {
return this._apiOrg return this._apiOrg
} }
// @ts-ignore
set apiOrg(apiOrg: string) { set apiOrg(apiOrg: string) {
this._apiOrg = apiOrg this._apiOrg = apiOrg
} }
@ -525,7 +533,7 @@ export class ChatGPTAPI {
content: parentMessage.text, content: parentMessage.text,
name: parentMessage.name, name: parentMessage.name,
function_call: parentMessage.functionCall ? parentMessage.functionCall : undefined, function_call: parentMessage.functionCall ? parentMessage.functionCall : undefined,
tools: parentMessage.toolCalls ? parentMessage.toolCalls : undefined // tool_calls: parentMessage.toolCalls ? parentMessage.toolCalls : undefined
}, },
...nextMessages.slice(systemMessageOffset) ...nextMessages.slice(systemMessageOffset)
]) ])