From 5306ac1b1418ba64a9ebc06fd7ebfdf5cb36969c Mon Sep 17 00:00:00 2001 From: Clivia <132346501+Yanyutin753@users.noreply.github.com> Date: Mon, 11 Mar 2024 14:51:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9coze=E5=BC=80=E5=A4=B4?= =?UTF-8?q?=E7=9A=84=E6=A8=A1=E5=9E=8B=EF=BC=8C=E4=BD=BF=E7=94=A8url?= =?UTF-8?q?=E4=BC=A0image=5Furl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/client/platforms/openai.ts | 66 +++++++++++++++------------------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/app/client/platforms/openai.ts b/app/client/platforms/openai.ts index a43bab9..df3e8fa 100644 --- a/app/client/platforms/openai.ts +++ b/app/client/platforms/openai.ts @@ -99,9 +99,13 @@ export class ChatGPTApi implements LLMApi { role: v.role, content: [], }; + message.content.push({ + type: "text", + text: v.content, + }); if (v.image_url) { let image_url_data = ""; - if (options.config.updateTypes && !options.config.model.includes("moomshot")) { + if (options.config.updateTypes && options.config.model.includes("coze")) { var base64Data = await getImageBase64Data(v.image_url); let mimeType: string | null; try { @@ -132,41 +136,14 @@ export class ChatGPTApi implements LLMApi { var url = window.location.protocol + "//" + window.location.hostname + port; image_url_data = encodeURI(`${url}${v.image_url}`) } - if (options.config.model.includes("moonshot")) { - messages.push({ - role: v.role, - content: `${image_url_data} ${v.content}`, - }); - } - else { - message.content.push({ - type: "text", - text: v.content, - }); - message.content.push({ - type: "image_url", - image_url: { - url: `${image_url_data}`, - }, - }); - messages.push(message); - } - } - else { - if (options.config.model.includes("moonshot")) { - messages.push({ - role: v.role, - content: v.content, - }); - } - else { - message.content.push({ - type: "text", - text: v.content, - }); - messages.push(message); - } + message.content.push({ + type: "image_url", + image_url: { + url: `${image_url_data}`, + }, + }); } + messages.push(message); } } else { options.messages.map((v) => @@ -199,8 +176,16 @@ export class ChatGPTApi implements LLMApi { // max_tokens: Math.max(modelConfig.max_tokens, 1024), // Please do not ask me why not send max_tokens, no reason, this param is just shit, I dont want to explain anymore. }; - - console.log("[Request] openai payload: ", requestPayload); + // 用于隐藏传参变量 + const moonshotPayload = { + messages, + stream: options.config.stream, + model: modelConfig.model, + use_search: + modelConfig.model.includes("vision") + ? false + : true, + } const shouldStream = !!options.config.stream; const controller = new AbortController(); @@ -214,6 +199,13 @@ export class ChatGPTApi implements LLMApi { signal: controller.signal, headers: getHeaders(), }; + if (modelConfig.model.includes("moonshot")) { + console.log("[Request] moonshot payload: ", moonshotPayload); + chatPayload.body = JSON.stringify(moonshotPayload) + } + else { + console.log("[Request] openai payload: ", requestPayload); + } // make a fetch request const requestTimeoutId = setTimeout(