Release v2.5.2

[Perf] 优化函数调用的底层逻辑

.gitignore

@@ -25,4 +25,6 @@ bin/
 .vscode
 test_*
 venv/
-hugchat.json
+hugchat.json
+qcapi
+/*.yaml

README.md

@@ -1,34 +1,39 @@
-# QChatGPT🤖
 
 <p align="center">
-<img src="res/social.png" alt="QChatGPT" width="640" />
+<img src="res/logo.png" alt="QChatGPT" width="120" />
 </p>
 
+<div align="center">
+
+# QChatGPT
+
+高稳定性/持续迭代/架构清晰/支持插件/高可自定义的 ChatGPT QQ机器人框架
+
 [English](README_en.md) | 简体中文
 
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/RockChinQ/QChatGPT?style=flat-square)](https://github.com/RockChinQ/QChatGPT/releases/latest)
 ![Wakapi Count](https://wakapi.dev/api/badge/RockChinQ/interval:any/project:QChatGPT)
+<img src="https://img.shields.io/badge/python-3.9+-blue.svg" alt="python">
+<a href="https://github.com/RockChinQ/QChatGPT/wiki">
+<img alt="Static Badge" src="https://img.shields.io/badge/%E6%9F%A5%E7%9C%8B-%E9%A1%B9%E7%9B%AEWiki-blue">
+</a>
+<a href="https://www.bilibili.com/video/BV1Y14y1Q7kQ">
+<img alt="Static Badge" src="https://img.shields.io/badge/%E8%A7%86%E9%A2%91%E6%95%99%E7%A8%8B-208647">
+</a>
+<a href="https://www.bilibili.com/video/BV11h4y1y74H">
+<img alt="Static Badge" src="https://img.shields.io/badge/Linux%E9%83%A8%E7%BD%B2%E8%A7%86%E9%A2%91-208647">
+</a>
 
+</div>
 
 > 2023/7/29 支持使用GPT的Function Calling功能实现类似ChatGPT Plugin的效果，请见[Wiki内容函数](https://github.com/RockChinQ/QChatGPT/wiki/%E6%8F%92%E4%BB%B6%E4%BD%BF%E7%94%A8-%E5%86%85%E5%AE%B9%E5%87%BD%E6%95%B0)  
-> 2023/4/24 支持使用go-cqhttp登录QQ，请查看[此文档](https://github.com/RockChinQ/QChatGPT/wiki/go-cqhttp%E9%85%8D%E7%BD%AE)  
-> 2023/3/18 现已支持GPT-4 API（内测），请查看`config-template.py`中的`completion_api_params`  
-> 2023/3/15 逆向库已支持New Bing，使用方法查看[插件文档](https://github.com/RockChinQ/revLibs)  
 
-
-**QChatGPT需要Python版本>=3.9**
-- 到[项目Wiki](https://github.com/RockChinQ/QChatGPT/wiki)可了解项目详细信息
-- 官方交流、答疑群: 656285629  
-  - **进群提问前请您`确保`已经找遍文档和issue均无法解决**  
-- 社区群（内有一键部署包、图形化界面等资源）: 891448839
-- QQ频道机器人见[QQChannelChatGPT](https://github.com/Soulter/QQChannelChatGPT)
-- 欢迎各种形式的贡献，请查看[贡献指引](CONTRIBUTING.md)
-- 购买ChatGPT账号: [此链接](http://fk.kimi.asia)
+<details>
+<summary>
 
 ## 🍺模型适配一览
 
-<details>
-<summary>点击此处展开</summary>
+</summary>
 
 ### 文字对话
 
@@ -55,14 +60,16 @@
 - Plachta/VITS-Umamusume-voice-synthesizer, 由[插件](https://github.com/oliverkirk-sudo/chat_voice)接入
 
 
+安装[此插件](https://github.com/RockChinQ/Switcher)，即可在使用中切换文字模型。
+
 </details>
 
-安装[此插件](https://github.com/RockChinQ/Switcher)，即可在使用中切换文字模型。
+<details>
+<summary>
 
 ## ✅功能
 
-<details>
-<summary>点击此处展开概述</summary>
+</summary>
 
 <details>
 <summary>✅支持敏感词过滤，避免账号风险</summary>
@@ -157,13 +164,24 @@
 <br/>
 <img alt="New Bing" src="res/screenshots/person_newbing.png" width="400"/>
 
+详情请查看[Wiki功能使用页](https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E5%8A%9F%E8%83%BD%E7%82%B9%E5%88%97%E4%B8%BE)
+
 </details>
 
-详情请查看[Wiki功能使用页](https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E5%8A%9F%E8%83%BD%E7%82%B9%E5%88%97%E4%B8%BE)
+<details>
+
+<summary>
 
 ## 🔩部署
 
+</summary>
+
 **部署过程中遇到任何问题，请先在[QChatGPT](https://github.com/RockChinQ/QChatGPT/issues)或[qcg-installer](https://github.com/RockChinQ/qcg-installer/issues)的issue里进行搜索**  
+**QChatGPT需要Python版本>=3.9**
+
+- 官方交流、答疑群: 656285629  
+  - **进群提问前请您`确保`已经找遍文档和issue均无法解决**  
+- 社区群（内有一键部署包、图形化界面等资源）: 891448839
 
 ### - 注册OpenAI账号
 
@@ -271,21 +289,34 @@ python3 main.py
 
 </details>
 
+</details>
+
+<details>
+
+<summary>
+
 ## 🚀使用
 
+</summary>
+
 **部署完成后必看: [指令说明](https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E6%9C%BA%E5%99%A8%E4%BA%BA%E6%8C%87%E4%BB%A4)**  
+
 所有功能查看[Wiki功能使用页](https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F)  
 
+</details>
+
+<details>
+<summary>
+
 ## 🧩插件生态
 
-现已支持自行开发插件对功能进行扩展或自定义程序行为  
-详见[Wiki插件使用页](https://github.com/RockChinQ/QChatGPT/wiki/%E6%8F%92%E4%BB%B6%E4%BD%BF%E7%94%A8)  
-开发教程见[Wiki插件开发页](https://github.com/RockChinQ/QChatGPT/wiki/%E6%8F%92%E4%BB%B6%E5%BC%80%E5%8F%91)
+</summary>
 
 ⭐我们已经支持了[GPT的Function Calling能力](https://platform.openai.com/docs/guides/gpt/function-calling)，请查看[Wiki内容函数](https://github.com/RockChinQ/QChatGPT/wiki/%E6%8F%92%E4%BB%B6%E4%BD%BF%E7%94%A8-%E5%86%85%E5%AE%B9%E5%87%BD%E6%95%B0)  
 
-<details>
-<summary>查看插件列表</summary>
+> 使用方法见：[Wiki插件使用](https://github.com/RockChinQ/QChatGPT/wiki/%E6%8F%92%E4%BB%B6%E4%BD%BF%E7%94%A8)  
+> 开发教程见：[Wiki插件开发](https://github.com/RockChinQ/QChatGPT/wiki/%E6%8F%92%E4%BB%B6%E5%BC%80%E5%8F%91)
+
 
 [所有插件列表](https://github.com/stars/RockChinQ/lists/qchatgpt-%E6%8F%92%E4%BB%B6)，欢迎提出issue以提交新的插件
 
@@ -305,9 +336,15 @@ python3 main.py
 - [SysStatPlugin](https://github.com/RockChinQ/SysStatPlugin) - 查看系统状态
 </details>
 
+<details>
+
+<summary>
+
 ## 😘致谢
 
-- [@the-lazy-me](https://github.com/the-lazy-me) 为本项目制作[视频教程](https://www.bilibili.com/video/BV15v4y1X7aP)
+</summary>
+
+- [@the-lazy-me](https://github.com/the-lazy-me) 为本项目制作[视频教程](https://www.bilibili.com/video/BV1Y14y1Q7kQ)
 - [@mikumifa](https://github.com/mikumifa) 本项目Docker部署仓库开发者
 - [@dominoar](https://github.com/dominoar) 为本项目开发多种插件
 - [@万神的星空](https://github.com/qq255204159)  整合包发行
@@ -315,6 +352,16 @@ python3 main.py
 
 以及所有[贡献者](https://github.com/RockChinQ/QChatGPT/graphs/contributors)和其他为本项目提供支持的朋友们。
 
+</details>
+
+<details>
+
+<summary>
+
 ## 👍赞赏
 
+</summary>
+
 <img alt="赞赏码" src="res/mm_reward_qrcode_1672840549070.png" width="400" height="400"/>
+
+</details>

config-template.py

@@ -70,6 +70,11 @@ openai_config = {
     "reverse_proxy": None
 }
 
+# api-key切换策略
+# active：每次请求时都会切换api-key
+# passive：仅当api-key超额时才会切换api-key
+switch_strategy = "active"
+
 # [必需] 管理员QQ号，用于接收报错等通知及执行管理员级别指令
 # 支持多个管理员，可以使用list形式设置，例如：
 # admin_qq = [12345678, 87654321]
@@ -152,7 +157,6 @@ response_rules = {
 }
 
 
-
 # 消息忽略规则
 # 适用于私聊及群聊
 # 符合此规则的消息将不会被响应
@@ -235,9 +239,17 @@ image_api_params = {
     "size": "256x256",  # 图片尺寸，支持256x256, 512x512, 1024x1024
 }
 
+# 跟踪函数调用
+# 为True时，在每次GPT进行Function Calling时都会输出发送一条回复给用户
+# 同时，一次提问内所有的Function Calling和普通回复消息都会单独发送给用户
+trace_function_calls = False
+
 # 群内回复消息时是否引用原消息
 quote_origin = True
 
+# 群内回复消息时是否at发送者
+at_sender = False
+
 # 回复绘图时是否包含图片描述
 include_image_description = True
 

main.py

@@ -60,35 +60,42 @@ def override_config():
     # 检查override.json覆盖
     if os.path.exists("override.json") and use_override:
         override_json = json.load(open("override.json", "r", encoding="utf-8"))
+        overrided = []
         for key in override_json:
             if hasattr(config, key):
                 setattr(config, key, override_json[key])
-                logging.info("覆写配置[{}]为[{}]".format(key, override_json[key]))
+                # logging.info("覆写配置[{}]为[{}]".format(key, override_json[key]))
+                overrided.append(key)
             else:
                 logging.error("无法覆写配置[{}]为[{}]，该配置不存在，请检查override.json是否正确".format(key, override_json[key]))
+        if len(overrided) > 0:
+            logging.info("已根据override.json覆写配置项: {}".format(", ".join(overrided)))
 
 
 # 临时函数，用于加载config和上下文，未来统一放在config类
 def load_config():
     logging.info("检查config模块完整性.")
     # 完整性校验
+    non_exist_keys = []
+
     is_integrity = True
     config_template = importlib.import_module('config-template')
     config = importlib.import_module('config')
     for key in dir(config_template):
         if not key.startswith("__") and not hasattr(config, key):
             setattr(config, key, getattr(config_template, key))
-            logging.warning("[{}]不存在".format(key))
+            # logging.warning("[{}]不存在".format(key))
+            non_exist_keys.append(key)
             is_integrity = False
     
     if not is_integrity:
-        logging.warning("配置文件不完整，您可以依据config-template.py检查config.py")
+        logging.warning("以下配置字段不存在: {}".format(", ".join(non_exist_keys)))
 
     # 检查override.json覆盖
     override_config()
 
     if not is_integrity:
-        logging.warning("以上不存在的配置已被设为默认值，将在3秒后继续启动... ")
+        logging.warning("以上不存在的配置已被设为默认值，您可以依据config-template.py检查config.py，将在3秒后继续启动... ")
         time.sleep(3)
 
     # 存进上下文
@@ -97,6 +104,8 @@ def load_config():
 
 def complete_tips():
     """根据tips-custom-template模块补全tips模块的属性"""
+    non_exist_keys = []
+
     is_integrity = True
     logging.info("检查tips模块完整性.")
     tips_template = importlib.import_module('tips-custom-template')
@@ -104,10 +113,12 @@ def complete_tips():
     for key in dir(tips_template):
         if not key.startswith("__") and not hasattr(tips, key):
             setattr(tips, key, getattr(tips_template, key))
-            logging.warning("[{}]不存在".format(key))
+            # logging.warning("[{}]不存在".format(key))
+            non_exist_keys.append(key)
             is_integrity = False
 
     if not is_integrity:
+        logging.warning("以下提示语字段不存在: {}".format(", ".join(non_exist_keys)))
         logging.warning("tips模块不完整，您可以依据tips-custom-template.py检查tips.py")
         logging.warning("以上配置已被设为默认值，将在3秒后继续启动... ")
         time.sleep(3)
@@ -214,7 +225,7 @@ def start(first_time_init=False):
                 def run_bot_wrapper():
                     global known_exception_caught
                     try:
-                        logging.info("使用账号: {}".format(qqbot.bot_account_id))
+                        logging.debug("使用账号: {}".format(qqbot.bot_account_id))
                         qqbot.adapter.run_sync()
                     except TypeError as e:
                         if str(e).__contains__("argument 'debug'"):
@@ -318,7 +329,8 @@ def start(first_time_init=False):
         if pkg.utils.updater.is_new_version_available():
             logging.info("新版本可用，请发送 !update 进行自动更新\n更新日志:\n{}".format("\n".join(pkg.utils.updater.get_rls_notes())))
         else:
-            logging.info("当前已是最新版本")
+            # logging.info("当前已是最新版本")
+            pass
 
     except Exception as e:
         logging.warning("检查更新失败:{}".format(e))

override-all.json

@@ -21,6 +21,7 @@
         "http_proxy": null,
         "reverse_proxy": null
     },
+    "switch_strategy": "active",
     "admin_qq": 0,
     "default_prompt": {
         "default": "如果我之后想获取帮助，请你说“输入!help获取帮助”"
@@ -64,7 +65,9 @@
     "image_api_params": {
         "size": "256x256"
     },
+    "trace_function_calls": false,
     "quote_origin": true,
+    "at_sender": false,
     "include_image_description": true,
     "process_message_timeout": 30,
     "show_prefix": false,

pkg/openai/api/chat_completion.py

@@ -30,7 +30,7 @@ class ChatCompletionRequest(RequestBase):
         )
         self.pending_msg = ""
 
-    def append_message(self, role: str, content: str, name: str=None):
+    def append_message(self, role: str, content: str, name: str=None, function_call: dict=None):
         msg = {
             "role": role,
             "content": content
@@ -39,6 +39,9 @@ class ChatCompletionRequest(RequestBase):
         if name is not None:
             msg['name'] = name
 
+        if function_call is not None:
+            msg['function_call'] = function_call
+
         self.messages.append(msg)
 
     def __init__(
@@ -87,16 +90,17 @@ class ChatCompletionRequest(RequestBase):
             choice0 = resp["choices"][0]
 
             # 如果不是函数调用，且finish_reason为stop，则停止迭代
-            if 'function_call' not in choice0['message'] and choice0["finish_reason"] == "stop":
+            if choice0['finish_reason'] == 'stop':  #  and choice0["finish_reason"] == "stop"
                 self.stopped = True
             
             if 'function_call' in choice0['message']:
                 self.pending_func_call = choice0['message']['function_call']
 
-                # self.append_message(
-                #     role="assistant",
-                #     content="function call: "+json.dumps(self.pending_func_call, ensure_ascii=False)
-                # )
+                self.append_message(
+                    role="assistant",
+                    content=choice0['message']['content'],
+                    function_call=choice0['message']['function_call']
+                )
 
                 return {
                     "id": resp["id"],
@@ -106,7 +110,7 @@ class ChatCompletionRequest(RequestBase):
                             "message": {
                                 "role": "assistant",
                                 "type": "function_call",
-                                "content": None,
+                                "content": choice0['message']['content'],
                                 "function_call": choice0['message']['function_call']
                             },
                             "finish_reason": "function_call"
@@ -129,7 +133,7 @@ class ChatCompletionRequest(RequestBase):
                                 "type": "text",
                                 "content": choice0['message']['content']
                             },
-                            "finish_reason": "stop"
+                            "finish_reason": choice0["finish_reason"]
                         }
                     ],
                     "usage": resp["usage"]

pkg/openai/api/model.py

@@ -13,8 +13,15 @@ class RequestBase:
     def __init__(self, *args, **kwargs):
         raise NotImplementedError
 
+    def _next_key(self):
+        import pkg.utils.context as context
+        switched, name = context.get_openai_manager().key_mgr.auto_switch()
+        logging.debug("切换api-key: switched={}, name={}".format(switched, name))
+        openai.api_key = context.get_openai_manager().key_mgr.get_using_key()
+
     def _req(self, **kwargs):
         """处理代理问题"""
+        import config
 
         ret: dict = {}
         exception: Exception = None
@@ -25,6 +32,10 @@ class RequestBase:
             try:
                 ret = await self.req_func(**kwargs)
                 logging.debug("接口请求返回：%s", str(ret))
+                
+                if config.switch_strategy == 'active':
+                    self._next_key()
+
                 return ret
             except Exception as e:
                 exception = e

pkg/openai/keymgr.py

@@ -54,7 +54,24 @@ class KeysManager:
             是否切换成功, 切换后的api-key的别名
         """
 
+        index = 0
+
         for key_name in self.api_key:
+            if self.api_key[key_name] == self.using_key:
+                break
+            
+            index += 1
+
+        # 从当前key开始向后轮询
+        start_index = index
+        index += 1
+        if index >= len(self.api_key):
+            index = 0
+
+        while index != start_index:
+            
+            key_name = list(self.api_key.keys())[index]
+
             if self.api_key[key_name] not in self.exceeded:
                 self.using_key = self.api_key[key_name]
 
@@ -69,10 +86,14 @@ class KeysManager:
 
                 return True, key_name
 
-        self.using_key = list(self.api_key.values())[0]
-        logging.info("使用api-key:" + list(self.api_key.keys())[0])
+            index += 1
+            if index >= len(self.api_key):
+                index = 0
 
-        return False, ""
+        self.using_key = list(self.api_key.values())[start_index]
+        logging.debug("使用api-key:" + list(self.api_key.keys())[start_index])
+
+        return False, list(self.api_key.keys())[start_index]
 
     def add(self, key_name, key):
         self.api_key[key_name] = key

pkg/openai/manager.py

@@ -29,7 +29,7 @@ class OpenAIInteract:
         self.key_mgr = pkg.openai.keymgr.KeysManager(api_key)
         self.audit_mgr = pkg.audit.gatherer.DataGatherer()
 
-        logging.info("文字总使用量：%d", self.audit_mgr.get_total_text_length())
+        # logging.info("文字总使用量：%d", self.audit_mgr.get_total_text_length())
 
         openai.api_key = self.key_mgr.get_using_key()
 

pkg/openai/modelmgr.py

@@ -112,6 +112,7 @@ def count_completion_tokens(messages: list, model: str) -> int:
 
 
 def count_tokens(messages: list, model: str):
+
     if model in CHAT_COMPLETION_MODELS:
         return count_chat_completion_tokens(messages, model)
     elif model in COMPLETION_MODELS:

pkg/openai/session.py

@@ -66,7 +66,7 @@ def load_sessions():
     session_data = db_inst.load_valid_sessions()
 
     for session_name in session_data:
-        logging.info('加载session: {}'.format(session_name))
+        logging.debug('加载session: {}'.format(session_name))
 
         temp_session = Session(session_name)
         temp_session.name = session_name
@@ -194,8 +194,15 @@ class Session:
 
     # 请求回复
     # 这个函数是阻塞的
-    def append(self, text: str=None) -> str:
-        """向session中添加一条消息，返回接口回复"""
+    def query(self, text: str=None) -> tuple[str, str, list[str]]:
+        """向session中添加一条消息，返回接口回复
+        
+        Args:
+            text (str): 用户消息
+
+        Returns:
+            tuple[str, str]: (接口回复, finish_reason, 已调用的函数列表)
+        """
 
         self.last_interact_timestamp = int(time.time())
 
@@ -209,7 +216,7 @@ class Session:
 
             event = pkg.plugin.host.emit(plugin_models.SessionFirstMessageReceived, **args)
             if event.is_prevented_default():
-                return None
+                return None, None, None
 
         config = pkg.utils.context.get_config()
         max_length = config.prompt_submit_length
@@ -244,26 +251,63 @@ class Session:
 
         total_tokens = 0
 
+        finish_reason: str = ""
+
+        funcs = []
+
+        trace_func_calls = config.trace_function_calls
+        botmgr = pkg.utils.context.get_qqbot_manager()
+
+        session_name_spt: list[str] = self.name.split("_")
+
+        pending_res_text = ""
+
+        # TODO 对不起，我知道这样非常非常屎山，但我之后会重构的
         for resp in pkg.utils.context.get_openai_manager().request_completion(prompts):
-            if resp['choices'][0]['message']['type'] == 'text':  # 普通回复
-                res_text += resp['choices'][0]['message']['content']
+
+            if pending_res_text != "":
+                botmgr.adapter.send_message(
+                    session_name_spt[0],
+                    session_name_spt[1],
+                    pending_res_text
+                )
+                pending_res_text = ""
+
+            finish_reason = resp['choices'][0]['finish_reason']
+
+            if resp['choices'][0]['message']['role'] == "assistant" and resp['choices'][0]['message']['content'] != None:  # 包含纯文本响应
+
+                if not trace_func_calls:
+                    res_text += resp['choices'][0]['message']['content'] + "\n"
+                else:
+                    res_text = resp['choices'][0]['message']['content']
+                    pending_res_text = resp['choices'][0]['message']['content']
 
                 total_tokens += resp['usage']['total_tokens']
 
-                pending_msgs.append(
-                    {
-                        "role": "assistant",
-                        "content": resp['choices'][0]['message']['content']
-                    }
-                )
+                msg = {
+                    "role": "assistant",
+                    "content": resp['choices'][0]['message']['content']
+                }
 
-            elif resp['choices'][0]['message']['type'] == 'function_call':
+                if 'function_call' in resp['choices'][0]['message']:
+                    msg['function_call'] = json.dumps(resp['choices'][0]['message']['function_call'])
+
+                pending_msgs.append(msg)
+
+            if resp['choices'][0]['message']['type'] == 'function_call':
                 # self.prompt.append(
                 #     {
                 #         "role": "assistant",
                 #         "content": "function call: "+json.dumps(resp['choices'][0]['message']['function_call'])
                 #     }
                 # )
+                if trace_func_calls:
+                    botmgr.adapter.send_message(
+                        session_name_spt[0],
+                        session_name_spt[1],
+                        "调用函数 "+resp['choices'][0]['message']['function_call']['name'] + "..."
+                    )
 
                 total_tokens += resp['usage']['total_tokens']
             elif resp['choices'][0]['message']['type'] == 'function_return':
@@ -276,10 +320,12 @@ class Session:
                 # )
 
                 # total_tokens += resp['usage']['total_tokens']
+                funcs.append(
+                    resp['choices'][0]['message']['function_name']
+                )
                 pass
 
 
-
         # 向API请求补全
         # message, total_token = pkg.utils.context.get_openai_manager().request_completion(
         #     prompts,
@@ -305,7 +351,7 @@ class Session:
             self.just_switched_to_exist_session = False
             self.set_ongoing()
 
-        return res_ans if res_ans[0] != '\n' else res_ans[1:]
+        return res_ans if res_ans[0] != '\n' else res_ans[1:], finish_reason, funcs
 
     # 删除上一回合并返回上一回合的问题
     def undo(self) -> str:

pkg/plugin/host.py

@@ -99,7 +99,7 @@ def walk_plugin_path(module, prefix='', path_prefix=''):
 
 def load_plugins():
     """加载插件"""
-    logging.info("加载插件")
+    logging.debug("加载插件")
     PluginHost()
     walk_plugin_path(__import__('plugins'))
 
@@ -122,15 +122,21 @@ def initialize_plugins():
     """初始化插件"""
     logging.info("初始化插件")
     import pkg.plugin.models as models
+
+    successfully_initialized_plugins = []
+
     for plugin in iter_plugins():
         # if not plugin['enabled']:
         #     continue
         try:
             models.__current_registering_plugin__ = plugin['name']
             plugin['instance'] = plugin["class"](plugin_host=context.get_plugin_host())
-            logging.info("插件 {} 已初始化".format(plugin['name']))
+            # logging.info("插件 {} 已初始化".format(plugin['name']))
+            successfully_initialized_plugins.append(plugin['name'])
         except:
             logging.error("插件{}初始化时发生错误: {}".format(plugin['name'], sys.exc_info()))
+    
+    logging.info("以下插件已初始化: {}".format(", ".join(successfully_initialized_plugins)))
 
 
 def unload_plugins():
@@ -387,7 +393,7 @@ class PluginHost:
                         logging.debug("插件 {} 已要求阻止事件 {} 的默认行为".format(plugin['name'], event_name))
 
                 except Exception as e:
-                    logging.error("插件{}触发事件{}时发生错误".format(plugin['name'], event_name))
+                    logging.error("插件{}响应事件{}时发生错误".format(plugin['name'], event_name))
                     logging.error(traceback.format_exc())
 
             # print("done:{}".format(plugin['name']))

pkg/plugin/models.py

@@ -88,6 +88,8 @@ NormalMessageResponded = "normal_message_responded"
         session: pkg.openai.session.Session 会话对象
         prefix: str 回复文字消息的前缀
         response_text: str 响应文本
+        finish_reason: str 响应结束原因
+        funcs_called: list[str] 此次响应中调用的函数列表
     
     returns (optional):
         prefix: str 修改后的回复文字消息的前缀

pkg/qqbot/cmds/aamgr.py

@@ -327,6 +327,10 @@ def apply_privileges():
     for path, priv in data.items():
         if path == 'comment':
             continue
+        
+        if path not in __command_list__:
+            continue
+        
         if __command_list__[path]['privilege'] != priv:
             logging.debug('应用权限: {} -> {}(default: {})'.format(path, priv, __command_list__[path]['privilege']))
 

pkg/qqbot/cmds/funcs/func.py

@@ -1,6 +1,8 @@
 from ..aamgr import AbstractCommandNode, Context
 import logging
 
+import json
+
 
 @AbstractCommandNode.register(
     parent=None,
@@ -19,10 +21,13 @@ class FuncCommand(AbstractCommandNode):
 
         reply_str = "当前已加载的内容函数：\n\n"
 
+        logging.debug("host.__callable_functions__: {}".format(json.dumps(host.__callable_functions__, indent=4)))
+
         index = 1
         for func in host.__callable_functions__:
             reply_str += "{}. {}{}:\n{}\n\n".format(index, ("(已禁用) " if not func['enabled'] else ""), func['name'], func['description'])
-
+            index += 1
+            
         reply = [reply_str]
 
         return True, reply

pkg/qqbot/cmds/session/continue.py

@@ -1,27 +0,0 @@
-from ..aamgr import AbstractCommandNode, Context
-
-
-@AbstractCommandNode.register(
-    parent=None,
-    name="continue",
-    description="继续未完成的响应",
-    usage="!continue",
-    aliases=[],
-    privilege=1
-)
-class ContinueCommand(AbstractCommandNode):
-    @classmethod
-    def process(cls, ctx: Context) -> tuple[bool, list]:
-        import pkg.openai.session
-        import config
-        session_name = ctx.session_name
-
-        reply = []
-
-        session = pkg.openai.session.get_session(session_name)
-
-        text = session.append()
-
-        reply = [text]
-
-        return True, reply

pkg/qqbot/manager.py

@@ -118,7 +118,7 @@ class QQBotManager:
         # 故只在第一次初始化时创建bot对象，重载之后使用原bot对象
         # 因此，bot的配置不支持热重载
         if first_time_init:
-            logging.info("Use adapter:" + config.msg_source_adapter)
+            logging.debug("Use adapter:" + config.msg_source_adapter)
             if config.msg_source_adapter == 'yirimirai':
                 from pkg.qqbot.sources.yirimirai import YiriMiraiAdapter
 
@@ -264,8 +264,24 @@ class QQBotManager:
         else:
             self.reply_filter = pkg.qqbot.filter.ReplyFilter([])
 
-    def send(self, event, msg, check_quote=True):
+    def send(self, event, msg, check_quote=True, check_at_sender=True):
         config = pkg.utils.context.get_config()
+        
+        if check_at_sender and config.at_sender:
+            msg.insert(
+                0,
+                Plain(" \n")
+            )
+
+            # 当回复的正文中包含换行时，quote可能会自带at，此时就不再单独添加at，只添加换行
+            if "\n" not in str(msg[1]) or config.msg_source_adapter == 'nakuru':
+                msg.insert(
+                    0,
+                    At(
+                        event.sender.id
+                    )
+                )
+
         self.adapter.reply_message(
             event,
             msg,
@@ -313,7 +329,7 @@ class QQBotManager:
                     reply = [tips_custom.reply_message]
 
         if reply:
-            return self.send(event, reply, check_quote=False)
+            return self.send(event, reply, check_quote=False, check_at_sender=False)
 
     # 群消息处理
     def on_group_message(self, event: GroupMessage):

pkg/qqbot/message.py

@@ -40,7 +40,7 @@ def process_normal_message(text_message: str, mgr, config, launcher_type: str,
         try:
             prefix = "[GPT]" if config.show_prefix else ""
 
-            text = session.append(text_message)
+            text, finish_reason, funcs = session.query(text_message)
 
             # 触发插件事件
             args = {
@@ -49,7 +49,9 @@ def process_normal_message(text_message: str, mgr, config, launcher_type: str,
                 "sender_id": sender_id,
                 "session": session,
                 "prefix": prefix,
-                "response_text": text
+                "response_text": text,
+                "finish_reason": finish_reason,
+                "funcs_called": funcs,
             }
 
             event = pkg.plugin.host.emit(plugin_models.NormalMessageResponded, **args)
@@ -62,10 +64,11 @@ def process_normal_message(text_message: str, mgr, config, launcher_type: str,
 
             if not event.is_prevented_default():
                 reply = [prefix + text]
+
         except openai.error.APIConnectionError as e:
             err_msg = str(e)
             if err_msg.__contains__('Error communicating with OpenAI'):
-                reply = handle_exception("{}会话调用API失败:{}\n请尝试关闭网络代理来解决此问题。".format(session_name, e),
+                reply = handle_exception("{}会话调用API失败:{}\n您的网络无法访问OpenAI接口或网络代理不正常".format(session_name, e),
                                          "[bot]err:调用API失败，请重试或联系管理员，或等待修复")
             else:
                 reply = handle_exception("{}会话调用API失败:{}".format(session_name, e), "[bot]err:调用API失败，请重试或联系管理员，或等待修复")

pkg/qqbot/sources/yirimirai.py

@@ -1,6 +1,7 @@
 from ..adapter import MessageSourceAdapter
 import mirai
 import mirai.models.bus
+from mirai.bot import MiraiRunner
 
 import asyncio
 import typing
@@ -110,7 +111,12 @@ class YiriMiraiAdapter(MessageSourceAdapter):
         bus.unsubscribe(event_type, callback)
 
     def run_sync(self):
-        self.bot.run()
+        """运行YiriMirai"""
+
+        # 创建新的
+        loop = asyncio.new_event_loop()
+
+        loop.run_until_complete(MiraiRunner(self.bot)._run())
 
     def kill(self) -> bool:
         return False

res/announcement.json

@@ -1,14 +1,8 @@
 [
     {
-        "id": 0,
-        "time": "2023-04-24 16:05:20",
-        "timestamp": 1682323520,
-        "content": "现已支持使用go-cqhttp替换mirai作为QQ登录框架, 请更新并查看 https://github.com/RockChinQ/QChatGPT/wiki/go-cqhttp%E9%85%8D%E7%BD%AE"
-    },
-    {
-        "id": 1,
-        "time": "2023-05-21 17:33:18",
-        "timestamp": 1684661598,
-        "content": "NewBing不再需要鉴权，若您正在使用revLibs逆向库插件，请立即使用!plugin update revLibs命令更新插件到最新版。"
+        "id": 2,
+        "time": "2023-08-01 10:49:26",
+        "timestamp": 1690858166,
+        "content": "现已支持GPT函数调用功能，欢迎了解：https://github.com/RockChinQ/QChatGPT/wiki/%E6%8F%92%E4%BB%B6%E4%BD%BF%E7%94%A8-%E5%86%85%E5%AE%B9%E5%87%BD%E6%95%B0"
     }
 ]

res/templates/cmdpriv-template.json

@@ -8,7 +8,6 @@
     "plugin.del": 2,
     "plugin.off": 2,
     "plugin.on": 2,
-    "continue": 1,
     "default": 1,
     "default.set": 2,
     "del": 1,

res/wiki/功能使用.md

@@ -180,7 +180,6 @@
 !draw <提示语>     进行绘图
 !version          查看当前版本并检查更新
 !resend           重新回复上一个问题
-!continue         继续响应未完成的回合（通常用于内容函数继续调用）
 !plugin           用法请查看插件使用页的`管理`章节
 !default          查看可用的情景预设值
 ```

res/wiki/插件使用-内容函数.md

@@ -18,6 +18,13 @@ GPT将会回复一个对`access_the_web`的函数调用请求，QChatGPT将自
 - 您需要使用`v2.5.0`以上的版本才能加载包含内容函数的插件
 - 您需要同时在`config.py`中的`completion_api_params`中设置`model`为支持函数调用的模型，推荐使用`gpt-3.5-turbo-16k`
 - 使用此功能可能会造成难以预期的账号余额消耗，请关注
+- [逆向库插件](https://github.com/RockChinQ/revLibs)现在也支持函数调用了..您可以在完全免费的情况下使用GPT-3.5进行函数调用，若您在主程序配置了内容函数并启用，逆向ChatGPT会自动使用这些函数
+
+### ？QChatGPT有什么类型的插件？区别是什么？
+
+QChatGPT具有`行为插件`和`内容函数`两种扩展方式，行为插件是完整的插件结构，是由运行期间的事件驱动的，内容函数被包含于一个完整的插件体中，由GPT接口驱动。
+
+> 还是不理解？可以尝试根据插件开发页的步骤自行编写插件
 
 ## QChatGPT的一些不错的内容函数插件
 

res/wiki/插件开发.md

@@ -407,10 +407,11 @@ NormalMessageResponded = "normal_message_responded"
         session: pkg.openai.session.Session 会话对象
         prefix: str 回复文字消息的前缀
         response_text: str 响应文本
+        finish_reason: str 响应结束原因
     
     returns (optional):
         prefix: str 修改后的回复文字消息的前缀
-        reply: list 替换回复消息组件列表，元素为YiriMirai支持的消息组件
+        reply: list 替换回复消息组件列表
 """
 
 SessionFirstMessageReceived = "session_first_message_received"