jason/ThunderAI
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

openai_api - improved error messages in case of connection errors.

Browse source
This commit is contained in:
mic 2024-08-20 14:43:22 +02:00
parent b0fdaf7037
commit 470d326826
2 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
api_webchat/model-worker.js
View file

@ -89,10 +89,16 @@ self.onmessage = async function(event) {
postMessage({ type: 'messageSent' }); postMessage({ type: 'messageSent' });
if (!response.ok) { if (!response.ok) {
const errorJSON = await response.json(); let error_message = '';
const errorDetail = JSON.stringify(errorJSON); if(response.is_exception === true){
//console.log(">>>>>>>>>>>>> errorJSON.error.message: " + JSON.stringify(errorJSON.error.message)); error_message = response.error;
postMessage({ type: 'error', payload: errorJSON.error.message }); }else{
const errorJSON = await response.json();
const errorDetail = JSON.stringify(errorJSON);
error_message = errorJSON.error.message;
//console.log(">>>>>>>>>>>>> errorJSON.error.message: " + JSON.stringify(errorJSON.error.message));
}
postMessage({ type: 'error', payload: error_message });
throw new Error("[ThunderAI] OpenAI API request failed: " + response.status + " " + response.statusText + ", Detail: " + errorDetail); throw new Error("[ThunderAI] OpenAI API request failed: " + response.status + " " + response.statusText + ", Detail: " + errorDetail);
} }

38
js/api/openai.js
View file

@ -60,21 +60,29 @@ export class OpenAI {
} }
fetchResponse = async (messages, maxTokens = 0) => { fetchResponse = async (messages, maxTokens = 0) => {
const response = await fetch("https://api.openai.com/v1/chat/completions", { try {
method: "POST", const response = await fetch("https://api.openai.com/v1/chat/completions", {
headers: { method: "POST",
"Content-Type": "application/json", headers: {
Authorization: "Bearer "+ this.apiKey "Content-Type": "application/json",
}, Authorization: "Bearer "+ this.apiKey
body: JSON.stringify({ },
model: this.model, body: JSON.stringify({
messages: messages, model: this.model,
stream: this.stream, messages: messages,
...(maxTokens > 0 ? { 'max_tokens': parseInt(maxTokens) } : {}) stream: this.stream,
}), ...(maxTokens > 0 ? { 'max_tokens': parseInt(maxTokens) } : {})
}); }),
});
return response; return response;
}catch (error) {
console.error("[ThunderAI] OpenAI API request failed: " + error);
let output = {};
output.is_exception = true;
output.ok = false;
output.error = "OpenAI API request failed: " + error;
return output;
}
} }
async countTokensUsingAPI(model, text) { async countTokensUsingAPI(model, text) {