From 6404332adce895b9797ade54404f44432334fdee Mon Sep 17 00:00:00 2001
From: lanvent <lanvent@qq.com>
Date: Tue, 18 Apr 2023 02:21:41 +0800
Subject: [PATCH 1/8] feat: itchat support joingroup message

---
 bridge/context.py                |  1 +
 channel/wechat/wechat_channel.py | 19 +++++++++++++------
 channel/wechat/wechat_message.py | 29 +++++++++++++++++++++++++++--
 plugins/hello/hello.py           | 11 ++++++++++-
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/bridge/context.py b/bridge/context.py
index 7a857b3..7eac9c1 100644
--- a/bridge/context.py
+++ b/bridge/context.py
@@ -8,6 +8,7 @@ class ContextType(Enum):
     VOICE = 2  # 音频消息
     IMAGE = 3  # 图片消息
     IMAGE_CREATE = 10  # 创建图片命令
+    JOIN_GROUP = 20  # 加入群聊
 
     def __str__(self):
         return self.name
diff --git a/channel/wechat/wechat_channel.py b/channel/wechat/wechat_channel.py
index 52c8ee3..b3099f6 100644
--- a/channel/wechat/wechat_channel.py
+++ b/channel/wechat/wechat_channel.py
@@ -28,18 +28,23 @@ from plugins import *
 
 @itchat.msg_register([TEXT, VOICE, PICTURE])
 def handler_single_msg(msg):
-    # logger.debug("handler_single_msg: {}".format(msg))
-    if msg["Type"] == PICTURE and msg["MsgType"] == 47:
+    try:
+        cmsg = WeChatMessage(msg, False)
+    except NotImplementedError as e:
+        logger.debug("[WX]single message {} skipped: {}".format(msg["MsgId"], e))
         return None
-    WechatChannel().handle_single(WeChatMessage(msg))
+    WechatChannel().handle_single(cmsg)
     return None
 
 
-@itchat.msg_register([TEXT, VOICE, PICTURE], isGroupChat=True)
+@itchat.msg_register([TEXT, VOICE, PICTURE, NOTE], isGroupChat=True)
 def handler_group_msg(msg):
-    if msg["Type"] == PICTURE and msg["MsgType"] == 47:
+    try:
+        cmsg = WeChatMessage(msg, True)
+    except NotImplementedError as e:
+        logger.debug("[WX]group message {} skipped: {}".format(msg["MsgId"], e))
         return None
-    WechatChannel().handle_group(WeChatMessage(msg, True))
+    WechatChannel().handle_group(cmsg)
     return None
 
 
@@ -186,6 +191,8 @@ 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 == ContextType.JOIN_GROUP:
+            logger.debug("[WX]receive join group msg: {}".format(cmsg.content))
         else:
             # logger.debug("[WX]receive group msg: {}, cmsg={}".format(json.dumps(cmsg._rawmsg, ensure_ascii=False), cmsg))
             pass
diff --git a/channel/wechat/wechat_message.py b/channel/wechat/wechat_message.py
index 92182bd..6bfd9f2 100644
--- a/channel/wechat/wechat_message.py
+++ b/channel/wechat/wechat_message.py
@@ -1,3 +1,5 @@
+import re
+
 from bridge.context import ContextType
 from channel.chat_message import ChatMessage
 from common.log import logger
@@ -24,9 +26,31 @@ class WeChatMessage(ChatMessage):
             self.ctype = ContextType.IMAGE
             self.content = TmpDir().path() + itchat_msg["FileName"]  # content直接存临时目录路径
             self._prepare_fn = lambda: itchat_msg.download(self.content)
+        elif itchat_msg["Type"] == NOTE and itchat_msg["MsgType"] == 10000:
+            if is_group and (
+                "加入群聊" in itchat_msg["Content"] or "加入了群聊" in itchat_msg["Content"]
+            ):
+                self.ctype = ContextType.JOIN_GROUP
+                logger.debug("[WX]join group message: " + itchat_msg["Content"])
+                self.content = itchat_msg["Content"]
+                # 这里只能得到nickname， actual_user_id还是机器人的id
+                if "加入了群聊" in itchat_msg["Content"]:
+                    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]
+            else:
+                raise NotImplementedError(
+                    "Unsupported note message: " + itchat_msg["Content"]
+                )
         else:
             raise NotImplementedError(
-                "Unsupported message type: {}".format(itchat_msg["Type"])
+                "Unsupported message type: Type:{} MsgType:{}".format(
+                    itchat_msg["Type"], itchat_msg["MsgType"]
+                )
             )
 
         self.from_user_id = itchat_msg["FromUserName"]
@@ -58,4 +82,5 @@ class WeChatMessage(ChatMessage):
         if self.is_group:
             self.is_at = itchat_msg["IsAt"]
             self.actual_user_id = itchat_msg["ActualUserName"]
-            self.actual_user_nickname = itchat_msg["ActualNickName"]
+            if self.ctype != ContextType.JOIN_GROUP:
+                self.actual_user_nickname = itchat_msg["ActualNickName"]
diff --git a/plugins/hello/hello.py b/plugins/hello/hello.py
index 4067c2a..00732ec 100644
--- a/plugins/hello/hello.py
+++ b/plugins/hello/hello.py
@@ -23,7 +23,16 @@ class Hello(Plugin):
         logger.info("[Hello] inited")
 
     def on_handle_context(self, e_context: EventContext):
-        if e_context["context"].type != ContextType.TEXT:
+        if e_context["context"].type not in [ContextType.TEXT, ContextType.JOIN_GROUP]:
+            return
+
+        if e_context["context"].type == ContextType.JOIN_GROUP:
+            e_context["context"].type = ContextType.TEXT
+            msg: ChatMessage = e_context["context"]["msg"]
+            e_context[
+                "context"
+            ].content = f'请你随机使用一种风格说一句问候语来欢迎新用户"{msg.actual_user_nickname}"加入群聊。'
+            e_context.action = EventAction.CONTINUE  # 事件继续，交付给下个插件或默认逻辑
             return
 
         content = e_context["context"].content

From f2e29f3f2e73b95105dd56ee476dd7d949fc0128 Mon Sep 17 00:00:00 2001
From: lanvent <lanvent@qq.com>
Date: Tue, 18 Apr 2023 11:43:34 +0800
Subject: [PATCH 2/8] fix: banwords help

---
 plugins/banwords/banwords.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/banwords/banwords.py b/plugins/banwords/banwords.py
index 138b4c2..4f7f75c 100644
--- a/plugins/banwords/banwords.py
+++ b/plugins/banwords/banwords.py
@@ -102,4 +102,4 @@ class Banwords(Plugin):
                 return
 
     def get_help_text(self, **kwargs):
-        return Banwords.desc
+        return "过滤消息中的敏感词。"

