From f7262a0a3a93e142b9af7a3629ac797adfa181b4 Mon Sep 17 00:00:00 2001 From: befantasy <31535803+befantasy@users.noreply.github.com> Date: Wed, 27 Sep 2023 19:26:47 +0800 Subject: [PATCH 01/13] =?UTF-8?q?Update=20chat=5Fchannel.py=20fix=20SHARIN?= =?UTF-8?q?G=20Type=20=E6=8A=A5=E9=94=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit chatgpt-on-wechat | [ERROR][2023-09-27 18:48:41][chat_channel.py:211] - [WX] unknown context type: SHARING --- channel/chat_channel.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/channel/chat_channel.py b/channel/chat_channel.py index 42530ab..0122d86 100644 --- a/channel/chat_channel.py +++ b/channel/chat_channel.py @@ -205,6 +205,8 @@ class ChatChannel(Channel): elif context.type == ContextType.IMAGE: # 图片消息，当前仅做下载保存到本地的逻辑 cmsg = context["msg"] cmsg.prepare() + elif context.type == ContextType.SHARING: # 分享信息，当前无默认逻辑 + pass elif context.type == ContextType.FUNCTION or context.type == ContextType.FILE: # 文件消息及函数调用等，当前无默认逻辑 pass else: From a0ae2d13dc3e77c449ca732a18ff57c2f16779a3 Mon Sep 17 00:00:00 2001 From: befantasy <31535803+befantasy@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:11:09 +0800 Subject: [PATCH 02/13] =?UTF-8?q?Update=20context.py=20=E6=96=B0=E5=A2=9EC?= =?UTF-8?q?ontextType=20"ACCEPT=5FFRIEND"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bridge/context.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bridge/context.py b/bridge/context.py index 4f2df1f..1e5958c 100644 --- a/bridge/context.py +++ b/bridge/context.py @@ -12,6 +12,7 @@ class ContextType(Enum): SHARING = 6 # 分享信息 IMAGE_CREATE = 10 # 创建图片命令 + ACCEPT_FRIEND = 19 # 同意好友请求 JOIN_GROUP = 20 # 加入群聊 PATPAT = 21 # 拍了拍 FUNCTION = 22 # 函数调用 From 5b552dffbf16e4f566255414f6a45d94d9a87315 Mon Sep 17 00:00:00 2001 From: befantasy <31535803+befantasy@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:16:30 +0800 Subject: [PATCH 03/13] =?UTF-8?q?Update=20wechat=5Fchannel.py=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20ContextType.ACCEPT=5FFRIEND?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- channel/wechat/wechat_channel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channel/wechat/wechat_channel.py b/channel/wechat/wechat_channel.py index be7fbe2..504c368 100644 --- a/channel/wechat/wechat_channel.py +++ b/channel/wechat/wechat_channel.py @@ -167,7 +167,7 @@ class WechatChannel(ChatChannel): logger.debug("[WX]receive voice for group msg: {}".format(cmsg.content)) elif cmsg.ctype == ContextType.IMAGE: logger.debug("[WX]receive image for group msg: {}".format(cmsg.content)) - elif cmsg.ctype in [ContextType.JOIN_GROUP, ContextType.PATPAT]: + elif cmsg.ctype in [ContextType.JOIN_GROUP, ContextType.PATPAT, ContextType.ACCEPT_FRIEND]: logger.debug("[WX]receive note msg: {}".format(cmsg.content)) elif cmsg.ctype == ContextType.TEXT: # logger.debug("[WX]receive group msg: {}, cmsg={}".format(json.dumps(cmsg._rawmsg, ensure_ascii=False), cmsg)) From f72cd13fbadac31f0da581acf3e743a835ed41a2 Mon Sep 17 00:00:00 2001 From: befantasy <31535803+befantasy@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:18:04 +0800 Subject: [PATCH 04/13] Update wechat_message.py --- channel/wechat/wechat_message.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/channel/wechat/wechat_message.py b/channel/wechat/wechat_message.py index 406162a..cf8b3e6 100644 --- a/channel/wechat/wechat_message.py +++ b/channel/wechat/wechat_message.py @@ -34,6 +34,9 @@ class WechatMessage(ChatMessage): self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[-1] elif "加入群聊" in itchat_msg["Content"]: self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[0] + elif "你已添加了" in itchat_msg["Content"]: #通过好友请求 + self.ctype = ContextType.ACCEPT_FRIEND + self.content = itchat_msg["Content"] elif "拍了拍我" in itchat_msg["Content"]: self.ctype = ContextType.PATPAT self.content = itchat_msg["Content"] From 270dd778d90a413b23bb084ae9a4975699a29a8d Mon Sep 17 00:00:00 2001 From: zhayujie Date: Fri, 13 Oct 2023 16:26:29 +0800 Subject: [PATCH 05/13] docs: update config-template and readme --- README.md | 14 ++++++-------- plugins/linkai/config.json.template | 5 ----- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 2e409a8..834e259 100644 --- a/README.md +++ b/README.md @@ -50,11 +50,13 @@ Demo made by [Visionn](https://www.wangpc.cc/) ## 准备 -### 1. OpenAI账号注册 +### 1. 账号注册 -前往 [OpenAI注册页面](https://beta.openai.com/signup) 创建账号，参考这篇 [教程](https://www.pythonthree.com/register-openai-chatgpt/) 可以通过虚拟手机号来接收验证码。创建完账号则前往 [API管理页面](https://beta.openai.com/account/api-keys) 创建一个 API Key 并保存下来，后面需要在项目中配置这个key。 +项目默认使用OpenAI接口，需前往 [OpenAI注册页面](https://beta.openai.com/signup) 创建账号，创建完账号则前往 [API管理页面](https://beta.openai.com/account/api-keys) 创建一个 API Key 并保存下来，后面需要在项目中配置这个key。接口需要海外网络访问及绑定信用卡支付。 -> 项目中默认使用的对话模型是 gpt3.5 turbo，计费方式是约每 500 汉字 (包含请求和回复) 消耗 $0.002，图片生成是每张消耗 $0.016。 +> 默认对话模型是 openai 的 gpt-3.5-turbo，计费方式是约每 1000tokens (约750个英文单词 或 500汉字，包含请求和回复) 消耗 $0.002，图片生成是Dell E模型，每张消耗 $0.016。 + +项目同时也支持使用 LinkAI 接口，无需代理，可使用 文心、讯飞、GPT-3、GPT-4 等模型，支持 定制化知识库、联网搜索、MJ绘图、文档总结和对话等能力。修改配置即可一键切换，参考 [接入文档](https://link-ai.tech/platform/link-app/wechat)。 ### 2.运行环境 @@ -269,8 +271,4 @@ FAQs： ## 联系 -欢迎提交PR、Issues，以及Star支持一下。程序运行遇到问题可以查看 [常见问题列表](https://github.com/zhayujie/chatgpt-on-wechat/wiki/FAQs) ，其次前往 [Issues](https://github.com/zhayujie/chatgpt-on-wechat/issues) 中搜索。 - -如果你想了解更多项目细节，与开发者们交流更多关于AI技术的实践，欢迎加入星球: - - +欢迎提交PR、Issues，以及Star支持一下。程序运行遇到问题可以查看 [常见问题列表](https://github.com/zhayujie/chatgpt-on-wechat/wiki/FAQs) ，其次前往 [Issues](https://github.com/zhayujie/chatgpt-on-wechat/issues) 中搜索。参与更多讨论可加入技术交流群。 diff --git a/plugins/linkai/config.json.template b/plugins/linkai/config.json.template index 697d0cc..ccd8967 100644 --- a/plugins/linkai/config.json.template +++ b/plugins/linkai/config.json.template @@ -15,10 +15,5 @@ "enabled": true, "group_enabled": true, "max_file_size": 5000 - }, - "knowledge_base": { - "search_miss_text_enabled": false, - "search_miss_similarity": 0.8, - "search_miss_suffix": "\n-------------\n回复仅供参考，请以官方文档为准" } } From 572932d8e845ab33040bd5a5758c5143b79158be Mon Sep 17 00:00:00 2001 From: zhayujie Date: Fri, 13 Oct 2023 16:31:02 +0800 Subject: [PATCH 06/13] docs: update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 834e259..c824253 100644 --- a/README.md +++ b/README.md @@ -186,10 +186,10 @@ pip3 install azure-cognitiveservices-speech 如果是开发机 **本地运行**，直接在项目根目录下执行： ```bash -python3 app.py +python3 app.py # windows环境下该命令通常为 python app.py ``` -终端输出二维码后，使用微信进行扫码，当输出 "Start auto replying" 时表示自动回复程序已经成功运行了（注意：用于登录的微信需要在支付处已完成实名认证）。扫码登录后你的账号就成为机器人了，可以在微信手机端通过配置的关键词触发自动回复 (任意好友发送消息给你，或是自己发消息给好友)，参考[#142](https://github.com/zhayujie/chatgpt-on-wechat/issues/142)。 +终端输出二维码后，使用微信进行扫码，当输出 "Start auto replying" 时表示自动回复程序已经成功运行了（注意：用于登录的微信需要在支付处已完成实名认证）。扫码登录后你的账号就成为机器人了，可以在微信手机端通过配置的关键词触发自动回复 (任意好友发送消息给你，或是自己发消息给好友)，参考[#142](https://github.com/zhayujie/chatgpt-on-wechat/issues/142)。 ### 2.服务器部署 From 4b27de809bf23153777bf9228114787c1d02d6a0 Mon Sep 17 00:00:00 2001 From: zhayujie Date: Fri, 13 Oct 2023 18:10:05 +0800 Subject: [PATCH 07/13] fix: image create prefix --- config-template.json | 4 +--- plugins/linkai/midjourney.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config-template.json b/config-template.json index f01633d..699b96b 100644 --- a/config-template.json +++ b/config-template.json @@ -20,9 +20,7 @@ "ChatGPT测试群" ], "image_create_prefix": [ - "画", - "看", - "找" + "画" ], "speech_recognition": false, "group_speech_recognition": false, diff --git a/plugins/linkai/midjourney.py b/plugins/linkai/midjourney.py index c008bcd..a944ae5 100644 --- a/plugins/linkai/midjourney.py +++ b/plugins/linkai/midjourney.py @@ -48,7 +48,7 @@ task_name_mapping = { class MJTask: - def __init__(self, id, user_id: str, task_type: TaskType, raw_prompt=None, expires: int = 60 * 30, + def __init__(self, id, user_id: str, task_type: TaskType, raw_prompt=None, expires: int = 60 * 6, status=Status.PENDING): self.id = id self.user_id = user_id From c2477b26c0d416c1b10f8fd803bf3a40bbdfe552 Mon Sep 17 00:00:00 2001 From: zhayujie Date: Fri, 13 Oct 2023 18:58:13 +0800 Subject: [PATCH 08/13] fix: summary no user_id bug --- plugins/linkai/linkai.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/linkai/linkai.py b/plugins/linkai/linkai.py index f791cc4..39feaf1 100644 --- a/plugins/linkai/linkai.py +++ b/plugins/linkai/linkai.py @@ -290,7 +290,8 @@ def _find_sum_id(context): return USER_FILE_MAP.get(_find_user_id(context) + "-sum_id") def _find_file_id(context): - return USER_FILE_MAP.get(_find_user_id(context) + "-file_id") + user_id = _find_user_id(context) + if user_id: + return USER_FILE_MAP.get(user_id + "-file_id") - -USER_FILE_MAP = ExpiredDict(conf().get("expires_in_seconds") or 60 * 60) +USER_FILE_MAP = ExpiredDict(conf().get("expires_in_seconds") or 60 * 30) From 792e9402799c421accee87e59e758d6713e43f2e Mon Sep 17 00:00:00 2001 From: zhayujie Date: Fri, 13 Oct 2023 19:12:23 +0800 Subject: [PATCH 09/13] fix: knowledge base miss suffix bug --- bot/linkai/link_ai_bot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bot/linkai/link_ai_bot.py b/bot/linkai/link_ai_bot.py index 18898aa..80c0326 100644 --- a/bot/linkai/link_ai_bot.py +++ b/bot/linkai/link_ai_bot.py @@ -94,11 +94,11 @@ class LinkAIBot(Bot, OpenAIImage): response = res.json() reply_content = response["choices"][0]["message"]["content"] total_tokens = response["usage"]["total_tokens"] + logger.info(f"[LINKAI] reply={reply_content}, total_tokens={total_tokens}") + self.sessions.session_reply(reply_content, session_id, total_tokens) suffix = self._fecth_knowledge_search_suffix(response) if suffix: reply_content += suffix - logger.info(f"[LINKAI] reply={reply_content}, total_tokens={total_tokens}") - self.sessions.session_reply(reply_content, session_id, total_tokens) return Reply(ReplyType.TEXT, reply_content) else: From 21b956b98398a78cf8568a1e47b98753758ad068 Mon Sep 17 00:00:00 2001 From: zhayujie Date: Mon, 16 Oct 2023 16:44:06 +0800 Subject: [PATCH 10/13] fix: mj open auth bug --- plugins/linkai/linkai.py | 26 ++++---------------------- plugins/linkai/midjourney.py | 4 ++++ plugins/linkai/utils.py | 28 ++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 plugins/linkai/utils.py diff --git a/plugins/linkai/linkai.py b/plugins/linkai/linkai.py index 39feaf1..e40140a 100644 --- a/plugins/linkai/linkai.py +++ b/plugins/linkai/linkai.py @@ -1,7 +1,6 @@ import plugins from bridge.context import ContextType from bridge.reply import Reply, ReplyType -from config import global_config from plugins import * from .midjourney import MJBot from .summary import LinkSummary @@ -9,7 +8,7 @@ from bridge import bridge from common.expired_dict import ExpiredDict from common import const import os - +from .utils import Util @plugins.register( name="linkai", @@ -129,7 +128,7 @@ class LinkAI(Plugin): if len(cmd) == 2 and (cmd[1] == "open" or cmd[1] == "close"): # 知识库开关指令 - if not _is_admin(e_context): + if not Util.is_admin(e_context): _set_reply_text("需要管理员权限执行", e_context, level=ReplyType.ERROR) return is_open = True @@ -147,7 +146,7 @@ class LinkAI(Plugin): if not context.kwargs.get("isgroup"): _set_reply_text("该指令需在群聊中使用", e_context, level=ReplyType.ERROR) return - if not _is_admin(e_context): + if not Util.is_admin(e_context): _set_reply_text("需要管理员权限执行", e_context, level=ReplyType.ERROR) return app_code = cmd[2] @@ -164,7 +163,7 @@ class LinkAI(Plugin): if len(cmd) == 3 and cmd[1] == "sum" and (cmd[2] == "open" or cmd[2] == "close"): # 知识库开关指令 - if not _is_admin(e_context): + if not Util.is_admin(e_context): _set_reply_text("需要管理员权限执行", e_context, level=ReplyType.ERROR) return is_open = True @@ -253,23 +252,6 @@ def _send_info(e_context: EventContext, content: str): channel = e_context["channel"] channel.send(reply, e_context["context"]) -# 静态方法 -def _is_admin(e_context: EventContext) -> bool: - """ - 判断消息是否由管理员用户发送 - :param e_context: 消息上下文 - :return: True: 是, False: 否 - """ - context = e_context["context"] - if context["isgroup"]: - actual_user_id= context.kwargs.get("msg").actual_user_id - for admin_user in global_config["admin_users"]: - if actual_user_id and actual_user_id in admin_user: - return True - return False - else: - return context["receiver"] in global_config["admin_users"] - def _find_user_id(context): if context["isgroup"]: diff --git a/plugins/linkai/midjourney.py b/plugins/linkai/midjourney.py index a944ae5..76395bd 100644 --- a/plugins/linkai/midjourney.py +++ b/plugins/linkai/midjourney.py @@ -8,6 +8,7 @@ from bridge.reply import Reply, ReplyType import asyncio from bridge.context import ContextType from plugins import EventContext, EventAction +from .utils import Util INVALID_REQUEST = 410 NOT_FOUND_ORIGIN_IMAGE = 461 @@ -113,6 +114,9 @@ class MJBot: return if len(cmd) == 2 and (cmd[1] == "open" or cmd[1] == "close"): + if not Util.is_admin(e_context): + Util.set_reply_text("需要管理员权限执行", e_context, level=ReplyType.ERROR) + return # midjourney 开关指令 is_open = True tips_text = "开启" diff --git a/plugins/linkai/utils.py b/plugins/linkai/utils.py new file mode 100644 index 0000000..c874cdf --- /dev/null +++ b/plugins/linkai/utils.py @@ -0,0 +1,28 @@ +from config import global_config +from bridge.reply import Reply, ReplyType +from plugins.event import EventContext, EventAction + + +class Util: + @staticmethod + def is_admin(e_context: EventContext) -> bool: + """ + 判断消息是否由管理员用户发送 + :param e_context: 消息上下文 + :return: True: 是, False: 否 + """ + context = e_context["context"] + if context["isgroup"]: + actual_user_id = context.kwargs.get("msg").actual_user_id + for admin_user in global_config["admin_users"]: + if actual_user_id and actual_user_id in admin_user: + return True + return False + else: + return context["receiver"] in global_config["admin_users"] + + @staticmethod + def set_reply_text(content: str, e_context: EventContext, level: ReplyType = ReplyType.ERROR): + reply = Reply(level, content) + e_context["reply"] = reply + e_context.action = EventAction.BREAK_PASS From aaed3f9839446e0a1d58c3bc4900e71e8d9c18cc Mon Sep 17 00:00:00 2001 From: zhayujie Date: Wed, 18 Oct 2023 11:14:44 +0800 Subject: [PATCH 11/13] fix: ignore system message --- channel/wechat/wechat_channel.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/channel/wechat/wechat_channel.py b/channel/wechat/wechat_channel.py index 504c368..0989a85 100644 --- a/channel/wechat/wechat_channel.py +++ b/channel/wechat/wechat_channel.py @@ -142,6 +142,9 @@ class WechatChannel(ChatChannel): @time_checker @_check def handle_single(self, cmsg: ChatMessage): + # filter system message + if cmsg.other_user_id in ["weixin"]: + return if cmsg.ctype == ContextType.VOICE: if conf().get("speech_recognition") != True: return From 0c18c3a6dd4254e2fc3ce1fe16c75c395dd0ea1d Mon Sep 17 00:00:00 2001 From: zhayujie Date: Thu, 19 Oct 2023 21:51:57 +0800 Subject: [PATCH 12/13] docs: update demo vedio --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c824253..796346f 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ # 演示 -https://user-images.githubusercontent.com/26161723/233777277-e3b9928e-b88f-43e2-b0e0-3cbc923bc799.mp4 +https://github.com/zhayujie/chatgpt-on-wechat/assets/26161723/d5154020-36e3-41db-8706-40ce9f3f1b1e Demo made by [Visionn](https://www.wangpc.cc/) From 1a9edb69072b2a5f0a9ddf6257ec388972a928ad Mon Sep 17 00:00:00 2001 From: zhayujie Date: Mon, 23 Oct 2023 21:09:18 +0800 Subject: [PATCH 13/13] fix: plugin config not exist warning --- bot/linkai/link_ai_bot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/linkai/link_ai_bot.py b/bot/linkai/link_ai_bot.py index 80c0326..089e387 100644 --- a/bot/linkai/link_ai_bot.py +++ b/bot/linkai/link_ai_bot.py @@ -195,7 +195,7 @@ class LinkAIBot(Bot, OpenAIImage): first_similarity = response.get("knowledge_base").get("first_similarity") logger.info(f"[LINKAI] knowledge base, search_hit={search_hit}, first_similarity={first_similarity}") plugin_config = pconf("linkai") - if plugin_config.get("knowledge_base") and plugin_config.get("knowledge_base").get("search_miss_text_enabled"): + if plugin_config and plugin_config.get("knowledge_base") and plugin_config.get("knowledge_base").get("search_miss_text_enabled"): search_miss_similarity = plugin_config.get("knowledge_base").get("search_miss_similarity") search_miss_text = plugin_config.get("knowledge_base").get("search_miss_suffix") if not search_hit: