From 7b9db4d7d949a2b2d96a2b5853045b3f1568a9d4 Mon Sep 17 00:00:00 2001
From: Dooy <dooy520@qq.com>
Date: Tue, 26 Nov 2024 15:59:28 +0800
Subject: [PATCH] 2.22.3

---
 changlog.md               | 3 +++
 package.json              | 2 +-
 src-tauri/tauri.conf.json | 2 +-
 src/api/mjapi.ts          | 2 +-
 src/api/openapi.ts        | 1 +
 src/views/mj/aiModel.vue  | 4 ++--
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/changlog.md b/changlog.md
index 15a7d6ee6e..d06e019689 100644
--- a/changlog.md
+++ b/changlog.md
@@ -1,6 +1,9 @@
 # 功能升级日志
 
 #  计划 
+# 2.22.3
+- 😄 新增音乐：suno-v4
+- 😄 新增gpt模型：gpt-4o-2024-11-20
 # 2.22.2
 - 😄 新增：支持ruanway 官方api
 - 🐞 修复：模型识图表示
diff --git a/package.json b/package.json
index cb7f02de4d..6b71cdf07f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-web-midjourney-proxy",
-  "version": "2.22.2",
+  "version": "2.22.3",
   "private": false,
   "description": "ChatGPT Web Midjourney Proxy",
   "author": "Dooy <ydlhero@gmail.com>",
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index e213cda040..3a750f49c1 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "ChatGPT-MJ",
-    "version": "2.22.2"
+    "version": "2.22.3"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/api/mjapi.ts b/src/api/mjapi.ts
index 1971887c9e..f1058fef63 100644
--- a/src/api/mjapi.ts
+++ b/src/api/mjapi.ts
@@ -389,7 +389,7 @@ export const isCanBase64Model=(model:string)=>{
         return true
     }
     //if(model.indexOf('sonnet')>-1 ) return true ;
-    let visionArr=['gemini-pro-vision','gpt-4o-2024-08-06','gpt-4o','gpt-4o-2024-05-13','gpt-4o-mini','gpt-4o-mini-2024-07-18','gemini-pro-1.5','gpt-4-turbo','gpt-4-turbo-2024-04-09','gpt-4-vision-preview','luma-video','claude-3-5-sonnet-20240620' ,'claude-3-sonnet-20240229','claude-3-opus-20240229', defaultVisionModel() ]
+    let visionArr=['gemini-pro-vision','gpt-4o-2024-08-06','gpt-4o-2024-11-20','gpt-4o','gpt-4o-2024-05-13','gpt-4o-mini','gpt-4o-mini-2024-07-18','gemini-pro-1.5','gpt-4-turbo','gpt-4-turbo-2024-04-09','gpt-4-vision-preview','luma-video','claude-3-5-sonnet-20240620' ,'claude-3-sonnet-20240229','claude-3-opus-20240229', defaultVisionModel() ]
     if( homeStore.myData.session.customVisionModel ){ 
         homeStore.myData.session.customVisionModel.split(/[ ,]+/ig).map( (v:string)=>{
             visionArr.push( v.toLocaleLowerCase() )
diff --git a/src/api/openapi.ts b/src/api/openapi.ts
index 11a333f53d..80e0c82e90 100644
--- a/src/api/openapi.ts
+++ b/src/api/openapi.ts
@@ -33,6 +33,7 @@ export const KnowledgeCutOffDate: Record<string, string> = {
   "gpt-4o-mini-2024-07-18": "2023-10", 
   "gpt-4o-2024-08-06": "2023-10", //chatgpt-4o-latest
   "chatgpt-4o-latest": "2023-10", 
+  "gpt-4o-2024-11-20": "2023-10", 
   "gpt-4-turbo": "2023-12", 
   "gpt-4-turbo-preview": "2023-12",
   "claude-3-opus-20240229": "2023-08",
diff --git a/src/views/mj/aiModel.vue b/src/views/mj/aiModel.vue
index 0dded84b66..abd6d4778e 100644
--- a/src/views/mj/aiModel.vue
+++ b/src/views/mj/aiModel.vue
@@ -14,7 +14,7 @@ const chatSet = new chatSetting( uuid==null?1002:uuid);
 const nGptStore = ref(  chatSet.getGptConfig() );
 
 const config = ref({
-model:[ 'gpt-4-turbo-2024-04-09','o1-preview','o1-mini','o1-preview-2024-09-12','o1-mini-2024-09-12','chatgpt-4o-latest','gpt-4o-2024-08-06','gpt-4o-2024-05-13','gpt-4o-mini-2024-07-18','gpt-4o-mini','gpt-4o','gpt-4-turbo','gpt-4-0125-preview','gpt-3.5-turbo',`gpt-4-1106-preview`,`gpt-3.5-turbo-16k`,'gpt-4','gpt-4-0613','gpt-4-32k-0613' ,'gpt-4-32k','gpt-4-32k-0314',`gpt-3.5-turbo-16k-0613`
+model:[ 'gpt-4-turbo-2024-04-09','o1-preview','o1-mini','o1-preview-2024-09-12','o1-mini-2024-09-12','chatgpt-4o-latest','gpt-4o-2024-11-20','gpt-4o-2024-08-06','gpt-4o-2024-05-13','gpt-4o-mini-2024-07-18','gpt-4o-mini','gpt-4o','gpt-4-turbo','gpt-4-0125-preview','gpt-3.5-turbo',`gpt-4-1106-preview`,`gpt-3.5-turbo-16k`,'gpt-4','gpt-4-0613','gpt-4-32k-0613' ,'gpt-4-32k','gpt-4-32k-0314',`gpt-3.5-turbo-16k-0613`
 ,`gpt-4-vision-preview`,`gpt-3.5-turbo-1106` ,'gpt-3.5-turbo-0125'
 ,'gpt-3.5-turbo-0301','gpt-3.5-turbo-0613','gpt-4-all','gpt-3.5-net'
 ,'gemini-pro',"gemini-pro-vision",'gemini-pro-1.5',"gemini-1.5-pro-exp-0801"
@@ -93,7 +93,7 @@ watch(()=>nGptStore.value.model,(n)=>{
         max=65536 ;
     }else if(  n.indexOf('o1-mini')>-1){  
         max=65536 *2;
-    }else if( n=='gpt-4o-2024-08-06' || n=='chatgpt-4o-latest' ){  
+    }else if( n=='gpt-4o-2024-08-06' || n=='chatgpt-4o-latest' || n.indexOf('gpt-4o')>-1 ){  
         max=16384 *2;
     }else if( n.indexOf('gpt-4')>-1 ||  n.indexOf('16k')>-1 ||  n.indexOf('o1-')>-1 ){ //['16k','8k','32k','gpt-4'].indexOf(n)>-1
         max=4096*2;