formatting: run precommit on all files

channel/wechatmp/active_reply.py

@@ -1,16 +1,17 @@
 import time
 
 import web
+from wechatpy import parse_message
+from wechatpy.replies import create_reply
 
-from channel.wechatmp.wechatmp_message import WeChatMPMessage
 from bridge.context import *
 from bridge.reply import *
 from channel.wechatmp.common import *
 from channel.wechatmp.wechatmp_channel import WechatMPChannel
-from wechatpy import parse_message
+from channel.wechatmp.wechatmp_message import WeChatMPMessage
 from common.log import logger
 from config import conf
-from wechatpy.replies import create_reply
+
 
 # This class is instantiated once per query
 class Query:
@@ -50,29 +51,19 @@ class Query:
                     )
                 )
                 if msg.type == "voice" and wechatmp_msg.ctype == ContextType.TEXT and conf().get("voice_reply_voice", False):
-                    context = channel._compose_context(
-                        wechatmp_msg.ctype, content, isgroup=False, desire_rtype=ReplyType.VOICE, msg=wechatmp_msg
-                    )
+                    context = channel._compose_context(wechatmp_msg.ctype, content, isgroup=False, desire_rtype=ReplyType.VOICE, msg=wechatmp_msg)
                 else:
-                    context = channel._compose_context(
-                        wechatmp_msg.ctype, content, isgroup=False, msg=wechatmp_msg
-                    )
+                    context = channel._compose_context(wechatmp_msg.ctype, content, isgroup=False, msg=wechatmp_msg)
                 if context:
                     # set private openai_api_key
                     # if from_user is not changed in itchat, this can be placed at chat_channel
                     user_data = conf().get_user_data(from_user)
-                    context["openai_api_key"] = user_data.get(
-                        "openai_api_key"
-                    )  # None or user openai_api_key
+                    context["openai_api_key"] = user_data.get("openai_api_key")  # None or user openai_api_key
                     channel.produce(context)
                 # The reply will be sent by channel.send() in another thread
                 return "success"
             elif msg.type == "event":
-                logger.info(
-                    "[wechatmp] Event {} from {}".format(
-                        msg.event, msg.source
-                    )
-                )
+                logger.info("[wechatmp] Event {} from {}".format(msg.event, msg.source))
                 if msg.event in ["subscribe", "subscribe_scan"]:
                     reply_text = subscribe_msg()
                     replyPost = create_reply(reply_text, msg)

channel/wechatmp/common.py

@@ -1,10 +1,12 @@
 import textwrap
-import web
 
-from config import conf
-from wechatpy.utils import check_signature
+import web
 from wechatpy.crypto import WeChatCrypto
 from wechatpy.exceptions import InvalidSignatureException
+from wechatpy.utils import check_signature
+
+from config import conf
+
 MAX_UTF8_LEN = 2048
 
 

channel/wechatmp/passive_reply.py

@@ -1,17 +1,18 @@
-import time
 import asyncio
+import time
 
 import web
+from wechatpy import parse_message
+from wechatpy.replies import ImageReply, VoiceReply, create_reply
 
-from channel.wechatmp.wechatmp_message import WeChatMPMessage
 from bridge.context import *
 from bridge.reply import *
 from channel.wechatmp.common import *
 from channel.wechatmp.wechatmp_channel import WechatMPChannel
+from channel.wechatmp.wechatmp_message import WeChatMPMessage
 from common.log import logger
 from config import conf
-from wechatpy import parse_message
-from wechatpy.replies import create_reply, ImageReply, VoiceReply
+
 
 # This class is instantiated once per query
 class Query:
@@ -49,21 +50,15 @@ class Query:
                 if (
                     from_user not in channel.cache_dict
                     and from_user not in channel.running
-                    or content.startswith("#") 
-                    and message_id not in channel.request_cnt # insert the godcmd
+                    or content.startswith("#")
+                    and message_id not in channel.request_cnt  # insert the godcmd
                 ):
                     # The first query begin
                     if msg.type == "voice" and wechatmp_msg.ctype == ContextType.TEXT and conf().get("voice_reply_voice", False):
-                        context = channel._compose_context(
-                            wechatmp_msg.ctype, content, isgroup=False, desire_rtype=ReplyType.VOICE, msg=wechatmp_msg
-                        )
+                        context = channel._compose_context(wechatmp_msg.ctype, content, isgroup=False, desire_rtype=ReplyType.VOICE, msg=wechatmp_msg)
                     else:
