diff --git a/apps/chat.js b/apps/chat.js index 5a666c8..b977833 100644 --- a/apps/chat.js +++ b/apps/chat.js @@ -1665,32 +1665,12 @@ export class chatgpt extends plugin { if (Config.debug) { logger.mark(`开始生成内容:${response.details.imageTag}`) } - if (Config.bingDrawApi) { + if (Config.bingAPDraw) { // 调用第三方API进行绘图 - const drawOption = { - method: 'POST', - headers: {'content-type': 'application/json'}, - body: JSON.stringify({ - prompt: response.details.imageTag, - width: Config.bingDrawWidth || 512, - height: Config.bingDrawHeight || 512, - sampler_index: Config.bingDrawSampler || 'DPM++ 2M SDE' - }) - } - const drawData = await fetch(Config.bingDrawApi, drawOption) - if (drawData.ok) { - let draw = await drawData.json() - if (draw.images?.length > 0) { - for(let image of draw.images) { - this.reply(segment.image(`base64://${image}`), true) - } - } else { - await e.reply('绘图失败:未产生图片') - } - } else { - await e.reply('绘图失败:第三方绘图服务器错误') - } - + let apDraw = new APTool() + apDraw.func({ + prompt: response.details.imageTag + }, e) } else { let client = new BingDrawClient({ baseUrl: Config.sydneyReverseProxy, diff --git a/resources/view/setting_view.json b/resources/view/setting_view.json index 5d37503..78ebca4 100644 --- a/resources/view/setting_view.json +++ b/resources/view/setting_view.json @@ -638,27 +638,10 @@ "data": "bingCaptchaOneShotUrl" }, { - "type": "url", + "type": "check", "label": "第三方绘图", - "placeholder": "Stable Diffusion API地址", - "data": "bingDrawApi" - }, - { - "type": "text", - "label": "第三方绘图采样方法", - "data": "bingDrawSampler" - }, - { - "type": "number", - "label": "第三方绘图宽度", - "placeholder": "图片宽度", - "data": "bingDrawWidth" - }, - { - "type": "number", - "label": "第三方绘图高度", - "placeholder": "图片高度", - "data": "bingDrawHeight" + "placeholder": "使用AP插件代替Bing进行绘图", + "data": "bingAPDraw" } ] }, diff --git a/utils/config.js b/utils/config.js index d0f7707..f37951a 100644 --- a/utils/config.js +++ b/utils/config.js @@ -96,10 +96,7 @@ const defaultConfig = { maxNumUserMessagesInConversation: 20, sydneyApologyIgnored: true, enforceMaster: false, - bingDrawApi: '', - bingDrawSampler: '', - bingDrawWidth: 512, - bingDrawHeight: 512, + bingAPDraw: false, serverPort: 3321, serverHost: '', viewHost: '',