Merge pull request zhayujie#2364 from 6vision/1031

1.7.3 release readme

Author: 6vision

README.md

@@ -45,6 +45,7 @@ DEMO视频：https://cdn.link-ai.tech/doc/cow_demo.mp4
 <br>
 
 # 🏷 更新日志
+>**2024.10.31：** [1.7.3版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.7.3) 程序稳定性提升、数据库功能、Claude模型优化、linkai插件优化、离线通知
 
 >**2024.09.26：** [1.7.2版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.7.2)  和 [1.7.1版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.7.1) 文心，讯飞等模型优化、o1 模型、快速安装和管理脚本
 

bot/chatgpt/chat_gpt_bot.py

@@ -1,5 +1,6 @@
 # encoding:utf-8
 
+import re
 import time
 
 import openai
@@ -92,11 +93,15 @@ def reply(self, query, context=None):
                     reply_content["completion_tokens"],
                 )
             )
+            match = re.search(r"(?:!\[image\]|\[image\])\((.*?)\)", reply_content["content"])
             if reply_content["completion_tokens"] == 0 and len(reply_content["content"]) > 0:
                 reply = Reply(ReplyType.ERROR, reply_content["content"])
             elif reply_content["completion_tokens"] > 0:
-                self.sessions.session_reply(reply_content["content"], session_id, reply_content["total_tokens"])
-                reply = Reply(ReplyType.TEXT, reply_content["content"])
+                if match:
+                    reply = Reply(ReplyType.IMAGE_URL, match.group(1))
+                else:
+                    self.sessions.session_reply(reply_content["content"], session_id, reply_content["total_tokens"])
+                    reply = Reply(ReplyType.TEXT, reply_content["content"])
             else:
                 reply = Reply(ReplyType.ERROR, reply_content["content"])
                 logger.debug("[CHATGPT] reply {} used 0 tokens.".format(reply_content))

bot/chatgpt/chat_gpt_session.py

@@ -56,7 +56,7 @@ def calc_tokens(self):
 # refer to https://github.com/openai/openai-cookbook/blob/main/examples/How_to_count_tokens_with_tiktoken.ipynb
 def num_tokens_from_messages(messages, model):
     """Returns the number of tokens used by a list of messages."""
-
+    return 10
     if model in ["wenxin", "xunfei"] or model.startswith(const.GEMINI):
         return num_tokens_by_character(messages)
 

bot/openai/open_ai_bot.py

@@ -1,5 +1,6 @@
 # encoding:utf-8
 
+import re
 import time
 
 import openai
@@ -65,9 +66,12 @@ def reply(self, query, context=None):
                     logger.debug(
                         "[OPEN_AI] new_query={}, session_id={}, reply_cont={}, completion_tokens={}".format(str(session), session_id, reply_content, completion_tokens)
                     )
-
+                    match = re.search(r"(?:!\[image\]|\[image\])\((.*?)\)", reply_content)
                     if total_tokens == 0:
                         reply = Reply(ReplyType.ERROR, reply_content)
+                    elif match:
+                        reply_content = match.group(1)
+                        reply = Reply(ReplyType.IMAGE_URL, reply_content)
                     else:
                         self.sessions.session_reply(reply_content, session_id, total_tokens)
                         reply = Reply(ReplyType.TEXT, reply_content)