v2.20.2

changlog.md

@@ -1,8 +1,13 @@
 # 功能升级日志
 
 #  计划 
+# 2.20.2
+- 😄 新增：gemini-1.5-pro-exp-0801
+- 😄 新增：chatgpt-4o-latest
+
 # 2.20.1
 - 😄 新增：gpt-4o-2024-08-06
+
 # 2.19.10
 - 😄 新增：视频 runway gen3 支持图片
 - 😄 新增：mj 6.1选项

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-web-midjourney-proxy",
-  "version": "2.20.1",
+  "version": "2.20.2",
   "private": false,
   "description": "ChatGPT Web Midjourney Proxy",
   "author": "Dooy <[email protected]>",

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "ChatGPT-MJ",
-    "version": "2.20.1"
+    "version": "2.20.2"
   },
   "tauri": {
     "allowlist": {

src/api/mjapi.ts

@@ -375,6 +375,9 @@ export const canVisionModel= (model:string)=>{
 export const isCanBase64Model=(model:string)=>{
     //gpt-4o
     //customVisionModel
+    if(model.indexOf('gpt-4o')>-1 || ( model.indexOf('gemini')>-1 && model.indexOf('1.5')>-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() ]
     if( homeStore.myData.session.customVisionModel ){ 
         homeStore.myData.session.customVisionModel.split(/[ ,]+/ig).map( (v:string)=>{

src/api/openapi.ts

@@ -25,7 +25,8 @@ export const KnowledgeCutOffDate: Record<string, string> = {
   "gpt-4o": "2023-10", 
   "gpt-4o-mini": "2023-10", 
   "gpt-4o-mini-2024-07-18": "2023-10", 
-  "gpt-4o-2024-08-06": "2023-10", 
+  "gpt-4o-2024-08-06": "2023-10", //chatgpt-4o-latest
+  "chatgpt-4o-latest": "2023-10", 
   "gpt-4-turbo": "2023-12", 
   "gpt-4-turbo-preview": "2023-12",
   "claude-3-opus-20240229": "2023-08",

src/views/mj/aiModel.vue

@@ -14,9 +14,10 @@ const chatSet = new chatSetting( uuid==null?1002:uuid);
 const nGptStore = ref(  chatSet.getGptConfig() );
 
 const config = ref({
-model:[ 'gpt-4-turbo-2024-04-09','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','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`
 ,`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'
+,'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"
 ,'claude-3-sonnet-20240229','claude-3-opus-20240229','claude-3-haiku-20240307','claude-3-5-sonnet-20240620','suno-v3'
 ]
 ,maxToken:4096
@@ -88,7 +89,7 @@ watch(()=>nGptStore.value.model,(n)=>{
     let max=4096*2*2;
     if( n.indexOf('vision')>-1){
         max=4096*2;
-    }else if( n=='gpt-4o-2024-08-06' ){  
+    }else if( n=='gpt-4o-2024-08-06' || n=='chatgpt-4o-latest' ){  
         max=16384 *2;
     }else if( n.indexOf('gpt-4')>-1 ||  n.indexOf('16k')>-1 ){ //['16k','8k','32k','gpt-4'].indexOf(n)>-1
         max=4096*2;