From f9f32289eafd6fa01ff63b360de961ffbee73d2d Mon Sep 17 00:00:00 2001 From: XiaomaiTX Date: Thu, 18 Jul 2024 20:13:17 +0800 Subject: [PATCH 1/5] chore(gitignore): add .env to .gitignore for opencommit configuration --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 57af2a0..6fe3f20 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,6 @@ access/*.json db redis config + +# for opencommit +.env \ No newline at end of file From b78e8fe2e992830a49c8c2fec61d88f4fbab6aaf Mon Sep 17 00:00:00 2001 From: XiaomaiTX Date: Thu, 18 Jul 2024 20:13:47 +0800 Subject: [PATCH 2/5] fix(settings.ts): correct default sender behavior for mobile and PC --- app/src/store/settings.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/store/settings.ts b/app/src/store/settings.ts index 8c01f30..69eae79 100644 --- a/app/src/store/settings.ts +++ b/app/src/store/settings.ts @@ -15,7 +15,7 @@ export const initialSettings = { context: true, align: false, history: 8, - sender: isMobile(), // Defaults to true (Enter) in the case of mobile and false (Ctrl + Enter) on PCs + sender: !isMobile(), // default [mobile: Ctrl + Enter, pc: Enter] max_tokens: 2000, temperature: 0.6, top_p: 1, @@ -32,7 +32,7 @@ export const settingsSlice = createSlice({ context: getBooleanMemory("context", true), // keep context align: getBooleanMemory("align", false), // chat textarea align center history: getNumberMemory("history_context", 8), // max history context length - sender: getBooleanMemory("sender", false), // sender (false: Ctrl + Enter, true: Enter) + sender: getBooleanMemory("sender", !isMobile()), // sender (false: Ctrl + Enter, true: Enter) max_tokens: getNumberMemory("max_tokens", 2000), // max tokens temperature: getNumberMemory("temperature", 0.6), // temperature top_p: getNumberMemory("top_p", 1), // top_p From b7d50acd6e2902ae5ec0a2f97a7f2dbf4bc1e3cc Mon Sep 17 00:00:00 2001 From: XiaomaiTX Date: Thu, 18 Jul 2024 20:56:06 +0800 Subject: [PATCH 3/5] chore(version): bump version from 3.11.0 to 3.11.1 in tauri.conf.json and bootstrap.ts --- app/src-tauri/tauri.conf.json | 2 +- app/src/conf/bootstrap.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src-tauri/tauri.conf.json b/app/src-tauri/tauri.conf.json index 8dfff2e..ee85ddb 100644 --- a/app/src-tauri/tauri.conf.json +++ b/app/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "chatnio", - "version": "3.11.0" + "version": "3.11.1" }, "tauri": { "allowlist": { diff --git a/app/src/conf/bootstrap.ts b/app/src/conf/bootstrap.ts index 5c7f113..a9c6478 100644 --- a/app/src/conf/bootstrap.ts +++ b/app/src/conf/bootstrap.ts @@ -7,7 +7,7 @@ import { import { syncSiteInfo } from "@/admin/api/info.ts"; import { setAxiosConfig } from "@/conf/api.ts"; -export const version = "3.11.0"; // version of the current build +export const version = "3.11.1"; // version of the current build export const dev: boolean = getDev(); // is in development mode (for debugging, in localhost origin) export const deploy: boolean = true; // is production environment (for api endpoint) export const tokenField = getTokenField(deploy); // token field name for storing token From 77ab253f455ac9b7947dee4449ef0e0d3a5c3d7e Mon Sep 17 00:00:00 2001 From: XiaomaiTX Date: Fri, 19 Jul 2024 20:29:43 +0800 Subject: [PATCH 4/5] fix: redefine `sendKeys` --- app/src/store/settings.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/store/settings.ts b/app/src/store/settings.ts index 69eae79..8840a64 100644 --- a/app/src/store/settings.ts +++ b/app/src/store/settings.ts @@ -8,9 +8,7 @@ import { import { RootState } from "@/store/index.ts"; import { isMobile } from "@/utils/device"; -export const sendKeys = isMobile() - ? ["Ctrl + Enter", "Enter"] - : ["Enter", "Ctrl + Enter"]; +export const sendKeys = ["Ctrl + Enter", "Enter"]; export const initialSettings = { context: true, align: false, From 2efef764c08e5d32e18abb4483c5c33a182f45a2 Mon Sep 17 00:00:00 2001 From: XiaomaiTX Date: Fri, 19 Jul 2024 20:38:56 +0800 Subject: [PATCH 5/5] feat: Add support of `gpt-4o-mini ` chore(version): bump version from `3.11.1` to `3.11.2` --- app/src-tauri/tauri.conf.json | 2 +- app/src/admin/channel.ts | 2 ++ app/src/admin/colors.ts | 2 ++ app/src/admin/datasets/charge.ts | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src-tauri/tauri.conf.json b/app/src-tauri/tauri.conf.json index ee85ddb..41d8430 100644 --- a/app/src-tauri/tauri.conf.json +++ b/app/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "chatnio", - "version": "3.11.1" + "version": "3.11.2" }, "tauri": { "allowlist": { diff --git a/app/src/admin/channel.ts b/app/src/admin/channel.ts index e4489b8..09085cb 100644 --- a/app/src/admin/channel.ts +++ b/app/src/admin/channel.ts @@ -116,6 +116,8 @@ export const ChannelInfos: Record = { "gpt-4-32k-0613", "gpt-4o", "gpt-4o-2024-05-13", + "gpt-4o-mini", + "gpt-4o-mini-2024-07-18", "dalle", "dall-e-2", "dall-e-3", diff --git a/app/src/admin/colors.ts b/app/src/admin/colors.ts index 32ccc74..7b18bcc 100644 --- a/app/src/admin/colors.ts +++ b/app/src/admin/colors.ts @@ -35,6 +35,8 @@ export const modelColorMapper: Record = { "gpt-4-32k-0314": "purple-600", "gpt-4o": "purple-600", "gpt-4o-2024-05-13": "purple-600", + "gpt-4o-mini": "purple-600", + "gpt-4o-mini-2024-07-18": "purple-600", "dall-e-3": "purple-700", diff --git a/app/src/admin/datasets/charge.ts b/app/src/admin/datasets/charge.ts index 789f023..77e30a4 100644 --- a/app/src/admin/datasets/charge.ts +++ b/app/src/admin/datasets/charge.ts @@ -73,6 +73,11 @@ export const pricing: PricingDataset = [ input: 0.005, output: 0.015, }, + { + models: ["gpt-4o-mini", "gpt-4o-mini-2024-07-18"], + input: 0.00015, + output: 0.0006, + }, { models: ["gpt-4-32k", "gpt-4-32k-0314", "gpt-4-32k-0613"],