ezKit 1.11.0__py3-none-any.whl → 1.11.2__py3-none-any.whl

ezKit/_file.py

@@ -0,0 +1,36 @@
+from loguru import logger
+
+from . import utils
+
+
+def markdown_to_html(markdown_file: str, html_file: str, header_file: str = "markdown.html") -> bool:
+    """Markdown to HTML"""
+
+    # Markdown to HTML
+    # 使用 MacDown 生成 HTML, 然后提取样式到 markdown.html
+    # pandoc 生成的 HTML 默认 max-width: 36em, 如果表格内容很长, 会导致表格样式难看
+    # 所以在 markdown.html 的 body{...} 中添加配置 max-width: unset, 解决内容过长的样式问题
+    # 所有 a 标签添加 text-decoration: none; 去除链接下划线
+    # pandoc --no-highlight -s --quiet -f markdown -t html -H markdown.html -o data.html data.md
+
+    info: str = "markdown to html"
+
+    logger.info(f"{info} ......")
+
+    try:
+
+        result = utils.shell(
+            f"pandoc --no-highlight -s --quiet -f markdown -t html -H {header_file} -o {html_file} {markdown_file}"
+        )
+
+        if result is None or result.returncode != 0:
+            logger.error(f"{info} [failure]")
+            return False
+
+        logger.success(f"{info} [success]")
+        return True
+
+    except Exception as e:
+        logger.error(f"{info} [failure]")
+        logger.exception(e)
+        return False

ezKit/qywx.py

@@ -1,10 +1,38 @@
 """企业微信"""
+#
 # 企业微信开发者中心
 #     https://developer.work.weixin.qq.com/
 #     https://developer.work.weixin.qq.com/document/path/90313 (全局错误码)
 # 参考文档:
 #     https://www.gaoyuanqi.cn/python-yingyong-qiyewx/
 #     https://www.jianshu.com/p/020709b130d3
+#
+# 应用管理
+#   https://work.weixin.qq.com/wework_admin/frame#apps
+# 自建 -> 创建应用
+#   https://work.weixin.qq.com/wework_admin/frame#apps/createApiApp
+# 上传 Logo -> 应用名称 -> 选择部门 / 成员 -> 创建应用
+#
+# 服务端API
+#   https://developer.work.weixin.qq.com/document/path/90664
+# 基本概念
+#   https://developer.work.weixin.qq.com/document/path/90665
+# 企业ID:
+#   https://work.weixin.qq.com/wework_admin/frame#profile
+# AgentId 和 Secret:
+#   进入已创建的应用, 即可获取
+#
+# 应用管理 -> 应用 -> 开发者接口 -> 网页授权及JS-SDK
+#
+#   可作为应用OAuth2.0网页授权功能的回调域名
+#   下载 配置可信域名需完成域名归属认证 的文件
+#   保存到域名下
+#   配置可信域名需完成域名归属认证 已验证
+#
+# 应用管理 -> 应用 -> 开发者接口 -> 企业可信IP
+#
+#   添加IP
+#
 import json
 import time
 
@@ -17,150 +45,217 @@ from . import utils
 class QYWX:
     """企业微信"""
 
-    url_prefix = "https://qyapi.weixin.qq.com"
-    work_id: str | None = None
-    agent_id: str | None = None
-    agent_secret: str | None = None
-    access_token: str | None = None
+    # API前缀
+    api_prefix = "https://qyapi.weixin.qq.com"
 
-    def __init__(self, work_id: str | None, agent_id: str | None, agent_secret: str | None):
+    # 企业ID: https://developer.work.weixin.qq.com/document/path/90665#corpid
+    work_id: str = ""
+
+    # 应用ID: https://developer.work.weixin.qq.com/document/path/90665#agentid
+    agent_id: str = ""
+
+    # 应用Secret: https://developer.work.weixin.qq.com/document/path/90665#secret
+    agent_secret: str = ""
+
+    # Token: https://developer.work.weixin.qq.com/document/path/90665#access-token
+    access_token: str = ""
+
+    def __init__(self, work_id: str, agent_id: str, agent_secret: str):
         """Initiation"""
         self.work_id = work_id
         self.agent_id = agent_id
         self.agent_secret = agent_secret
 
         """获取 Token"""
