From 171b071c432ae0b0d3835b39a547d829c1e0e85f Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 23:50:57 +0200
Subject: [PATCH 01/12] version set to 2.2.2

---
 CHANGELOG.md                    | 4 ++++
 manifest.json                   | 2 +-
 options/mzta-release-notes.html | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86836e60..df83036a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@
 
 
 
+<h2>Version 2.2.2 - ??/??/2024</h2>
+      <ul>
+        <li>...</li>
+      </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
       <ul>
         <li><i>[ChatGPT Web]</i> Added a workaround to login in ChatGPT. See the new button in the options page.</li>
diff --git a/manifest.json b/manifest.json
index 40f4334e..9f77945a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ThunderAI",
     "description": "__MSG_extensionDescription__",
-    "version": "2.2.1",
+    "version": "2.2.2",
     "author": "Mic (m@micz.it)",
     "homepage_url": "https://micz.it/thunderbird-addon-thunderai/",
     "browser_specific_settings": {
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 5050bec5..f436480e 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -7,6 +7,10 @@
   <body>
     <div id="miczBackPrefs"><a href="mzta-options.html">__MSG_backToOptionsText__</a></div>
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
+      <h2>Version 2.2.2 - ??/??/2024</h2>
+      <ul>
+        <li>...</li>
+      </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>
       <ul>
         <li><i>[ChatGPT Web]</i> Added a workaround to login in ChatGPT. See the new button in the options page.</li>

From eb709fa380e5f05df34dd53b041dc413bbe7031c Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 23:54:04 +0200
Subject: [PATCH 02/12] Better OpenAI Comp API error messages handling

---
 options/mzta-options.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/options/mzta-options.js b/options/mzta-options.js
index dcdc7d9b..060a0702 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -333,10 +333,16 @@ select_openai_comp_model.addEventListener("change", warn_OpenAIComp_HostEmpty);
     let openai_comp = new OpenAIComp(document.getElementById("openai_comp_host").value , null, document.getElementById("openai_comp_api_key").value, true);
     openai_comp.fetchModels().then((data) => {
       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('openai_comp_model_fetch_loading').style.display = 'none';
         console.error("[ThunderAI] " + browser.i18n.getMessage("OpenAIComp_Models_Error_fetching"));
-        alert(browser.i18n.getMessage("OpenAIComp_Models_Error_fetching")+": " + errorDetail.error.message);
+        alert(browser.i18n.getMessage("OpenAIComp_Models_Error_fetching")+": " + errorDetail);
         return;
       }
       taLog.log("OpenAIComp models: " + JSON.stringify(data));

From bf0e161401e12e46ab87e7d7dd932fe24e97d0af Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 23:57:43 +0200
Subject: [PATCH 03/12] Better Ollama API and OpenAI API error messages
 handling

---
 options/mzta-options.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/options/mzta-options.js b/options/mzta-options.js
index 060a0702..e4ff6a9d 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -247,10 +247,16 @@ document.addEventListener('DOMContentLoaded', async () => {
     let openai = new OpenAI(document.getElementById("chatgpt_api_key").value, '', true);
     openai.fetchModels().then((data) => {
       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';
         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;
       }
       taLog.log("ChatGPT models: " + JSON.stringify(data));
@@ -288,10 +294,16 @@ select_ollama_model.addEventListener("change", warn_Ollama_HostEmpty);
         return;
       }
       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';
         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;
       }
       if(data.response.models.length == 0){

From fbfdb0f51528337714a41b552c108f4d0f2a6c37 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Mon, 14 Oct 2024 23:59:18 +0200
Subject: [PATCH 04/12] release notes updated

---
 CHANGELOG.md                    | 1 +
 options/mzta-release-notes.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df83036a..123c8d64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 <h2>Version 2.2.2 - ??/??/2024</h2>
       <ul>
+        <li>All APIs error messages handling improved.</li>
         <li>...</li>
       </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index f436480e..2e24fe48 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -9,6 +9,7 @@
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
       <h2>Version 2.2.2 - ??/??/2024</h2>
       <ul>
+        <li>All APIs error messages handling improved.</li>
         <li>...</li>
       </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>

From 0df2d61d83fda8c1dc5963387ac99a0c0d67ac57 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 17:04:29 +0200
Subject: [PATCH 05/12] release notes updated

---
 CHANGELOG.md                    | 2 +-
 options/mzta-release-notes.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 123c8d64..036e4c93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 
 <h2>Version 2.2.2 - ??/??/2024</h2>
       <ul>
-        <li>All APIs error messages handling improved.</li>
+        <li>All APIs error handling improved.</li>
         <li>...</li>
       </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index 2e24fe48..ebc7772d 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -9,7 +9,7 @@
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
       <h2>Version 2.2.2 - ??/??/2024</h2>
       <ul>
-        <li>All APIs error messages handling improved.</li>
+        <li>All APIs error handling improved.</li>
         <li>...</li>
       </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>

From 9fe528d6c82a3431e23939f3dbfcc6a2f488a82d Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 17:06:30 +0200
Subject: [PATCH 06/12] openai_comp_use_v1 pref added

---
 api_webchat/controller.js               |  4 ++--
 api_webchat/model-worker-openai_comp.js |  4 +++-
 js/api/openai_comp.js                   |  8 +++++---
 options/mzta-options-default.js         |  1 +
 options/mzta-options.html               | 11 +++++++++++
 options/mzta-options.js                 |  2 +-
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/api_webchat/controller.js b/api_webchat/controller.js
index 6555c78b..72bf7ac4 100644
--- a/api_webchat/controller.js
+++ b/api_webchat/controller.js
@@ -80,13 +80,13 @@ switch (llm) {
         break;
     }
     case "openai_comp_api": {
-        let prefs_api = await browser.storage.sync.get({openai_comp_host: '', openai_comp_model: '', openai_comp_api_key: '', openai_comp_chat_name: '', do_debug: false});
+        let prefs_api = await browser.storage.sync.get({openai_comp_host: '', openai_comp_model: '', openai_comp_api_key: '', openai_comp_use_v1: true, openai_comp_chat_name: '', do_debug: false});
         let i18nStrings = {};
         i18nStrings["OpenAIComp_api_request_failed"] = browser.i18n.getMessage('OpenAIComp_api_request_failed');
         i18nStrings["error_connection_interrupted"] = browser.i18n.getMessage('error_connection_interrupted');
         messageInput.setModel(prefs_api.openai_comp_model);
         messagesArea.setLLMName(prefs_api.openai_comp_chat_name);
-        worker.postMessage({ type: 'init', openai_comp_host: prefs_api.openai_comp_host, openai_comp_model: prefs_api.openai_comp_model, openai_comp_api_key: prefs_api.openai_comp_api_key, do_debug: prefs_api.do_debug, i18nStrings: i18nStrings});
+        worker.postMessage({ type: 'init', openai_comp_host: prefs_api.openai_comp_host, openai_comp_model: prefs_api.openai_comp_model, openai_comp_api_key: prefs_api.openai_comp_api_key, openai_comp_use_v1: prefs_api.openai_comp_use_v1, do_debug: prefs_api.do_debug, i18nStrings: i18nStrings});
         messagesArea.appendUserMessage(browser.i18n.getMessage("OpenAIComp_api_connecting") + " \"" + prefs_api.openai_comp_host + "\" " +browser.i18n.getMessage("AndModel") + " \"" + prefs_api.openai_comp_model + "\"...", "info");
         browser.runtime.sendMessage({command: "openai_comp_api_ready_" + call_id, window_id: (await browser.windows.getCurrent()).id});
         break;
diff --git a/api_webchat/model-worker-openai_comp.js b/api_webchat/model-worker-openai_comp.js
index 5af68da8..20b1bf10 100644
--- a/api_webchat/model-worker-openai_comp.js
+++ b/api_webchat/model-worker-openai_comp.js
@@ -26,6 +26,7 @@ import { taLogger } from '../js/mzta-logger.js';
 let openai_comp_host = null;
 let openai_comp_model = '';
 let openai_comp_api_key = '';
+let openai_comp_use_v1 = true;
 let openai_comp = null;
 let stopStreaming = false;
 let i18nStrings = null;
@@ -40,7 +41,8 @@ self.onmessage = async function(event) {
         openai_comp_host = event.data.openai_comp_host;
         openai_comp_model = event.data.openai_comp_model;
         openai_comp_api_key = event.data.openai_comp_api_key;
-        openai_comp = new OpenAIComp(openai_comp_host, openai_comp_model, openai_comp_api_key, true);
+        openai_comp_use_v1 = event.data.openai_comp_use_v1;
+        openai_comp = new OpenAIComp(openai_comp_host, openai_comp_model, openai_comp_api_key, true, openai_comp_use_v1);
         do_debug = event.data.do_debug;
         i18nStrings = event.data.i18nStrings;
         taLog = new taLogger('model-worker-openai_comp', do_debug);
diff --git a/js/api/openai_comp.js b/js/api/openai_comp.js
index 0b5fefe2..fe80caaa 100644
--- a/js/api/openai_comp.js
+++ b/js/api/openai_comp.js
@@ -24,13 +24,15 @@ export class OpenAIComp {
   host = '';
   model = '';
   apiKey = '';
+  use_v1 = true;
   stream = false;
 
-  constructor(host, model, apiKey = '', stream = false) {
+  constructor(host, model, apiKey = '', stream = false, use_v1 = true) {
     this.host = host.trim().replace(/\/+$/, "");
     this.model = model;
     this.stream = stream;
     this.apiKey = apiKey;
+    this.use_v1 = use_v1;
   }
 
 
@@ -40,7 +42,7 @@ export class OpenAIComp {
     };
     if(this.apiKey !== '') curr_headers["Authorization"] = "Bearer "+ this.apiKey;
 
-    const response = await fetch(this.host + "/v1/models", {
+    const response = await fetch(this.host + (this.use_v1 ? "/v1" : "") + "/models", {
         method: "GET",
         headers: curr_headers,
     });
@@ -70,7 +72,7 @@ export class OpenAIComp {
     if(this.apiKey !== '') curr_headers["Authorization"] = "Bearer "+ this.apiKey;
 
     try {
-      const response = await fetch(this.host + "/v1/chat/completions", {
+      const response = await fetch(this.host + (this.use_v1 ? "/v1" : "") + "/chat/completions", {
           method: "POST",
           headers: curr_headers,
           body: JSON.stringify({ 
diff --git a/options/mzta-options-default.js b/options/mzta-options-default.js
index 1f055670..014eae76 100644
--- a/options/mzta-options-default.js
+++ b/options/mzta-options-default.js
@@ -29,6 +29,7 @@ export const prefs_default = {
     openai_comp_host: '',   // For OpenAI Compatible API as LM-Studio
     openai_comp_model: '',
     openai_comp_api_key: '',
+    openai_comp_use_v1: true,
     openai_comp_chat_name: 'OpenAI Comp',
     dynamic_menu_force_enter: false,
     dynamic_menu_order_alphabet: true,
diff --git a/options/mzta-options.html b/options/mzta-options.html
index 050d87b5..73d0c328 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -170,6 +170,17 @@
           </label>
         </td>
       </tr>
+      <tr class="conntype_openai_comp_api">
+        <td><label>
+          <span>__MSG_prefs_OptionText_openai_comp_use_v1__</span>
+        </label></td>
+        <td>
+          <label>
+            <input type="checkbox" id="openai_comp_use_v1" name="openai_comp_use_v1" class="option-input" />
+            &nbsp;<span>__MSG_prefs_OptionText_openai_comp_use_v1_info__</span>
+          </label>
+        </td>
+      </tr>
       <tr class="conntype_openai_comp_api">
         <td><label>
           <span>__MSG_prefs_OpenAIComp_API_Key__</span>
diff --git a/options/mzta-options.js b/options/mzta-options.js
index e4ff6a9d..c4024e2f 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -342,7 +342,7 @@ select_openai_comp_model.addEventListener("change", warn_OpenAIComp_HostEmpty);
 
   document.getElementById('btnUpdateOpenAICompModels').addEventListener('click', async () => {
     document.getElementById('openai_comp_model_fetch_loading').style.display = 'inline';
-    let openai_comp = new OpenAIComp(document.getElementById("openai_comp_host").value , null, document.getElementById("openai_comp_api_key").value, true);
+    let openai_comp = new OpenAIComp(document.getElementById("openai_comp_host").value , null, document.getElementById("openai_comp_api_key").value, true, document.getElementById("openai_comp_use_v1").checked);
     openai_comp.fetchModels().then((data) => {
       if(!data.ok){
         let errorDetail;

From 80eecda5509f2382f0f327434aa0306c5844d8f5 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 17:08:33 +0200
Subject: [PATCH 07/12] error handling improved in all APIs

---
 api_webchat/model-worker-ollama.js      | 16 ++++---
 api_webchat/model-worker-openai.js      | 16 ++++---
 api_webchat/model-worker-openai_comp.js | 16 ++++---
 js/api/ollama.js                        | 55 ++++++++++++++-----------
 js/api/openai.js                        | 53 ++++++++++++++----------
 js/api/openai_comp.js                   | 41 +++++++++++-------
 6 files changed, 118 insertions(+), 79 deletions(-)

diff --git a/api_webchat/model-worker-ollama.js b/api_webchat/model-worker-ollama.js
index 9b4485ed..98354fae 100644
--- a/api_webchat/model-worker-ollama.js
+++ b/api_webchat/model-worker-ollama.js
@@ -57,13 +57,17 @@ self.onmessage = async function(event) {
                 if(response.is_exception === true){
                     error_message = response.error;
                 }else{
-                    const errorJSON = await response.json();
-                    errorDetail = JSON.stringify(errorJSON);
-                    error_message = errorJSON.error;
-                    taLog.log("errorJSON.error.message: " + JSON.stringify(errorJSON.error.message));
+                    try{
+                        const errorJSON = await response.json();
+                        errorDetail = JSON.stringify(errorJSON);
+                        error_message = errorJSON.error.message;
+                    }catch(e){
+                        error_message = response.statusText;
+                    }
+                    taLog.log("error_message: " + JSON.stringify(error_message));
                 }
-                postMessage({ type: 'error', payload: i18nStrings["ollama_api_request_failed"] + ": " + error_message });
-                throw new Error("[ThunderAI] Ollama API request failed: " + response.status + " " + response.statusText + ", Detail: " + errorDetail);
+                postMessage({ type: 'error', payload: i18nStrings["ollama_api_request_failed"] + ": " + response.status + " " + response.statusText + ", Detail: " + error_message + " " + errorDetail });
+                throw new Error("[ThunderAI] Ollama API request failed: " + response.status + " " + response.statusText + ", Detail: " + error_message + " " + errorDetail);
             }
 
             const reader = response.body.getReader();
diff --git a/api_webchat/model-worker-openai.js b/api_webchat/model-worker-openai.js
index c23c0436..173a3499 100644
--- a/api_webchat/model-worker-openai.js
+++ b/api_webchat/model-worker-openai.js
@@ -52,13 +52,17 @@ self.onmessage = async function(event) {
             if(response.is_exception === true){
                 error_message = response.error;
             }else{
-                const errorJSON = await response.json();
-                errorDetail = JSON.stringify(errorJSON);
-                error_message = errorJSON.error.message;
-                taLog.error("errorJSON.error.message: " + JSON.stringify(errorJSON.error.message));
+                try{
+                    const errorJSON = await response.json();
+                    errorDetail = JSON.stringify(errorJSON);
+                    error_message = errorJSON.error.message;
+                }catch(e){
+                    error_message = response.statusText;
+                }
+                taLog.log("error_message: " + JSON.stringify(error_message));
             }
-            postMessage({ type: 'error', payload: error_message });
-            throw new Error("[ThunderAI] OpenAI API request failed: " + response.status + " " + response.statusText + ", Detail: " + errorDetail);
+            postMessage({ type: 'error', payload: i18nStrings["chatgpt_api_request_failed"] + ": " + response.status + " " + response.statusText + ", Detail: " + error_message + " " + errorDetail });
+            throw new Error("[ThunderAI] OpenAI ChatGPT API request failed: " + response.status + " " + response.statusText + ", Detail: " + error_message + " " + errorDetail);
         }
 
         const reader = response.body.getReader();
diff --git a/api_webchat/model-worker-openai_comp.js b/api_webchat/model-worker-openai_comp.js
index 20b1bf10..b63de5d7 100644
--- a/api_webchat/model-worker-openai_comp.js
+++ b/api_webchat/model-worker-openai_comp.js
@@ -58,13 +58,17 @@ self.onmessage = async function(event) {
             if(response.is_exception === true){
                 error_message = response.error;
             }else{
-                const errorJSON = await response.json();
-                errorDetail = JSON.stringify(errorJSON);
-                error_message = errorJSON.error.message;
-                taLog.log("errorJSON.error.message: " + JSON.stringify(errorJSON.error.message));
+                try{
+                    const errorJSON = await response.json();
+                    errorDetail = JSON.stringify(errorJSON);
+                    error_message = errorJSON.error.message;
+                }catch(e){
+                    error_message = response.statusText;
+                }
+                taLog.log("error_message: " + JSON.stringify(error_message));
             }
-            postMessage({ type: 'error', payload: i18nStrings["OpenAIComp_api_request_failed"] + ": " + error_message });
-            throw new Error("[ThunderAI] OpenAI Comp API request failed: " + response.status + " " + response.statusText + ", Detail: " + errorDetail);
+            postMessage({ type: 'error', payload: i18nStrings["OpenAIComp_api_request_failed"] + ": " + response.status + " " + response.statusText + ", Detail: " + error_message + " " + errorDetail });
+            throw new Error("[ThunderAI] OpenAI Comp API request failed: " + response.status + " " + response.statusText + ", Detail: " + error_message + " " + errorDetail);
         }
 
         const reader = response.body.getReader();
diff --git a/js/api/ollama.js b/js/api/ollama.js
index 2ad59032..68506afd 100644
--- a/js/api/ollama.js
+++ b/js/api/ollama.js
@@ -29,31 +29,40 @@ export class Ollama {
     }
 
     fetchModels = async () => {
-      const response = await fetch(this.host + "/api/tags", {
-          method: "GET",
-          headers: {
-              "Content-Type": "application/json"
-          },
-      });
+      try{
+        const response = await fetch(this.host + "/api/tags", {
+            method: "GET",
+            headers: {
+                "Content-Type": "application/json"
+            },
+        });
 
-      if (!response.ok) {
-          const errorDetail = await response.text();
-          let err_msg = "[ThunderAI] Ollama API request failed: " + response.status + " " + response.statusText + ", Detail: " + errorDetail;
-          console.error(err_msg);
-          let output = {};
-          output.ok = false;
-          output.error = errorDetail;
-          return output;
+        if (!response.ok) {
+            const errorDetail = await response.text();
+            let err_msg = "[ThunderAI] Ollama API request failed: " + response.status + " " + response.statusText + ", Detail: " + errorDetail;
+            console.error(err_msg);
+            let output = {};
+            output.ok = false;
+            output.error = errorDetail;
+            return output;
+        }
+
+        let output = {};
+        output.ok = true;
+        let output_response = await response.json();
+        output.response = output_response;
+
+        //console.log(">>>>>>>>>> output_response: " + JSON.stringify(output_response));
+
+        return output;
+      }catch (error) {
+        console.error("[ThunderAI] Ollama API request failed: " + error);
+        let output = {};
+        output.is_exception = true;
+        output.ok = false;
+        output.error = "Ollama API request failed: " + error;
+        return output;
       }
-  
-      let output = {};
-      output.ok = true;
-      let output_response = await response.json();
-      output.response = output_response;
-
-      //console.log(">>>>>>>>>> output_response: " + JSON.stringify(output_response));
-  
-      return output;
     }
 
     
diff --git a/js/api/openai.js b/js/api/openai.js
index 9eb21fda..11d4398d 100644
--- a/js/api/openai.js
+++ b/js/api/openai.js
@@ -33,30 +33,39 @@ export class OpenAI {
 
 
   fetchModels = async () => {
-    const response = await fetch("https://api.openai.com/v1/models", {
-        method: "GET",
-        headers: {
-            "Content-Type": "application/json",
-            Authorization: "Bearer "+ this.apiKey
-        },
-    });
+    try{
+      const response = await fetch("https://api.openai.com/v1/models", {
+          method: "GET",
+          headers: {
+              "Content-Type": "application/json",
+              Authorization: "Bearer "+ this.apiKey
+          },
+      });
 
-    if (!response.ok) {
-        const errorDetail = await response.text();
-        let err_msg = "[ThunderAI] OpenAI API request failed: " + response.status + " " + response.statusText + ", Detail: " + errorDetail;
-        console.error(err_msg);
-        let output = {};
-        output.ok = false;
-        output.error = errorDetail;
-        return output;
+      if (!response.ok) {
+          const errorDetail = await response.text();
+          let err_msg = "[ThunderAI] OpenAI API request failed: " + response.status + " " + response.statusText + ", Detail: " + errorDetail;
+          console.error(err_msg);
+          let output = {};
+          output.ok = false;
+          output.error = errorDetail;
+          return output;
+      }
+
+      let output = {};
+      output.ok = true;
+      let output_response = await response.json();
+      output.response = output_response.data.filter(item => item.id.startsWith('gpt-')).sort((a, b) => b.id.localeCompare(a.id));
+
+      return output;
+    }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;
     }
-
-    let output = {};
-    output.ok = true;
-    let output_response = await response.json();
-    output.response = output_response.data.filter(item => item.id.startsWith('gpt-')).sort((a, b) => b.id.localeCompare(a.id));
-
-    return output;
   }
 
   fetchResponse = async (messages, maxTokens = 0) => {
diff --git a/js/api/openai_comp.js b/js/api/openai_comp.js
index fe80caaa..fd901cbc 100644
--- a/js/api/openai_comp.js
+++ b/js/api/openai_comp.js
@@ -66,23 +66,32 @@ export class OpenAIComp {
   }
 
   fetchResponse = async (messages, maxTokens = 0) => {
-    const curr_headers = {
-      "Content-Type": "application/json",
-    };
-    if(this.apiKey !== '') curr_headers["Authorization"] = "Bearer "+ this.apiKey;
+    try{
+      const curr_headers = {
+        "Content-Type": "application/json",
+      };
+      if(this.apiKey !== '') curr_headers["Authorization"] = "Bearer "+ this.apiKey;
 
-    try {
-      const response = await fetch(this.host + (this.use_v1 ? "/v1" : "") + "/chat/completions", {
-          method: "POST",
-          headers: curr_headers,
-          body: JSON.stringify({ 
-              model: this.model, 
-              messages: messages,
-              stream: this.stream,
-              ...(maxTokens > 0 ? { 'max_tokens': parseInt(maxTokens) } : {})
-          }),
-      });
-      return response;
+      try {
+        const response = await fetch(this.host + (this.use_v1 ? "/v1" : "") + "/chat/completions", {
+            method: "POST",
+            headers: curr_headers,
+            body: JSON.stringify({ 
+                model: this.model, 
+                messages: messages,
+                stream: this.stream,
+                ...(maxTokens > 0 ? { 'max_tokens': parseInt(maxTokens) } : {})
+            }),
+        });
+        return response;
+      }catch (error) {
+          console.error("[ThunderAI] OpenAI API Comp request failed: " + error);
+          let output = {};
+          output.is_exception = true;
+          output.ok = false;
+          output.error = "OpenAI API Comp request failed: " + error;
+          return output;
+      }
     }catch (error) {
         console.error("[ThunderAI] OpenAI API Comp request failed: " + error);
         let output = {};

From cbb598c032540e989425814247a014903506015c Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 17:10:25 +0200
Subject: [PATCH 08/12] locales updated

---
 _locales/de/messages.json    | 12 ++++++++++++
 _locales/en/messages.json    | 12 ++++++++++++
 _locales/fr/messages.json    | 12 ++++++++++++
 _locales/it/messages.json    | 14 +++++++++++++-
 _locales/pt-br/messages.json | 12 ++++++++++++
 5 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index ece5c7e0..22b5f053 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -503,6 +503,10 @@
     "message": "Anfrage an die Ollama API fehlgeschlagen.",
     "description": ""
   },
+  "chatgpt_api_request_failed": {
+    "message": "Anfrage an die OpenAI ChatGPT API fehlgeschlagen",
+    "description": ""
+  },
   "WaitingServerReponse": {
     "message": "Warten auf die Serverantwort.",
     "description": ""
@@ -586,5 +590,13 @@
   "OpenChatGPTTab_Info": {
     "message": "Bei Anmeldeproblemen im ThunderAI-Fenster öffnen Sie ChatGPT in einem neuen Tab über die Schaltfläche rechts, melden Sie sich an, schließen Sie dann den Tab und fahren Sie fort, ThunderAI zu verwenden.",
     "description": ""
+  },
+  "prefs_OptionText_openai_comp_use_v1": {
+    "message": "\"v1\"-Kompatibilität beibehalten",
+    "description": ""
+  },
+  "prefs_OptionText_openai_comp_use_v1_info": {
+      "message": "Wenn aktiviert, wird das \"v1\"-Segment im Pfad der API-Aufrufe beibehalten, z.B. \"http://localhost:1234/v1/chat/completions\".",
+      "description": ""
   }
 }
\ No newline at end of file
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 0905b0ac..43b0a745 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -503,6 +503,10 @@
     "message": "Ollama API request failed",
     "description": ""
   },
+  "chatgpt_api_request_failed": {
+    "message": "OpenAI ChatGPT API request failed",
+    "description": ""
+  },
   "WaitingServerReponse": {
     "message": "Waiting for the server response",
     "description": ""
@@ -590,5 +594,13 @@
   "OpenChatGPTTab_Info": {
     "message": "In case of login issues in the ThunderAI window, open ChatGPT in a new tab using the button on the right, log in, then close the tab and continue using ThunderAI.",
     "description": ""
+  },
+  "prefs_OptionText_openai_comp_use_v1" : {
+    "message": "Keep the \"v1\" compatibility",
+    "description": ""
+  },
+  "prefs_OptionText_openai_comp_use_v1_info": {
+    "message": "If checked, the \"v1\" segment in the path of API calls will be kept, like \"http://localhost:1234/v1/chat/completions\".",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index e244852c..2d2dd5d5 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -503,6 +503,10 @@
     "message": "La demande d'API Ollama a échoué",
     "description": ""
   },
+  "chatgpt_api_request_failed": {
+    "message": "La demande d'API OpenAI ChatGPT a échoué",
+    "description": ""
+  },
   "WaitingServerReponse": {
     "message": "En attente de la réponse du serveur",
     "description": ""
@@ -586,5 +590,13 @@
   "OpenChatGPTTab_Info": {
     "message": "En cas de problèmes de connexion dans la fenêtre ThunderAI, ouvrez ChatGPT dans un nouvel onglet à l'aide du bouton à droite, connectez-vous, puis fermez l'onglet et continuez à utiliser ThunderAI.",
     "description": ""
+  },
+  "prefs_OptionText_openai_comp_use_v1": {
+    "message": "Conserver la compatibilité \"v1\"",
+    "description": ""
+  },
+  "prefs_OptionText_openai_comp_use_v1_info": {
+      "message": "Si coché, le segment \"v1\" dans le chemin des appels API sera conservé, comme \"http://localhost:1234/v1/chat/completions\".",
+      "description": ""
   }
 }
\ No newline at end of file
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index e2d4bab6..7c8f24c8 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -539,6 +539,10 @@
     "message": "Richiesta all'API compatibile con OpenAI fallita",
     "description": ""
   },
+  "chatgpt_api_request_failed": {
+    "message": "Richiesta all'API compatibile con OpenAI ChatGPT fallita",
+    "description": ""
+  },
   "prefs_OpenAIComp_ChatName": {
     "message": "Nome della chat",
     "description": ""
@@ -586,5 +590,13 @@
   "OpenChatGPTTab_Info": {
     "message": "In caso di problemi di accesso nella finestra di ThunderAI, apri ChatGPT in un nuovo tab utilizzando il pulsante a destra, accedi, quindi chiudi la scheda e continua a usare ThunderAI.",
     "description": ""
-  }
+  },
+  "prefs_OptionText_openai_comp_use_v1": {
+    "message": "Mantieni la compatibilità con \"v1\"",
+    "description": ""
+  },
+  "prefs_OptionText_openai_comp_use_v1_info": {
+      "message": "Se selezionato, il segmento \"v1\" nel percorso delle chiamate API verrà mantenuto, ad esempio \"http://localhost:1234/v1/chat/completions\".",
+      "description": ""
+}
 }
\ No newline at end of file
diff --git a/_locales/pt-br/messages.json b/_locales/pt-br/messages.json
index 580842f6..b354d5cd 100644
--- a/_locales/pt-br/messages.json
+++ b/_locales/pt-br/messages.json
@@ -503,6 +503,10 @@
     "message": "A solicitação da API do Ollama falhou",
     "description": ""
   },
+  "chatgpt_api_request_failed": {
+    "message": "A solicitação da API do OpenAI ChatGPT falhou",
+    "description": ""
+  },
   "WaitingServerReponse": {
     "message": "Aguardando a resposta do servidor",
     "description": ""
@@ -590,5 +594,13 @@
   "OpenChatGPTTab_Info": {
     "message": "Em caso de problemas de login na janela do ThunderAI, abra o ChatGPT em uma nova aba usando o botão à direita, faça o login, depois feche a aba e continue usando o ThunderAI.",
     "description": ""
+  },
+  "prefs_OptionText_openai_comp_use_v1": {
+    "message": "Manter a compatibilidade com \"v1\"",
+    "description": ""
+  },
+  "prefs_OptionText_openai_comp_use_v1_info": {
+      "message": "Se marcado, o segmento \"v1\" no caminho das chamadas de API será mantido, como em \"http://localhost:1234/v1/chat/completions\".",
+      "description": ""
   }
 }
\ No newline at end of file

From fcb91cc9cb14e6e91365929e086d5df5b7595c75 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 18:07:25 +0200
Subject: [PATCH 09/12] added a warning when an Owl account is found. see #148

---
 _locales/de/messages.json    |  8 ++++++--
 _locales/en/messages.json    |  4 ++++
 _locales/fr/messages.json    |  8 ++++++--
 _locales/it/messages.json    | 10 +++++++---
 _locales/pt-br/messages.json |  8 ++++++--
 options/mzta-options.css     | 20 ++++++++++++++++++++
 options/mzta-options.html    |  3 +++
 options/mzta-options.js      |  8 ++++++++
 8 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/_locales/de/messages.json b/_locales/de/messages.json
index 22b5f053..e9f8aecc 100644
--- a/_locales/de/messages.json
+++ b/_locales/de/messages.json
@@ -596,7 +596,11 @@
     "description": ""
   },
   "prefs_OptionText_openai_comp_use_v1_info": {
-      "message": "Wenn aktiviert, wird das \"v1\"-Segment im Pfad der API-Aufrufe beibehalten, z.B. \"http://localhost:1234/v1/chat/completions\".",
-      "description": ""
+    "message": "Wenn aktiviert, wird das \"v1\"-Segment im Pfad der API-Aufrufe beibehalten, z.B. \"http://localhost:1234/v1/chat/completions\".",
+    "description": ""
+  },
+  "prefs_OptionText_owl_warning": {
+    "message": "Es scheint, dass mindestens eines Ihrer Konten das Add-on Eule für Exchange verwendet. Es gibt ein bekanntes Problem zwischen Thunderbird und Eule, das derzeit behoben wird. Derzeit können Sie ThunderAI beim Verfassen von E-Mails verwenden, jedoch nicht beim Lesen.",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 43b0a745..b05edca8 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -602,5 +602,9 @@
   "prefs_OptionText_openai_comp_use_v1_info": {
     "message": "If checked, the \"v1\" segment in the path of API calls will be kept, like \"http://localhost:1234/v1/chat/completions\".",
     "description": ""
+  },
+  "prefs_OptionText_owl_warning": {
+    "message": "It appears that at least one of your accounts is using the Owl for Exchange add-on. There is a known issue between Thunderbird and Owl, which is currently being addressed. At this time, you can use ThunderAI while composing emails, but not when reading them.",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 2d2dd5d5..f8e369a6 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -596,7 +596,11 @@
     "description": ""
   },
   "prefs_OptionText_openai_comp_use_v1_info": {
-      "message": "Si coché, le segment \"v1\" dans le chemin des appels API sera conservé, comme \"http://localhost:1234/v1/chat/completions\".",
-      "description": ""
+    "message": "Si coché, le segment \"v1\" dans le chemin des appels API sera conservé, comme \"http://localhost:1234/v1/chat/completions\".",
+    "description": ""
+  },
+  "prefs_OptionText_owl_warning": {
+    "message": "Il semble qu'au moins un de vos comptes utilise le module complémentaire Chouette pour Exchange. Il existe un problème connu entre Thunderbird et Chouette, qui est en cours de résolution. Pour le moment, vous pouvez utiliser ThunderAI lors de la rédaction d'e-mails, mais pas lors de leur lecture.",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index 7c8f24c8..786a83f0 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -596,7 +596,11 @@
     "description": ""
   },
   "prefs_OptionText_openai_comp_use_v1_info": {
-      "message": "Se selezionato, il segmento \"v1\" nel percorso delle chiamate API verrà mantenuto, ad esempio \"http://localhost:1234/v1/chat/completions\".",
-      "description": ""
-}
+    "message": "Se selezionato, il segmento \"v1\" nel percorso delle chiamate API verrà mantenuto, ad esempio \"http://localhost:1234/v1/chat/completions\".",
+    "description": ""
+  },
+  "prefs_OptionText_owl_warning": {
+    "message": "Sembra che almeno uno dei tuoi account stia utilizzando il componente aggiuntivo Gufo per Exchange. Esiste un problema noto tra Thunderbird e Gufo, che è attualmente in fase di risoluzione. Al momento, puoi utilizzare ThunderAI durante la composizione delle email, ma non durante la loro lettura.",
+    "description": ""
+  }
 }
\ No newline at end of file
diff --git a/_locales/pt-br/messages.json b/_locales/pt-br/messages.json
index b354d5cd..848f2ece 100644
--- a/_locales/pt-br/messages.json
+++ b/_locales/pt-br/messages.json
@@ -600,7 +600,11 @@
     "description": ""
   },
   "prefs_OptionText_openai_comp_use_v1_info": {
-      "message": "Se marcado, o segmento \"v1\" no caminho das chamadas de API será mantido, como em \"http://localhost:1234/v1/chat/completions\".",
-      "description": ""
+    "message": "Se marcado, o segmento \"v1\" no caminho das chamadas de API será mantido, como em \"http://localhost:1234/v1/chat/completions\".",
+    "description": ""
+  },
+  "prefs_OptionText_owl_warning": {
+    "message": "Parece que pelo menos uma das suas contas está usando o complemento Coruja para Exchange. Existe um problema conhecido entre Thunderbird e Coruja, que está sendo resolvido no momento. Por enquanto, você pode usar o ThunderAI ao redigir e-mails, mas não ao lê-los.",
+    "description": ""
   }
 }
\ No newline at end of file
diff --git a/options/mzta-options.css b/options/mzta-options.css
index d3bc9368..9c0305c1 100644
--- a/options/mzta-options.css
+++ b/options/mzta-options.css
@@ -146,6 +146,26 @@ input.option-input[type="text"]{
     font-style: italic;
 }
 
+#owl_warning{
+    display: none;
+}
+
+#owl_warning div{
+    color: white;
+    font-style: italic;
+    background-color: red;
+    border-radius: 4px;
+    padding: 3px;
+    font-weight: bold;
+    margin-bottom: 5px;
+}
+
+#owl_warning div a{
+    background-color: white;
+    padding:0px 3px;
+    border-radius: 4px;
+}
+
 @media (prefers-color-scheme: dark) {
     body {
         background-color: rgb(35, 34, 43);
diff --git a/options/mzta-options.html b/options/mzta-options.html
index 73d0c328..4a999b94 100644
--- a/options/mzta-options.html
+++ b/options/mzta-options.html
@@ -8,6 +8,9 @@
     <div id="miczRelNotes"><a href="mzta-release-notes.html">__MSG_prefs_OptionText_release_notes__</a></div>
     <div id="miczStatusPage" class="conntype_chatgpt_web"><a href="https://micz.it/thunderbird-addon-thunderai/status/">__MSG_prefs_status_page__</a></div>
     <table id="miczPrefs">
+      <tr id="owl_warning">
+        <td colspan="2"><div>__MSG_prefs_OptionText_owl_warning__ <a href="https://micz.it/thunderbird-addon-thunderai/owl/">__MSG_customPrompts_managePrompts_help__</a></div></td>
+      </tr>
       <tr>
         <td><span>__MSG_prefs_OptionText_chatgpt_win_text__</span></td>
         <td>
diff --git a/options/mzta-options.js b/options/mzta-options.js
index c4024e2f..3c218e3b 100644
--- a/options/mzta-options.js
+++ b/options/mzta-options.js
@@ -205,6 +205,14 @@ function warn_OpenAIComp_HostEmpty() {
 
 document.addEventListener('DOMContentLoaded', async () => {
   await restoreOptions();
+
+  // show Owl warning
+  const accountList = await messenger.accounts.list(false);
+  if(accountList.some(account => account.type.toLowerCase().includes('owl'))) {
+    taLog.log('OWL detected, displaying the warning.');
+    document.getElementById('owl_warning').style.display = 'table-row';
+  }
+
   i18n.updateDocument();
   document.querySelectorAll(".option-input").forEach(element => {
     element.addEventListener("change", saveOptions);

From 8f2f55001af081aa5f66f98f4cd04f6bd06b5eae Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 20:58:06 +0200
Subject: [PATCH 10/12] release notes updated

---
 CHANGELOG.md                    | 4 ++--
 options/mzta-release-notes.html | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 036e4c93..a05331d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,8 @@
 
 <h2>Version 2.2.2 - ??/??/2024</h2>
       <ul>
-        <li>All APIs error handling improved.</li>
-        <li>...</li>
+        <li>APIs error handling improved.</li>
+        <li><i>[OpenAI Comp API]</i> Added an option to remove the <i>v1</i> segment in the API calls path [<a href="https://github.com/micz/ThunderAI/issues/161">#161</a>].</li>
       </ul>
 <h2>Version 2.2.1 - 11/10/2024</h2>
       <ul>
diff --git a/options/mzta-release-notes.html b/options/mzta-release-notes.html
index ebc7772d..99652c49 100644
--- a/options/mzta-release-notes.html
+++ b/options/mzta-release-notes.html
@@ -7,10 +7,10 @@
   <body>
     <div id="miczBackPrefs"><a href="mzta-options.html">__MSG_backToOptionsText__</a></div>
     <div id="miczRelNotes"><h1>ThunderAI Release Notes</h1>
-      <h2>Version 2.2.2 - ??/??/2024</h2>
+      <h2>Version 2.2.2 - 15/10/2024</h2>
       <ul>
-        <li>All APIs error handling improved.</li>
-        <li>...</li>
+        <li>APIs error handling improved.</li>
+        <li><i>[OpenAI Comp API]</i> Added an option to remove the <i>v1</i> segment in the API calls path [<a href="https://github.com/micz/ThunderAI/issues/161">#161</a>].</li>
       </ul>
       <h2>Version 2.2.1 - 11/10/2024</h2>
       <ul>

From a311098011061c65f7be9cbc83354d1e67b3a598 Mon Sep 17 00:00:00 2001
From: mic <m@micz.it>
Date: Tue, 15 Oct 2024 20:59:13 +0200
Subject: [PATCH 11/12] release notes updated

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a05331d2..c9ebae8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
 
 
 
-<h2>Version 2.2.2 - ??/??/2024</h2>
+<h2>Version 2.2.2 - 15/10/2024</h2>
       <ul>
         <li>APIs error handling improved.</li>
         <li><i>[OpenAI Comp API]</i> Added an option to remove the <i>v1</i> segment in the API calls path [<a href="https://github.com/micz/ThunderAI/issues/161">#161</a>].</li>

From c53c90c2f80b5600d51eefe28259eac9f4beb18e Mon Sep 17 00:00:00 2001
From: Mic <micz@users.noreply.github.com>
Date: Thu, 17 Oct 2024 18:54:39 +0200
Subject: [PATCH 12/12] Update bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index f2404b34..8e9a344a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -55,6 +55,7 @@ body:
         - ChatGPT Web Interface
         - OpenAI ChatGPT API
         - Ollama API
+        - OpenAI Compatible API
   - type: markdown
     attributes:
       value: |