From 6a13dd04a3221c92324bbb963923bd22e0f835e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E7=9D=A3=E7=BF=94?= <linduxiang@gdcattsoft.com>
Date: Tue, 18 Apr 2023 13:57:20 +0800
Subject: [PATCH 3/8] =?UTF-8?q?feat(=E6=8F=92=E4=BB=B6=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=EF=BC=89=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/keyword/README.md            |  13 ++++++
 plugins/keyword/__init__.py          |   1 +
 plugins/keyword/config.json.template |   5 ++
 plugins/keyword/keyword.py           |  67 +++++++++++++++++++++++++++
 plugins/keyword/test-keyword.png     | Bin 0 -> 12350 bytes
 5 files changed, 86 insertions(+)
 create mode 100644 plugins/keyword/README.md
 create mode 100644 plugins/keyword/__init__.py
 create mode 100644 plugins/keyword/config.json.template
 create mode 100644 plugins/keyword/keyword.py
 create mode 100644 plugins/keyword/test-keyword.png

diff --git a/plugins/keyword/README.md b/plugins/keyword/README.md
new file mode 100644
index 0000000..4678f68
--- /dev/null
+++ b/plugins/keyword/README.md
@@ -0,0 +1,13 @@
+# 目的
+关键字匹配并回复
+
+# 试用场景
+目前是在微信公众号下面使用过。
+
+# 使用步骤
+1. 复制 `config.json.template` 为 `config.json`
+2. 在关键字 `keyword` 新增需要关键字匹配的内容
+3. 重启程序做验证
+
+# 验证结果
+![结果](test-keyword.png)
\ No newline at end of file
diff --git a/plugins/keyword/__init__.py b/plugins/keyword/__init__.py
new file mode 100644
index 0000000..b860b69
--- /dev/null
+++ b/plugins/keyword/__init__.py
@@ -0,0 +1 @@
+from .keyword import *
diff --git a/plugins/keyword/config.json.template b/plugins/keyword/config.json.template
new file mode 100644
index 0000000..9a8332f
--- /dev/null
+++ b/plugins/keyword/config.json.template
@@ -0,0 +1,5 @@
+{
+  "keyword": {
+      "关键字匹配": "测试成功"
+  }
+}
\ No newline at end of file
diff --git a/plugins/keyword/keyword.py b/plugins/keyword/keyword.py
new file mode 100644
index 0000000..cc286bd
--- /dev/null
+++ b/plugins/keyword/keyword.py
@@ -0,0 +1,67 @@
+# encoding:utf-8
+
+import json
+import os
+import plugins
+from bridge.context import ContextType
+from bridge.reply import Reply, ReplyType
+from common.log import logger
+from plugins import *
+
+@plugins.register(
+    name="Keyword",
+    desire_priority=900,
+    hidden=True,
+    desc="关键词匹配过滤",
+    version="0.1",
+    author="fengyege.top",
+)
+class Keyword(Plugin):
+    def __init__(self):
+        super().__init__()
+        try:
+            curdir = os.path.dirname(__file__)
+            config_path = os.path.join(curdir, "config.json")
+            conf = None
+            if not os.path.exists(config_path):
+                logger.debug(f"[keyword]不存在配置文件{config_path}")
+                conf = {"keyword": {}}
+                with open(config_path, "w", encoding="utf-8") as f:
+                    json.dump(conf, f, indent=4)
+            else:
+                logger.debug(f"[keyword]加载配置文件{config_path}")
+                with open(config_path, "r", encoding="utf-8") as f:
+                    conf = json.load(f)
+            # 加载关键词
+            self.keyword = conf["keyword"]
+
+            logger.info(self.keyword)
+            self.handlers[Event.ON_HANDLE_CONTEXT] = self.on_handle_context
+            logger.info("[keyword] inited")
+        except Exception as e:
+            logger.warn(
+                "[keyword] init failed, ignore or see https://github.com/zhayujie/chatgpt-on-wechat/tree/master/plugins/keyword ."
+            )
+            raise e
+
+    def on_handle_context(self, e_context: EventContext):
+        if e_context["context"].type != ContextType.TEXT:
+            return
+
+        content = e_context["context"].content.strip()
+        logger.info("[keyword] on_handle_context. content: %s" % content)
+        if content in self.keyword:
+            logger.debug(f"[keyword] 匹配到关键字【{content}】")
+            reply_text = self.keyword[content]
+
+            reply = Reply()
+            reply.type = ReplyType.TEXT
+            reply.content = reply_text
+            e_context['reply'] = reply
+            e_context.action = EventAction.BREAK_PASS  # 事件结束，并跳过处理context的默认逻辑
+
+    def get_help_text(self, **kwargs):
+        help_text = "关键词过滤"
+        return help_text
+
+
diff --git a/plugins/keyword/test-keyword.png b/plugins/keyword/test-keyword.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f17ae80b8c584095ef3eed8770ae8638b2cd3da
GIT binary patch
literal 12350
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%0Dafrtvj|p
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

literal 0
HcmV?d00001


From abcbb34b1c5eb27253c8a2d9625cfc028a2b6dbc Mon Sep 17 00:00:00 2001
From: lanvent <lanvent@qq.com>
Date: Tue, 18 Apr 2023 14:18:22 +0800
Subject: [PATCH 4/8] fix(chat_gpt_bot.py, open_ai_bot.py): increase retry time
 to 20 seconds when encountering RateLimitError

---
 bot/chatgpt/chat_gpt_bot.py | 2 +-
 bot/openai/open_ai_bot.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/chatgpt/chat_gpt_bot.py b/bot/chatgpt/chat_gpt_bot.py
index 59acaa6..d8e4b0e 100644
--- a/bot/chatgpt/chat_gpt_bot.py
+++ b/bot/chatgpt/chat_gpt_bot.py
@@ -142,7 +142,7 @@ class ChatGPTBot(Bot, OpenAIImage):
                 logger.warn("[CHATGPT] RateLimitError: {}".format(e))
                 result["content"] = "提问太快啦，请休息一下再问我吧"
                 if need_retry:
-                    time.sleep(5)
+                    time.sleep(20)
             elif isinstance(e, openai.error.Timeout):
                 logger.warn("[CHATGPT] Timeout: {}".format(e))
                 result["content"] = "我没有收到你的消息"
diff --git a/bot/openai/open_ai_bot.py b/bot/openai/open_ai_bot.py
index 8a56cf1..1cfbf10 100644
--- a/bot/openai/open_ai_bot.py
+++ b/bot/openai/open_ai_bot.py
@@ -114,7 +114,7 @@ class OpenAIBot(Bot, OpenAIImage):
                 logger.warn("[OPEN_AI] RateLimitError: {}".format(e))
                 result["content"] = "提问太快啦，请休息一下再问我吧"
                 if need_retry:
-                    time.sleep(5)
+                    time.sleep(20)
             elif isinstance(e, openai.error.Timeout):
                 logger.warn("[OPEN_AI] Timeout: {}".format(e))
                 result["content"] = "我没有收到你的消息"

From de339114600a558ecfc6cd0977ba53b060c95a6f Mon Sep 17 00:00:00 2001
From: lanvent <lanvent@qq.com>
Date: Tue, 18 Apr 2023 23:34:08 +0800
Subject: [PATCH 5/8] feat: add support for PATPAT context

---
 bridge/context.py                |  1 +
 channel/wechat/wechat_channel.py | 16 +++++++++++-----
 channel/wechat/wechat_message.py | 10 ++++++++--
 plugins/hello/hello.py           | 13 ++++++++++++-
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/bridge/context.py b/bridge/context.py
index 7eac9c1..c1eb10c 100644
--- a/bridge/context.py
+++ b/bridge/context.py
@@ -9,6 +9,7 @@ class ContextType(Enum):
     IMAGE = 3  # 图片消息
     IMAGE_CREATE = 10  # 创建图片命令
     JOIN_GROUP = 20  # 加入群聊
+    PATPAT = 21  # 拍了拍
 
     def __str__(self):
         return self.name
diff --git a/channel/wechat/wechat_channel.py b/channel/wechat/wechat_channel.py
index b3099f6..cf200b1 100644
--- a/channel/wechat/wechat_channel.py
+++ b/channel/wechat/wechat_channel.py
@@ -26,7 +26,7 @@ from lib.itchat.content import *
 from plugins import *
 
 
-@itchat.msg_register([TEXT, VOICE, PICTURE])
+@itchat.msg_register([TEXT, VOICE, PICTURE, NOTE])
 def handler_single_msg(msg):
     try:
         cmsg = WeChatMessage(msg, False)
@@ -170,12 +170,16 @@ class WechatChannel(ChatChannel):
             logger.debug("[WX]receive voice msg: {}".format(cmsg.content))
         elif cmsg.ctype == ContextType.IMAGE:
             logger.debug("[WX]receive image msg: {}".format(cmsg.content))
-        else:
+        elif cmsg.ctype == ContextType.PATPAT:
+            logger.debug("[WX]receive patpat msg: {}".format(cmsg.content))
+        elif cmsg.ctype == ContextType.TEXT:
             logger.debug(
                 "[WX]receive text msg: {}, cmsg={}".format(
                     json.dumps(cmsg._rawmsg, ensure_ascii=False), cmsg
                 )
             )
+        else:
+            logger.debug("[WX]receive msg: {}, cmsg={}".format(cmsg.content, cmsg))
         context = self._compose_context(
             cmsg.ctype, cmsg.content, isgroup=False, msg=cmsg
         )
@@ -191,11 +195,13 @@ 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 == ContextType.JOIN_GROUP:
-            logger.debug("[WX]receive join group msg: {}".format(cmsg.content))
-        else:
+        elif cmsg.ctype in [ContextType.JOIN_GROUP, ContextType.PATPAT]:
+            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))
             pass
