v2.20.3

changlog.md

@@ -5,6 +5,8 @@
 - 🤖 合并： 新增自定义背景图片 #488 @Yanyutin753
 - 💄 合并： 优化文件上传样式 #487 @Yanyutin753
 - 💄 合并： AUTH_SECRET_KEY 新增多密钥支持，使用,隔开 #484 @Yanyutin753 
+- 😄 新增： runway Gen3a Turbo
+- 😄 新增： UI服务端 同步 `runway` `viggle` 设置
 
 # 2.20.2
 - 😄 新增：gemini-1.5-pro-exp-0801

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-web-midjourney-proxy",
-  "version": "2.20.2",
+  "version": "2.20.3",
   "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.2"
+    "version": "2.20.3"
   },
   "tauri": {
     "allowlist": {

src/api/openapi.ts

@@ -464,10 +464,15 @@ export const openaiSetting= ( q:any,ms:MessageApiInjection )=>{
                 MJ_SERVER:url, 
                 SUNO_SERVER:url,
                 LUMA_SERVER:url,
+                RUNWAY_SERVER:url,
+                VIGGLE_SERVER:url,
+
                 OPENAI_API_KEY:key,
                 MJ_API_SECRET:key, 
                 SUNO_KEY:key,
-                LUMA_KEY:key
+                LUMA_KEY:key,
+                RUNWAY_KEY:key,
+                VIGGLE_KEY:key
              } )
             blurClean();
             gptServerStore.setMyData( gptServerStore.myData );

src/locales/en-US.ts

@@ -445,7 +445,10 @@ export default {
     "nosup": "Not supported temporarily",
     "rwgen2": "Version: Gen-2, cost-effective",
     "rwgen3": "Version: Gen-3 Alpha",
-    "repeat2":"Expired.Reget"
+    "repeat2":"Expired.Reget",
+
+    rwgen3turbo:'Version: Gen-3 Alpha Turbo',
+    gen3a_turbo_img:'Gen-3 Alpha Turbo must image',
 
   },
   dance:{

src/locales/zh-CN.ts

@@ -451,14 +451,16 @@ export default {
     runwayserver:'Runway 接口地址',
     setOpenKeyPlaceholder2:'Runway API 的key, 可不填',
     endImg:'尾帧图',
-    runwayinfo:'说明：<ul><li>1. Runway 图片与视频都有有效期</li>  <li>2. 请在生成视频后30分钟内将mp4保存到本地</li>  <li>3. 过期重新获取，可能存在账号下线而获取失败</li></ul>',
+    runwayinfo:'说明：<ul><li>1. Runway 图片与视频都有有效期</li>  <li>2. 请在生成视频后30分钟内将mp4保存到本地</li>  <li>3. 过期重新获取，可能存在账号下线而获取失败</li><li>4. Gen3A Turbo 必须带图</li></ul>',
     nosup:'暂不支持',
     rwgen2:'版本: Gen-2, 价格实惠',
     rwgen3:'版本: Gen-3 Alpha',
     rwgen3fast:'版本: Gen-3 Alpha Fast',
-
     repeat2:'过期.重新获取',
 
+    rwgen3turbo:'版本: Gen-3 Alpha Turbo',
+    gen3a_turbo_img:'Gen-3 Alpha Turbo 必须带图',
+
   }
   ,dance:{
     menu:"舞蹈",

src/locales/zh-TW.ts

@@ -432,7 +432,10 @@ export default {
     "nosup": "暫不支持",
     "rwgen2": "版本: Gen-2, 價格實惠",
     "rwgen3": "版本: Gen-3 Alpha",
-    "repeat2":"Expired.Reget"
+    "repeat2":"Expired.Reget",
+
+    rwgen3turbo:'版本: Gen-3 Alpha Turbo',
+    gen3a_turbo_img:'Gen-3 Alpha Turbo 必须带图',
   },
   dance:{
     menu: "跳舞",

src/views/luma/runwayInput.vue

@@ -97,6 +97,24 @@ const generate= async ()=>{
                 },
             //    "asTeamId": 17511575
         }
+        let gen3_trubo=    {
+                "taskType": "gen3a_turbo",
+                "internal": false,
+                "options": {
+                    "name": `Gen-3 Alpha Turbo ${seed}`,
+                    "seconds":st.value.time,
+                    "text_prompt": "run",
+                    "seed": seed,
+                    "exploreMode": false,
+                    "watermark": false,
+                    "enhance_prompt": true,
+                    "init_image":  runway.value.image_prompt,
+                    "resolution": "720p",
+                    "image_as_end_frame": false,
+                    "assetGroupName": "Generative Video"
+                }
+}
+  
 
         if( obj.options.gen2Options.image_prompt==''){
             delete obj.options.gen2Options.image_prompt;
@@ -108,8 +126,19 @@ const generate= async ()=>{
         }
         
         gen3.options.exploreMode= st.value.version=='europa'
-
-        const d=  await runwayFetch('/tasks', st.value.version=='gen2'?obj: gen3 ) 
+        let sobj:any = gen3;
+        if(  st.value.version=='gen2' ){
+            sobj= obj
+        }
+        if(  st.value.version=='gen3a_turbo' ){
+            sobj= gen3_trubo
+            if(gen3_trubo.options.init_image=='') {
+                ms.error( t('video.gen3a_turbo_img') )
+                return 
+            }
+        }
+       // const d=  await runwayFetch('/tasks', st.value.version=='gen2'?obj: gen3 ) 
+        const d=  await runwayFetch('/tasks',  sobj ) 
         mlog("runwayGen2",d) 
         d.task && d.task.id&& runwayFeed(d.task.id)
     }catch(e:any){
@@ -123,6 +152,7 @@ const mvOption= [
 {label: t('video.rwgen2'),value: 'gen2'}
 ,{label:t('video.rwgen3'),value: 'europa'}
 ,{label:t('video.rwgen3fast'),value: 'europa-fast'}
+,{label:t('video.rwgen3turbo'),value: 'gen3a_turbo'}
  ]
  const timeOption= [
 {label: 'Duration: 5s',value: 5}

src/views/luma/runwayList.vue

@@ -96,6 +96,7 @@ initLoad();
                     </template>
                     <div v-if="item.id" >ID: {{ item.id }}</div>
                     <div v-if="item.taskType=='gen3a'" >Version: Gen-3</div>
+                    <div v-if="item.taskType=='gen3a_turbo'" >Version: Gen-3-turbo</div>
                     <div v-if="item.taskType=='gen2'" >Version: Gen-2</div>
                     <div v-if="item.createdAt" >createdAt: {{ new Date( item.createdAt).toLocaleString() }}</div>
                     <div class=" max-w-[300px]" v-if="item.options.text_prompt">{{ item.options.text_prompt }}</div>