-                        context = channel._compose_context(
-                            wechatmp_msg.ctype, content, isgroup=False, msg=wechatmp_msg
-                        )
-                    logger.debug(
-                        "[wechatmp] context: {} {} {}".format(context, wechatmp_msg, supported)
-                    )
+                        context = channel._compose_context(wechatmp_msg.ctype, content, isgroup=False, msg=wechatmp_msg)
+                    logger.debug("[wechatmp] context: {} {} {}".format(context, wechatmp_msg, supported))
 
                     if supported and context:
                         # set private openai_api_key
@@ -94,23 +89,17 @@ class Query:
                                 """\
                                 未知错误，请稍后再试"""
                             )
-                        
+
                         replyPost = create_reply(reply_text, msg)
                         return encrypt_func(replyPost.render())
 
-
                 # Wechat official server will request 3 times (5 seconds each), with the same message_id.
                 # Because the interval is 5 seconds, here assumed that do not have multithreading problems.
                 request_cnt = channel.request_cnt.get(message_id, 0) + 1
                 channel.request_cnt[message_id] = request_cnt
                 logger.info(
                     "[wechatmp] Request {} from {} {} {}:{}\n{}".format(
-                        request_cnt,
-                        from_user,
-                        message_id,
-                        web.ctx.env.get("REMOTE_ADDR"),
-                        web.ctx.env.get("REMOTE_PORT"),
-                        content
+                        request_cnt, from_user, message_id, web.ctx.env.get("REMOTE_ADDR"), web.ctx.env.get("REMOTE_PORT"), content
                     )
                 )
 
@@ -130,7 +119,7 @@ class Query:
                         time.sleep(2)
                         # and do nothing, waiting for the next request
                         return "success"
-                    else: # request_cnt == 3:
+                    else:  # request_cnt == 3:
                         # return timeout message
                         reply_text = "【正在思考中，回复任意文字尝试获取回复】"
                         replyPost = create_reply(reply_text, msg)
@@ -140,10 +129,7 @@ class Query:
                 channel.request_cnt.pop(message_id)
 
                 # no return because of bandwords or other reasons
-                if (
-                    from_user not in channel.cache_dict
-                    and from_user not in channel.running
-                ):
+                if from_user not in channel.cache_dict and from_user not in channel.running:
                     return "success"
 
                 # Only one request can access to the cached data
@@ -152,7 +138,7 @@ class Query:
                 except KeyError:
                     return "success"
 
-                if (reply_type == "text"):
+                if reply_type == "text":
                     if len(reply_content.encode("utf8")) <= MAX_UTF8_LEN:
                         reply_text = reply_content
                     else:
@@ -177,7 +163,7 @@ class Query:
                     replyPost = create_reply(reply_text, msg)
                     return encrypt_func(replyPost.render())
 
