From 946cadc51d0a966b6ecc757d40f086e4cbdfebd5 Mon Sep 17 00:00:00 2001 From: josc146 Date: Mon, 13 Nov 2023 00:03:12 +0800 Subject: [PATCH] update for chatgpt3.5 web (#562, #551#issuecomment-1803668105, #543#issuecomment-1803666487) --- src/services/apis/chatgpt-web.mjs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/services/apis/chatgpt-web.mjs b/src/services/apis/chatgpt-web.mjs index 159cb18..0277de4 100644 --- a/src/services/apis/chatgpt-web.mjs +++ b/src/services/apis/chatgpt-web.mjs @@ -84,7 +84,8 @@ export async function generateAnswersWithChatgptWebApi(port, question, session, }) .join('; ') - if (!config.chatgptArkoseReqUrl) + const needArkoseToken = !usedModel.includes(Models[chatgptWebModelKeys[0]].value) + if (needArkoseToken && !config.chatgptArkoseReqUrl) throw new Error( t('Please login at https://chat.openai.com first') + '\n\n' + @@ -92,20 +93,19 @@ export async function generateAnswersWithChatgptWebApi(port, question, session, "Please keep https://chat.openai.com open and try again. If it still doesn't work, type some characters in the input box of chatgpt web page and try again.", ), ) - const arkoseToken = await fetch( - config.chatgptArkoseReqUrl + '?' + config.chatgptArkoseReqParams, - { - method: 'POST', - body: config.chatgptArkoseReqForm, - headers: { - 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', - }, - }, - ) - .then((resp) => resp.json()) - .then((resp) => resp.token) - .catch(() => null) - if (!arkoseToken) + const arkoseToken = config.chatgptArkoseReqUrl + ? await fetch(config.chatgptArkoseReqUrl + '?' + config.chatgptArkoseReqParams, { + method: 'POST', + body: config.chatgptArkoseReqForm, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', + }, + }) + .then((resp) => resp.json()) + .then((resp) => resp.token) + .catch(() => null) + : null + if (needArkoseToken && !arkoseToken) throw new Error( t('Failed to get arkose token.') + '\n\n' +