+        else:
+            logger.debug("[WX]receive group msg: {}".format(cmsg.content))
         context = self._compose_context(
             cmsg.ctype, cmsg.content, isgroup=True, msg=cmsg
         )
diff --git a/channel/wechat/wechat_message.py b/channel/wechat/wechat_message.py
index 6bfd9f2..1888425 100644
--- a/channel/wechat/wechat_message.py
+++ b/channel/wechat/wechat_message.py
@@ -31,7 +31,6 @@ class WeChatMessage(ChatMessage):
                 "加入群聊" in itchat_msg["Content"] or "加入了群聊" in itchat_msg["Content"]
             ):
                 self.ctype = ContextType.JOIN_GROUP
-                logger.debug("[WX]join group message: " + itchat_msg["Content"])
                 self.content = itchat_msg["Content"]
                 # 这里只能得到nickname， actual_user_id还是机器人的id
                 if "加入了群聊" in itchat_msg["Content"]:
@@ -42,6 +41,13 @@ class WeChatMessage(ChatMessage):
                     self.actual_user_nickname = re.findall(
                         r"\"(.*?)\"", itchat_msg["Content"]
                     )[0]
+            elif "拍了拍我" in itchat_msg["Content"]:
+                self.ctype = ContextType.PATPAT
+                self.content = itchat_msg["Content"]
+                if is_group:
+                    self.actual_user_nickname = re.findall(
+                        r"\"(.*?)\"", itchat_msg["Content"]
+                    )[0]
             else:
                 raise NotImplementedError(
                     "Unsupported note message: " + itchat_msg["Content"]
@@ -82,5 +88,5 @@ class WeChatMessage(ChatMessage):
         if self.is_group:
             self.is_at = itchat_msg["IsAt"]
             self.actual_user_id = itchat_msg["ActualUserName"]
-            if self.ctype != ContextType.JOIN_GROUP:
+            if self.ctype not in [ContextType.JOIN_GROUP, ContextType.PATPAT]:
                 self.actual_user_nickname = itchat_msg["ActualNickName"]
diff --git a/plugins/hello/hello.py b/plugins/hello/hello.py
index 00732ec..254b172 100644
--- a/plugins/hello/hello.py
+++ b/plugins/hello/hello.py
@@ -23,7 +23,11 @@ class Hello(Plugin):
         logger.info("[Hello] inited")
 
     def on_handle_context(self, e_context: EventContext):
-        if e_context["context"].type not in [ContextType.TEXT, ContextType.JOIN_GROUP]:
+        if e_context["context"].type not in [
+            ContextType.TEXT,
+            ContextType.JOIN_GROUP,
+            ContextType.PATPAT,
+        ]:
             return
 
         if e_context["context"].type == ContextType.JOIN_GROUP:
@@ -35,6 +39,13 @@ class Hello(Plugin):
             e_context.action = EventAction.CONTINUE  # 事件继续，交付给下个插件或默认逻辑
             return
 
+        if e_context["context"].type == ContextType.PATPAT:
+            e_context["context"].type = ContextType.TEXT
+            msg: ChatMessage = e_context["context"]["msg"]
+            e_context["context"].content = f"请你随机使用一种风格介绍你自己，并告诉用户输入#help可以查看帮助信息。"
+            e_context.action = EventAction.CONTINUE  # 事件继续，交付给下个插件或默认逻辑
+            return
+
         content = e_context["context"].content
         logger.debug("[Hello] on_handle_context. content: %s" % content)
         if content == "Hello":

From a83e5a9b6589bd00e5c352b695852e491e038787 Mon Sep 17 00:00:00 2001
From: lanvent <lanvent@qq.com>
Date: Wed, 19 Apr 2023 00:51:52 +0800
Subject: [PATCH 6/8] feat(azure_voice.py): improve error logging in
 textToVoice method

---
 voice/azure/azure_voice.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/voice/azure/azure_voice.py b/voice/azure/azure_voice.py
index 9317b83..8b45a87 100644
--- a/voice/azure/azure_voice.py
+++ b/voice/azure/azure_voice.py
@@ -83,6 +83,10 @@ class AzureVoice(Voice):
             )
             reply = Reply(ReplyType.VOICE, fileName)
         else:
