fix(docker): chown /usr/local/lib in debian dockerfile

fix(企业微信）：补充缺失依赖textwrap

README.md

@@ -14,8 +14,12 @@
 > 欢迎接入更多应用，参考 [Terminal代码](https://github.com/zhayujie/chatgpt-on-wechat/blob/master/channel/terminal/terminal_channel.py)实现接收和发送消息逻辑即可接入。 同时欢迎增加新的插件，参考 [插件说明文档](https://github.com/zhayujie/chatgpt-on-wechat/tree/master/plugins)。
 
 **一键部署:**
+- 个人微信
   
   [![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/qApznZ?referralCode=RC3znh)
+- 企业微信应用号
+  
+  [![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/-FHS--?referralCode=RC3znh)
 
 # 演示
 

channel/wechatcom/wechatcomapp_channel.py

@@ -93,7 +93,8 @@ class WechatComAppChannel(ChatChannel):
             image_storage = io.BytesIO()
             for block in pic_res.iter_content(1024):
                 image_storage.write(block)
-            if (sz := fsize(image_storage)) >= 10 * 1024 * 1024:
+            sz = fsize(image_storage)
+            if sz >= 10 * 1024 * 1024:
                 logger.info("[wechatcom] image too large, ready to compress, sz={}".format(sz))
                 image_storage = compress_imgfile(image_storage, 10 * 1024 * 1024 - 1)
                 logger.info("[wechatcom] image compressed, sz={}".format(fsize(image_storage)))
@@ -109,7 +110,8 @@ class WechatComAppChannel(ChatChannel):
             logger.info("[wechatcom] sendImage url={}, receiver={}".format(img_url, receiver))
         elif reply.type == ReplyType.IMAGE:  # 从文件读取图片
             image_storage = reply.content
-            if (sz := fsize(image_storage)) >= 10 * 1024 * 1024:
+            sz = fsize(image_storage)
+            if sz >= 10 * 1024 * 1024:
                 logger.info("[wechatcom] image too large, ready to compress, sz={}".format(sz))
                 image_storage = compress_imgfile(image_storage, 10 * 1024 * 1024 - 1)
                 logger.info("[wechatcom] image compressed, sz={}".format(fsize(image_storage)))

channel/wechatmp/passive_reply.py

@@ -4,7 +4,7 @@ import time
 import web
 from wechatpy import parse_message
 from wechatpy.replies import ImageReply, VoiceReply, create_reply
-
+import textwrap
 from bridge.context import *
 from bridge.reply import *
 from channel.wechatmp.common import *

docker/Dockerfile.alpine.latest

@@ -26,4 +26,4 @@ RUN chmod +x /entrypoint.sh \
 
 USER noroot
 
-ENTRYPOINT ["docker/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

docker/Dockerfile.debian

@@ -31,9 +31,10 @@ WORKDIR ${BUILD_PREFIX}
 ADD ./entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh \
+    && mkdir -p /home/noroot \
     && groupadd -r noroot \
     && useradd -r -g noroot -s /bin/bash -d /home/noroot noroot \
-    && chown -R noroot:noroot ${BUILD_PREFIX}
+    && chown -R noroot:noroot /home/noroot ${BUILD_PREFIX} /usr/local/lib
 
 USER noroot
 

docker/Dockerfile.latest

@@ -25,10 +25,11 @@ WORKDIR ${BUILD_PREFIX}
 ADD docker/entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh \
+    && mkdir -p /home/noroot \
     && groupadd -r noroot \
     && useradd -r -g noroot -s /bin/bash -d /home/noroot noroot \
-    && chown -R noroot:noroot ${BUILD_PREFIX}
+    && chown -R noroot:noroot /home/noroot ${BUILD_PREFIX} /usr/local/lib
 
 USER noroot
 
-ENTRYPOINT ["docker/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

lib/itchat/components/register.py

@@ -25,8 +25,9 @@ def auto_login(self, hotReload=False, statusStorageDir='itchat.pkl',
     self.useHotReload = hotReload
     self.hotReloadDir = statusStorageDir
     if hotReload:
-        if rval:=self.load_login_status(statusStorageDir,
+        rval=self.load_login_status(statusStorageDir,
-                loginCallback=loginCallback, exitCallback=exitCallback):
+                loginCallback=loginCallback, exitCallback=exitCallback)
+        if rval:
             return
         logger.error('Hot reload failed, logging in normally, error={}'.format(rval))
         self.logout()

plugins/plugin_manager.py

@@ -123,7 +123,7 @@ class PluginManager:
                     try:
                         instance = plugincls()
                     except Exception as e:
-                        logger.error("Failed to init %s, diabled. %s" % (name, e))
+                        logger.exception("Failed to init %s, diabled. %s" % (name, e))
                         self.disable_plugin(name)
                         failed_plugins.append(name)
                         continue

translate/baidu/baidu_translate.py

@@ -31,7 +31,8 @@ class BaiduTranslator(Translator):
         while retry_cnt:
             r = requests.post(self.url, params=payload, headers=headers)
             result = r.json()
-            if errcode := result.get("error_code", "52000") != "52000":
+            errcode = result.get("error_code", "52000")
+            if errcode != "52000":
                 if errcode == "52001" or errcode == "52002":
                     retry_cnt -= 1
                     continue