2.24.1

Author: Dooy

changlog.md

@@ -1,6 +1,10 @@
 # 功能升级日志
 
 #  计划 
+# 2.24.1
+- 😄 新增：gpt-image-1 dall.e-2 支持 v1/image/edit 支持多图
+- 🐞 改进：默认上传改为5M
+
 # 2.23.10
 
 - 😄 新增：gpt-image-1 这个是dall-e格式

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-web-midjourney-proxy",
-  "version": "2.23.10",
+  "version": "2.24.1",
   "private": false,
   "description": "ChatGPT Web Midjourney Proxy",
   "author": "Dooy <ydlhero@gmail.com>",

src-tauri/tauri.conf.json

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

src/api/mjapi.ts

@@ -18,7 +18,7 @@ export interface gptsType{
  //const { addChat, updateChat, updateChatSome, getChatByUuidAndIndex } = useChat()
 export function upImg(file:any   ):Promise<any>
 {
-    const maxSize= homeStore.myData.session.uploadImgSize? (+homeStore.myData.session.uploadImgSize):1
+    const maxSize= homeStore.myData.session.uploadImgSize? (+homeStore.myData.session.uploadImgSize):5
     return new Promise((h,r)=>{
         const filename = file.name;
         if(file.size>(1024*1024 * maxSize)){

src/api/openapi.ts

@@ -225,9 +225,20 @@ export const whisperUpload = ( FormData:FormData )=>{
     })
 }
 
+//gpt 文件上传 /v1/image/edits
+export const gptUploadFile=   (url :string, FormData:FormData)=>{
+    url=  gptGetUrl( url);
+    let headers=   {'Content-Type': 'multipart/form-data' }
+    headers={...headers,...getHeaderAuthorization()}
+
+    return axios.post( url , FormData, {  headers  })
+
+}
+
 export const subGPT= async (data:any, chat:Chat.Chat )=>{
    let d:any;
    let action= data.action;
+   // mlog("gp-image-1 base64Array ",   data.base64Array   )
    //chat.myid=  `${Date.now()}`;
    if(  action=='gpt.dall-e-3' && data.data && data.data.model && data.data.model.indexOf('ideogram')>-1 ){ //ideogram
          mlog("ddlog 数据 ", data.data  )
@@ -246,6 +257,50 @@ export const subGPT= async (data:any, chat:Chat.Chat )=>{
             chat.loading=false;
             homeStore.setMyData({act:'updateChat', actData:chat });
          }
+   }else if(  action=='gpt.dall-e-3'  && data.data.base64Array!=undefined ){ //执行变化
+        mlog("gp-image-1 base64Array ",data.data ,  data.data.base64Array   )
+     //let d= await gptFetch('/v1/images/edits', data.data);
+     const formData = new FormData( ); 
+     for(let o in data.data ){
+        if(o=='base64Array'){
+            for(let f of data.data.base64Array){
+                 formData.append('image[]', f.file )
+            }
+        }else{
+            formData.append(o, data.data[o])
+        }
+       
+
+     }
+    mlog("formData  ",  formData   )
+    
+    //const jda=    upd.data
+    try {
+        const ds = await gptUploadFile('/v1/images/edits', formData)
+        const d=ds.data;
+        if(ds.status!=200) throw "Fail with status:"+ ds.status
+        //const d= jda;
+        //mlog("gp-image-1 结果 ",  d   )
+    
+      
+        let key= 'dall:'+chat.myid;
+        const rz : any= d.data[0];
+        if(rz.b64_json){
+            const base64='data:image/png;base64,'+rz.b64_json;
+            await localSaveAny(base64,key)
+        }
+       
+        chat.text= rz.revised_prompt??`图片已完成`;
+        chat.opt={imageUrl:rz.url?rz.url: 'https://www.openai-hk.com/res/img/open.png' } ;
+        chat.loading = false;
+        homeStore.setMyData({act:'updateChat', actData:chat });
+    } catch (e) {
+        chat.text='失败！'+"\n```json\n"+ (d?JSON.stringify(d, null, 2):e) +"\n```\n";
+        chat.loading=false;
+        homeStore.setMyData({act:'updateChat', actData:chat });
+    }
+    
+
    }else if(  action=='gpt.dall-e-3' ){ //执行变化
        // chat.model= 'dall-e-3';
 

src/locales/zh-CN.ts

@@ -175,7 +175,7 @@ export default {
     ,tQuality:'画质'
     ,tStyles:'艺术程度'
     ,tVersion:'模型版本'
-    ,dalleInfo:' 说明：   <li>1 dall-e 是openAi提供的画图模型</li>  <li>2 openAi的图片有时效性，请做好备份</li>   <li>3 注意：1790px的图片价格是双倍</li> '
+    ,dalleInfo:' 说明：   <li>1 dall-e 是openAi提供的画图模型</li>  <li>2 openAi的图片有时效性，请做好备份</li>   <li>3 注意：1790px的图片价格是双倍</li> <li>4 注意：dall-e-2、gpt-image-1 支持多图参考</li> '
     ,version:'版本'
     ,size:'尺寸'
     ,blendInfo:'说明： <li>1 合成至少2张图片</li> <li>2 最多可传6张图</li> '

src/views/mj/aiDall.vue

@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import { ref ,computed,watch} from 'vue';
-import {useMessage, NButton,NSelect,NInput} from 'naive-ui';
+import {useMessage, NButton,NSelect,NInput, NImage} from 'naive-ui';
 import {gptFetch, mlog, upImg} from '@/api'
 import { homeStore } from '@/store';
 import { SvgIcon } from '@/components/common';
+import { t } from '@/locales';
 
 const ms = useMessage();
 const config = ref( {
@@ -17,7 +18,13 @@ model:[
  ,{  "label": "Flux.1.1-Pro", "value": "flux.1.1-pro" }
 ]
 });
-const st =ref({isGo:false });     
+interface myFile{
+    file:any
+    base64:string
+}
+const st =ref({isGo:false,quality:'medium' }); 
+const fsRef= ref() ; 
+const base64Array= ref<myFile[]>([]);    
 const f = ref({size:'1024x1024', prompt:'',"model": "dall-e-3","n": 1});
 const isDisabled= computed(()=>{
     if(st.value.isGo) return true;
@@ -33,7 +40,16 @@ const create= async ()=>{
     //return ;
     let obj= {
         action:'gpt.dall-e-3',
-        data:f.value
+        data:{} //f.value
+    }
+    obj.data= { ...f.value}
+    if(isCanImageEdit.value){
+        obj.data= {...obj.data ,quality:st.value.quality};
+    }
+    if (isCanImageEdit.value && base64Array.value.length>0){ 
+         
+        obj.data= {...obj.data, 'base64Array':base64Array.value,quality:st.value.quality};
+        mlog("data", '我加东西了：',  base64Array.value  )
     }
     homeStore.setMyData({act:'draw', actData:obj});
     st.value.isGo=true;
@@ -46,6 +62,15 @@ watch(()=>homeStore.myData.act,(n)=>{
     if(n=='updateChat')  st.value.isGo=false;  
 })
 
+ 
+const qualityOption=  computed(()=>{ 
+    return [
+{label:'High',value: 'high'}
+,{label:'Medium',value: 'medium'}
+,{label:'Low',value: 'low'}
+ 
+]
+});
 const dimensionsList= computed(()=>{
     if(f.value.model=='dall-e-2'){
         return [{ 
@@ -60,6 +85,19 @@ const dimensionsList= computed(()=>{
             }
     ];
     } 
+    if(f.value.model=='gpt-image-1'){
+    return [{ 
+                "label": "1024px*1024px",
+                "value": "1024x1024"
+            }, {
+                "label": "1536px*1024px",
+                "value": "1536x1024"
+            }, {
+                "label": "1024px*1536px",
+                "value": "1024x1536"
+            }
+    ];
+    }
     return [{ 
                 "label": "1024px*1024px",
                 "value": "1024x1024"
@@ -76,6 +114,27 @@ const dimensionsList= computed(()=>{
 watch(()=>f.value.model,(n)=>{
     f.value.size='1024x1024';
 })
+const isCanImageEdit= computed(()=>{
+    if(f.value.model=='dall-e-2') return true;
+    if(f.value.model=='gpt-image-1') return true;
+    return false;
+})
+
+const selectFile=(input:any)=>{
+    const ff=input.target.files[0];
+    upImg(input.target.files[0]).then(d=>{
+        fsRef.value.value='';
+        const index = base64Array.value.findIndex(item => item.base64 == d);
+        if(index>-1){
+            ms.error(t('mjchat.no2add') )
+            return ;
+        }
+        base64Array.value.push({file: ff ,base64:d});
+        if(base64Array.value.length>1) st.value.isGo=true;
+        //if(st)
+    }).catch(e=>ms.error(e));
+}
+
 </script>
 <template>
 <section class="mb-4 flex justify-between items-center"  >
@@ -86,10 +145,32 @@ watch(()=>f.value.model,(n)=>{
      <div>{{ $t('mjchat.size') }}</div>
     <n-select v-model:value="f.size" :options="dimensionsList"  filterable tag size="small"  class="!w-[70%]" :clearable="false" />
 </section>
+<section class="mb-4 flex justify-between items-center" v-if="isCanImageEdit" >
+     <div>Quality</div>
+    <n-select v-model:value="st.quality" :options="qualityOption"  filterable tag size="small"  class="!w-[70%]" :clearable="false" />
+</section>
+
 <div class="mb-1">
      <n-input    type="textarea"  v-model:value="f.prompt"   :placeholder="$t('mjchat.prompt')" round clearable maxlength="500" show-count 
       :autosize="{   minRows:3, maxRows:10 }" />
 </div>
+<div class="mb-1" v-if="isCanImageEdit"> 
+    <div class="flex justify-start items-center flex-wrap myblend">
+
+    <div class="w-[var(--my-blend-img-size)] h-[var(--my-blend-img-size)] mr-2 mt-2 bg-[#ddd] overflow-hidden rounded-sm relative group " v-for="item in base64Array">
+        <NImage :src="item.base64" object-fit="cover"></NImage>
+        <SvgIcon icon="fluent:delete-12-filled"
+        class="absolute top-0 right-0 text-red-600 text-[20px] cursor-pointer hidden group-hover:block "
+        @click="base64Array.splice(base64Array.indexOf(item),1)"></SvgIcon>
+    </div>
+
+        <div   @click="fsRef.click()" v-if="base64Array.length<3"
+         class="w-[var(--my-blend-img-size)] h-[var(--my-blend-img-size)] mt-2 bg-[#999] overflow-hidden rounded-sm flex justify-center items-center cursor-pointer">
+            <SvgIcon icon="mdi:add-bold" class="text-[40px] text-[#fff]"></SvgIcon>
+        </div>
+         
+    </div>   
+</div>
 
 <div class="mb-4 flex justify-end items-center">
     <div class="flex ">
@@ -103,4 +184,13 @@ watch(()=>f.value.model,(n)=>{
 <ul class="pt-4" v-html="$t('mjchat.dalleInfo')">
 
 </ul>
-</template>
+
+<input type="file"  @change="selectFile"  ref="fsRef" style="display: none" accept="image/jpeg, image/jpg, image/png, image/gif"/>
+
+</template>
+
+<style scoped>
+.myblend{
+    --my-blend-img-size:75px
+}
+</style>

src/views/mj/aiDrawInput.vue

@@ -79,7 +79,7 @@ initLoad();
 
     <n-tab-pane name="ideogram" tab="IdeoGram">
      <div class="p-2"> <aiIdeoInput/> </div>
-    </n-tab-pane> 
+    </n-tab-pane>