-        self.getaccess_token()
+        self.get_access_token()
+
+    def get_access_token(self) -> bool:
+        """获取Token"""
+
+        info: str = "获取 Token"
 
-    def getaccess_token(self) -> str | None:
         try:
-            response = requests.get(f"{self.url_prefix}/cgi-bin/gettoken?corpid={self.work_id}&corpsecret={self.agent_secret}", timeout=10)
+
+            logger.info(f"{info} ......")
+
+            response = requests.get(f"{self.api_prefix}/cgi-bin/gettoken?corpid={self.work_id}&corpsecret={self.agent_secret}", timeout=10)
 
             if response.status_code != 200:
-                self.access_token = None
-                return None
+                logger.error(f"{info} [状态码错误]")
+                return False
 
             result: dict = response.json()
-            self.access_token = result.get('access_token')
-            return result.get('access_token')
 
-        except Exception as e:
-            logger.exception(e)
-            return None
+            self.access_token = result.get("access_token", "")
 
-    def get_agent_list(self) -> dict | str | None:
-        try:
-            if self.access_token is None:
-                self.getaccess_token()
-            response = requests.get(f"{self.url_prefix}/cgi-bin/agent/list?access_token={self.access_token}", timeout=10)
-            if response.status_code == 200:
-                response_data: dict = response.json()
-                if response_data.get('errcode') == 42001:
-                    self.getaccess_token()
-                    time.sleep(1)
-                    self.get_agent_list()
-                return response_data
-            return response.text
-        except Exception as e:
-            logger.exception(e)
-            return None
+            if not utils.isTrue(self.access_token, str):
+                logger.error(f"{info} [失败]")
+                return False
 
-    def get_department_list(self, eid: str | None = None) -> dict | str | None:
-        """eid: Enterprise ID"""
-        try:
-            if self.access_token is None:
-                self.getaccess_token()
-            response = requests.get(f"{self.url_prefix}/cgi-bin/department/list?access_token={self.access_token}&id={eid}", timeout=10)
-            if response.status_code == 200:
-                response_data: dict = response.json()
-                if response_data.get('errcode') == 42001:
-                    self.getaccess_token()
-                    time.sleep(1)
-                    self.get_department_list(eid)
-                return response_data
-            return response.text
-        except Exception as e:
-            logger.exception(e)
-            return None
+            logger.success(f"{info} [成功]")
+            return True
 
-    def get_user_list(self, eid: str | None = None) -> dict | str | None:
-        """eid: Enterprise ID"""
-        try:
-            if self.access_token is None:
-                self.getaccess_token()
-            response = requests.get(f"{self.url_prefix}/cgi-bin/user/list?access_token={self.access_token}&department_id={eid}", timeout=10)
-            if response.status_code == 200:
-                response_data: dict = response.json()
-                if response_data.get('errcode') == 42001:
-                    self.getaccess_token()
-                    time.sleep(1)
-                    self.get_user_list(eid)
-                return response_data
-            return response.text
         except Exception as e:
+            logger.success(f"{info} [失败]")
             logger.exception(e)
