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

Better Ollama API and OpenAI API error messages handling

Browse source
This commit is contained in:
mic 2024-10-14 23:57:43 +02:00
parent eb709fa380
commit bf0e161401
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
options/mzta-options.js
View file

@ -247,10 +247,16 @@ document.addEventListener('DOMContentLoaded', async () => {
let openai = new OpenAI(document.getElementById("chatgpt_api_key").value, '', true); let openai = new OpenAI(document.getElementById("chatgpt_api_key").value, '', true);
openai.fetchModels().then((data) => { openai.fetchModels().then((data) => {
if(!data.ok){ if(!data.ok){
let errorDetail = JSON.parse(data.error); let errorDetail;
try {
errorDetail = JSON.parse(data.error);
errorDetail = errorDetail.error.message;
} catch (e) {
errorDetail = data.error;
}
document.getElementById('chatgpt_model_fetch_loading').style.display = 'none'; document.getElementById('chatgpt_model_fetch_loading').style.display = 'none';
console.error("[ThunderAI] " + browser.i18n.getMessage("ChatGPT_Models_Error_fetching")); console.error("[ThunderAI] " + browser.i18n.getMessage("ChatGPT_Models_Error_fetching"));
alert(browser.i18n.getMessage("ChatGPT_Models_Error_fetching")+": " + errorDetail.error.message); alert(browser.i18n.getMessage("ChatGPT_Models_Error_fetching")+": " + errorDetail);
return; return;
} }
taLog.log("ChatGPT models: " + JSON.stringify(data)); taLog.log("ChatGPT models: " + JSON.stringify(data));
@ -288,10 +294,16 @@ select_ollama_model.addEventListener("change", warn_Ollama_HostEmpty);
return; return;
} }
if(!data.ok){ if(!data.ok){
let errorDetail = JSON.parse(data.error); let errorDetail;
try {
errorDetail = JSON.parse(data.error);
errorDetail = errorDetail.error.message;
} catch (e) {
errorDetail = data.error;
}
document.getElementById('ollama_model_fetch_loading').style.display = 'none'; document.getElementById('ollama_model_fetch_loading').style.display = 'none';
console.error("[ThunderAI] " + browser.i18n.getMessage("Ollama_Models_Error_fetching")); console.error("[ThunderAI] " + browser.i18n.getMessage("Ollama_Models_Error_fetching"));
alert(browser.i18n.getMessage("Ollama_Models_Error_fetching")+": " + errorDetail.error.message); alert(browser.i18n.getMessage("Ollama_Models_Error_fetching")+": " + errorDetail);
return; return;
} }
if(data.response.models.length == 0){ if(data.response.models.length == 0){