From ae19a0dc5ff6d7dc15e811eed131eb4e1bacb63a Mon Sep 17 00:00:00 2001 From: Fred Liang Date: Sun, 24 Dec 2023 04:22:12 +0800 Subject: [PATCH] chroe: update model name --- app/client/api.ts | 8 ++++---- app/client/platforms/google.ts | 4 ++-- app/components/exporter.tsx | 4 ++-- app/components/home.tsx | 4 ++-- app/constant.ts | 4 ++-- app/locales/cn.ts | 2 +- app/locales/en.ts | 2 +- app/store/chat.ts | 10 +++++----- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/client/api.ts b/app/client/api.ts index 3215f45b..30a220ea 100644 --- a/app/client/api.ts +++ b/app/client/api.ts @@ -7,7 +7,7 @@ import { } from "../constant"; import { ChatMessage, ModelType, useAccessStore, useChatStore } from "../store"; import { ChatGPTApi } from "./platforms/openai"; -import { GeminiApi } from "./platforms/google"; +import { GeminiProApi } from "./platforms/google"; export const ROLES = ["system", "user", "assistant"] as const; export type MessageRole = (typeof ROLES)[number]; @@ -86,8 +86,8 @@ export class ClientApi { public llm: LLMApi; constructor(provider: ModelProvider = ModelProvider.GPT) { - if (provider === ModelProvider.Gemini) { - this.llm = new GeminiApi(); + if (provider === ModelProvider.GeminiPro) { + this.llm = new GeminiProApi(); return; } this.llm = new ChatGPTApi(); @@ -146,7 +146,7 @@ export function getHeaders() { "x-requested-with": "XMLHttpRequest", }; const modelConfig = useChatStore.getState().currentSession().mask.modelConfig; - const isGoogle = modelConfig.model === "gemini"; + const isGoogle = modelConfig.model === "gemini-pro"; const isAzure = accessStore.provider === ServiceProvider.Azure; const authHeader = isAzure ? "api-key" : "Authorization"; const apiKey = isGoogle diff --git a/app/client/platforms/google.ts b/app/client/platforms/google.ts index edff13a2..e1e52663 100644 --- a/app/client/platforms/google.ts +++ b/app/client/platforms/google.ts @@ -9,9 +9,9 @@ import { prettyObject } from "@/app/utils/format"; import { getClientConfig } from "@/app/config/client"; import Locale from "../../locales"; import { getServerSideConfig } from "@/app/config/server"; -export class GeminiApi implements LLMApi { +export class GeminiProApi implements LLMApi { extractMessage(res: any) { - console.log("[Response] gemini response: ", res); + console.log("[Response] gemini-pro response: ", res); return ( res?.candidates?.at(0)?.content?.parts.at(0)?.text || res?.error?.message || diff --git a/app/components/exporter.tsx b/app/components/exporter.tsx index 70b4ab91..dff17e4a 100644 --- a/app/components/exporter.tsx +++ b/app/components/exporter.tsx @@ -307,8 +307,8 @@ export function PreviewActions(props: { setShouldExport(false); var api: ClientApi; - if (config.modelConfig.model === "gemini") { - api = new ClientApi(ModelProvider.Gemini); + if (config.modelConfig.model === "gemini-pro") { + api = new ClientApi(ModelProvider.GeminiPro); } else { api = new ClientApi(ModelProvider.GPT); } diff --git a/app/components/home.tsx b/app/components/home.tsx index 928c2d90..4be7da0f 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -171,8 +171,8 @@ export function useLoadData() { const config = useAppConfig(); var api: ClientApi; - if (config.modelConfig.model === "gemini") { - api = new ClientApi(ModelProvider.Gemini); + if (config.modelConfig.model === "gemini-pro") { + api = new ClientApi(ModelProvider.GeminiPro); } else { api = new ClientApi(ModelProvider.GPT); } diff --git a/app/constant.ts b/app/constant.ts index 1f6a647d..7668381c 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -72,7 +72,7 @@ export enum ServiceProvider { export enum ModelProvider { GPT = "GPT", - Gemini = "Gemini", + GeminiPro = "GeminiPro", } export const OpenaiPath = { @@ -240,7 +240,7 @@ export const DEFAULT_MODELS = [ }, }, { - name: "gemini", + name: "gemini-pro", available: true, provider: { id: "google", diff --git a/app/locales/cn.ts b/app/locales/cn.ts index 69b6c025..8746047f 100644 --- a/app/locales/cn.ts +++ b/app/locales/cn.ts @@ -325,7 +325,7 @@ const cn = { }, ApiVerion: { - Title: "接口版本 (gemini api version)", + Title: "接口版本 (gemini-pro api version)", SubTitle: "选择指定的部分版本", }, }, diff --git a/app/locales/en.ts b/app/locales/en.ts index 21aa6383..768275c0 100644 --- a/app/locales/en.ts +++ b/app/locales/en.ts @@ -333,7 +333,7 @@ const en: LocaleType = { }, ApiVerion: { - Title: "API Version (gemini api version)", + Title: "API Version (gemini-pro api version)", SubTitle: "Select a specific part version", }, }, diff --git a/app/store/chat.ts b/app/store/chat.ts index f53f6115..1dcf4e64 100644 --- a/app/store/chat.ts +++ b/app/store/chat.ts @@ -303,8 +303,8 @@ export const useChatStore = createPersistStore( }); var api: ClientApi; - if (modelConfig.model === "gemini") { - api = new ClientApi(ModelProvider.Gemini); + if (modelConfig.model === "gemini-pro") { + api = new ClientApi(ModelProvider.GeminiPro); } else { api = new ClientApi(ModelProvider.GPT); } @@ -389,7 +389,7 @@ export const useChatStore = createPersistStore( const shouldInjectSystemPrompts = modelConfig.enableInjectSystemPrompts; var systemPrompts: ChatMessage[] = []; - if (modelConfig.model !== "gemini") { + if (modelConfig.model !== "gemini-pro") { systemPrompts = shouldInjectSystemPrompts ? [ createMessage({ @@ -488,8 +488,8 @@ export const useChatStore = createPersistStore( const modelConfig = session.mask.modelConfig; var api: ClientApi; - if (modelConfig.model === "gemini") { - api = new ClientApi(ModelProvider.Gemini); + if (modelConfig.model === "gemini-pro") { + api = new ClientApi(ModelProvider.GeminiPro); } else { api = new ClientApi(ModelProvider.GPT); }