initial change so that we can use any openAI server

Author: rootedbox

lib/aiClient/adapters/ChatGPTAdapter.js

@@ -6,11 +6,15 @@ class ChatGPTAdapter extends BaseAdapter {
     super(config);
     this.apiKey = config.chatgptApiKey;
     this.model = config.chatgptModel;
+    this.apiUrl = config.chatgptApiUrl || "https://api.openai.com/v1"; 
   }
 
   async generateResponse(command) {
     try {
-      const openai = new OpenAI({ apiKey: this.apiKey });
+      const openai = new OpenAI({
+        apiKey: this.apiKey,
+        baseURL: this.apiUrl, 
+      });
 
       this.messages.push({
         role: "user",

lib/config.js

@@ -8,6 +8,7 @@ import gradient from "gradient-string";
 
 const configPath = path.join(os.homedir(), ".commandai", "config.json");
 const defaultChatGPTModel = "gpt-4o";
+const defaultChatGPTApiUrl = "https://api.openai.com/v1";
 const defaultOllamaUrl = "http://127.0.0.1:11434";
 
 async function checkOllamaActive(url = defaultOllamaUrl) {
@@ -46,9 +47,9 @@ async function saveConfig(config) {
   console.log();
 }
 
-async function validateApiKey(apiKey) {
+async function validateApiKey(apiKey, chatgptApiUrl) {
   try {
-    const openai = new OpenAI({ apiKey: apiKey });
+    const openai = new OpenAI({ baseURL: chatgptApiUrl, apiKey: apiKey });
     await openai.models.list();
     return true;
   } catch (error) {
@@ -57,9 +58,9 @@ async function validateApiKey(apiKey) {
   }
 }
 
-async function fetchChatGPTModels(apiKey) {
+async function fetchChatGPTModels(apiKey, chatgptApiUrl) {
   try {
-    const openai = new OpenAI({ apiKey: apiKey });
+    const openai = new OpenAI({ baseURL: chatgptApiUrl, apiKey: apiKey });
     const response = await openai.models.list();
     return response.data.map((model) => model.id);
   } catch (error) {
@@ -161,7 +162,7 @@ async function promptOllamaConfig(defaultUrl, defaultModel) {
   };
 }
 
-async function promptChatGPTAPIKey(defaultApiKey) {
+async function promptChatGPTAPIKey(defaultApiKey, chatgptApiUrl) {
   const chatgptConfig = await inquirer.prompt([
     {
       type: "input",
@@ -171,7 +172,7 @@ async function promptChatGPTAPIKey(defaultApiKey) {
     },
   ]);
 
-  const isValidApiKey = await validateApiKey(chatgptConfig.chatgptApiKey);
+  const isValidApiKey = await validateApiKey(chatgptConfig.chatgptApiKey, chatgptApiUrl);
 
   if (!isValidApiKey) {
     return null;
@@ -180,8 +181,10 @@ async function promptChatGPTAPIKey(defaultApiKey) {
   return chatgptConfig;
 }
 
-async function promptChatGPTModels(defaultModel, defaultApiKey) {
-  const models = await fetchChatGPTModels(defaultApiKey);
+
+async function promptChatGPTModels(defaultModel, chatgptApiUrl) {
+  const models = await fetchChatGPTModels(chatgptApiUrl);
+
   if (models.length === 0) {
     console.error(
       "No models found for the provided API key. Please try again.",
@@ -202,26 +205,55 @@ async function promptChatGPTModels(defaultModel, defaultApiKey) {
   return chatgptModel;
 }
 
-async function promptChatGPTConfig(defaultApiKey, defaultModel) {
-  const chatgptConfig = await promptChatGPTAPIKey(defaultApiKey);
+async function promptChatGPTURL(defaultUrl) {
+  const chatgptApiUrl = await inquirer.prompt([
+    {
+      type: "input",
+      name: "chatgptApiUrl",
+      message: "Enter the URL for the Ollama server:",
+      default: defaultUrl,
+    },
+  ]);
+
+  return chatgptApiUrl;
+}
+
+async function promptChatGPTConfig(config) {
+  let chatgptApiUrl = { chatgptApiUrl: config.chatgptApiUrl || defaultChatGPTApiUrl };
+
+  if (config.aiService === "OpenAI") {
+    chatgptApiUrl = await promptChatGPTURL(config.chatgptApiUrl);
+    if (!chatgptApiUrl) return null;
+  } 
+
+  const chatgptConfig = await promptChatGPTAPIKey(config.chatgptApiKey, chatgptApiUrl.chatgptApiUrl);
 
   if (!chatgptConfig) return null;
 
-  const chatgptModel = await promptChatGPTModels(defaultModel, defaultApiKey);
+  const chatgptModel = await promptChatGPTModels(config.chatgptModel, chatgptApiUrl.chatgptApiUrl);
 
   if (!chatgptModel) return null;
 
-  return {
-    chatgptApiKey: chatgptConfig.chatgptApiKey,
-    chatgptModel: chatgptModel.chatgptModel,
-  };
+  if (chatgptApiUrl) {
+    return {
+      chatgptApiKey: chatgptConfig.chatgptApiKey,
+      chatgptModel: chatgptModel.chatgptModel,
+      chatgptApiUrl: chatgptApiUrl.chatgptApiUrl,
+    };
+  } else {
+    return {
+      chatgptApiKey: chatgptConfig.chatgptApiKey,
+      chatgptModel: chatgptModel.chatgptModel,
+    };
+  }
 }
 
 async function getAIServiceChoices() {
   const isOllamaActive = await checkOllamaActive();
   return [
     { name: isOllamaActive ? "Ollama (Running)" : "Ollama", value: "Ollama" },
     { name: "ChatGPT", value: "ChatGPT" },
+    { name: "OpenAI", value: "OpenAI" },
   ];
 }
 
@@ -232,6 +264,7 @@ async function configure(
     ollamaModel: "",
     chatgptApiKey: "",
     chatgptModel: defaultChatGPTModel,
+    chatgptApiUrl: defaultChatGPTApiUrl,
     showExecutionDescription: true,
     showExecutionPlan: true,
     enableLogging: false,
@@ -279,6 +312,8 @@ async function configureSelectedAIService(finalConfig) {
     return await configureOllamaService(finalConfig);
   } else if (finalConfig.aiService === "ChatGPT") {
     return await configureChatGPTService(finalConfig);
+  } else if (finalConfig.aiService === "OpenAI") {
+    return await configureChatGPTService(finalConfig);
   }
   return null;
 }
@@ -297,16 +332,21 @@ async function configureOllamaService(finalConfig) {
 }
 
 async function configureChatGPTService(finalConfig) {
-  const chatgptConfig = await promptChatGPTConfig(
-    finalConfig.chatgptApiKey,
-    finalConfig.chatgptModel,
-  );
+  const chatgptConfig = await promptChatGPTConfig(finalConfig);
   if (!chatgptConfig) return null;
 
-  return {
-    chatgptApiKey: chatgptConfig.chatgptApiKey,
-    chatgptModel: chatgptConfig.chatgptModel,
-  };
+  if (finalConfig.aiService === "OpenAI") {
+    return {
+      chatgptApiKey: chatgptConfig.chatgptApiKey,
+      chatgptModel: chatgptConfig.chatgptModel,
+      chatgptApiUrl: chatgptConfig.chatgptApiUrl,
+    };
+  } else {
+    return {
+      chatgptApiKey: chatgptConfig.chatgptApiKey,
+      chatgptModel: chatgptConfig.chatgptModel,
+    };
+  }
 }
 
 export { loadConfig, saveConfig, configure };