-            logger.error("[Azure] textToVoice error, result={}".format(result))
+            logger.error(
+                "[Azure] textToVoice error, result={}, canceldetails={}".format(
+                    result, result.cancellation_details
+                )
+            )
             reply = Reply(ReplyType.ERROR, "抱歉，语音合成失败")
         return reply

From a0cbe9c3e2eedad6ce286061eb0ebadb748f9111 Mon Sep 17 00:00:00 2001
From: lanvent <lanvent@qq.com>
Date: Wed, 19 Apr 2023 00:55:22 +0800
Subject: [PATCH 7/8] feat(azure_voice.py): improve error logging in
 voiceToText method

---
 voice/azure/azure_voice.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/voice/azure/azure_voice.py b/voice/azure/azure_voice.py
index 8b45a87..3ee9504 100644
--- a/voice/azure/azure_voice.py
+++ b/voice/azure/azure_voice.py
@@ -66,7 +66,11 @@ class AzureVoice(Voice):
             )
             reply = Reply(ReplyType.TEXT, result.text)
         else:
-            logger.error("[Azure] voiceToText error, result={}".format(result))
+            logger.error(
+                "[Azure] voiceToText error, result={}, canceldetails={}".format(
+                    result, result.cancellation_details
+                )
+            )
             reply = Reply(ReplyType.ERROR, "抱歉，语音识别失败")
         return reply
 

