kaiyuan/chatgpt-on-wechat
1
0
Fork 0
mirror of https://github.com/zhayujie/chatgpt-on-wechat.git synced 2026-07-21 22:27:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1446 from 6vision/master

Browse Source 
个人订阅号消息存储优化
This commit is contained in:
zhayujie
2023-09-26 00:36:36 +08:00
committed by GitHub
parent c03e31b7be 5ba8fdc5e7
commit 576526d4ee
2 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channel/wechatmp/passive_reply.py
View File

@@ -49,7 +49,7 @@ class Query:
# New request # New request
if ( if (
from_user not in channel.cache_dict channel.cache_dict.get(from_user) is None
and from_user not in channel.running and from_user not in channel.running
or content.startswith("#") or content.startswith("#")
and message_id not in channel.request_cnt # insert the godcmd and message_id not in channel.request_cnt # insert the godcmd
@@ -131,8 +131,10 @@ class Query:
# Only one request can access to the cached data # Only one request can access to the cached data
try: try:
(reply_type, reply_content) = channel.cache_dict.pop(from_user) (reply_type, reply_content) = channel.cache_dict[from_user].pop(0)
except KeyError: if not channel.cache_dict[from_user]: # If popping the message makes the list empty, delete the user entry from cache
del channel.cache_dict[from_user]
except IndexError:
return "success" return "success"
if reply_type == "text": if reply_type == "text":
@@ -146,7 +148,7 @@ class Query:
max_split=1, max_split=1,
) )
reply_text = splits[0] + continue_text reply_text = splits[0] + continue_text
channel.cache_dict[from_user] = ("text", splits[1]) channel.cache_dict[from_user].append(("text", splits[1]))
logger.info( logger.info(
"[wechatmp] Request {} do send to {} {}: {}\n{}".format( "[wechatmp] Request {} do send to {} {}: {}\n{}".format(

45
channel/wechatmp/wechatmp_channel.py
View File

@@ -10,6 +10,7 @@ import requests
import web import web
from wechatpy.crypto import WeChatCrypto from wechatpy.crypto import WeChatCrypto
from wechatpy.exceptions import WeChatClientException from wechatpy.exceptions import WeChatClientException
from collections import defaultdict
from bridge.context import * from bridge.context import *
from bridge.reply import * from bridge.reply import *
@@ -46,7 +47,7 @@ class WechatMPChannel(ChatChannel):
self.crypto = WeChatCrypto(token, aes_key, appid) self.crypto = WeChatCrypto(token, aes_key, appid)
if self.passive_reply: if self.passive_reply:
# Cache the reply to the user's first message # Cache the reply to the user's first message
self.cache_dict = dict() self.cache_dict = defaultdict(list)
# Record whether the current message is being processed # Record whether the current message is being processed
self.running = set() self.running = set()
# Count the request from wechat official server by message_id # Count the request from wechat official server by message_id
@@ -82,24 +83,28 @@ class WechatMPChannel(ChatChannel):
if reply.type == ReplyType.TEXT or reply.type == ReplyType.INFO or reply.type == ReplyType.ERROR: if reply.type == ReplyType.TEXT or reply.type == ReplyType.INFO or reply.type == ReplyType.ERROR:
reply_text = reply.content reply_text = reply.content
logger.info("[wechatmp] text cached, receiver {}\n{}".format(receiver, reply_text)) logger.info("[wechatmp] text cached, receiver {}\n{}".format(receiver, reply_text))
self.cache_dict[receiver] = ("text", reply_text) self.cache_dict[receiver].append(("text", reply_text))
elif reply.type == ReplyType.VOICE: elif reply.type == ReplyType.VOICE:
try: voice_file_path = reply.content
voice_file_path = reply.content duration, files = split_audio(voice_file_path, 60 * 1000)
with open(voice_file_path, "rb") as f: if len(files) > 1:
# support: <2M, <60s, mp3/wma/wav/amr logger.info("[wechatmp] voice too long {}s > 60s , split into {} parts".format(duration / 1000.0, len(files)))
response = self.client.material.add("voice", f)
logger.debug("[wechatmp] upload voice response: {}".format(response)) for path in files:
# 根据文件大小估计一个微信自动审核的时间，审核结束前返回将会导致语音无法播放，这个估计有待验证 # support: <2M, <60s, mp3/wma/wav/amr
f_size = os.fstat(f.fileno()).st_size try:
time.sleep(1.0 + 2 * f_size / 1024 / 1024) with open(path, "rb") as f:
# todo check media_id response = self.client.material.add("voice", f)
except WeChatClientException as e: logger.debug("[wechatmp] upload voice response: {}".format(response))
logger.error("[wechatmp] upload voice failed: {}".format(e)) f_size = os.fstat(f.fileno()).st_size
return time.sleep(1.0 + 2 * f_size / 1024 / 1024)
media_id = response["media_id"] # todo check media_id
logger.info("[wechatmp] voice uploaded, receiver {}, media_id {}".format(receiver, media_id)) except WeChatClientException as e:
self.cache_dict[receiver] = ("voice", media_id) logger.error("[wechatmp] upload voice failed: {}".format(e))
return
media_id = response["media_id"]
logger.info("[wechatmp] voice uploaded, receiver {}, media_id {}".format(receiver, media_id))
self.cache_dict[receiver].append(("voice", media_id))
elif reply.type == ReplyType.IMAGE_URL: # 从网络下载图片 elif reply.type == ReplyType.IMAGE_URL: # 从网络下载图片
img_url = reply.content img_url = reply.content
@@ -119,7 +124,7 @@ class WechatMPChannel(ChatChannel):
return return
media_id = response["media_id"] media_id = response["media_id"]
logger.info("[wechatmp] image uploaded, receiver {}, media_id {}".format(receiver, media_id)) logger.info("[wechatmp] image uploaded, receiver {}, media_id {}".format(receiver, media_id))
self.cache_dict[receiver] = ("image", media_id) self.cache_dict[receiver].append(("image", media_id))
elif reply.type == ReplyType.IMAGE: # 从文件读取图片 elif reply.type == ReplyType.IMAGE: # 从文件读取图片
image_storage = reply.content image_storage = reply.content
image_storage.seek(0) image_storage.seek(0)
@@ -134,7 +139,7 @@ class WechatMPChannel(ChatChannel):
return return
media_id = response["media_id"] media_id = response["media_id"]
logger.info("[wechatmp] image uploaded, receiver {}, media_id {}".format(receiver, media_id)) logger.info("[wechatmp] image uploaded, receiver {}, media_id {}".format(receiver, media_id))
self.cache_dict[receiver] = ("image", media_id) self.cache_dict[receiver].append(("image", media_id))
else: else:
if reply.type == ReplyType.TEXT or reply.type == ReplyType.INFO or reply.type == ReplyType.ERROR: if reply.type == ReplyType.TEXT or reply.type == ReplyType.INFO or reply.type == ReplyType.ERROR:
reply_text = reply.content reply_text = reply.content