+            return False
+
+    # def get_agent_list(self) -> dict | str | None:
+    #     try:
+    #         if not utils.isTrue(self.access_token, str):
+    #             self.get_access_token()
+    #         response = requests.get(f"{self.api_prefix}/cgi-bin/agent/list?access_token={self.access_token}", timeout=10)
+    #         if response.status_code == 200:
+    #             response_data: dict = response.json()
+    #             if response_data.get('errcode') == 42001:
+    #                 self.get_access_token()
+    #                 time.sleep(1)
+    #                 self.get_agent_list()
+    #             return response_data
+    #         return response.text
+    #     except Exception as e:
+    #         logger.exception(e)
+    #         return None
+
+    # def get_department_list(self, eid: str | None = None) -> dict | str | None:
+    #     """eid: Enterprise ID"""
+    #     try:
+    #         if self.access_token is None:
+    #             self.get_access_token()
+    #         response = requests.get(f"{self.api_prefix}/cgi-bin/department/list?access_token={self.access_token}&id={eid}", timeout=10)
+    #         if response.status_code == 200:
+    #             response_data: dict = response.json()
+    #             if response_data.get('errcode') == 42001:
+    #                 self.get_access_token()
+    #                 time.sleep(1)
+    #                 self.get_department_list(eid)
+    #             return response_data
+    #         return response.text
+    #     except Exception as e:
+    #         logger.exception(e)
+    #         return None
+
+    # def get_user_list(self, eid: str | None = None) -> dict | str | None:
+    #     """eid: Enterprise ID"""
+    #     try:
+    #         if self.access_token is None:
+    #             self.get_access_token()
+    #         response = requests.get(f"{self.api_prefix}/cgi-bin/user/list?access_token={self.access_token}&department_id={eid}", timeout=10)
+    #         if response.status_code == 200:
+    #             response_data: dict = response.json()
+    #             if response_data.get('errcode') == 42001:
+    #                 self.get_access_token()
+    #                 time.sleep(1)
+    #                 self.get_user_list(eid)
+    #             return response_data
+    #         return response.text
+    #     except Exception as e:
+    #         logger.exception(e)
+    #         return None
+
+    def get_user_id_by_mobile(self, mobile: str) -> dict | None:
+        """根据电话号码获取用户ID"""
+
+        info: str = f"根据电话号码获取用户ID: {mobile}"
+
+        if not utils.check_arguments([(mobile, str, "mobile")]):
+            logger.error(f"{info} [错误]")
             return None
 
-    def get_user_id_by_mobile(self, mobile: str | None = None) -> dict | str | None:
         try:
-            if self.access_token is None:
-                self.getaccess_token()
+
+            logger.info(f"{info} ......")
+
+            if not utils.isTrue(self.access_token, str):
+                self.get_access_token()
+
             json_string = json.dumps({'mobile': mobile})
-            response = requests.post(f"{self.url_prefix}/cgi-bin/user/getuserid?access_token={self.access_token}", data=json_string, timeout=10)
-            if response.status_code == 200:
-                response_data: dict = response.json()
-                if response_data.get('errcode') == 42001:
-                    self.getaccess_token()
-                    time.sleep(1)
-                    self.get_user_id_by_mobile(mobile)
-                return response_data
-            return response.text
-        except Exception as e:
-            logger.exception(e)
-            return None
 
-    def get_user_info(self, eid: str | None = None) -> dict | str | None:
-        """eid: Enterprise ID"""
-        try:
-            if self.access_token is None:
-                self.getaccess_token()
-            response = requests.get(f"{self.url_prefix}/cgi-bin/user/get?access_token={self.access_token}&userid={eid}", timeout=10)
-            if response.status_code == 200:
-                response_data: dict = response.json()
-                if response_data.get('errcode') == 42001:
-                    self.getaccess_token()
-                    time.sleep(1)
-                    self.get_user_info(eid)
-                return response_data
-            return response.text
+            response = requests.post(f"{self.api_prefix}/cgi-bin/user/getuserid?access_token={self.access_token}", data=json_string, timeout=10)
+
+            if response.status_code != 200:
+                logger.error(f"{info} [接口请求错误]")
+                return None
+
+            response_data: dict = response.json()
+
+            if response_data.get('errcode') == 42001:
+                self.get_access_token()
+                time.sleep(1)
+                self.get_user_id_by_mobile(mobile)
+
+            logger.success(f"{info} [成功]")
+
+            return response_data
+
+            # return response.text
+
         except Exception as e:
+            logger.error(f"{info} [失败]")
             logger.exception(e)
             return None
 
