feat(handlers): use new custom openai

src/lib/providers/index.ts

@@ -4,6 +4,12 @@ import { loadOpenAIChatModels, loadOpenAIEmbeddingsModels } from './openai';
 import { loadAnthropicChatModels } from './anthropic';
 import { loadTransformersEmbeddingsModels } from './transformers';
 import { loadGeminiChatModels, loadGeminiEmbeddingsModels } from './gemini';
+import {
+  getCustomOpenaiApiKey,
+  getCustomOpenaiApiUrl,
+  getCustomOpenaiModelName,
+} from '../../config';
+import { ChatOpenAI } from '@langchain/openai';
 
 const chatModelProviders = {
   openai: loadOpenAIChatModels,
@@ -30,7 +36,27 @@ export const getAvailableChatModelProviders = async () => {
     }
   }
 
-  models['custom_openai'] = {};
+  const customOpenAiApiKey = getCustomOpenaiApiKey();
+  const customOpenAiApiUrl = getCustomOpenaiApiUrl();
+  const customOpenAiModelName = getCustomOpenaiModelName();
+
+  models['custom_openai'] = {
+    ...(customOpenAiApiKey && customOpenAiApiUrl && customOpenAiModelName
+      ? {
+          [customOpenAiModelName]: {
+            displayName: customOpenAiModelName,
+            model: new ChatOpenAI({
+              openAIApiKey: customOpenAiApiKey,
+              modelName: customOpenAiModelName,
+              temperature: 0.7,
+              configuration: {
+                baseURL: customOpenAiApiUrl,
+              },
+            }),
+          },
+        }
+      : {}),
+  };
 
   return models;
 };

src/routes/config.ts

@@ -10,6 +10,9 @@ import {
   getGeminiApiKey,
   getOpenaiApiKey,
   updateConfig,
+  getCustomOpenaiApiUrl,
+  getCustomOpenaiApiKey,
+  getCustomOpenaiModelName,
 } from '../config';
 import logger from '../utils/logger';
 
