Merge pull request #293 from Center-for-AI-Innovation/fix-fetch-models

Fetch only enabled models

Author: rohan-uiuc

src/app/api/chat/openaiFunctionCall/route.ts

@@ -46,16 +46,20 @@ export async function POST(req: Request) {
     openaiKey: string
   } = await req.json()
 
-  let decryptedKey = openaiKey ? 
-    await decryptKeyIfNeeded(openaiKey) : 
-    process.env.VLADS_OPENAI_KEY
+  // console.log('Received request with openaiKey:', openaiKey)
+  let decryptedKey = openaiKey
+    ? await decryptKeyIfNeeded(openaiKey)
+    : process.env.VLADS_OPENAI_KEY
 
   if (!decryptedKey?.startsWith('sk-')) {
     decryptedKey = process.env.VLADS_OPENAI_KEY as string
   }
 
+  // console.log('Using key for function calling:', decryptedKey)
+
   // Format messages
-  const message_to_send: ChatCompletionMessageParam[] = conversationToMessages(conversation)
+  const message_to_send: ChatCompletionMessageParam[] =
+    conversationToMessages(conversation)
 
   // Add system message
   const globalToolsSytemPromptPrefix =
@@ -97,70 +101,80 @@ export async function POST(req: Request) {
     })
 
     if (!response.ok) {
+      console.log('OpenAI API error:', response.status, response.statusText)
       return new Response(
-        JSON.stringify({ error: `OpenAI API error: ${response.status}` }), 
-        { 
+        JSON.stringify({ error: `OpenAI API error: ${response.status}` }),
+        {
           status: response.status,
-          headers: { 'Content-Type': 'application/json' }
-        }
+          headers: { 'Content-Type': 'application/json' },
+        },
       )
     }
 
     const data = await response.json()
 
     if (!data.choices) {
+      console.log('No response from OpenAI')
       return new Response(
-        JSON.stringify({ error: 'No response from OpenAI' }), 
-        { 
+        JSON.stringify({ error: 'No response from OpenAI' }),
+        {
           status: 500,
-          headers: { 'Content-Type': 'application/json' }
-        }
+          headers: { 'Content-Type': 'application/json' },
+        },
       )
     }
 
     if (!data.choices[0]?.message.tool_calls) {
+      console.log('No tool calls from OpenAI')
       return new Response(
         JSON.stringify({
-          choices: [{
-            message: {
-              content: 'No tools invoked by OpenAI',
-              role: 'assistant'
-            }
-          }]
+          choices: [
+            {
+              message: {
+                content: 'No tools invoked by OpenAI',
+                role: 'assistant',
+              },
+            },
+          ],
         }),
         {
           status: 200,
-          headers: { 'Content-Type': 'application/json' }
-        }
+          headers: { 'Content-Type': 'application/json' },
+        },
       )
     }
 
     const toolCalls = data.choices[0].message.tool_calls
 
     return new Response(
       JSON.stringify({
-        choices: [{
-          message: {
-            content: JSON.stringify(toolCalls),
-            role: 'assistant',
-            tool_calls: toolCalls
-          }
-        }]
+        choices: [
+          {
+            message: {
+              content: JSON.stringify(toolCalls),
+              role: 'assistant',
+              tool_calls: toolCalls,
+            },
+          },
+        ],
       }),
       {
         status: 200,
-        headers: { 'Content-Type': 'application/json' }
-      }
+        headers: { 'Content-Type': 'application/json' },
+      },
     )
   } catch (error) {
     return new Response(
-      JSON.stringify({ 
-        error: error instanceof Error ? error.message : 'An unexpected error occurred'
+      JSON.stringify({
+        error:
+          error instanceof Error
+            ? error.message
+            : 'An unexpected error occurred',
       }),
-      { 
+      {
         status: 500,
-        headers: { 'Content-Type': 'application/json' }
-      }
+        headers: { 'Content-Type': 'application/json' },
+      },
     )
   }
 }

src/utils/modelProviders/NCSAHosted.ts

@@ -3,14 +3,18 @@ import {
   ProviderNames,
 } from '~/utils/modelProviders/LLMProvider'
 import { OllamaModels, OllamaModelIDs } from './ollama'
-import { ChatBody } from '~/types/chat'
 
 export const getNCSAHostedModels = async (
   ncsaHostedProvider: NCSAHostedProvider,
 ): Promise<NCSAHostedProvider> => {
   delete ncsaHostedProvider.error // Remove the error property if it exists
   ncsaHostedProvider.provider = ProviderNames.NCSAHosted
 
+  if (!ncsaHostedProvider.enabled) {
+    ncsaHostedProvider.models = []
+    return ncsaHostedProvider
+  }
+
   // Store existing model states
   const existingModelStates = new Map<
     string,

src/utils/modelProviders/WebLLM.ts

@@ -299,7 +299,11 @@ export const getWebLLMModels = async (
   webLLMProvider: WebLLMProvider,
 ): Promise<WebLLMProvider> => {
   webLLMProvider.provider = ProviderNames.WebLLM
-  if (!webLLMProvider.models || webLLMProvider.models.length === 0) {
+  if (
+    !webLLMProvider.models ||
+    webLLMProvider.models.length === 0 ||
+    !webLLMProvider.enabled
+  ) {
     // If no models, add all models but only enable Llama 3 8b, Phi 3 mini, and Gemma 2b by default
     webLLMProvider.models = webLLMModels.map((model) => ({
       ...model,

src/utils/modelProviders/azure.ts

@@ -127,7 +127,11 @@ export const getAzureModels = async (
   delete azureProvider.error // Clear previous errors if any.
   azureProvider.provider = ProviderNames.Azure
   try {
-    if (!azureProvider.AzureEndpoint || !azureProvider.apiKey) {
+    if (
+      !azureProvider.AzureEndpoint ||
+      !azureProvider.apiKey ||
+      !azureProvider.enabled
+    ) {
       // azureProvider.error = `Azure OpenAI Endpoint or Deployment is not set. Endpoint: ${azureProvider.AzureEndpoint}, Deployment: ${azureProvider.AzureDeployment}`
       azureProvider.models = [] // clear any previous models.
       return azureProvider
@@ -138,6 +142,8 @@ export const getAzureModels = async (
       : azureProvider.AzureEndpoint
     const url = `${baseUrl}/openai/deployments?api-version=${OPENAI_API_VERSION}`
 
+    // console.log('Fetching Azure models from:', url)
+
     const response = await fetch(url, {
       method: 'GET',
       headers: {

src/utils/modelProviders/ollama.ts

@@ -128,7 +128,7 @@ export const getOllamaModels = async (
   delete ollamaProvider.error // Remove the error property if it exists
   ollamaProvider.provider = ProviderNames.Ollama
   try {
-    if (!ollamaProvider.baseUrl) {
+    if (!ollamaProvider.baseUrl || !ollamaProvider.enabled) {
       // Don't error here, too confusing for users.
       // ollamaProvider.error = `Ollama Base Url is not defined, please set it to the URL that points to your Ollama instance.`
       ollamaProvider.models = [] // clear any previous models.

src/utils/modelProviders/routes/anthropic.ts

@@ -11,7 +11,11 @@ export const getAnthropicModels = async (
   anthropicProvider.provider = ProviderNames.Anthropic
   delete anthropicProvider.error // Clear any previous errors
 
-  if (!anthropicProvider.apiKey || anthropicProvider.apiKey === '') {
+  if (
+    !anthropicProvider.apiKey ||
+    anthropicProvider.apiKey === '' ||
+    !anthropicProvider.enabled
+  ) {
     // Don't show any error here... too confusing for users.
     anthropicProvider.models = []
     return anthropicProvider

src/utils/modelProviders/routes/bedrock.ts

@@ -17,7 +17,8 @@ export const getBedrockModels = async (
     !bedrockProvider.region ||
     bedrockProvider.accessKeyId === '' ||
     bedrockProvider.secretAccessKey === '' ||
-    bedrockProvider.region === ''
+    bedrockProvider.region === '' ||
+    !bedrockProvider.enabled
   ) {
     // Don't show any error here... too confusing for users.
     bedrockProvider.models = []

src/utils/modelProviders/routes/gemini.ts

@@ -1,7 +1,6 @@
 import { type GeminiProvider, ProviderNames } from '../LLMProvider'
 import {
-  type GeminiModel,
-  GeminiModelID,
+  type GeminiModelID,
   GeminiModels,
   preferredGeminiModelIds,
 } from '../types/gemini'
@@ -17,7 +16,11 @@ export const getGeminiModels = async (
   geminiProvider.provider = ProviderNames.Gemini
   delete geminiProvider.error // Clear any previous errors
 
-  if (!geminiProvider.apiKey || geminiProvider.apiKey === '') {
+  if (
+    !geminiProvider.apiKey ||
+    geminiProvider.apiKey === '' ||
+    !geminiProvider.enabled
+  ) {
     // Don't show any error here... too confusing for users.
     geminiProvider.models = []
     return geminiProvider

src/utils/modelProviders/routes/openai.ts

@@ -14,7 +14,11 @@ export const getOpenAIModels = async (
     // 1. Use all passed-in models that are ALSO available from the endpoint...
     // If no passed-in models, then use all. Enabled by default, following our types spec.
 
-    if (!openAIProvider.apiKey || openAIProvider.apiKey === undefined) {
+    if (
+      !openAIProvider.apiKey ||
+      openAIProvider.apiKey === undefined ||
+      !openAIProvider.enabled
+    ) {
       // No error here, too confusing for users.
       // openAIProvider.error = 'OpenAI API Key is not set.'
       openAIProvider.models = [] // clear any previous models.

src/utils/modelProviders/routes/sambanova.ts

@@ -2,7 +2,7 @@ import { type SambaNovaProvider, ProviderNames } from '../LLMProvider'
 import {
   SambaNovaModels,
   type SambaNovaModel,
-  SambaNovaModelID,
+  type SambaNovaModelID,
   SambanovaPreferredModelIDs,
 } from '../types/SambaNova'
 

src/utils/modelProviders/types/NCSAHostedVLM.ts

@@ -52,6 +52,11 @@ export const getNCSAHostedVLMModels = async (
   delete vlmProvider.error // Clear any previous errors
   vlmProvider.provider = ProviderNames.NCSAHostedVLM
 
+  if (!vlmProvider.enabled) {
+    vlmProvider.models = []
+    return vlmProvider
+  }
+
   // Store existing model states
   const existingModelStates = new Map<
     string,