+    # def get_user_info(self, eid: str | None = None) -> dict | str | None:
+    #     """eid: Enterprise ID"""
+    #     try:
+    #         if self.access_token is None:
+    #             self.get_access_token()
+    #         response = requests.get(f"{self.api_prefix}/cgi-bin/user/get?access_token={self.access_token}&userid={eid}", timeout=10)
+    #         if response.status_code == 200:
+    #             response_data: dict = response.json()
+    #             if response_data.get('errcode') == 42001:
+    #                 self.get_access_token()
+    #                 time.sleep(1)
+    #                 self.get_user_info(eid)
+    #             return response_data
+    #         return response.text
+    #     except Exception as e:
+    #         logger.exception(e)
+    #         return None
+
     def send_message_by_mobile(self, mobile: str | list, message: str) -> bool:
         """发送消息"""
 
         # 参考文档:
         # https://developer.work.weixin.qq.com/document/path/90235
 
+        info: str = "发送消息"
+
+        if not utils.check_arguments([(mobile, (str, list), "mobile"), (message, str, "message")]):
+            logger.error(f"{info} [失败]")
+            return False
+
         try:
-            if self.access_token is None:
-                self.getaccess_token()
 
-            users: list = []
+            logger.info(f"{info} ......")
 
-            match True:
-                case True if isinstance(mobile, list) and utils.isTrue(mobile, list):
-                    users = mobile
-                case True if isinstance(mobile, str) and utils.isTrue(mobile, str):
-                    users.append(mobile)
-                case _:
+            if not utils.isTrue(self.access_token, str):
+                if not self.get_access_token():
+                    logger.error(f"{info} [失败]")
                     return False
 
+            users: list = []
+
+            if isinstance(mobile, str) and utils.isTrue(mobile, str):
+                users.append(mobile)
+            elif isinstance(mobile, list) and utils.isTrue(mobile, list):
+                users += mobile
+            else:
+                logger.error(f"{info} [电话号码错误]")
+                return False
+
             for user in users:
+
+                logger.info(f"{info} [用户 {user}]")
+
                 user_object = self.get_user_id_by_mobile(user)
 
-                if not isinstance(user_object, dict):
+                if not (isinstance(user_object, dict) and utils.isTrue(user_object, dict)):
+                    logger.error(f"{info} [获取用户ID错误: {user}]")
+                    continue
+
+                if user_object.get("errcode", -1) != 0 or user_object.get("errmsg", "") != "ok":
+                    logger.error(f"{user_object.get('errcode')}: {user_object.get('errmsg')}")
                     continue
 
                 json_dict = {
@@ -173,17 +268,29 @@ class QYWX:
                     'enable_duplicate_check': 0,
                     'duplicate_check_interval': 1800
                 }
+
                 json_string = json.dumps(json_dict)
-                response = requests.post(f"{self.url_prefix}/cgi-bin/message/send?access_token={self.access_token}", data=json_string, timeout=10)
-                if response.status_code == 200:
-                    response_data: dict = response.json()
-                    if response_data.get('errcode') == 42001:
-                        self.getaccess_token()
-                        time.sleep(1)
-                        self.send_message_by_mobile(mobile, message)
+
+                response = requests.post(f"{self.api_prefix}/cgi-bin/message/send?access_token={self.access_token}", data=json_string, timeout=10)
+
+                if response.status_code != 200:
+                    logger.error(f"{info} [发送消息失败: {user}]")
+                    continue
+
+                response_data: dict = response.json()
+
+                if response_data.get('errcode') == 42001:
+                    self.get_access_token()
+                    time.sleep(1)
+                    self.send_message_by_mobile(mobile, message)
+
+                logger.success(f"{info} [成功: 用户 {user}]")
+
+            logger.success(f"{info} [完成]")
 
             return True
 
         except Exception as e:
+            logger.error(f"{info} [失败]")
             logger.exception(e)
             return False

ezKit/utils.py