@@ -54,6 +57,9 @@ router.get('/', async (_, res) => {
     config['anthropicApiKey'] = getAnthropicApiKey();
     config['groqApiKey'] = getGroqApiKey();
     config['geminiApiKey'] = getGeminiApiKey();
+    config['customOpenaiApiUrl'] = getCustomOpenaiApiUrl();
+    config['customOpenaiApiKey'] = getCustomOpenaiApiKey();
+    config['customOpenaiModelName'] = getCustomOpenaiModelName();
 
     res.status(200).json(config);
   } catch (err: any) {
@@ -66,14 +72,27 @@ router.post('/', async (req, res) => {
   const config = req.body;
 
   const updatedConfig = {
-    API_KEYS: {
+    MODELS: {
-      OPENAI: config.openaiApiKey,
+      OPENAI: {
-      GROQ: config.groqApiKey,
+        API_KEY: config.openaiApiKey,
-      ANTHROPIC: config.anthropicApiKey,
+      },
-      GEMINI: config.geminiApiKey,
+      GROQ: {
-    },
+        API_KEY: config.groqApiKey,
-    API_ENDPOINTS: {
+      },
-      OLLAMA: config.ollamaApiUrl,
+      ANTHROPIC: {
+        API_KEY: config.anthropicApiKey,
+      },
+      GEMINI: {
+        API_KEY: config.geminiApiKey,
+      },
+      OLLAMA: {
+        API_URL: config.ollamaApiUrl,
+      },
+      CUSTOM_OPENAI: {
+        API_URL: config.customOpenaiApiUrl,
+        API_KEY: config.customOpenaiApiKey,
+        MODEL_NAME: config.customOpenaiModelName,
+      },
     },
   };
 

src/routes/images.ts

@@ -5,14 +5,17 @@ import { getAvailableChatModelProviders } from '../lib/providers';
 import { HumanMessage, AIMessage } from '@langchain/core/messages';
 import logger from '../utils/logger';
 import { ChatOpenAI } from '@langchain/openai';
+import {
+  getCustomOpenaiApiKey,
+  getCustomOpenaiApiUrl,
+  getCustomOpenaiModelName,
+} from '../config';
 
 const router = express.Router();
 
 interface ChatModel {
   provider: string;
   model: string;
-  customOpenAIBaseURL?: string;
-  customOpenAIKey?: string;
 }
 
 interface ImageSearchBody {
@@ -44,21 +47,12 @@ router.post('/', async (req, res) => {
     let llm: BaseChatModel | undefined;
 
     if (body.chatModel?.provider === 'custom_openai') {
-      if (
-        !body.chatModel?.customOpenAIBaseURL ||
-        !body.chatModel?.customOpenAIKey
-      ) {
-        return res
-          .status(400)
-          .json({ message: 'Missing custom OpenAI base URL or key' });
-      }
-
       llm = new ChatOpenAI({
-        modelName: body.chatModel.model,
+        modelName: getCustomOpenaiModelName(),
-        openAIApiKey: body.chatModel.customOpenAIKey,
+        openAIApiKey: getCustomOpenaiApiKey(),
         temperature: 0.7,
         configuration: {
-          baseURL: body.chatModel.customOpenAIBaseURL,
+          baseURL: getCustomOpenaiApiUrl(),
         },
       }) as unknown as BaseChatModel;
     } else if (

src/routes/search.ts

@@ -10,14 +10,19 @@ import {
 import { searchHandlers } from '../websocket/messageHandler';
 import { AIMessage, BaseMessage, HumanMessage } from '@langchain/core/messages';
 import { MetaSearchAgentType } from '../search/metaSearchAgent';
+import {
+  getCustomOpenaiApiKey,
+  getCustomOpenaiApiUrl,
+  getCustomOpenaiModelName,
+} from '../config';
 
 const router = express.Router();
 
 interface chatModel {
   provider: string;
   model: string;
-  customOpenAIBaseURL?: string;
   customOpenAIKey?: string;
+  customOpenAIBaseURL?: string;
 }
 
 interface embeddingModel {
@@ -78,21 +83,12 @@ router.post('/', async (req, res) => {
     let embeddings: Embeddings | undefined;
 
     if (body.chatModel?.provider === 'custom_openai') {
-      if (
-        !body.chatModel?.customOpenAIBaseURL ||
-        !body.chatModel?.customOpenAIKey
-      ) {
-        return res
-          .status(400)
-          .json({ message: 'Missing custom OpenAI base URL or key' });
-      }
-
       llm = new ChatOpenAI({
-        modelName: body.chatModel.model,
+        modelName: body.chatModel?.model || getCustomOpenaiModelName(),
-        openAIApiKey: body.chatModel.customOpenAIKey,
+        openAIApiKey: body.chatModel?.customOpenAIKey || getCustomOpenaiApiKey(),
         temperature: 0.7,
         configuration: {
-          baseURL: body.chatModel.customOpenAIBaseURL,
+          baseURL: body.chatModel?.customOpenAIBaseURL || getCustomOpenaiApiUrl(),
         },
       }) as unknown as BaseChatModel;
     } else if (

src/routes/suggestions.ts

@@ -5,14 +5,17 @@ import { getAvailableChatModelProviders } from '../lib/providers';
 import { HumanMessage, AIMessage } from '@langchain/core/messages';
 import logger from '../utils/logger';
 import { ChatOpenAI } from '@langchain/openai';
+import {
+  getCustomOpenaiApiKey,
+  getCustomOpenaiApiUrl,
+  getCustomOpenaiModelName,
+} from '../config';
 
 const router = express.Router();
 
 interface ChatModel {
   provider: string;
   model: string;
-  customOpenAIBaseURL?: string;
-  customOpenAIKey?: string;
 }
 
 interface SuggestionsBody {
@@ -43,21 +46,12 @@ router.post('/', async (req, res) => {
     let llm: BaseChatModel | undefined;
 
     if (body.chatModel?.provider === 'custom_openai') {
-      if (
-        !body.chatModel?.customOpenAIBaseURL ||
-        !body.chatModel?.customOpenAIKey
-      ) {
-        return res
-          .status(400)
-          .json({ message: 'Missing custom OpenAI base URL or key' });
-      }
-
       llm = new ChatOpenAI({
-        modelName: body.chatModel.model,
+        modelName: getCustomOpenaiModelName(),
-        openAIApiKey: body.chatModel.customOpenAIKey,
+        openAIApiKey: getCustomOpenaiApiKey(),
         temperature: 0.7,
         configuration: {
-          baseURL: body.chatModel.customOpenAIBaseURL,
+          baseURL: getCustomOpenaiApiUrl(),
         },
       }) as unknown as BaseChatModel;
     } else if (

src/routes/videos.ts

@@ -5,14 +5,17 @@ import { HumanMessage, AIMessage } from '@langchain/core/messages';
 import logger from '../utils/logger';
 import handleVideoSearch from '../chains/videoSearchAgent';
 import { ChatOpenAI } from '@langchain/openai';
+import {
+  getCustomOpenaiApiKey,
+  getCustomOpenaiApiUrl,
+  getCustomOpenaiModelName,
+} from '../config';
 
 const router = express.Router();
 
 interface ChatModel {
   provider: string;
   model: string;
-  customOpenAIBaseURL?: string;
-  customOpenAIKey?: string;
 }
 
 interface VideoSearchBody {
@@ -44,21 +47,12 @@ router.post('/', async (req, res) => {
     let llm: BaseChatModel | undefined;
 
     if (body.chatModel?.provider === 'custom_openai') {
-      if (
-        !body.chatModel?.customOpenAIBaseURL ||
-        !body.chatModel?.customOpenAIKey
-      ) {
-        return res
-          .status(400)
-          .json({ message: 'Missing custom OpenAI base URL or key' });
-      }
-
       llm = new ChatOpenAI({
-        modelName: body.chatModel.model,
+        modelName: getCustomOpenaiModelName(),
-        openAIApiKey: body.chatModel.customOpenAIKey,
+        openAIApiKey: getCustomOpenaiApiKey(),
         temperature: 0.7,
         configuration: {
-          baseURL: body.chatModel.customOpenAIBaseURL,
+          baseURL: getCustomOpenaiApiUrl(),
         },
       }) as unknown as BaseChatModel;
     } else if (

src/websocket/connectionManager.ts

@@ -9,6 +9,11 @@ import type { Embeddings } from '@langchain/core/embeddings';
 import type { IncomingMessage } from 'http';
 import logger from '../utils/logger';
 import { ChatOpenAI } from '@langchain/openai';
+import {
+  getCustomOpenaiApiKey,
+  getCustomOpenaiApiUrl,
+  getCustomOpenaiModelName,
+} from '../config';
 
 export const handleConnection = async (
   ws: WebSocket,
@@ -48,14 +53,20 @@ export const handleConnection = async (
       llm = chatModelProviders[chatModelProvider][chatModel]
         .model as unknown as BaseChatModel | undefined;
     } else if (chatModelProvider == 'custom_openai') {
-      llm = new ChatOpenAI({
+      const customOpenaiApiKey = getCustomOpenaiApiKey();
-        modelName: chatModel,
+      const customOpenaiApiUrl = getCustomOpenaiApiUrl();
-        openAIApiKey: searchParams.get('openAIApiKey'),
+      const customOpenaiModelName = getCustomOpenaiModelName();
-        temperature: 0.7,
+
-        configuration: {
+      if (customOpenaiApiKey && customOpenaiApiUrl && customOpenaiModelName) {
-          baseURL: searchParams.get('openAIBaseURL'),
+        llm = new ChatOpenAI({
-        },
+          modelName: customOpenaiModelName,
-      }) as unknown as BaseChatModel;
+          openAIApiKey: customOpenaiApiKey,
+          temperature: 0.7,
+          configuration: {
+            baseURL: customOpenaiApiUrl,
+          },
+        }) as unknown as BaseChatModel;
+      }
     }
 
     if (