diff --git a/js/api/openai_comp.js b/js/api/openai_comp.js
new file mode 100644
index 00000000..f54bffd4
--- /dev/null
+++ b/js/api/openai_comp.js
@@ -0,0 +1,86 @@
+/*
+ *  ThunderAI [https://micz.it/thunderbird-addon-thunderai/]
+ *  Copyright (C) 2024  Mic (m@micz.it)
+
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Some original methods derived from https://github.com/ali-raheem/Aify/blob/4ece286095ea7a6cf89d696902e6b81b5d1c3a4b/plugin/html/API.js
+
+
+export class OpenAIComp {
+
+  host = '';
+  model = '';
+  stream = false;
+
+  constructor(host, model, stream = false) {
+    this.host = host.trim().replace(/\/+$/, "");
+    this.model = model;
+    this.stream = stream;
+  }
+
+
+  fetchModels = async () => {
+    const response = await fetch(this.host + "/v1/models", {
+        method: "GET",
+        headers: {
+            "Content-Type": "application/json",
+        },
+    });
+
+    if (!response.ok) {
+        const errorDetail = await response.text();
+        let err_msg = "[ThunderAI] OpenAI API Comp 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;
+  }
+
+  fetchResponse = async (messages, maxTokens = 0) => {
+    try {
+      const response = await fetch(this.host + "/v1/chat/completions", {
+          method: "POST",
+          headers: { 
+              "Content-Type": "application/json",
+          },
+          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;
+    }
+  }
+
+}
\ No newline at end of file