@@ -418,26 +418,19 @@ def list_print_by_step(
 
     try:
 
-        # result: list = []
-
-        # if len(data) <= step:
-        #     result.append(data)
-        # else:
-        #     data_list = list_split(data, step, debug=debug)
-        #     if data_list is None or isTrue(data_list, list) is False:
-        #         return False
-        #     result = data_list
-
-        # for item in result:
-        #     print(*item, sep=separator)
-
-        # return True
-
         # 打印
         for i, v in enumerate(data):
+
             if i > 0 and i % step == 0:
                 print()
-            print(v, end=separator)
+
+            # print(v, end=separator)
+
+            # 每行最后一个 或者 所有数据最后一个, 不打印分隔符
+            if ((i % step) == (step - 1)) or ((i + 1) == len(data)):
+                print(v, end='')
+            else:
+                print(v, end=separator)
 
         print()
 

{ezKit-1.11.0.dist-info → ezKit-1.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.11.0
+Version: 1.11.2
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezKit-1.11.0.dist-info → ezKit-1.11.2.dist-info}/RECORD

@@ -1,18 +1,19 @@
 ezKit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ezKit/_file.py,sha256=0qRZhwYuagTgTGrhm-tzAMvEQT4HTJA_xZKqF2bo0ho,1207
 ezKit/bottle.py,sha256=usKK1wVaZw4_D-4VwMYmOIc8jtz4TrpM30nck59HMFw,180178
 ezKit/bottle_extensions.py,sha256=3reEQVZuHklXTl6r7F8kiBFFPb0RaAGc3mYJJnrMDjQ,1129
 ezKit/cipher.py,sha256=0T_StbjiNI4zgrjVgcfU-ffKgu1waBA9UDudAnqFcNM,2896
 ezKit/database.py,sha256=r5YNoEzeOeVTlEWI99xXtHTmPZ73_DopS8DTzZk8Lts,12432
 ezKit/http.py,sha256=ysXzqXFi9zmuVKINbYGwmf9Q5xDVW_DZWrSh6HSVq8M,1800
 ezKit/mongo.py,sha256=l3jRMmoGrTm16OG4daSCn0JLU1nbYAmTtHokwjLXzoA,2390
-ezKit/qywx.py,sha256=X_H4fzP-iEqeDEbumr7D1bXi6dxczaxfO8iyutzy02s,7171
+ezKit/qywx.py,sha256=GKwcx_L3WCcWEMZuuMpqdAy9ubqSu2RoxndxkkAYRtQ,10301
 ezKit/redis.py,sha256=tdiqfizPYQQTIUumkJGUJsJVlv0zVTSTYGQN0QutYs4,1963
 ezKit/sendemail.py,sha256=tRXCsJm_RfTJ9xEWe_lTQ5kOs2JxHGPXvq0oWA7prq0,7263
 ezKit/token.py,sha256=HKREyZj_T2S8-aFoFIrBXTaCKExQq4zE66OHXhGHqQg,1750
-ezKit/utils.py,sha256=CeRFReOm3afxRYkqaVXWv1x4eKXB1YiHnbeGBxvWhKs,42657
+ezKit/utils.py,sha256=a2RiwOjO83Wi4GmyBRLI1UreaVgNLL66Snbq0HnI37c,42501
 ezKit/xftp.py,sha256=XyIdr_2rxRVLqPofG6fIYWhAMVsFwTyp46dg5P9FLW4,7774
-ezKit-1.11.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezKit-1.11.0.dist-info/METADATA,sha256=qSEnzYClSlWB_0w9rYxDuVD-tc9Y7hPIv_sw3GuXo8g,191
-ezKit-1.11.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ezKit-1.11.0.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezKit-1.11.0.dist-info/RECORD,,
+ezKit-1.11.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.11.2.dist-info/METADATA,sha256=O6yYp94ImOfIjj7pLEWeFsCl1PDBeJNk9nPgme9iOAs,191
+ezKit-1.11.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.11.2.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.11.2.dist-info/RECORD,,