Update config.ts

resolve conflict

src/routes/config.ts

@@ -11,6 +11,9 @@ import {
   getGeminiApiKey,
   getOpenaiApiKey,
   updateConfig,
+  getCustomOpenaiApiUrl,
+  getCustomOpenaiApiKey,
+  getCustomOpenaiModelName,
 } from '../config';
 import logger from '../utils/logger';
 
@@ -56,6 +59,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) {
@@ -68,15 +74,30 @@ 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: {
-      LMSTUDIO: config.lmStudioApiUrl,
+        API_KEY: config.anthropicApiKey,
+      },
+      GEMINI: {
+        API_KEY: config.geminiApiKey,
+      },
+      OLLAMA: {
+        API_URL: config.ollamaApiUrl,
+      },
+      LMSTUDIO: {
+        API_URL: config.lmStudioApiUrl,
+      },
+      CUSTOM_OPENAI: {
+        API_URL: config.customOpenaiApiUrl,
+        API_KEY: config.customOpenaiApiKey,
+        MODEL_NAME: config.customOpenaiModelName,
+      },
     },
   };