-                elif (reply_type == "voice"):
+                elif reply_type == "voice":
                     media_id = reply_content
                     asyncio.run_coroutine_threadsafe(channel.delete_media(media_id), channel.delete_media_loop)
                     logger.info(
@@ -193,7 +179,7 @@ class Query:
                     replyPost.media_id = media_id
                     return encrypt_func(replyPost.render())
 
-                elif (reply_type == "image"):
+                elif reply_type == "image":
                     media_id = reply_content
                     asyncio.run_coroutine_threadsafe(channel.delete_media(media_id), channel.delete_media_loop)
                     logger.info(
@@ -210,11 +196,7 @@ class Query:
                     return encrypt_func(replyPost.render())
 
             elif msg.type == "event":
-                logger.info(
-                    "[wechatmp] Event {} from {}".format(
-                        msg.event, msg.source
-                    )
-                )
+                logger.info("[wechatmp] Event {} from {}".format(msg.event, msg.source))
                 if msg.event in ["subscribe", "subscribe_scan"]:
                     reply_text = subscribe_msg()
                     replyPost = create_reply(reply_text, msg)

channel/wechatmp/wechatmp_channel.py

@@ -1,24 +1,26 @@
 # -*- coding: utf-8 -*-
+import asyncio
+import imghdr
 import io
 import os
-import time
-import imghdr
-import requests
-import asyncio
 import threading
-from config import conf
+import time
+
+import requests
+import web
+from wechatpy.crypto import WeChatCrypto
+from wechatpy.exceptions import WeChatClientException
+
 from bridge.context import *
 from bridge.reply import *
-from common.log import logger
-from common.singleton import singleton
-from voice.audio_convert import any_to_mp3
 from channel.chat_channel import ChatChannel
 from channel.wechatmp.common import *
 from channel.wechatmp.wechatmp_client import WechatMPClient
-from wechatpy.exceptions import WeChatClientException
-from wechatpy.crypto import WeChatCrypto
+from common.log import logger
+from common.singleton import singleton
+from config import conf
+from voice.audio_convert import any_to_mp3
 
-import web
 # If using SSL, uncomment the following lines, and modify the certificate path.
 # from cheroot.server import HTTPServer
 # from cheroot.ssl.builtin import BuiltinSSLAdapter
@@ -54,7 +56,6 @@ class WechatMPChannel(ChatChannel):
             t.setDaemon(True)
             t.start()
 
-
     def startup(self):
         if self.passive_reply:
             urls = ("/wx", "channel.wechatmp.passive_reply.Query")
@@ -84,7 +85,7 @@ class WechatMPChannel(ChatChannel):
             elif reply.type == ReplyType.VOICE:
                 try:
                     voice_file_path = reply.content
-                    with open(voice_file_path, 'rb') as f:
+                    with open(voice_file_path, "rb") as f:
                         # support: <2M, <60s, mp3/wma/wav/amr
                         response = self.client.material.add("voice", f)
                         logger.debug("[wechatmp] upload voice response: {}".format(response))
@@ -107,7 +108,7 @@ class WechatMPChannel(ChatChannel):
                     image_storage.write(block)
                 image_storage.seek(0)
                 image_type = imghdr.what(image_storage)
-                filename = receiver + "-" + str(context['msg'].msg_id) + "." + image_type
+                filename = receiver + "-" + str(context["msg"].msg_id) + "." + image_type
                 content_type = "image/" + image_type
                 try:
                     response = self.client.material.add("image", (filename, image_storage, content_type))
@@ -122,7 +123,7 @@ class WechatMPChannel(ChatChannel):
                 image_storage = reply.content
                 image_storage.seek(0)
                 image_type = imghdr.what(image_storage)
-                filename = receiver + "-" + str(context['msg'].msg_id) + "." + image_type
+                filename = receiver + "-" + str(context["msg"].msg_id) + "." + image_type
                 content_type = "image/" + image_type
                 try:
                     response = self.client.material.add("image", (filename, image_storage, content_type))
@@ -137,7 +138,7 @@ class WechatMPChannel(ChatChannel):
             if reply.type == ReplyType.TEXT or reply.type == ReplyType.INFO or reply.type == ReplyType.ERROR:
                 reply_text = reply.content
                 texts = split_string_by_utf8_length(reply_text, MAX_UTF8_LEN)
-                if len(texts)>1:
+                if len(texts) > 1:
                     logger.info("[wechatmp] text too long, split into {} parts".format(len(texts)))
                 for text in texts:
                     self.client.message.send_text(receiver, text)
@@ -174,7 +175,7 @@ class WechatMPChannel(ChatChannel):
                     image_storage.write(block)
                 image_storage.seek(0)
                 image_type = imghdr.what(image_storage)
-                filename = receiver + "-" + str(context['msg'].msg_id) + "." + image_type
+                filename = receiver + "-" + str(context["msg"].msg_id) + "." + image_type
                 content_type = "image/" + image_type
                 try:
                     response = self.client.media.upload("image", (filename, image_storage, content_type))
@@ -188,7 +189,7 @@ class WechatMPChannel(ChatChannel):
                 image_storage = reply.content
                 image_storage.seek(0)
                 image_type = imghdr.what(image_storage)
-                filename = receiver + "-" + str(context['msg'].msg_id) + "." + image_type
+                filename = receiver + "-" + str(context["msg"].msg_id) + "." + image_type
                 content_type = "image/" + image_type
                 try:
                     response = self.client.media.upload("image", (filename, image_storage, content_type))
@@ -201,20 +202,12 @@ class WechatMPChannel(ChatChannel):
         return
 
     def _success_callback(self, session_id, context, **kwargs):  # 线程异常结束时的回调函数
-        logger.debug(
-            "[wechatmp] Success to generate reply, msgId={}".format(
-                context["msg"].msg_id
-            )
-        )
+        logger.debug("[wechatmp] Success to generate reply, msgId={}".format(context["msg"].msg_id))
         if self.passive_reply:
             self.running.remove(session_id)
 
     def _fail_callback(self, session_id, exception, context, **kwargs):  # 线程异常结束时的回调函数
-        logger.exception(
-            "[wechatmp] Fail to generate reply to user, msgId={}, exception={}".format(
-                context["msg"].msg_id, exception
-            )
-        )
+        logger.exception("[wechatmp] Fail to generate reply to user, msgId={}, exception={}".format(context["msg"].msg_id, exception))
         if self.passive_reply:
             assert session_id not in self.cache_dict
             self.running.remove(session_id)

channel/wechatmp/wechatmp_client.py

@@ -1,17 +1,16 @@
-import time
 import threading
-from channel.wechatmp.common import *
+import time
+
 from wechatpy.client import WeChatClient
-from common.log import logger
 from wechatpy.exceptions import APILimitedException
 
+from channel.wechatmp.common import *
+from common.log import logger
+
 
 class WechatMPClient(WeChatClient):
-    def __init__(self, appid, secret, access_token=None,
-                 session=None, timeout=None, auto_retry=True):
-        super(WechatMPClient, self).__init__(
-            appid, secret, access_token, session, timeout, auto_retry
-        )
+    def __init__(self, appid, secret, access_token=None, session=None, timeout=None, auto_retry=True):
+        super(WechatMPClient, self).__init__(appid, secret, access_token, session, timeout, auto_retry)
         self.fetch_access_token_lock = threading.Lock()
 
     def clear_quota(self):
@@ -20,7 +19,7 @@ class WechatMPClient(WeChatClient):
     def clear_quota_v2(self):
         return self.post("clear_quota/v2", params={"appid": self.appid, "appsecret": self.secret})
 
-    def fetch_access_token(self): # 重载父类方法，加锁避免多线程重复获取access_token
+    def fetch_access_token(self):  # 重载父类方法，加锁避免多线程重复获取access_token
         with self.fetch_access_token_lock:
             access_token = self.session.get(self.access_token_key)
             if access_token:
@@ -31,11 +30,11 @@ class WechatMPClient(WeChatClient):
                     return access_token
             return super().fetch_access_token()
 
-    def _request(self, method, url_or_endpoint, **kwargs): # 重载父类方法，遇到API限流时，清除quota后重试
+    def _request(self, method, url_or_endpoint, **kwargs):  # 重载父类方法，遇到API限流时，清除quota后重试
         try:
             return super()._request(method, url_or_endpoint, **kwargs)
         except APILimitedException as e:
             logger.error("[wechatmp] API quata has been used up. {}".format(e))
             response = self.clear_quota_v2()
             logger.debug("[wechatmp] API quata has been cleard, {}".format(response))
-            return super()._request(method, url_or_endpoint, **kwargs)
+            return super()._request(method, url_or_endpoint, **kwargs)

channel/wechatmp/wechatmp_message.py

@@ -6,7 +6,6 @@ from common.log import logger
 from common.tmp_dir import TmpDir
 
 
-
 class WeChatMPMessage(ChatMessage):
     def __init__(self, msg, client=None):
         super().__init__(msg)
@@ -18,12 +17,9 @@ class WeChatMPMessage(ChatMessage):
             self.ctype = ContextType.TEXT
             self.content = msg.content
         elif msg.type == "voice":
-            
             if msg.recognition == None:
                 self.ctype = ContextType.VOICE
-                self.content = (
-                    TmpDir().path() + msg.media_id + "." + msg.format
-                )  # content直接存临时目录路径
+                self.content = TmpDir().path() + msg.media_id + "." + msg.format  # content直接存临时目录路径
 
                 def download_voice():
                     # 如果响应状态码是200，则将响应内容写入本地文件
@@ -32,9 +28,7 @@ class WeChatMPMessage(ChatMessage):
                         with open(self.content, "wb") as f:
                             f.write(response.content)
                     else:
-                        logger.info(
-                            f"[wechatmp] Failed to download voice file, {response.content}"
-                        )
+                        logger.info(f"[wechatmp] Failed to download voice file, {response.content}")
 
                 self._prepare_fn = download_voice
             else:
@@ -43,6 +37,7 @@ class WeChatMPMessage(ChatMessage):
         elif msg.type == "image":
             self.ctype = ContextType.IMAGE
             self.content = TmpDir().path() + msg.media_id + ".png"  # content直接存临时目录路径
+
             def download_image():
                 # 如果响应状态码是200，则将响应内容写入本地文件
                 response = client.media.download(msg.media_id)
@@ -50,15 +45,11 @@ class WeChatMPMessage(ChatMessage):
                     with open(self.content, "wb") as f:
                         f.write(response.content)
                 else:
-                    logger.info(
-                        f"[wechatmp] Failed to download image file, {response.content}"
-                    )
+                    logger.info(f"[wechatmp] Failed to download image file, {response.content}")
 
             self._prepare_fn = download_image
         else:
-            raise NotImplementedError(
-                "Unsupported message type: Type:{} ".format(msg.type)
-            )
+            raise NotImplementedError("Unsupported message type: Type:{} ".format(msg.type))
 
         self.from_user_id = msg.source
         self.to_user_id = msg.target