v2.20.9

changlog.md

@@ -1,6 +1,10 @@
 # 功能升级日志
 
 #  计划 
+# 2.20.9
+- 🐞 修复：kling 图片提交
+- 😄 新增：可灵 kling 的镜头运用
+
 # 2.20.8
 - 😄 新增：可灵 kling 视频 绘图模块
 

package.json

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

src/api/mjapi.ts

@@ -41,6 +41,11 @@ export function upImg(file:any   ):Promise<any>
 
 }
 
+export const clearImageBase64= ( str:string)=>{
+    let arr= str.split('base64,',2 )
+    return arr[1]??arr[0];
+}
+
 export const file2blob= (selectedFile: any  )=>{
     return new Promise<{blob:Blob,filename:string}>((resolve, reject) => {
         const reader = new FileReader();

src/locales/en-US.ts

@@ -215,6 +215,13 @@ export default {
   seed: 'Seed number 1~2147483647',
   klingInfo: 'Description: <li>1. High Quality is 3.5 times the price</li> <li>2. 10s is 2 times the price</li> <li>3. The last frame must have a reference image to take effect</li>'
 
+  ,"camera_type": "Lens",
+  "cnull": "Smart Matching",
+  "down_back": "Move Down and Zoom Out",
+  "forward_up": "Push Forward and Move Up",
+  "right_turn_forward": "Turn Right and Push Forward",
+  "left_turn_forward": "Turn Left and Push Forward"
+
   },
   "mjset": {
     "server": "Server",

src/locales/fr-FR.ts

@@ -214,6 +214,12 @@ export default {
         seed: 'Numéro de graine 1~2147483647',
         klingInfo: 'Description : <li>1. Haute qualité coûte 3,5 fois le prix</li> <li>2. 10 secondes coûtent 2 fois le prix</li> <li>3. La dernière image doit avoir une image de référence pour prendre effet</li>'
 
+        ,"camera_type": "Objectif",
+        "cnull": "Correspondance intelligente",
+        "down_back": "Descendre et zoomer",
+        "forward_up": "Avancer et monter",
+        "right_turn_forward": "Tourner à droite et avancer",
+        "left_turn_forward": "Tourner à gauche et avancer"
     },
     "mjset": {
         "server": "Serveur",

src/locales/ko-KR.ts

@@ -212,6 +212,12 @@ export default {
     seed: '시드 번호 1~2147483647',
     klingInfo: '설명: <li>1. 고품질은 가격의 3.5배입니다</li> <li>2. 10초는 가격의 2배입니다</li> <li>3. 마지막 프레임은 효과를 위해 참조 이미지가 필요합니다</li>'
 
+    ,"camera_type": "렌즈",
+    "cnull": "스마트 매칭",
+    "down_back": "아래로 이동하고 멀리하기",
+    "forward_up": "앞으로 밀고 위로 이동하기",
+    "right_turn_forward": "오른쪽으로 돌리고 앞으로 밀기",
+    "left_turn_forward": "왼쪽으로 돌리고 앞으로 밀기"
   },
   "mjset": {
     "server": "서버"

src/locales/ru-RU.ts

@@ -215,7 +215,12 @@ export default {
   needImg: 'Пожалуйста, загрузите эталонное изображение, чтобы это заработало!',
   seed: 'Число семени 1~2147483647',
   klingInfo: 'Описание: <li>1. Высокое качество стоит в 3.5 раза дороже</li> <li>2. 10 секунд стоит в 2 раза дороже</li> <li>3. Последний кадр должен иметь эталонное изображение для действия</li>'
-
+  ,"camera_type": "Объектив",
+"cnull": "Умное соответствие",
+"down_back": "Опустить и отдалить",
+"forward_up": "Продвинуть вперед и поднять",
+"right_turn_forward": "Повернуть вправо и продвинуться вперед",
+"left_turn_forward": "Повернуть влево и продвинуться вперед"
 
   },
   "mjset": {

src/locales/tr-TR.ts

@@ -213,6 +213,13 @@ export default {
         needImg: 'Etki etmesi için lütfen bir referans resmi yükleyin!',
         seed: 'Tohum numarası 1~2147483647',
         klingInfo: 'Açıklama: <li>1. Yüksek kalite fiyatın 3.5 katıdır</li> <li>2. 10 saniye fiyatın 2 katıdır</li> <li>3. Son kare etkili olması için bir referans resmine sahip olmalıdır</li>'
+
+        ,"camera_type": "Lens",
+        "cnull": "Akıllı eşleştirme",
+        "down_back": "Aşağı ve geri git",
+        "forward_up": "İleri it ve yukarı kaldır",
+        "right_turn_forward": "Sağa dön ve ileri git",
+        "left_turn_forward": "Sola dön ve ileri git"
     },
     "mjset": {
         "server": "Sunucu",

src/locales/vi-VN.ts

@@ -213,6 +213,12 @@ export default {
     seed: 'Số hạt 1~2147483647',
     klingInfo: 'Mô tả: <li>1. Chất lượng cao gấp 3,5 lần giá</li> <li>2. 10 giây gấp 2 lần giá</li> <li>3. Khung cuối cùng phải có hình ảnh tham khảo để có hiệu lực</li>'
 
+    ,"camera_type": "Ống kính",
+    "cnull": "Ghép thông minh",
+    "down_back": "Di chuyển xuống và thu nhỏ",
+    "forward_up": "Đẩy tới và di chuyển lên",
+    "right_turn_forward": "Quay phải và đẩy tới",
+    "left_turn_forward": "Quay trái và đẩy tới"
   },
   "mjset": {
     "server": "Máy chủ",

src/locales/zh-CN.ts

@@ -318,7 +318,12 @@ export default {
     ,seed:'种子数字 1~2147483647'
     ,klingInfo:'说明： <li>1. 高表现是3.5倍的价格</li>  <li>2. 10s是2倍的价格</li> <li>3. 尾帧必须有参考图片才生效</li>'
 
-
+    ,camera_type:'镜头'
+    ,cnull:'智能匹配'
+    ,down_back: '下移拉远'
+    ,forward_up: '推进上移'
+    ,right_turn_forward: '右旋推进'
+    ,left_turn_forward: '左旋推进'
   },
 
 	draw: {

src/locales/zh-TW.ts

@@ -209,6 +209,13 @@ export default {
     needImg: '請傳參考圖才生效！',
     seed: '種子數字 1~2147483647',
     klingInfo: '說明： <li>1. 高表現是3.5倍的價格</li> <li>2. 10秒是2倍的價格</li> <li>3. 尾幀必須有參考圖片才生效</li>'
+    ,"camera_type": "鏡頭",
+    "cnull": "智能配對",
+    "down_back": "下移拉遠",
+    "forward_up": "推進上移",
+    "right_turn_forward": "右旋推進",
+    "left_turn_forward": "左旋推進"
+
   },
   "mjset": {
     "server": "服務端",

src/views/kling/kgInputImage.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 import {useMessage, NButton,NInput,NTag} from 'naive-ui';
-import { mlog, upImg } from '@/api';
+import { clearImageBase64, mlog, upImg } from '@/api';
 import { homeStore } from '@/store';
 import { klingFeed, klingFetch } from '@/api/kling';
 
@@ -38,10 +38,13 @@ const clearInput = ()=>{
 const createImg = async ()=>{
     st.value.isLoading= true
     f.value.aspect_ratio= vf[st.value.bili].value
+    let abc= {...f.value};
+    if(abc.image) abc.image= clearImageBase64( abc.image )
     try {
-        const d:any= await klingFetch('/v1/images/generations ' ,f.value )
+        const d:any= await klingFetch('/v1/images/generations ' , abc  )
         mlog('img', d );
         klingFeed( d.data.task_id ,'image',  f.value.prompt )
+        //f.value.image= ''
     } catch (error) {
     }  
     st.value.isLoading= false
@@ -50,6 +53,10 @@ const createImg = async ()=>{
 onMounted(() => {
     homeStore.setMyData({ms:ms})
 });
+
+const test=()=>{
+klingFetch('https://api.openai-hk.com/v1/models').then(d=>mlog('models',d ) )
+}
 //Cl6NIGbYLVQAAAAAALp
 //klingFeed('Cl6NIGbYLVQAAAAAALp-jw','image',"测试啊").then(d=>mlog('d>>',d ) ) 
 //klingFeed('Cl6NIGbYLVQAAAAAALXTmA','image',"大雪纷飞").then(d=>mlog('d>>',d ) ) 
@@ -95,5 +102,7 @@ onMounted(() => {
             <NButton :loading="st.isLoading" type="primary" @click="createImg()" :disabled="!f.prompt"  >{{ $t('mjchat.imgcreate') }}</NButton>
         </div>
     </section>
+
+    <!-- <NButton @click="test()">test</NButton> -->
 </div>
 </template>

src/views/kling/kgInputVideo.vue

@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 import {useMessage, NButton,NInput,NTag,NSelect} from 'naive-ui';
-import { mlog, upImg } from '@/api';
+import { clearImageBase64, mlog, upImg } from '@/api';
 import { homeStore } from '@/store';
 import { klingFeed, klingFetch } from '@/api/kling';
 import { t } from '@/locales';
 
 const f= ref({prompt:'',negative_prompt:'',image:'',image_tail:'',aspect_ratio:'1:1',mode:'std', duration:'5'});
-const st= ref({bili:0,isLoading:false});
+const st= ref({bili:0,isLoading:false,camera_type:''});
 
 const fsRef= ref() ; 
 const fsRef2= ref() ; 
@@ -22,6 +22,9 @@ const vf=[
 
 const modeOptions=[ {label:t('mj.std'),value:'std'},{label:t('mj.pro'),value:'pro'}]
 const durationOptions=[ {label:'5s',value:'5'},{label:'10s',value:'10'}]
+const cameraOption=[ {label: t('mj.cnull'),value:''},{label: t('mj.down_back'),value:'down_back'}
+,{label:t('mj.forward_up'),value:'forward_up'},{label:t('mj.forwright_turn_forwardard_up'),value:'right_turn_forward'},{label:t('mj.left_turn_forward'),value:'left_turn_forward'}
+]
 
 
 function selectFile(input:any){
@@ -56,8 +59,18 @@ const createImg = async ()=>{
     f.value.aspect_ratio= vf[st.value.bili].value
     try {
         let cat= 'text2video'; 
-        if(f.value.image!='')cat='image2video'
-        const d:any= await klingFetch('/v1/videos/'+ cat ,f.value )
+        let abc:any  = {...f.value};
+        //if(abc.image) abc.image= clearImageBase64( abc.image )
+        if(f.value.image!=''){
+            cat='image2video'
+            abc.image= clearImageBase64( abc.image )
+            if( f.value.image_tail) abc.image_tail= clearImageBase64( f.value.image_tail )
+        }else if( st.value.camera_type ){
+            abc.camera_control={ type:st.value.camera_type }
+        }
+        //  mlog('abc>> ',  abc  );
+        // return 
+        const d:any= await klingFetch('/v1/videos/'+ cat , abc  )
         mlog('img', d );
         klingFeed( d.data.task_id , cat ,  f.value.prompt )
     } catch (error) {
@@ -95,12 +108,18 @@ onMounted(() => {
          <div>{{ $t('mj.duration') }}</div>
          <n-select v-model:value="f.duration" size="small" :options="durationOptions"  class="!w-[70%]" />
 
+    </section>
+     <section class="mb-4 flex justify-between items-center" >
+         <div>{{ $t('mj.camera_type') }}</div>
+         <n-select v-model:value="st.camera_type" size="small" :options="cameraOption"  class="!w-[70%]" />
+
     </section>
 
     <section class="mb-4 flex justify-between items-center" >
          <div>{{ $t('mj.nohead') }}</div>
           <NInput v-model="f.negative_prompt" size="small"  class="!w-[70%]"  clearable :placeholder="$t('mj.negative_prompt')" />
     </section>
+
      <section class="mb-4 flex justify-between items-center" >
 
           <n-input v-model:value="f.prompt"