fix(chatgpt): chatgpt & ollama update #39

Author: 10cl

src/app/components/Chat/ConversationPanel.tsx

@@ -187,7 +187,7 @@ const ConversationPanel: FC<Props> = (props) => {
   };
 
   const isBotShowSetting = useCallback(() => {
-    if(props.botId == 'chatgpt' || props.botId == 'claude' || props.botId == 'bing'){
+    if(props.botId == 'chatgpt' || props.botId == 'claude' || props.botId == 'bing' || props.botId == 'ollama'){
       return true
     }
     return false;

src/app/components/Chat/ErrorAction.tsx

@@ -39,7 +39,7 @@ const ChatGPTAuthErrorAction = () => {
 
   return (
     <div className="flex flex-row gap-2 items-center">
-      <a href="https://chat.openai.com" target='_blank' rel="noreferrer"><ActionButton text={t('Login to ChatGPT')} /></a>
+      <a href="https://chatgpt.com" target='_blank' rel="noreferrer"><ActionButton text={t('Login to ChatGPT')} /></a>
       <span className="text-sm text-primary-text">OR</span>
       <a
         onClick={() => setShowSettings(true)}
@@ -93,7 +93,7 @@ const ErrorAction: FC<{ error: ChatError }> = ({ error }) => {
   }
   if (error.code === ErrorCode.CHATGPT_AUTH) {
     return (
-      <a href="https://chat.openai.com" target="_blank" rel="noreferrer">
+      <a href="https://chatgpt.com" target="_blank" rel="noreferrer">
         <ActionButton text={t('Login to ChatGPT')} />
       </a>
     )

src/app/components/Settings/OllamaAPISettings.tsx

@@ -0,0 +1,38 @@
+import { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+import {ClaudeAPIModel, OllamaAPIModel, UserConfig} from '~services/user-config'
+import { Input } from '../Input'
+import Select from '../Select'
+
+interface Props {
+  userConfig: UserConfig
+  updateConfigValue: (update: Partial<UserConfig>) => void
+}
+
+const OllamaAPISettings: FC<Props> = ({ userConfig, updateConfigValue }) => {
+  const { t } = useTranslation()
+  return (
+    <div className="flex flex-col gap-2">
+      <div className="flex flex-col gap-1">
+        <p className="font-medium text-sm">API Host({t('Make sure your Ollama server has `export OLLAMA_ORIGINS="*"` configured')})</p>
+        <Input
+          className="w-[300px]"
+          placeholder="http://xxxx:xxxx/api/chat"
+          value={userConfig.ollamaApi}
+          onChange={(e) => updateConfigValue({ ollamaApi: e.currentTarget.value })}
+          type="input"
+        />
+      </div>
+      <div className="flex flex-col gap-1 w-[300px]">
+        <p className="font-medium text-sm">{t('Model')}</p>
+        <Select
+          options={Object.entries(OllamaAPIModel).map(([k, v]) => ({ name: k, value: v }))}
+          value={userConfig.ollamaModel}
+          onChange={(v) => updateConfigValue({ ollamaModel: v })}
+        />
+      </div>
+    </div>
+  )
+}
+
+export default OllamaAPISettings

src/app/consts.ts

@@ -73,7 +73,7 @@ export const CHATBOTS: Record<BotId, { name: string; avatar: string }> = {
   },
 }
 
-export const CHATGPT_HOME_URL = 'https://chat.openai.com'
+export const CHATGPT_HOME_URL = 'https://chatgpt.com'
 export const CHATGPT_API_MODELS = ['gpt-3.5-turbo', 'gpt-4-turbo', 'gpt-4'] as const
 export const ALL_IN_ONE_PAGE_ID = 'all'
 

src/services/user-config.ts

@@ -11,10 +11,7 @@ export enum BingConversationStyle {
 
 export enum ChatGPTMode {
   Webapp = 'webapp',
-  API = 'api',
-  Azure = 'azure',
-  Poe = 'poe',
-  OpenRouter = 'openrouter',
+  API = 'api'
 }
 
 export enum ChatGPTWebModel {
@@ -35,16 +32,32 @@ export enum PoeClaudeModel {
 
 export enum ClaudeMode {
   Webapp = 'webapp',
-  API = 'api',
-  Poe = 'poe',
-  OpenRouter = 'openrouter',
+  API = 'api'
 }
 
 export enum ClaudeAPIModel {
-  'claude-2' = 'claude-2',
-  'claude-instant-1' = 'claude-instant-v1',
+  'claude-instant-1' = 'claude-instant-1.2',
+  'claude-2' = 'claude-2.1',
+  'claude-3-sonnet' = 'claude-3-sonnet-20240229',
+  'claude-3-opus' = 'claude-3-opus-20240229'
+}
+
+export enum OllamaAPIModel {
+  'Llama 3 8B ' = 'llama3',
+  'Llama 3 70B' = 'llama3:70b',
+  'Phi-3 3.8B ' = 'phi3',
+  'Mistral 7B ' = 'mistral',
+  'Neural Chat 7B ' = 'neural-chat',
+  'Starling  7B ' = 'starling-lm',
+  'Code Llama  7B ' = 'codellama',
+  'Llama 2 Uncensored  7B ' = 'llama2-uncensored',
+  'LLaVA 7B ' = 'llava',
+  'Gemma 2B ' = 'gemma:2b',
+  'Gemma 7B ' = 'gemma:7b',
+  'Solar 10.7B' = 'solar'
 }
 
+
 export enum OpenRouterClaudeModel {
   'claude-2' = 'claude-2',
   'claude-instant-v1' = 'claude-instant-v1',
@@ -59,19 +72,20 @@ const userConfigWithDefaultValue = {
   chatgptMode: ChatGPTMode.Webapp,
   chatgptWebappModelName: ChatGPTWebModel['GPT-3.5'],
   chatgptPoeModelName: PoeGPTModel['GPT-3.5'],
-  startupPage: "chatgpt",
   bingConversationStyle: BingConversationStyle.Balanced,
   poeModel: PoeClaudeModel['claude-instant'],
   azureOpenAIApiKey: '',
   azureOpenAIApiInstanceName: '',
   azureOpenAIApiDeploymentName: '',
-  enabledBots: Object.keys(CHATBOTS).slice(0, 8) as BotId[],
+  enabledBots: Object.keys(CHATBOTS) as BotId[],
   claudeApiKey: '',
-  claudeMode: ClaudeMode.Poe,
+  claudeMode: ClaudeMode.API,
   claudeApiModel: ClaudeAPIModel['claude-2'],
   openrouterOpenAIModel: CHATGPT_API_MODELS[0] as (typeof CHATGPT_API_MODELS)[number],
   openrouterClaudeModel: OpenRouterClaudeModel['claude-2'],
   openrouterApiKey: '',
+  ollamaApi: 'http://localhost:11434/api/chat',
+  ollamaModel: 'llama3'
 }
 
 export type UserConfig = typeof userConfigWithDefaultValue
@@ -93,12 +107,6 @@ export async function getUserConfig(): Promise<UserConfig> {
   if (result.chatgptApiModel === 'gpt-3.5-turbo-16k') {
     result.chatgptApiModel = 'gpt-3.5-turbo'
   }
-  if (
-    result.claudeApiModel !== ClaudeAPIModel['claude-2'] ||
-    result.claudeApiModel !== ClaudeAPIModel['claude-instant-1']
-  ) {
-    result.claudeApiModel = ClaudeAPIModel['claude-2']
-  }
   return defaults(result, userConfigWithDefaultValue)
 }