diff --git a/changlog.md b/changlog.md index 18749f3179..8aae5afb4b 100644 --- a/changlog.md +++ b/changlog.md @@ -1,6 +1,10 @@ # 功能升级日志 # 计划 +# 2.21.8 +- 😄 新增:flux.1.1-pro 画图模型 +- 😄 新增:runway3 支持 参考视频 + # 2.21.7 - 😄 新增:claude-3-5-sonnet-20241022 diff --git a/package.json b/package.json index 433bc32ea1..c928b4c466 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "chatgpt-web-midjourney-proxy", - "version": "2.21.7", + "version": "2.21.8", "private": false, "description": "ChatGPT Web Midjourney Proxy", "author": "Dooy ", diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 9ef5e44980..f35d7f23aa 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "ChatGPT-MJ", - "version": "2.21.7" + "version": "2.21.8" }, "tauri": { "allowlist": { diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 6cbefba5c7..f72b0b24f9 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -497,7 +497,7 @@ export default { runwayserver:'Runway 接口地址', setOpenKeyPlaceholder2:'Runway API 的key, 可不填', endImg:'尾帧图', - runwayinfo:'说明:', + runwayinfo:'说明:', nosup:'暂不支持', rwgen2:'版本: Gen-2, 价格实惠', rwgen3:'版本: Gen-3 Alpha', diff --git a/src/views/luma/runwayInput.vue b/src/views/luma/runwayInput.vue index fe81e61deb..5ddfe7a134 100644 --- a/src/views/luma/runwayInput.vue +++ b/src/views/luma/runwayInput.vue @@ -120,7 +120,25 @@ const generate= async ()=>{ ,"extended_from_task_id":(exRunway.value&&exRunway.value.id)?exRunway.value.id:undefined ,"init_video": ( exRunway.value && exRunway.value.artifacts && exRunway.value.artifacts[0].url)?exRunway.value.artifacts[0].url:undefined } -} + } + let v_gen3={ + "taskType": "europa", + "internal": false, + "options": { + "name": `Gen-3 Alpha ${seed}`, + "seconds": st.value.time, + "text_prompt":runway.value.text_prompt, + "seed":seed, + "exploreMode": true, + "watermark": false, + "enhance_prompt": true, + "video_prompt": runway.value.image_prompt , + "structure_transformation": 0.3, + "width": 1280, + "height": 768, + "assetGroupName": "Generative Video" + } + } if( obj.options.gen2Options.image_prompt==''){ @@ -143,6 +161,7 @@ const generate= async ()=>{ gen3_trubo.options.image_as_end_frame=st.value.image_as_end_frame gen3.options.exploreMode= st.value.version=='europa' + v_gen3.options.exploreMode= st.value.version=='europa' let sobj:any = gen3; if( st.value.version=='gen2' ){ sobj= obj @@ -154,6 +173,17 @@ const generate= async ()=>{ return } } + if(runway.value.image_prompt && isMp4(runway.value.image_prompt)){ + if( st.value.version=='gen2'){ + ms.error( 'gen2 不支持视频' ) + return + } + v_gen3.taskType='europa' + if( st.value.version=='gen3a_turbo' ){ + v_gen3.taskType='gen3a_turbo' + } + sobj= v_gen3 + } // const d= await runwayFetch('/tasks', st.value.version=='gen2'?obj: gen3 ) const d= await runwayFetch('/tasks', sobj ) mlog("runwayGen2",d) @@ -164,6 +194,9 @@ const generate= async ()=>{ st.value.isDo=false } +const isMp4=(url:string)=>{ + return url.indexOf('.mp4')>0 +} const mvOption= [ {label: t('video.rwgen2'),value: 'gen2'} @@ -251,7 +284,7 @@ watch(()=>homeStore.myData.act, (n)=>{
- + +
{{ $t('video.selectimg') }}
-
- +
diff --git a/src/views/mj/aiDall.vue b/src/views/mj/aiDall.vue index 5db1e73851..53d0a70edd 100644 --- a/src/views/mj/aiDall.vue +++ b/src/views/mj/aiDall.vue @@ -13,6 +13,7 @@ model:[ ,{ "label": "Flux", "value": "flux" } ,{ "label": "Flux-Dev", "value": "flux-dev" } ,{ "label": "Flux-Pro", "value": "flux-pro" } + ,{ "label": "Flux.1.1-Pro", "value": "flux.1.1-pro" } ] }); const st =ref({isGo:false });