From 0a7d6e4577de362f3a29272aa536b8ff34d5a067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?goldfish=E8=8F=8C?= <q8584@qq.com>
Date: Wed, 19 Apr 2023 10:05:28 +0800
Subject: [PATCH 8/8] plugin(tool) ver0.4.1 (#891)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* plugin(tool) fix bugs

* plugin(tool) tool插件更新至0.4.1 版本
---
 .gitignore                |  1 +
 plugins/tool/README.md    | 70 +++++++++++++++++++++++++++++++++------
 plugins/tool/tool.py      | 25 +++++++-------
 requirements-optional.txt |  3 +-
 4 files changed, 74 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index e1daced..4eb71e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ plugins.json
 itchat.pkl
 *.log
 user_datas.pkl
+chatgpt_tool_hub/
 plugins/**/
 !plugins/bdunit
 !plugins/dungeon
diff --git a/plugins/tool/README.md b/plugins/tool/README.md
index 0a78193..3ce92da 100644
--- a/plugins/tool/README.md
+++ b/plugins/tool/README.md
@@ -9,9 +9,21 @@
 ### 1. python
 ###### python解释器，使用它来解释执行python指令，可以配合你想要chatgpt生成的代码输出结果或执行事务
 
-### 2. url-get
+### 2. 访问网页的工具汇总(默认url-get)
+
+#### 2.1 url-get
 ###### 往往用来获取某个网站具体内容，结果可能会被反爬策略影响
 
+#### 2.2 browser
+###### 浏览器，功能与2.1类似，但能更好模拟，不会被识别为爬虫影响获取网站内容
+
+> 注1：url-get默认配置、browser需额外配置，browser依赖google-chrome，你需要提前安装好
+
+> 注2：browser默认使用summary tool 分段总结长文本信息，tokens可能会大量消耗！
+
+这是debian端安装google-chrome教程，其他系统请执行查找
+> https://www.linuxjournal.com/content/how-can-you-install-google-browser-debian
+
 ### 3. terminal
 ###### 在你运行的电脑里执行shell命令，可以配合你想要chatgpt生成的代码使用，给予自然语言控制手段
 
@@ -38,47 +50,83 @@
 ### 5. wikipedia
 ###### 可以回答你想要知道确切的人事物
 
-### 6. news *
+### 6. 新闻类工具
+
+#### 6.1. news-api *
 ###### 从全球 80,000 多个信息源中获取当前和历史新闻文章
 
-### 7. morning-news *
+#### 6.2. morning-news *
 ###### 每日60秒早报，每天凌晨一点更新，本工具使用了[alapi-每日60秒早报](https://alapi.cn/api/view/93)
 
 > 该tool每天返回内容相同
 
-### 8. bing-search *
+#### 6.3. finance-news 
+###### 获取实时的金融财政新闻
+
+> 该工具需要解决browser tool 的google-chrome依赖安装
+
+### 7. bing-search *
 ###### bing搜索引擎，从此你不用再烦恼搜索要用哪些关键词
 
-### 9. wolfram-alpha *
+### 8. wolfram-alpha *
 ###### 知识搜索引擎、科学问答系统，常用于专业学科计算
 
-### 10. google-search *
+### 9. google-search *
 ###### google搜索引擎，申请流程较bing-search繁琐
 
-###### 注1：带*工具需要获取api-key才能使用，部分工具需要外网支持  
+
+### 10. arxiv(dev 开发中)
+###### 用于查找论文
+
+
+### 11. debug(dev 开发中，目前没有接入wechat)
+###### 当bot遇到无法确定的信息时，将会向你寻求帮助的工具
+
+
+### 12. summary
+###### 总结工具，该工具必须输入一个本地文件的绝对路径
+
+> 该工具目前是和其他工具配合使用，暂未测试单独使用效果
+
+
+### 13. image2text
+###### 将图片转换成文字，底层调用imageCaption模型，该工具必须输入一个本地文件的绝对路径
+
+
+### 14. searxng-search *
+###### 一个私有化的搜索引擎工具
+
+> 安装教程：https://docs.searxng.org/admin/installation.html
+
+---
+
+###### 注1：带*工具需要获取api-key才能使用(在config.json内的kwargs添加项)，部分工具需要外网支持  
 #### [申请方法](https://github.com/goldfishh/chatgpt-tool-hub/blob/master/docs/apply_optional_tool.md)
 
 ## config.json 配置说明
 ###### 默认工具无需配置，其它工具需手动配置，一个例子：
 ```json
 {
-  "tools": ["wikipedia"],  // 填入你想用到的额外工具名
+  "tools": ["wikipedia", "你想要添加的其他工具"],  // 填入你想用到的额外工具名
   "kwargs": {
-      "request_timeout": 60,  // openai接口超时时间
+      "debug": true, // 当你遇到问题求助时，需要配置
+      "request_timeout": 120,  // openai接口超时时间
       "no_default": false,  // 是否不使用默认的4个工具
-      "OPTIONAL_API_NAME": "OPTIONAL_API_KEY"  // 带*工具需要申请api-key，在这里填入，api_name参考前述`申请方法`
+      // 带*工具需要申请api-key，在这里填入，api_name参考前述`申请方法`
   }
 }
 
 ```
 注：config.json文件非必须，未创建仍可使用本tool；带*工具需在kwargs填入对应api-key键值对  
-- `tools`：本插件初始化时加载的工具, 目前可选集：["wikipedia", "wolfram-alpha", "bing-search", "google-search", "news", "morning-news"] & 默认工具，除wikipedia工具之外均需要申请api-key
+- `tools`：本插件初始化时加载的工具, 目前可选集：["wikipedia", "wolfram-alpha", "bing-search", "google-search", "news"] & 默认工具，除wikipedia工具之外均需要申请api-key
 - `kwargs`：工具执行时的配置，一般在这里存放**api-key**，或环境配置
+  - `debug`: 输出chatgpt-tool-hub额外信息用于调试
   - `request_timeout`: 访问openai接口的超时时间，默认与wechat-on-chatgpt配置一致，可单独配置
   - `no_default`: 用于配置默认加载4个工具的行为，如果为true则仅使用tools列表工具，不加载默认工具
   - `top_k_results`: 控制所有有关搜索的工具返回条目数，数字越高则参考信息越多，但无用信息可能干扰判断，该值一般为2
   - `model_name`: 用于控制tool插件底层使用的llm模型，目前暂未测试3.5以外的模型，一般保持默认
 
+---
 
 ## 备注
 - 强烈建议申请搜索工具搭配使用，推荐bing-search
diff --git a/plugins/tool/tool.py b/plugins/tool/tool.py
index 5457ace..5a9c81a 100644
--- a/plugins/tool/tool.py
+++ b/plugins/tool/tool.py
@@ -1,7 +1,7 @@
 import json
 import os
 
-from chatgpt_tool_hub.apps import load_app
+from chatgpt_tool_hub.apps import AppFactory
 from chatgpt_tool_hub.apps.app import App
 from chatgpt_tool_hub.tools.all_tool_list import get_all_tool_names
 
@@ -18,7 +18,7 @@ from plugins import *
 @plugins.register(
     name="tool",
     desc="Arming your ChatGPT bot with various tools",
-    version="0.3",
+    version="0.4",
     author="goldfishh",
     desire_priority=0,
 )
@@ -131,17 +131,17 @@ class Tool(Plugin):
 
     def _build_tool_kwargs(self, kwargs: dict):
         tool_model_name = kwargs.get("model_name")
+        request_timeout = kwargs.get("request_timeout")
 
         return {
+            "debug": kwargs.get("debug", False),
             "openai_api_key": conf().get("open_ai_api_key", ""),
             "proxy": conf().get("proxy", ""),
-            "request_timeout": str(conf().get("request_timeout", 60)),
+            "request_timeout": request_timeout if request_timeout else conf().get("request_timeout", 120),
             # note: 目前tool暂未对其他模型测试，但这里仍对配置来源做了优先级区分，一般插件配置可覆盖全局配置
-            "model_name": tool_model_name
-            if tool_model_name
-            else conf().get("model", "gpt-3.5-turbo"),
+            "model_name": tool_model_name if tool_model_name else conf().get("model", "gpt-3.5-turbo"),
             "no_default": kwargs.get("no_default", False),
-            "top_k_results": kwargs.get("top_k_results", 2),
+            "top_k_results": kwargs.get("top_k_results", 3),
             # for news tool
             "news_api_key": kwargs.get("news_api_key", ""),
             # for bing-search tool
@@ -157,8 +157,6 @@ class Tool(Plugin):
             "zaobao_api_key": kwargs.get("zaobao_api_key", ""),
             # for visual_dl tool
             "cuda_device": kwargs.get("cuda_device", "cpu"),
-            # for browser tool
-            "phantomjs_exec_path": kwargs.get("phantomjs_exec_path", ""),
         }
 
     def _filter_tool_list(self, tool_list: list):
@@ -172,11 +170,12 @@ class Tool(Plugin):
 
     def _reset_app(self) -> App:
         tool_config = self._read_json()
+        app_kwargs = self._build_tool_kwargs(tool_config.get("kwargs", {}))
+
+        app = AppFactory()
+        app.init_env(**app_kwargs)
 
         # filter not support tool
         tool_list = self._filter_tool_list(tool_config.get("tools", []))
 
-        return load_app(
-            tools_list=tool_list,
-            **self._build_tool_kwargs(tool_config.get("kwargs", {})),
-        )
+        return app.create_app(tools_list=tool_list, **app_kwargs)
\ No newline at end of file
diff --git a/requirements-optional.txt b/requirements-optional.txt
index ce29777..cfb52c9 100644
--- a/requirements-optional.txt
+++ b/requirements-optional.txt
@@ -20,5 +20,6 @@ pysilk_mod>=1.6.0 # needed by send voice
 web.py
 
 # chatgpt-tool-hub plugin
+
 --extra-index-url https://pypi.python.org/simple
-chatgpt_tool_hub>=0.3.9
\ No newline at end of file
+chatgpt_tool_hub>=0.4.1
\ No newline at end of file