From 1a97bd55c7364c7652063d0bfd6d91de8398b2c4 Mon Sep 17 00:00:00 2001 From: H0llyW00dzZ Date: Sat, 3 Feb 2024 00:19:25 +0700 Subject: [PATCH 1/5] Feat [OpenAI] [Models] gpt-3.5-turbo-0125 (#3971) - [+] feat(constant.ts): add new model 'gpt-3.5-turbo-0125' to DEFAULT_MODELS array --- app/constant.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/constant.ts b/app/constant.ts index 8f2518140..fc49e3dbc 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -213,6 +213,15 @@ export const DEFAULT_MODELS = [ providerType: "openai", }, }, + { + name: "gpt-3.5-turbo-0125", + available: true, + provider: { + id: "openai", + providerName: "OpenAI", + providerType: "openai", + }, + }, { name: "gpt-3.5-turbo-0301", available: true, From b25a0545f5b348bbef81f4fe8d41695c3fc10d94 Mon Sep 17 00:00:00 2001 From: Duplicate4 Date: Sat, 3 Feb 2024 01:20:10 +0800 Subject: [PATCH 2/5] fix: typo (#3871) Signed-off-by: Dup4 --- app/components/settings.tsx | 4 ++-- app/store/sync.ts | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/components/settings.tsx b/app/components/settings.tsx index 409af64d3..35d3b0215 100644 --- a/app/components/settings.tsx +++ b/app/components/settings.tsx @@ -268,7 +268,7 @@ function CheckButton() { const syncStore = useSyncStore(); const couldCheck = useMemo(() => { - return syncStore.coundSync(); + return syncStore.cloudSync(); }, [syncStore]); const [checkState, setCheckState] = useState< @@ -472,7 +472,7 @@ function SyncItems() { const promptStore = usePromptStore(); const maskStore = useMaskStore(); const couldSync = useMemo(() => { - return syncStore.coundSync(); + return syncStore.cloudSync(); }, [syncStore]); const [showSyncConfigModal, setShowSyncConfigModal] = useState(false); diff --git a/app/store/sync.ts b/app/store/sync.ts index b74f6895f..5ff1cc6e5 100644 --- a/app/store/sync.ts +++ b/app/store/sync.ts @@ -48,7 +48,7 @@ const DEFAULT_SYNC_STATE = { export const useSyncStore = createPersistStore( DEFAULT_SYNC_STATE, (set, get) => ({ - coundSync() { + cloudSync() { const config = get()[get().provider]; return Object.values(config).every((c) => c.toString().length > 0); }, @@ -60,8 +60,10 @@ export const useSyncStore = createPersistStore( export() { const state = getLocalAppState(); const datePart = isApp - ? `${new Date().toLocaleDateString().replace(/\//g, '_')} ${new Date().toLocaleTimeString().replace(/:/g, '_')}` - : new Date().toLocaleString(); + ? `${new Date().toLocaleDateString().replace(/\//g, "_")} ${new Date() + .toLocaleTimeString() + .replace(/:/g, "_")}` + : new Date().toLocaleString(); const fileName = `Backup-${datePart}.json`; downloadAs(JSON.stringify(state), fileName); From 4511aa4d21eda4e6e0b5130d1e3222bb30734672 Mon Sep 17 00:00:00 2001 From: H0llyW00dzZ Date: Sat, 3 Feb 2024 00:24:37 +0700 Subject: [PATCH 3/5] Fix [UI/UX] [Emoji] Update CDN (#3966) - [+] fix(emoji.tsx): update CDN url from 'cdn.jsdelivr.net' to 'fastly.jsdelivr.net' --- app/components/emoji.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/emoji.tsx b/app/components/emoji.tsx index a2a50320d..b24349307 100644 --- a/app/components/emoji.tsx +++ b/app/components/emoji.tsx @@ -13,7 +13,7 @@ export function getEmojiUrl(unified: string, style: EmojiStyle) { // Whoever owns this Content Delivery Network (CDN), I am using your CDN to serve emojis // Old CDN broken, so I had to switch to this one // Author: https://github.com/H0llyW00dzZ - return `https://cdn.jsdelivr.net/npm/emoji-datasource-apple/img/${style}/64/${unified}.png`; + return `https://fastly.jsdelivr.net/npm/emoji-datasource-apple/img/${style}/64/${unified}.png`; } export function AvatarPicker(props: { From a5517a1a51de81f9527f2e734d8412f6f4f8962c Mon Sep 17 00:00:00 2001 From: H0llyW00dzZ Date: Mon, 5 Feb 2024 12:35:51 +0700 Subject: [PATCH 4/5] Improve Default System Template (#3996) * Feat [UI/UX] [Constant] [DEFAULT System Template] replace hardcoded - [+] feat(constant.ts): replace hardcoded OpenAI with dynamic ServiceProvider variable in DEFAULT_SYSTEM_TEMPLATE * Improve [UI/UX] [Chat] "fillTemplateWith" - [+] feat(chat.ts): add DEFAULT_MODELS to modelConfig - [+] fix(chat.ts): replace replaceAll with regex in output string replacement - [+] refactor(chat.ts): use const instead of let for cutoff variable --- app/constant.ts | 2 +- app/store/chat.ts | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/constant.ts b/app/constant.ts index fc49e3dbc..68d0e1395 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -95,7 +95,7 @@ export const Google = { export const DEFAULT_INPUT_TEMPLATE = `{{input}}`; // input / time / model / lang export const DEFAULT_SYSTEM_TEMPLATE = ` -You are ChatGPT, a large language model trained by OpenAI. +You are ChatGPT, a large language model trained by {{ServiceProvider}}. Knowledge cutoff: {{cutoff}} Current model: {{model}} Current time: {{time}} diff --git a/app/store/chat.ts b/app/store/chat.ts index dff6b7bf1..a3dc94089 100644 --- a/app/store/chat.ts +++ b/app/store/chat.ts @@ -6,6 +6,7 @@ import { ModelConfig, ModelType, useAppConfig } from "./config"; import { createEmptyMask, Mask } from "./mask"; import { DEFAULT_INPUT_TEMPLATE, + DEFAULT_MODELS, DEFAULT_SYSTEM_TEMPLATE, KnowledgeCutOffDate, ModelProvider, @@ -91,10 +92,17 @@ function countMessages(msgs: ChatMessage[]) { } function fillTemplateWith(input: string, modelConfig: ModelConfig) { - let cutoff = - KnowledgeCutOffDate[modelConfig.model] ?? KnowledgeCutOffDate.default; + const cutoff = KnowledgeCutOffDate[modelConfig.model] ?? KnowledgeCutOffDate.default; + // Find the model in the DEFAULT_MODELS array that matches the modelConfig.model + const modelInfo = DEFAULT_MODELS.find(m => m.name === modelConfig.model); + if (!modelInfo) { + throw new Error(`Model ${modelConfig.model} not found in DEFAULT_MODELS array.`); + } + // Directly use the providerName from the modelInfo + const serviceProvider = modelInfo.provider.providerName; const vars = { + ServiceProvider: serviceProvider, cutoff, model: modelConfig.model, time: new Date().toLocaleString(), @@ -111,7 +119,8 @@ function fillTemplateWith(input: string, modelConfig: ModelConfig) { } Object.entries(vars).forEach(([name, value]) => { - output = output.replaceAll(`{{${name}}}`, value); + const regex = new RegExp(`{{${name}}}`, 'g'); + output = output.replace(regex, value.toString()); // Ensure value is a string }); return output; From bb26c03141473c9437827ceb559d43041b149604 Mon Sep 17 00:00:00 2001 From: H0llyW00dzZ Date: Mon, 5 Feb 2024 13:44:46 +0700 Subject: [PATCH 5/5] Feat [UI/UX] [Constants] [Models] gemini-pro KnowledgeCutOffDate (#3997) - [+] feat(constant.ts): add 'gemini-pro' to KnowledgeCutOffDate constant --- app/constant.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/constant.ts b/app/constant.ts index 68d0e1395..f0e895ed9 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -111,6 +111,9 @@ export const KnowledgeCutOffDate: Record = { "gpt-4-1106-preview": "2023-04", "gpt-4-0125-preview": "2023-04", "gpt-4-vision-preview": "2023-04", + // After improvements, + // it's now easier to add "KnowledgeCutOffDate" instead of stupid hardcoding it, as was done previously. + "gemini-pro": "2023-12", }; export const DEFAULT_MODELS = [