Refactor/standartize model providers, add "get provider key" for thos…

…e who have it for first time users
stackblitz-labs · Nov 11, 2024 · a2cca14 · a2cca14
1 parent 4b492b9
commit a2cca14
Show file tree

Hide file tree

Showing 3 changed files with 134 additions and 71 deletions.
diff --git a/app/components/chat/APIKeyManager.tsx b/app/components/chat/APIKeyManager.tsx
@@ -1,8 +1,9 @@
 import React, { useState } from 'react';
 import { IconButton } from '~/components/ui/IconButton';
+import type { ProviderInfo } from '~/utils/constants';
 
 interface APIKeyManagerProps {
-  provider: string;
+  provider: ProviderInfo;
   apiKey: string;
   setApiKey: (key: string) => void;
 }
@@ -18,7 +19,7 @@ export const APIKeyManager: React.FC<APIKeyManagerProps> = ({ provider, apiKey,
 
   return (
     <div className="flex items-center gap-2 mt-2 mb-2">
-      <span className="text-sm text-bolt-elements-textSecondary">{provider} API Key:</span>
+      <span className="text-sm text-bolt-elements-textSecondary">{provider?.name} API Key:</span>
       {isEditing ? (
         <>
           <input
@@ -42,6 +43,7 @@ export const APIKeyManager: React.FC<APIKeyManagerProps> = ({ provider, apiKey,
           <IconButton onClick={() => setIsEditing(true)} title="Edit API Key">
             <div className="i-ph:pencil-simple" />
           </IconButton>
+          {!!provider?.getApiKeyLink ? <a href={provider?.getApiKeyLink}>{provider?.labelForGetApiKey || "Get API Key"}</a> : "" }
         </>
       )}
     </div>

diff --git a/app/components/chat/BaseChat.tsx b/app/components/chat/BaseChat.tsx
@@ -7,7 +7,7 @@ import { Menu } from '~/components/sidebar/Menu.client';
 import { IconButton } from '~/components/ui/IconButton';
 import { Workbench } from '~/components/workbench/Workbench.client';
 import { classNames } from '~/utils/classNames';
-import { MODEL_LIST, DEFAULT_PROVIDER } from '~/utils/constants';
+import { MODEL_LIST, DEFAULT_PROVIDER, PROVIDER_LIST } from '~/utils/constants';
 import { Messages } from './Messages.client';
 import { SendButton } from './SendButton.client';
 import { useState } from 'react';
@@ -24,12 +24,12 @@ const EXAMPLE_PROMPTS = [
   { text: 'How do I center a div?' },
 ];
 
-const providerList = [...new Set(MODEL_LIST.map((model) => model.provider))]
+const providerList = PROVIDER_LIST;
 
 const ModelSelector = ({ model, setModel, provider, setProvider, modelList, providerList }) => {
   return (
     <div className="mb-2 flex gap-2">
-      <select 
+      <select
         value={provider}
         onChange={(e) => {
           setProvider(e.target.value);
@@ -39,19 +39,10 @@ const ModelSelector = ({ model, setModel, provider, setProvider, modelList, prov
         className="flex-1 p-2 rounded-lg border border-bolt-elements-borderColor bg-bolt-elements-prompt-background text-bolt-elements-textPrimary focus:outline-none focus:ring-2 focus:ring-bolt-elements-focus transition-all"
       >
         {providerList.map((provider) => (
-          <option key={provider} value={provider}>
-            {provider}
+          <option key={provider.name} value={provider.name}>
+            {provider.name}
           </option>
         ))}
-        <option key="Ollama" value="Ollama">
-          Ollama
-        </option>
-        <option key="OpenAILike" value="OpenAILike">
-          OpenAILike
-        </option>
-        <option key="LMStudio" value="LMStudio">
-          LMStudio
-        </option>
       </select>
       <select
         value={model}
@@ -315,4 +306,4 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
       </div>
     );
   },
-);
+);
diff --git a/app/utils/constants.ts b/app/utils/constants.ts
@@ -8,48 +8,119 @@ export const PROVIDER_REGEX = /\[Provider: (.*?)\]\n\n/;
 export const DEFAULT_MODEL = 'claude-3-5-sonnet-latest';
 export const DEFAULT_PROVIDER = 'Anthropic';
 
-const staticModels: ModelInfo[] = [
-  { name: 'gpt-4o', label: 'GPT-4o', provider: 'OpenAI' },
-  { name: 'anthropic/claude-3.5-sonnet', label: 'Anthropic: Claude 3.5 Sonnet (OpenRouter)', provider: 'OpenRouter' },
-  { name: 'anthropic/claude-3-haiku', label: 'Anthropic: Claude 3 Haiku (OpenRouter)', provider: 'OpenRouter' },
-  { name: 'deepseek/deepseek-coder', label: 'Deepseek-Coder V2 236B (OpenRouter)', provider: 'OpenRouter' },
-  { name: 'google/gemini-flash-1.5', label: 'Google Gemini Flash 1.5 (OpenRouter)', provider: 'OpenRouter' },
-  { name: 'google/gemini-pro-1.5', label: 'Google Gemini Pro 1.5 (OpenRouter)', provider: 'OpenRouter' },
-  { name: 'x-ai/grok-beta', label: "xAI Grok Beta (OpenRouter)", provider: 'OpenRouter' },
-  { name: 'mistralai/mistral-nemo', label: 'OpenRouter Mistral Nemo (OpenRouter)', provider: 'OpenRouter' },
-  { name: 'qwen/qwen-110b-chat', label: 'OpenRouter Qwen 110b Chat (OpenRouter)', provider: 'OpenRouter' },
-  { name: 'cohere/command', label: 'Cohere Command (OpenRouter)', provider: 'OpenRouter' },
-  { name: 'gemini-1.5-flash-latest', label: 'Gemini 1.5 Flash', provider: 'Google' },
-  { name: 'gemini-1.5-pro-latest', label: 'Gemini 1.5 Pro', provider: 'Google' },
-  { name: 'llama-3.1-70b-versatile', label: 'Llama 3.1 70b (Groq)', provider: 'Groq' },
-  { name: 'llama-3.1-8b-instant', label: 'Llama 3.1 8b (Groq)', provider: 'Groq' },
-  { name: 'llama-3.2-11b-vision-preview', label: 'Llama 3.2 11b (Groq)', provider: 'Groq' },
-  { name: 'llama-3.2-3b-preview', label: 'Llama 3.2 3b (Groq)', provider: 'Groq' },
-  { name: 'llama-3.2-1b-preview', label: 'Llama 3.2 1b (Groq)', provider: 'Groq' },
-  { name: 'claude-3-5-sonnet-latest', label: 'Claude 3.5 Sonnet (new)', provider: 'Anthropic' },
-  { name: 'claude-3-5-sonnet-20240620', label: 'Claude 3.5 Sonnet (old)', provider: 'Anthropic' },
-  { name: 'claude-3-5-haiku-latest', label: 'Claude 3.5 Haiku (new)', provider: 'Anthropic' },
-  { name: 'claude-3-opus-latest', label: 'Claude 3 Opus', provider: 'Anthropic' },
-  { name: 'claude-3-sonnet-20240229', label: 'Claude 3 Sonnet', provider: 'Anthropic' },
-  { name: 'claude-3-haiku-20240307', label: 'Claude 3 Haiku', provider: 'Anthropic' },
-  { name: 'gpt-4o-mini', label: 'GPT-4o Mini', provider: 'OpenAI' },
-  { name: 'gpt-4-turbo', label: 'GPT-4 Turbo', provider: 'OpenAI' },
-  { name: 'gpt-4', label: 'GPT-4', provider: 'OpenAI' },
-  { name: 'gpt-3.5-turbo', label: 'GPT-3.5 Turbo', provider: 'OpenAI' },
-  { name: 'grok-beta', label: "xAI Grok Beta", provider: 'xAI' },
-  { name: 'deepseek-coder', label: 'Deepseek-Coder', provider: 'Deepseek'},
-  { name: 'deepseek-chat', label: 'Deepseek-Chat', provider: 'Deepseek'},
-  { name: 'open-mistral-7b', label: 'Mistral 7B', provider: 'Mistral' },
-  { name: 'open-mixtral-8x7b', label: 'Mistral 8x7B', provider: 'Mistral' },
-  { name: 'open-mixtral-8x22b', label: 'Mistral 8x22B', provider: 'Mistral' },
-  { name: 'open-codestral-mamba', label: 'Codestral Mamba', provider: 'Mistral' },
-  { name: 'open-mistral-nemo', label: 'Mistral Nemo', provider: 'Mistral' },
-  { name: 'ministral-8b-latest', label: 'Mistral 8B', provider: 'Mistral' },
-  { name: 'mistral-small-latest', label: 'Mistral Small', provider: 'Mistral' },
-  { name: 'codestral-latest', label: 'Codestral', provider: 'Mistral' },
-  { name: 'mistral-large-latest', label: 'Mistral Large Latest', provider: 'Mistral' },
+export type ProviderInfo = {
+  staticModels: ModelInfo[],
+  name: string,
+  getDynamicModels?: () => Promise<ModelInfo[]>,
+  getApiKeyLink?: string,
+  labelForGetApiKey?: string,
+};
+
+const PROVIDER_LIST: ProviderInfo[] = [
+  {
+    name: 'Ollama',
+    staticModels: [],
+    getDynamicModels: getOllamaModels
+  }, {
+    name: 'OpenAILike',
+    staticModels: [],
+    getDynamicModels: getOpenAILikeModels
+  },
+  {
+    name: 'OpenRouter',
+    staticModels: [
+      { name: 'gpt-4o', label: 'GPT-4o', provider: 'OpenAI' },
+      {
+        name: 'anthropic/claude-3.5-sonnet',
+        label: 'Anthropic: Claude 3.5 Sonnet (OpenRouter)',
+        provider: 'OpenRouter'
+      },
+      { name: 'anthropic/claude-3-haiku', label: 'Anthropic: Claude 3 Haiku (OpenRouter)', provider: 'OpenRouter' },
+      { name: 'deepseek/deepseek-coder', label: 'Deepseek-Coder V2 236B (OpenRouter)', provider: 'OpenRouter' },
+      { name: 'google/gemini-flash-1.5', label: 'Google Gemini Flash 1.5 (OpenRouter)', provider: 'OpenRouter' },
+      { name: 'google/gemini-pro-1.5', label: 'Google Gemini Pro 1.5 (OpenRouter)', provider: 'OpenRouter' },
+      { name: 'x-ai/grok-beta', label: 'xAI Grok Beta (OpenRouter)', provider: 'OpenRouter' },
+      { name: 'mistralai/mistral-nemo', label: 'OpenRouter Mistral Nemo (OpenRouter)', provider: 'OpenRouter' },
+      { name: 'qwen/qwen-110b-chat', label: 'OpenRouter Qwen 110b Chat (OpenRouter)', provider: 'OpenRouter' },
+      { name: 'cohere/command', label: 'Cohere Command (OpenRouter)', provider: 'OpenRouter' }
+    ],
+    getApiKeyLink: 'https://openrouter.ai/settings/keys'
+  }, {
+    name: 'Google',
+    staticModels: [
+      { name: 'gemini-1.5-flash-latest', label: 'Gemini 1.5 Flash', provider: 'Google' },
+      { name: 'gemini-1.5-pro-latest', label: 'Gemini 1.5 Pro', provider: 'Google' }
+    ],
+    getApiKeyLink: 'https://aistudio.google.com/app/apikey'
+  }, {
+    name: 'Groq',
+    staticModels: [
+      { name: 'llama-3.1-70b-versatile', label: 'Llama 3.1 70b (Groq)', provider: 'Groq' },
+      { name: 'llama-3.1-8b-instant', label: 'Llama 3.1 8b (Groq)', provider: 'Groq' },
+      { name: 'llama-3.2-11b-vision-preview', label: 'Llama 3.2 11b (Groq)', provider: 'Groq' },
+      { name: 'llama-3.2-3b-preview', label: 'Llama 3.2 3b (Groq)', provider: 'Groq' },
+      { name: 'llama-3.2-1b-preview', label: 'Llama 3.2 1b (Groq)', provider: 'Groq' }
+    ],
+    getApiKeyLink: 'https://console.groq.com/keys'
+  }, {
+    name: 'Anthropic',
+    staticModels: [
+      { name: 'claude-3-5-sonnet-latest', label: 'Claude 3.5 Sonnet (new)', provider: 'Anthropic' },
+      { name: 'claude-3-5-sonnet-20240620', label: 'Claude 3.5 Sonnet (old)', provider: 'Anthropic' },
+      { name: 'claude-3-5-haiku-latest', label: 'Claude 3.5 Haiku (new)', provider: 'Anthropic' },
+      { name: 'claude-3-opus-latest', label: 'Claude 3 Opus', provider: 'Anthropic' },
+      { name: 'claude-3-sonnet-20240229', label: 'Claude 3 Sonnet', provider: 'Anthropic' },
+      { name: 'claude-3-haiku-20240307', label: 'Claude 3 Haiku', provider: 'Anthropic' }
+    ],
+    getApiKeyLink: "https://console.anthropic.com/settings/keys",
+  }, {
+    name: 'OpenAI',
+    staticModels: [
+      { name: 'gpt-4o-mini', label: 'GPT-4o Mini', provider: 'OpenAI' },
+      { name: 'gpt-4-turbo', label: 'GPT-4 Turbo', provider: 'OpenAI' },
+      { name: 'gpt-4', label: 'GPT-4', provider: 'OpenAI' },
+      { name: 'gpt-3.5-turbo', label: 'GPT-3.5 Turbo', provider: 'OpenAI' }
+    ],
+    getApiKeyLink: "https://platform.openai.com/api-keys",
+  }, {
+    name: 'xAI',
+    staticModels: [
+      { name: 'grok-beta', label: 'xAI Grok Beta', provider: 'xAI' }
+    ],
+    getApiKeyLink: 'https://docs.x.ai/docs/quickstart#creating-an-api-key'
+  }, {
+    name: 'Deepseek',
+    staticModels: [
+      { name: 'deepseek-coder', label: 'Deepseek-Coder', provider: 'Deepseek' },
+      { name: 'deepseek-chat', label: 'Deepseek-Chat', provider: 'Deepseek' }
+    ],
+    getApiKeyLink: 'https://platform.deepseek.com/api_keys'
+  }, {
+    name: 'Mistral',
+    staticModels: [
+      { name: 'open-mistral-7b', label: 'Mistral 7B', provider: 'Mistral' },
+      { name: 'open-mixtral-8x7b', label: 'Mistral 8x7B', provider: 'Mistral' },
+      { name: 'open-mixtral-8x22b', label: 'Mistral 8x22B', provider: 'Mistral' },
+      { name: 'open-codestral-mamba', label: 'Codestral Mamba', provider: 'Mistral' },
+      { name: 'open-mistral-nemo', label: 'Mistral Nemo', provider: 'Mistral' },
+      { name: 'ministral-8b-latest', label: 'Mistral 8B', provider: 'Mistral' },
+      { name: 'mistral-small-latest', label: 'Mistral Small', provider: 'Mistral' },
+      { name: 'codestral-latest', label: 'Codestral', provider: 'Mistral' },
+      { name: 'mistral-large-latest', label: 'Mistral Large Latest', provider: 'Mistral' }
+    ],
+    getApiKeyLink: 'https://console.mistral.ai/api-keys/'
+  }, {
+    name: 'LMStudio',
+    staticModels: [],
+    getDynamicModels: getLMStudioModels,
+    getApiKeyLink: 'https://lmstudio.ai/',
+    labelForGetApiKey: 'Get LMStudio'
+  }
 ];
 
+
+const staticModels: ModelInfo[] = PROVIDER_LIST.map(p => p.staticModels).flat();
+
 export let MODEL_LIST: ModelInfo[] = [...staticModels];
 
 const getOllamaBaseUrl = () => {
@@ -64,7 +135,7 @@ const getOllamaBaseUrl = () => {
   const isDocker = process.env.RUNNING_IN_DOCKER === 'true';
 
   return isDocker
-    ? defaultBaseUrl.replace("localhost", "host.docker.internal")
+    ? defaultBaseUrl.replace('localhost', 'host.docker.internal')
     : defaultBaseUrl;
 };
 
@@ -77,7 +148,7 @@ async function getOllamaModels(): Promise<ModelInfo[]> {
     return data.models.map((model: OllamaModel) => ({
       name: model.name,
       label: `${model.name} (${model.details.parameter_size})`,
-      provider: 'Ollama',
+      provider: 'Ollama'
     }));
   } catch (e) {
     return [];
@@ -86,37 +157,37 @@ async function getOllamaModels(): Promise<ModelInfo[]> {
 
 async function getOpenAILikeModels(): Promise<ModelInfo[]> {
   try {
-    const base_url = import.meta.env.OPENAI_LIKE_API_BASE_URL || "";
+    const base_url = import.meta.env.OPENAI_LIKE_API_BASE_URL || '';
     if (!base_url) {
       return [];
     }
-    const api_key = import.meta.env.OPENAI_LIKE_API_KEY ?? "";
+    const api_key = import.meta.env.OPENAI_LIKE_API_KEY ?? '';
     const response = await fetch(`${base_url}/models`, {
       headers: {
-        Authorization: `Bearer ${api_key}`,
+        Authorization: `Bearer ${api_key}`
       }
     });
     const res = await response.json() as any;
     return res.data.map((model: any) => ({
       name: model.id,
       label: model.id,
-      provider: 'OpenAILike',
+      provider: 'OpenAILike'
     }));
   } catch (e) {
-    return []
+    return [];
   }
 
 }
 
 async function getLMStudioModels(): Promise<ModelInfo[]> {
   try {
-    const base_url = import.meta.env.LMSTUDIO_API_BASE_URL || "http://localhost:1234";
+    const base_url = import.meta.env.LMSTUDIO_API_BASE_URL || 'http://localhost:1234';
     const response = await fetch(`${base_url}/v1/models`);
     const data = await response.json() as any;
     return data.data.map((model: any) => ({
       name: model.id,
       label: model.id,
-      provider: 'LMStudio',
+      provider: 'LMStudio'
     }));
   } catch (e) {
     return [];
@@ -125,10 +196,9 @@ async function getLMStudioModels(): Promise<ModelInfo[]> {
 
 
 async function initializeModelList(): Promise<void> {
-  const ollamaModels = await getOllamaModels();
-  const openAiLikeModels = await getOpenAILikeModels();
-  const lmstudioModels = await getLMStudioModels();
-  MODEL_LIST = [...ollamaModels,...openAiLikeModels, ...staticModels,...lmstudioModels,];
+  MODEL_LIST = [...(await Promise.all(
+    PROVIDER_LIST.filter(p => !!p.getDynamicModels).map(p => p.getDynamicModels()))).flat(), ...staticModels];
 }
+
 initializeModelList().then();
-export { getOllamaModels,getOpenAILikeModels,getLMStudioModels,initializeModelList };
+export { getOllamaModels, getOpenAILikeModels, getLMStudioModels, initializeModelList, PROVIDER_LIST };