From 8e522509d9c12bcc24b8e8d4f9411b4d7c5fee5b Mon Sep 17 00:00:00 2001
From: Dooy <dooy520@qq.com>
Date: Sat, 21 Dec 2024 23:04:57 +0800
Subject: [PATCH] 2.22.8

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

diff --git a/changlog.md b/changlog.md
index 27bb8b94a9..64d5ce5754 100644
--- a/changlog.md
+++ b/changlog.md
@@ -1,6 +1,8 @@
 # 功能升级日志
 
 #  计划 
+# 2.22.8
+- 😄 新增：o1  o1-2024-12-17
 
 # 2.22.7
 - 😄 修改：suno upload 二次创作方式
diff --git a/package.json b/package.json
index e491035ea0..7ea0e0f64a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-web-midjourney-proxy",
-  "version": "2.22.7",
+  "version": "2.22.8",
   "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 dc0f3d21a6..13b26a89e0 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "ChatGPT-MJ",
-    "version": "2.22.7"
+    "version": "2.22.8"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/api/openapi.ts b/src/api/openapi.ts
index 80e0c82e90..402ccb7232 100644
--- a/src/api/openapi.ts
+++ b/src/api/openapi.ts
@@ -26,6 +26,8 @@ export const KnowledgeCutOffDate: Record<string, string> = {
   "gpt-4o-2024-05-13": "2023-10", 
   "o1-preview-2024-09-12": "2023-10", 
   "o1-preview": "2023-10", 
+  "o1": "2023-10", 
+  "o1-2024-12-17": "2023-10", 
   "o1-mini": "2023-10", 
   "o1-mini-2024-09-12": "2023-10", 
   "gpt-4o": "2023-10", 
diff --git a/src/views/mj/aiModel.vue b/src/views/mj/aiModel.vue
index abd6d4778e..9474141ce7 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-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`
+model:[ 'o1','o1-2024-12-17', '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"
@@ -89,10 +89,10 @@ watch(()=>nGptStore.value.model,(n)=>{
     let max=4096*2*2;
     if( n.indexOf('vision')>-1){
         max=4096*2;
-    }else if(  n.indexOf('o1-preview')>-1){  
-        max=65536 ;
     }else if(  n.indexOf('o1-mini')>-1){  
         max=65536 *2;
+    }else if(  n.indexOf('o1-')>-1 || n=='o1' ){  
+        max=65536 ;
     }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