wechaty-web-panel 1.6.31 → 1.6.33

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## 更新日志
 
+### V1.6.33(2023-12-07)
+1、优化FastGPT对话重置功能
+2、添加GPT-4V识图功能
+3、优化发送文字断行功能
+4、修复一个可能导致上下文重置的bug
+
 ### V1.6.31(2023-11-18)
 1、修复批量定时任务的查询逻辑
 

package/dist/cjs/src/botInstance/dify.js

@@ -88,10 +88,8 @@ class DifyAi {
             }
             // 保存对话id 对于同一个用户的对话不更新conversationId
             if (!this.chatOption[uid]?.conversationId) {
-                this.chatOption = {
-                    [uid]: {
-                        conversationId
-                    },
+                this.chatOption[uid] = {
+                    conversationId
                 };
             }
             let replys = [];
@@ -102,9 +100,9 @@ class DifyAi {
             else {
                 message = text.replaceAll('\n', this.eol);
             }
-            while (message.length > 500) {
-                replys.push(message.slice(0, 500));
-                message = message.slice(500);
+            while (message.length > 1000) {
+                replys.push(message.slice(0, 1000));
+                message = message.slice(1000);
             }
             replys.push(message);
             replys = replys.map(item => {

package/dist/cjs/src/botInstance/gpt4v.d.ts

@@ -0,0 +1,5 @@
+export function get4vReply(images: any, question: any, config: any): Promise<{
+    type: number;
+    content: any;
+}[]>;
+//# sourceMappingURL=gpt4v.d.ts.map

package/dist/cjs/src/botInstance/gpt4v.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.get4vReply = void 0;
+const chatGPT4V_js_1 = require("./sdk/chatGPT4V.js");
+const puppet_type_js_1 = require("../const/puppet-type.js");
+async function get4vReply(images, question, config) {
+    try {
+        const eol = await (0, puppet_type_js_1.getPuppetEol)();
+        const finalConfig = {
+            ...config,
+            baseUrl: config.proxyPass || ''
+        };
+        const { text } = await (0, chatGPT4V_js_1.getImageVision)(images, question, finalConfig);
+        let replys = [];
+        let message = text.replaceAll("\n", eol);
+        while (message.length > 1000) {
+            replys.push(message.slice(0, 1000));
+            message = message.slice(1000);
+        }
+        replys.push(message);
+        replys = replys.map(item => {
+            return {
+                type: 1,
+                content: item.trim()
+            };
+        });
+        return replys;
+    }
+    catch (e) {
+        console.log("gpt4v报错：" + e);
+        return [{ type: 1, content: '图像识别失败，请确保你的账号有GPT-4V权限' }];
+    }
+}
+exports.get4vReply = get4vReply;
+//# sourceMappingURL=gpt4v.js.map

package/dist/cjs/src/botInstance/officialOpenAi.d.ts

@@ -15,7 +15,10 @@ declare class OfficialOpenAi {
         _apiKey: any;
         _apiOrg: any;
         _apiBaseUrl: any;
-        _debug: boolean;
+        _debug: boolean; /**
+         * 重置apikey
+         * @return {Promise<void>}
+         */
         _fetch: any;
         _completionParams: any;
         _systemMessage: any;

package/dist/cjs/src/botInstance/officialOpenAi.js

@@ -10,6 +10,7 @@ const aichatDb_js_1 = require("../db/aichatDb.js");
 const aibotk_js_1 = require("../proxy/aibotk.js");
 const contentCensor_js_1 = require("../lib/contentCensor.js");
 const puppet_type_js_1 = require("../const/puppet-type.js");
+const uuid_1 = require("uuid");
 const dayjs_1 = __importDefault(require("dayjs"));
 let chatGPT = null;
 class OfficialOpenAi {
@@ -125,20 +126,23 @@ class OfficialOpenAi {
                     return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
                 }
             }
-            if (systemMessage || content === 'reset' || content === '重置') {
+            const resetWord = ['reset', '重置', '重置对话', '忽略上下文', '重置上下文', '重新开始', '清除对话', '清除上下文'];
+            if (systemMessage || resetWord.includes(content)) {
                 console.log('重新更新上下文对话');
-                this.chatOption[uid] = {};
+                this.chatOption[uid] = null;
                 if (content === 'reset' || content === '重置') {
                     return [{ type: 1, content: '上下文已重置' }];
                 }
             }
+            if (isFastGPT && !this.chatOption[uid]) {
+                this.chatOption[uid] = {
+                    chatId: (0, uuid_1.v4)()
+                };
+            }
             const sendParams = { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 };
             if (systemMessage) {
                 sendParams.systemMessage = systemMessage;
             }
-            if (isFastGPT) {
-                sendParams.chatId = uid;
-            }
             const { conversationId, text, id } = await this.chatGPT.sendMessage(content, sendParams);
             if (this.config.filter) {
                 const censor = await this.contentCensor.checkText(text);
@@ -150,12 +154,17 @@ class OfficialOpenAi {
             if (this.config.record) {
                 void (0, aichatDb_js_1.addAichatRecord)({ contactId: uid, adminId, input: content, output: text, time: (0, dayjs_1.default)().format('YYYY-MM-DD HH:mm:ss') });
             }
-            this.chatOption = {
-                [uid]: {
+            if (isFastGPT) {
+                this.chatOption[uid] = {
+                    chatId: this.chatOption[uid].chatId
+                };
+            }
+            else {
+                this.chatOption[uid] = {
                     conversationId,
                     parentMessageId: id,
-                },
-            };
+                };
+            }
             let replys = [];
             let message;
             if (this.config.showQuestion) {
@@ -164,9 +173,9 @@ class OfficialOpenAi {
             else {
                 message = text.replaceAll('\n', this.eol);
             }
-            while (message.length > 500) {
-                replys.push(message.slice(0, 500));
-                message = message.slice(500);
+            while (message.length > 1000) {
+                replys.push(message.slice(0, 1000));
+                message = message.slice(1000);
             }
             replys.push(message);
             replys = replys.map(item => {

package/dist/cjs/src/botInstance/sdk/chatGPT4V.d.ts

@@ -0,0 +1,17 @@
+export function getImageVision(images: any, question: any, config: any): Promise<{
+    text: any;
+}>;
+export const BASE_URL: "https://api.openai.com/v1";
+export namespace routes {
+    namespace createVisionPreviewMessage {
+        const method: string;
+        function url(): string;
+    }
+    namespace createDellImage {
+        const method_1: string;
+        export { method_1 as method };
+        export function url_1(): string;
+        export { url_1 as url };
+    }
+}
+//# sourceMappingURL=chatGPT4V.d.ts.map

package/dist/cjs/src/botInstance/sdk/chatGPT4V.js

@@ -0,0 +1,96 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getImageVision = exports.routes = exports.BASE_URL = void 0;
+const axios_1 = __importDefault(require("axios"));
+exports.BASE_URL = "https://api.openai.com/v1";
+const GPT4VError = class extends Error {
+};
+exports.routes = {
+    createVisionPreviewMessage: {
+        method: "POST",
+        url: () => '/chat/completions'
+    },
+    createDellImage: {
+        method: "POST",
+        url: () => '/images/generations'
+    },
+};
+async function sendRequest({ method, endpoint, data, params, stream = false, timeoutMs = 180 * 1000, apiKey, baseUrl, debug }) {
+    const headers = {
+        "Authorization": `Bearer ${apiKey}`, "Content-Type": "application/json"
+    };
+    const url = `${baseUrl}${endpoint}`;
+    let response;
+    if (debug) {
+        console.log("gpt4v request", url, { data, headers, params });
+    }
+    response = await (0, axios_1.default)({
+        method,
+        url,
+        data: data || null,
+        params: params || null,
+        headers,
+        timeout: timeoutMs,
+        responseType: stream ? "stream" : "json"
+    });
+    return response;
+}
+async function getImageVision(images, question, config) {
+    const data = {
+        model: "gpt-4-vision-preview",
+        messages: [
+            {
+                role: "user",
+                content: [
+                    {
+                        type: "text",
+                        text: question || "Please describe the content of the image in Chinese. If it contains any prohibited content, please refrain from describing it."
+                    }
+                ]
+            }
+        ],
+        max_tokens: 300,
+        ...config.completionParams
+    };
+    for (let item of images) {
+        data.messages[0].content.push({
+            type: "image_url",
+            image_url: {
+                url: item
+            }
+        });
+    }
+    if (config.debug) {
+        console.log("request data", data);
+    }
+    const res = await sendRequest({
+        apiKey: config.apiKey,
+        debug: config.debug,
+        baseUrl: config.baseUrl || exports.BASE_URL,
+        method: exports.routes.createVisionPreviewMessage.method,
+        endpoint: exports.routes.createVisionPreviewMessage.url(),
+        data,
+        stream: false,
+        timeoutMs: config.timeoutMs * 1000
+    });
+    if (res.status !== 200) {
+        if (config.debug) {
+            console.log("gpt4v request error", res.data);
+        }
+        const reason = JSON.stringify(res.data);
+        const msg = `GPT4V error ${res.status}: ${reason}`;
+        const error = new GPT4VError(msg, { cause: res });
+        error.statusCode = res.status;
+        error.statusText = JSON.stringify(res.data);
+        return Promise.reject(res.message);
+    }
+    const response = res.data;
+    return {
+        text: response.choices[0].message.content
+    };
+}
+exports.getImageVision = getImageVision;
+//# sourceMappingURL=chatGPT4V.js.map

package/dist/cjs/src/botInstance/unOfficialOpenAi.js

@@ -101,11 +101,9 @@ class UnOfficialOpenAi {
                     time: (0, dayjs_1.default)().format('YYYY-MM-DD HH:mm:ss')
                 });
             }
-            this.chatOption = {
-                [uid]: {
-                    conversationId,
-                    parentMessageId: id,
-                },
+            this.chatOption[uid] = {
+                conversationId,
+                parentMessageId: id,
             };
             let replys = [];
             let message;
@@ -115,9 +113,9 @@ class UnOfficialOpenAi {
             else {
                 message = text.replaceAll('\n', this.eol);
             }
-            while (message.length > 500) {
-                replys.push(message.slice(0, 500));
-                message = message.slice(500);
+            while (message.length > 1000) {
+                replys.push(message.slice(0, 1000));
+                message = message.slice(1000);
             }
             replys.push(message);
             replys = replys.map(item => {

package/dist/cjs/src/common/multiReply.d.ts

@@ -0,0 +1,39 @@
+export class BotManage {
+    constructor(maxuser: number | undefined, that: any);
+    Bot: any;
+    userBotDict: {};
+    userTimeDict: {};
+    maxuser: number;
+    creatBot(username: any, content: any): Promise<{
+        type: number;
+        content: any;
+    }[] | undefined>;
+    updateBot(username: any, content: any, config: any): Promise<{
+        type: number;
+        content: any;
+    }[] | undefined>;
+    talk(username: any, content: any, config: any): Promise<{
+        type: number;
+        content: any;
+    }[] | undefined>;
+    removeBot(uid: any): void;
+    getBotList(): {};
+    /**
+     * 识别图片内容
+     * @param {*} username 用户名
+     * @returns
+     */
+    generateImage(username: any, question: any, config: any): Promise<{
+        type: number;
+        content: any;
+    }[]>;
+    getImage(username: any, content: any, step: any): {
+        type: number;
+        content: string;
+    }[];
+    run(userId: any, content: any, config: any): Promise<{
+        type: number;
+        content: any;
+    }[] | undefined>;
+}
+//# sourceMappingURL=multiReply.d.ts.map

package/dist/cjs/src/common/multiReply.js

@@ -0,0 +1,130 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BotManage = void 0;
+const gpt4v_js_1 = require("../botInstance/gpt4v.js");
+class MultiReply {
+    constructor() {
+        this.step = 0; // 当前step
+        this.stepRecord = []; // 经历过的step
+        this.imageIds = []; // 用户发送的图片消息id
+    }
+    paramsInit() {
+        this.step = 0; // 当前step
+        this.stepRecord = []; // 经历过的step
+        this.imageIds = []; // 用户发送的图片消息id
+    }
+}
+class BotManage {
+    constructor(maxuser = 50, that) {
+        this.Bot = that;
+        this.userBotDict = {}; // 存放所有对话的用户
+        this.userTimeDict = {};
+        this.maxuser = maxuser; // 最大同时处理的用户数
+    }
+    async creatBot(username, content) {
+        console.log("bot process create");
+        this.userBotDict[username] = new MultiReply();
+        this.userBotDict[username].userName = username;
+        this.userBotDict[username].imageIds = [content.id];
+        return await this.updateBot(username, content);
+    }
+    // 更新对话
+    async updateBot(username, content, config) {
+        console.log(`更新{${username}}对话`);
+        this.userTimeDict[username] = new Date().getTime();
+        return await this.talk(username, content, config);
+    }
+    async talk(username, content, config) {
+        if (this.userBotDict[username].step == 0) {
+            this.userBotDict[username].stepRecord.push(0);
+            if (content.type === 3) {
+                this.userBotDict[username].step += 1;
+                return [
+                    { type: 1, content: `请描述你对图片的问题，最多支持5张图片，已收到${this.userBotDict[username].imageIds.length}张图片` }
+                ];
+            }
+        }
+        else if (this.userBotDict[username].step == 1) {
+            console.log("第二轮对话，用户输入了需要提问的内容");
+            this.userBotDict[username].stepRecord.push(1);
+            if (content.type === 1) {
+                // 用户选择了漫画模式
+                const res = await this.generateImage(username, content.content, config);
+                this.removeBot(username);
+                return res;
+            }
+        }
+    }
+    removeBot(uid) {
+        delete this.userTimeDict[uid];
+        delete this.userBotDict[uid];
+    }
+    getBotList() {
+        return this.userBotDict;
+    }
+    /**
+     * 识别图片内容
+     * @param {*} username 用户名
+     * @returns
+     */
+    async generateImage(username, question, config) {
+        const images = [];
+        for (let id of this.userBotDict[username].imageIds) {
+            const msg = await this.Bot.Message.find({ id });
+            const file = await msg.toFileBox();
+            const base = await file.toDataURL();
+            images.push(base);
+        }
+        const replys = await (0, gpt4v_js_1.get4vReply)(images, question, config);
+        return replys;
+    }
+    getImage(username, content, step) {
+        if (this.userBotDict[username].imageIds.length === 5) {
+            this.removeBot(username);
+            let replys = {
+                type: 1,
+                content: "本次对话已经重置，请重新发送图片"
+            };
+            return [replys];
+        }
+        this.userBotDict[username].step = step;
+        this.userBotDict[username].imageIds.push(content.id);
+        if (this.userBotDict[username].imageIds.length === 5) {
+            let replys = {
+                type: 1,
+                content: "已收到5张图片，请描述你的问题，再次发送图片将会重置本次对话"
+            };
+            return [replys];
+        }
+        let replys = {
+            type: 1,
+            content: `请描述你的问题，最多支持5张图片，已收到${this.userBotDict[username].imageIds.length}张图片`
+        };
+        return [replys];
+    }
+    // 对话入口
+    async run(userId, content, config) {
+        if (content.type === 1) {
+            if (Object.keys(this.userTimeDict).includes(userId)) {
+                return this.updateBot(userId, content, config);
+            }
+            return [];
+        }
+        else if (content.type === 3) {
+            if (Object.keys(this.userTimeDict).includes(userId)) {
+                return this.getImage(userId, content, 1);
+            }
+            else {
+                if (this.userBotDict.length > this.maxuser) {
+                    const minNum = Math.min(...Object.values(this.userTimeDict));
+                    const earlyIndex = Object.values(this.userTimeDict).indexOf(minNum);
+                    const earlyKey = Object.keys(this.userTimeDict)[earlyIndex];
+                    this.removeBot(earlyKey);
+                }
+                return await this.creatBot(userId, content);
+            }
+        }
+    }
+}
+exports.BotManage = BotManage;
+//# sourceMappingURL=multiReply.js.map

package/dist/cjs/src/handlers/on-message.js

@@ -9,6 +9,7 @@ const aiDb_js_1 = require("../db/aiDb.js");
 const roomDb_js_1 = require("../db/roomDb.js");
 const hook_js_1 = require("../common/hook.js");
 const puppet_type_js_1 = require("../const/puppet-type.js");
+const gpt4vService_js_1 = require("../service/gpt4vService.js");
 const ignoreRecord = [
     { type: "include", word: "加入了群聊" },
     { type: "include", word: "与群里其他人都不是朋友关系" },
@@ -58,6 +59,23 @@ async function dispatchFriendFilterByMsgType(that, msg) {
                     console.log(`发消息人${name}:${content}`);
                     const isIgnore = checkIgnore(content.trim(), aibotConfig.ignoreMessages);
                     if (content.trim() && !isIgnore) {
+                        const gpt4vReplys = await (0, gpt4vService_js_1.getGpt4vChat)({
+                            that,
+                            room: false,
+                            roomId: '',
+                            uniqueId: contact.id,
+                            id: contact.id,
+                            roomName: '',
+                            isMention: false,
+                            name,
+                            msgContent: { type: 1, content }
+                        });
+                        if (gpt4vReplys.length) {
+                            for (let reply of gpt4vReplys) {
+                                await index_js_1.contactSay.call(that, contact, reply);
+                            }
+                            return;
+                        }
                         replys = await (0, reply_js_1.getContactTextReply)(that, contact, content.trim());
                         for (let reply of replys) {
                             await (0, index_js_2.delay)(1000);
@@ -74,6 +92,23 @@ async function dispatchFriendFilterByMsgType(that, msg) {
                 break;
             case that.Message.Type.Image:
                 console.log(`发消息人${await contact.name()}:发了一张图片`);
+                const imgGpt4vReplys = await (0, gpt4vService_js_1.getGpt4vChat)({
+                    that,
+                    room: false,
+                    roomId: '',
+                    id: contact.id,
+                    uniqueId: contact.id,
+                    roomName: '',
+                    isMention: false,
+                    name,
+                    msgContent: { type: 3, id: msg.id }
+                });
+                if (imgGpt4vReplys.length) {
+                    for (let reply of imgGpt4vReplys) {
+                        await index_js_1.contactSay.call(that, contact, reply);
+                    }
+                    return;
+                }
                 break;
             case that.Message.Type.Video:
                 console.log(`发消息人${await contact.name()}:发了一个视频`);
@@ -145,6 +180,24 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
                 const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages);
                 if (isIgnore)
                     return;
+                const gpt4vReplys = await (0, gpt4vService_js_1.getGpt4vChat)({
+                    that,
+                    room,
+                    roomId: room.id,
+                    id: contactId,
+                    uniqueId: `${room.id}-${contactId}`,
+                    roomName,
+                    isMention: mentionSelf,
+                    name: contactName,
+                    msgContent: { type: 1, content }
+                });
+                if (gpt4vReplys.length) {
+                    for (let reply of gpt4vReplys) {
+                        await (0, index_js_2.delay)(1000);
+                        await index_js_1.roomSay.call(that, room, contact, reply);
+                    }
+                    return;
+                }
                 replys = await (0, reply_js_1.getRoomTextReply)({
                     that,
                     content,
@@ -181,6 +234,23 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
                 break;
             case that.Message.Type.Image:
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 发了一张图片`);
+                const imgGpt4vReplys = await (0, gpt4vService_js_1.getGpt4vChat)({
+                    that,
+                    room,
+                    roomId: room.id,
+                    id: contactId,
+                    uniqueId: `${room.id}-${contactId}`,
+                    roomName,
+                    isMention: false,
+                    name: contactName,
+                    msgContent: { type: 3, id: msg.id }
+                });
+                if (imgGpt4vReplys.length) {
+                    for (let reply of imgGpt4vReplys) {
+                        await index_js_1.roomSay.call(that, room, contact, reply);
+                    }
+                    return;
+                }
                 break;
             case that.Message.Type.Video:
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 发了一个视频`);

package/dist/cjs/src/package-json.js

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.31",
+    "version": "1.6.33",
     "description": "智能微秘书插件",
     "exports": {
         ".": {

package/dist/cjs/src/service/gpt4vService.d.ts

@@ -0,0 +1,12 @@
+export function getGpt4vChat({ room, roomId, roomName, isMention, msgContent, name, id, uniqueId, that }: {
+    room: any;
+    roomId: any;
+    roomName: any;
+    isMention: any;
+    msgContent: any;
+    name: any;
+    id: any;
+    uniqueId: any;
+    that: any;
+}): Promise<any>;
+//# sourceMappingURL=gpt4vService.d.ts.map

package/dist/cjs/src/service/gpt4vService.js

@@ -0,0 +1,71 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGpt4vChat = void 0;
+const global_js_1 = __importDefault(require("../db/global.js"));
+const multiReply_js_1 = require("../common/multiReply.js");
+let gpt4vRes = '';
+async function getGpt4vChat({ room, roomId, roomName, isMention, msgContent, name, id, uniqueId, that }) {
+    if (!gpt4vRes) {
+        gpt4vRes = new multiReply_js_1.BotManage(100, that);
+    }
+    const gptConfigs = global_js_1.default.getAllGptConfig();
+    if (gptConfigs && gptConfigs.length) {
+        let finalConfig = "";
+        if (room) {
+            finalConfig = room && gptConfigs.find((item) => {
+                const targetNames = [];
+                const targetIds = [];
+                item.targets.forEach(tItem => {
+                    targetNames.push(tItem.name);
+                    targetIds.push(tItem.id);
+                });
+                return item.type === "room" && (targetNames.includes(roomName) || targetIds.includes(roomId));
+            });
+        }
+        else {
+            finalConfig = !room && gptConfigs.find((item) => {
+                const targetNames = [];
+                const targetIds = [];
+                item.targets.forEach(tItem => {
+                    targetNames.push(tItem.name);
+                    targetIds.push(tItem.id);
+                });
+                return item.type === "contact" && (targetNames.includes(name) || targetIds.includes(id));
+            });
+        }
+        if (finalConfig) {
+            const isRoom = finalConfig.type === "room";
+            if (finalConfig.openChat && finalConfig.botConfig.open4v) {
+                if (msgContent.type === 1) {
+                    let msg = msgContent.content;
+                    if ((isRoom && finalConfig.needAt === 1 && isMention) || isRoom & !finalConfig.needAt || !isRoom) {
+                        const keyword = finalConfig?.keywords.find((item) => msg.includes(item));
+                        if (keyword || !finalConfig?.keywords.length) {
+                            msg = keyword ? msg.replace(keyword, "") : msg;
+                            if (finalConfig.limitNum > 0 && finalConfig.limitNum <= finalConfig.usedNum) {
+                                return [];
+                            }
+                            const config = {
+                                ...finalConfig.botConfig,
+                                proxyPass: finalConfig.botConfig.proxyPass,
+                                apiKey: finalConfig.botConfig.token,
+                            };
+                            const res = await gpt4vRes.run(uniqueId, { type: 1, content: msg }, config);
+                            return res;
+                        }
+                    }
+                }
+                else if (msgContent.type === 3) {
+                    const res = await gpt4vRes.run(uniqueId, { type: 3, id: msgContent.id });
+                    return res;
+                }
+            }
+        }
+    }
+    return [];
+}
+exports.getGpt4vChat = getGpt4vChat;
+//# sourceMappingURL=gpt4vService.js.map