qrpa 1.0.27__tar.gz → 1.0.29__tar.gz

{qrpa-1.0.27 → qrpa-1.0.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.0.27
+Version: 1.0.29
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>

{qrpa-1.0.27 → qrpa-1.0.29}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qrpa"
-version = "1.0.27"
+version = "1.0.29"
 description = "qsir's rpa library"
 authors = [{ name = "QSir", email = "1171725650@qq.com" }]
 readme = "README.md"

{qrpa-1.0.27 → qrpa-1.0.29}/qrpa/__init__.py

@@ -1,4 +1,5 @@
 from .wxwork import WxWorkBot, WxWorkAppBot
+from .feishu_bot_app import FeishuBot
 from .db_migrator import DatabaseMigrator, DatabaseConfig, RemoteConfig, create_default_migrator
 
 from .shein_ziniao import ZiniaoRunner

{qrpa-1.0.27 → qrpa-1.0.29}/qrpa/feishu_bot_app.py

@@ -26,8 +26,8 @@ class FeishuBot:
         """获取飞书客户端，使用懒加载模式"""
         if self._client is None:
             self._client = lark.Client.builder() \
-                .app_id(self.config.feishu_bot_app_id) \
-                .app_secret(self.config.feishu_bot_app_secret) \
+                .app_id(self.config.feishu_bot.app_id) \
+                .app_secret(self.config.feishu_bot.app_secret) \
                 .log_level(lark.LogLevel.INFO) \
                 .build()
         return self._client

{qrpa-1.0.27 → qrpa-1.0.29}/qrpa/fun_excel.py

@@ -282,6 +282,7 @@ def delete_sheet_if_exists(wb, sheet_name):
     sheet_names = [s.name for s in wb.sheets]
     if sheet_name in sheet_names:
         wb.sheets[sheet_name].delete()
+        wb.save()
         print(f"已删除 Sheet: {sheet_name}")
     else:
         print(f"Sheet 不存在: {sheet_name}")
@@ -1871,18 +1872,18 @@ def format_to_text_v2_safe(sheet, columns=None, data_rows=None):
     """
     if columns is None or len(columns) == 0:
         return
-    
+
     # 确保columns是列表
     if not isinstance(columns, list):
         columns = [columns]
-    
+
     for col_name in columns:
         try:
             if isinstance(col_name, int):
                 col_name = xw.utils.col_name(col_name)
-            
+
             log(f'安全设置[{col_name}] 文本格式')
-            
+
             # 如果指定了数据行数，只格式化有数据的范围
             if data_rows and data_rows > 0:
                 # 格式化从第1行到数据行数的范围
@@ -1899,7 +1900,7 @@ def format_to_text_v2_safe(sheet, columns=None, data_rows=None):
                         log(f'列 {col_name} 没有数据，跳过格式化')
                 except:
                     log(f'列 {col_name} 格式化失败，跳过')
-                    
+
         except Exception as e:
             log(f'设置列 {col_name} 文本格式失败: {e}，继续处理其他列')
 
@@ -1914,14 +1915,14 @@ def pre_format_columns_safe(sheet, columns, data_rows):
     """
     if not columns or not isinstance(columns, list):
         return
-    
+
     for col_name in columns:
         try:
             if isinstance(col_name, int):
                 col_name = xw.utils.col_name(col_name)
-            
+
             log(f'预格式化列 [{col_name}] 为文本格式')
-            
+
             # 方法1：先创建最小范围，避免整列操作
             try:
                 # 创建足够大的范围来覆盖预期数据
@@ -1930,7 +1931,7 @@ def pre_format_columns_safe(sheet, columns, data_rows):
                 log(f'预格式化成功: {range_str}')
             except Exception as e1:
                 log(f'预格式化方法1失败: {e1}')
-                
+
                 # 方法2：逐行设置格式，更安全但稍慢
                 try:
                     for row in range(1, data_rows + 1):
@@ -1939,7 +1940,7 @@ def pre_format_columns_safe(sheet, columns, data_rows):
                     log(f'逐行预格式化成功: {col_name}')
                 except Exception as e2:
                     log(f'逐行预格式化也失败: {e2}')
-                    
+
         except Exception as e:
             log(f'预格式化列 {col_name} 失败: {e}，继续处理其他列')
 
@@ -1954,20 +1955,20 @@ def post_format_columns_safe(sheet, columns, data_rows):
     """
     if not columns or not isinstance(columns, list):
         return
-    
+
     for col_name in columns:
         try:
             if isinstance(col_name, int):
                 col_name = xw.utils.col_name(col_name)
-            
+
             log(f'后格式化列 [{col_name}] 为文本格式')
-            
+
             # 只对实际有数据的行进行格式化
             if data_rows > 0:
                 range_str = f'{col_name}1:{col_name}{data_rows}'
                 sheet.range(range_str).number_format = '@'
                 log(f'后格式化成功: {range_str}')
-                
+
         except Exception as e:
             log(f'后格式化列 {col_name} 失败: {e}，继续处理其他列')
 
@@ -2545,18 +2546,77 @@ def format_excel_with_lock(excel_path, sheet_name, format_func, *args, **kwargs)
 # 经过观察 fortmat时 传入函数需要为类函数且第二个参数必须是 sheet
 def batch_excel_operations(excel_path, operations):
     """
-    批量 Excel 操作函数，一次性打开 Excel 执行多个操作
-
+    批量 Excel 操作函数，自动分批处理，避免一次操作过多sheet导致Excel COM错误
+    保持操作的原始顺序执行
+    
     Args:
         excel_path: Excel 文件路径
         operations: 操作列表，每个操作是 (sheet_name, operation_type, data, format_func) 的元组
-                   operation_type: 'write' 或 'format'
-                   data: 写入的数据（仅 write 操作需要）
-                   format_func: 格式化函数（仅 format 操作需要）
-
+                   operation_type: 'write', 'format', 'delete', 'move', 'active'
+                   
     Returns:
         bool: 是否全部操作成功
     """
+    if not operations:
+        return True
+
+    # 批处理大小设置：每批最多处理8个操作
+    MAX_OPERATIONS_PER_BATCH = 8
+
+    try:
+        # 计算需要分几批
+        total_batches = (len(operations) + MAX_OPERATIONS_PER_BATCH - 1) // MAX_OPERATIONS_PER_BATCH
+        log(f"分{total_batches}批执行{len(operations)}个操作，每批最多{MAX_OPERATIONS_PER_BATCH}个，保持原始顺序")
+
+        # 按顺序分批执行
+        for batch_idx in range(total_batches):
+            start_idx = batch_idx * MAX_OPERATIONS_PER_BATCH
+            end_idx = min(start_idx + MAX_OPERATIONS_PER_BATCH, len(operations))
+            batch_operations = operations[start_idx:end_idx]
+
+            log(f"执行第{batch_idx + 1}/{total_batches}批操作（{start_idx + 1}-{end_idx}），共{len(batch_operations)}个操作")
+
+            # 重试机制
+            max_retries = 3
+            for retry in range(max_retries):
+                try:
+                    # 强制垃圾回收
+                    import gc
+                    gc.collect()
+
+                    if _execute_operations_batch(excel_path, batch_operations):
+                        log(f"第{batch_idx + 1}批操作成功")
+                        break
+                    else:
+                        log(f"第{batch_idx + 1}批操作失败，重试 {retry + 1}/{max_retries}")
+                        if retry == max_retries - 1:
+                            log(f"第{batch_idx + 1}批操作最终失败")
+                            return False
+                        import time
+                        time.sleep(3)
+                except Exception as e:
+                    log(f"第{batch_idx + 1}批操作异常: {e}")
+                    if retry == max_retries - 1:
+                        return False
+                    import time
+                    time.sleep(3)
+
+            # 批次间延迟
+            if batch_idx < total_batches - 1:
+                import time
+                time.sleep(1)
+
+        log(f"所有批量操作完成: {excel_path}")
+        return True
+
+    except Exception as e:
+        log(f"批量操作过程异常: {e}")
+        return False
+
+def _execute_operations_batch(excel_path, operations):
+    """
+    执行单个批次的操作
+    """
     app, wb, sheet = open_excel_with_lock(excel_path)
     if not app or not wb:
         log(f"无法打开 Excel 文件: {excel_path}")
@@ -2564,23 +2624,38 @@ def batch_excel_operations(excel_path, operations):
 
     try:
         for sheet_name, operation_type, *args in operations:
-            # 获取或创建工作表
+            # 根据操作类型决定是否需要获取或创建工作表
+            sheet = None
+            
+            # 删除操作不需要获取sheet对象
+            if operation_type == 'delete':
+                log(f'删除sheet: {sheet_name}')
+                delete_sheet_if_exists(wb, sheet_name)
+                continue
+            
+            # 其他操作需要获取或创建工作表
             if isinstance(sheet_name, str):
                 sheet_names = [s.name.strip().lower() for s in wb.sheets]
                 if sheet_name.strip().lower() in sheet_names:
                     sheet = wb.sheets[sheet_name]
                 else:
-                    sheet = wb.sheets.add(sheet_name, after=wb.sheets[-1])
+                    # 只有在需要操作sheet内容时才创建
+                    if operation_type in ['write', 'format']:
+                        sheet = wb.sheets.add(sheet_name, after=wb.sheets[-1])
+                    else:
+                        log(f"警告: 操作 {operation_type} 需要的sheet {sheet_name} 不存在，跳过此操作")
+                        continue
             else:
                 sheet = wb.sheets[sheet_name]
 
-            sheet.activate()
+            if sheet:
+                sheet.activate()
 
             if operation_type == 'write':
                 data, format_to_text_colunm = args[0], args[1:] if len(args) > 1 else None
                 # 清空工作表
                 sheet.clear()
-                
+
                 # 先设置文本格式，再写入数据（确保格式生效）
                 if format_to_text_colunm and format_to_text_colunm[0]:
                     try:
@@ -2588,11 +2663,11 @@ def batch_excel_operations(excel_path, operations):
                         pre_format_columns_safe(sheet, format_to_text_colunm[0], len(data))
                     except Exception as e:
                         log(f"预格式化失败: {e}，继续执行")
-                
+
                 # 写入数据
+                log(f"批量操作,写入数据到: {sheet_name}")
                 sheet.range('A1').value = data
-                log(f"批量操作：写入数据到 {sheet_name}")
-                
+
                 # 写入后再次确认格式（双重保险）
                 if format_to_text_colunm and format_to_text_colunm[0]:
                     try:
@@ -2602,31 +2677,24 @@ def batch_excel_operations(excel_path, operations):
 
             elif operation_type == 'format':
                 format_func, format_args = args[0], args[1:] if len(args) > 1 else ()
-                log('格式化入参', *format_args)
                 # 执行格式化
                 format_func(sheet, *format_args)
-                log(f"批量操作：格式化工作表 {sheet_name}")
-
-            elif operation_type == 'delete':
-                pass
-                delete_sheet_if_exists(wb, sheet_name)
 
             elif operation_type == 'move':
-                pass
+                log(f'移动sheet: {sheet_name}')
                 position = args[0]
                 move_sheet_to_position(wb, sheet_name, position)
 
             elif operation_type == 'active':
-                pass
+                log(f'激活sheet: {sheet_name}')
                 sheet.activate()
 
         # 保存所有更改
         wb.save()
-        log(f"批量操作完成: {excel_path}")
         return True
 
     except Exception as e:
-        log(f"批量操作失败: {e}")
+        log(f"单批次操作失败: {e}")
         return False
     finally:
         # 释放锁但不关闭 Excel（保持复用）

{qrpa-1.0.27 → qrpa-1.0.29}/qrpa/shein_excel.py

@@ -1426,6 +1426,13 @@ class SheinExcel:
         ))
         batch_excel_operations(excel_path, operations)
 
+    # 添加月度sheet操作 - 自定义操作函数
+    def write_monthly_data(self, sheet, data, name):
+        # 写入数据到A5位置（月度数据从A列开始）
+        sheet.range('A5').value = data
+        # 设置标题
+        sheet.range('A1').value = f'{name}SHEIN{TimeUtils.get_current_month()}月店铺数据'
+
     def write_sales_data(self):
         yesterday = TimeUtils.get_yesterday()
         model = SheinStoreSalesDetailManager(self.config.database_url)
@@ -1464,7 +1471,7 @@ class SheinExcel:
         sheet_name_first = 'SHEIN销售部每日店铺情况'
 
         # 准备批量操作列表
-        operations = []
+        base_operations = []
 
         # 添加每日汇总sheet的操作 - 自定义操作函数
         def write_daily_data(sheet):
@@ -1475,13 +1482,16 @@ class SheinExcel:
             # 设置日期和合并
             sheet.range('A4').value = f'{TimeUtils.format_date_cross_platform(yesterday)}\n({TimeUtils.get_chinese_weekday(yesterday)})'
 
-        operations.append((sheet_name_first, 'format', write_daily_data))
-        operations.append((sheet_name_first, 'format', self._format_daily_summary_sheet, yesterday, len(data_day)))
-        operations.append(('Sheet1', 'delete'))
-        operations.append((sheet_name_first, 'move', 1))
+        base_operations.append((sheet_name_first, 'format', write_daily_data))
+        base_operations.append((sheet_name_first, 'format', self._format_daily_summary_sheet, yesterday, len(data_day)))
+        base_operations.append((sheet_name_first, 'move', 1))
+        base_operations.append(('Sheet1', 'delete'))
 
         # 获取店铺列表并准备月度数据
         store_list = model.get_distinct_store_sales_list()
+
+        # 准备所有店铺的数据
+        store_operations_data = []
         for store in store_list:
             store_username = store[0]
             store_name = dict_store_name.get(store_username)
@@ -1512,18 +1522,22 @@ class SheinExcel:
                 # store_data.append(record.remark)  # 月度数据不包含备注列，保持19列
                 data_month.append(store_data)
 
-            # 添加月度sheet操作 - 自定义操作函数
-            def write_monthly_data(sheet, data=data_month, name=store_name):
-                # 写入数据到A5位置（月度数据从A列开始）
-                sheet.range('A5').value = data
-                # 设置标题
-                sheet.range('A1').value = f'{name}SHEIN{TimeUtils.get_current_month()}月店铺数据'
+            store_operations_data.append((store_name, data_month))
+
+        # 构建所有操作列表
+        operations = base_operations.copy()
 
-            operations.append((store_name, 'format', write_monthly_data))
-            operations.append((store_name, 'format', self._format_store_monthly_sheet, store_name, len(data_month)))
+        # 添加店铺操作
+        for store_name, data_month in store_operations_data:
+            # 清理店铺名称
+            clean_store_name = self._clean_sheet_name(store_name)
+            operations.append((clean_store_name, 'format', self.write_monthly_data, data_month, clean_store_name))
+            operations.append((clean_store_name, 'format', self._format_store_monthly_sheet, clean_store_name, len(data_month)))
 
-        # 执行批量操作
+        # 添加最后激活操作
         operations.append((sheet_name_first, 'active'))
+
+        # 执行批量操作（内部会自动分批处理）
         success = batch_excel_operations(excel_path, operations)
 
         if success:
@@ -1533,6 +1547,30 @@ class SheinExcel:
         else:
             log(f"销售数据写入失败: {excel_path}")
 
+    def _clean_sheet_name(self, name):
+        """
+        清理工作表名称，移除Excel不支持的字符
+        """
+        if not name:
+            return "DefaultSheet"
+
+        # Excel工作表名称限制：不能包含 [ ] : * ? / \ 字符，且长度不超过31字符
+        invalid_chars = ['[', ']', ':', '*', '?', '/', '\\']
+        clean_name = name
+
+        for char in invalid_chars:
+            clean_name = clean_name.replace(char, '_')
+
+        # 限制长度为31字符
+        if len(clean_name) > 31:
+            clean_name = clean_name[:28] + "..."
+
+        # 确保不为空
+        if not clean_name.strip():
+            clean_name = "Sheet"
+
+        return clean_name
+
     def _format_daily_summary_sheet(self, sheet, yesterday, data_length):
         """格式化每日汇总sheet"""
         las_row = data_length + 4  # 数据从第5行开始，4行header

{qrpa-1.0.27 → qrpa-1.0.29}/qrpa/temu_excel.py

@@ -3,6 +3,7 @@ from .fun_base import log
 from .fun_file import read_dict_from_file, read_dict_from_file_ex, write_dict_to_file, write_dict_to_file_ex, delete_file
 from .time_utils import TimeUtils
 from .wxwork import WxWorkBot
+import os
 
 class TemuExcel:
 
@@ -47,9 +48,9 @@ class TemuExcel:
         autofit_column(sheet, ['店铺名称', '商品信息'])
         column_to_left(sheet, ['商品信息'])
         InsertImageV2(sheet, ['SKC图片', 'SKU图片'], 'temu', 120)
-        if sheet.used_range.rows.count > 330:
-            log('表格数据行数超过了330行,将删除SKC图片')
-            remove_excel_columns(sheet, ['SKC图片'])
+        # if sheet.used_range.rows.count > 330:
+        #     log('表格数据行数超过了330行,将删除SKC图片')
+        #     remove_excel_columns(sheet, ['SKC图片'])
 
     def write_purchase_advise(self, erp='mb'):
         cache_file = f'{self.config.auto_dir}/temu/cache/warehouse_list_{TimeUtils.today_date()}.json'
@@ -59,19 +60,23 @@ class TemuExcel:
 
         header = ['店铺名称', 'SKC图片', 'SKU图片', '商品信息', '现有库存数量', '已采购数量', '近7日销量', '平均日销', '本地和采购可售天数', '生产天数', '建议采购', '产品起定量', '备货周期(天)', 'SKC', '导出时间']
         new_excel_path_list = []
+        
         for mall_id, subOrderList in dict.items():
             excel_data = []
             mall_name = store_info.get(mall_id)[1]
+            
             for product in subOrderList:
                 spu = str(product['productId'])  # temu平台 spu_id
                 skc = str(product['productSkcId'])  # temu平台 skc_id
                 skcExtCode = product['skcExtCode']  # 商家 SKC货号
                 category = product['category']  # 叶子类目
                 onSalesDurationOffline = product['onSalesDurationOffline']  # 加入站点时长
+                
                 for sku in product['skuQuantityDetailList']:
                     priceReviewStatus = sku['priceReviewStatus']
                     if priceReviewStatus == 3:  # 过滤 开款价格状态 已作废的  2是已生效
                         continue
+                    
                     mall_info = f'{mall_name}\n{mall_id}'
                     productSkcPicture = product['productSkcPicture']  # skc图片
                     skuExtCode = str(sku['skuExtCode'])  # sku货号
@@ -98,15 +103,37 @@ class TemuExcel:
                     row_item.append(TimeUtils.current_datetime())
                     excel_data.append(row_item)
 
-            new_excel_path = str(self.config.excel_purcase_advice_temu).replace('#store_name#', mall_name).replace(' ', '_')
-            new_excel_path_list.append(new_excel_path)
-            sheet_name = 'Sheet1'
-            data = [header] + excel_data
-            close_excel_file(new_excel_path)
-            log(new_excel_path)
-            batch_excel_operations(new_excel_path, [
-                (sheet_name, 'write', sort_by_column(data, 6, 1), ['N']),
-                (sheet_name, 'format', self.format_purchase_advise_batch)
-            ])
+            # 按近7日销量排序
+            excel_data = sort_by_column(excel_data, 6, 1)
+            
+            # 计算需要多少个文件（每个文件最多320行数据，包含表头）
+            max_data_rows = 320 - 1  # 减去表头行
+            total_files = (len(excel_data) + max_data_rows - 1) // max_data_rows  # 通过加(max_data_rows-1)实现向上取整
+            
+            for file_index in range(total_files):
+                start_idx = file_index * max_data_rows
+                end_idx = min((file_index + 1) * max_data_rows, len(excel_data))
+                current_data = excel_data[start_idx:end_idx]
+                
+                # 生成文件名，如果超过一个文件则添加序号
+                if total_files == 1:
+                    new_excel_path = str(self.config.excel_purcase_advice_temu).replace('#store_name#', mall_name).replace(' ', '_')
+                else:
+                    # 在文件名后添加 _2, _3 等序号
+                    base_path = str(self.config.excel_purcase_advice_temu).replace('#store_name#', mall_name).replace(' ', '_')
+                    file_name, file_ext = os.path.splitext(base_path)
+                    new_excel_path = f"{file_name}_{file_index + 1}{file_ext}"
+                
+                new_excel_path_list.append(new_excel_path)
+                sheet_name = 'Sheet1'
+                data = [header] + current_data
+                
+                close_excel_file(new_excel_path)
+                log(f"创建文件: {new_excel_path}, 数据行数: {len(current_data)}")
+                
+                batch_excel_operations(new_excel_path, [
+                    (sheet_name, 'write', data, ['N']),
+                    (sheet_name, 'format', self.format_purchase_advise_batch)
+                ])
 
         return new_excel_path_list

{qrpa-1.0.27 → qrpa-1.0.29}/qrpa/wxwork.py

@@ -1,318 +1,318 @@
-# -*- coding: utf-8 -*-
-"""
--------------------------------------------------
-@version    : v1.0
-@author     : qsir
-@contact    : qsir@vxnote.com
-@software   : PyCharm
-@filename   : wxwork.py
-@create time: 2025/08/03 
-@modify time: 2025/08/03 
-@describe   : 
--------------------------------------------------
-"""
-import json
-import os
-import hashlib
-import base64
-import requests
-from requests_toolbelt import MultipartEncoder
-from datetime import datetime
-
-# 通过企微群机器人发送消息
-class WxWorkBot:
-    def __init__(self, key):
-        self.key = key
-
-    def upload_media(self, filepath):
-        """
-        上传临时素材，给企微群里发文件消息时需要先将文件上传至企微临时素材中
-        :param filepath:
-        :return: 临时素材的media_id
-        """
-        try:
-            headers = {
-                'Content-Type': 'multipart/form-data',
-            }
-            with open(filepath, 'rb') as f:
-                files = {
-                    'media': (os.path.basename(filepath), f.read())
-                }
-                response = requests.post(
-                    f'https://qyapi.weixin.qq.com/cgi-bin/webhook/upload_media?key={self.key}&type=file',
-                    headers=headers, files=files)
-                response_text = json.loads(response.text)
-                if str(response_text.get('errcode')) != '0':
-                    raise Exception(response_text)
-                if response.status_code == 200:
-                    result = json.loads(response.text)
-                    return result['media_id']
-                else:
-                    print("HTTP Error:", response.status_code)
-                    return None
-        except Exception as err:
-            raise Exception("upload_media error", err)
-
-    def send_file(self, file_path):
-        if not os.path.exists(file_path):
-            print('文件不存在: ', file_path)
-            return
-        """
-        发送文件到群里
-        :param file_path:
-        :return:
-        """
-        media_id = self.upload_media(file_path)
-        data = {
-            "msgtype": "file",
-            "file"   : {
-                "media_id": media_id
-            }
-        }
-        return self.send_msg(data)
-
-    def send_text(self, content, mentioned_list=None, mentioned_mobile_list=None):
-        """
-        发送文本消息
-        :param content:
-        :param mentioned_list: 需要@的人userid
-        :param mentioned_mobile_list: 需要@的人手机号
-        :return:
-        """
-        data = {
-            "msgtype": "text",
-            "text"   : {
-                "content": content
-            }
-        }
-        if mentioned_list is not None and mentioned_list:
-            data['text'].update({"mentioned_list": mentioned_list})
-        if mentioned_mobile_list is not None and mentioned_mobile_list:
-            data['text'].update({"mentioned_mobile_list": mentioned_mobile_list})
-
-        self.send_msg(data)
-
-    def send_markdown(self, content):
-        """
-        发送Markdown消息
-        :param content:
-        :return:
-        """
-        data = {
-            "msgtype" : "markdown",
-            "markdown": {
-                "content": content
-            }
-        }
-        self.send_msg(data)
-
-    def send_notify(self, title, sub_title_list, data_list):
-        """
-        发送Markdown消息
-        :param content:
-        :return:
-        """
-
-        current_date = datetime.now().strftime("%Y-%m-%d")
-        header = f"{current_date} {title}\n\n"
-
-        arr_color = ['warning', 'info', 'warning']
-        arr_sub_header = [f"<font color='{arr_color[index]}'>{title}</font>" for index, title in enumerate(sub_title_list)]
-        sub_header = "\t".join(arr_sub_header) + "\n\n"
-
-        # 获取每个元素的行索引和列索引
-        arr_content = [
-            [
-                f'{value}' if col_idx == 0 else f"<font color='{arr_color[col_idx - 1]}'>{value}</font>"
-                for col_idx, value in enumerate(row)
-            ]  # 每行的元素组成一个子列表
-            for row_idx, row in enumerate(data_list)  # 外层循环控制行
-        ]
-        # 将二维数组转换为字符串
-        content = "\n".join(
-            # 对每行的元素列表使用 join()，用 \t 连接
-            "\t".join(row) for row in arr_content
-        )
-
-        data = {
-            "msgtype" : "markdown",
-            "markdown": {
-                "content": header + sub_header + content
-            }
-        }
-        self.send_msg(data)
-
-    def send_img(self, img_path):
-        """
-        发送图片消息
-        图片（base64编码前）最大不能超过2M，支持JPG,PNG格式
-        :param img_path:
-        :return:
-        """
-        data = {
-            "msgtype": "image",
-            "image"  : {
-                "base64": self.img_to_base64(img_path),
-                "md5"   : self.img_to_md5(img_path)
-            }
-        }
-        self.send_msg(data)
-
-    def send_news(self, title, description, url, picurl):
-        """
-        发送图文消息
-        :param title: 标题
-        :param description: 描述
-        :param url: 跳转URL
-        :param picurl: 图文图片地址
-        :return:
-        """
-        data = {
-            "msgtype": "news",
-            "news"   : {
-                "articles": [
-                    {
-                        "title"      : title,
-                        "description": description,
-                        "url"        : url,
-                        "picurl"     : picurl
-                    }
-                ]
-            }
-        }
-        self.send_msg(data)
-
-    def send_msg(self, data):
-        """
-        发送机器人通用消息到企微群
-        :param data: 消息内容json数据
-        :return:
-        """
-        try:
-            header = {
-                "Content-Type": "application/json"
-            }
-            response = requests.post(f"https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={self.key}", headers=header, data=json.dumps(data))
-            response_text = json.loads(response.text)
-            if str(response_text.get('errcode')) != '0':
-                raise Exception(response_text)
-            if response.status_code == 200:
-                result = json.loads(response.text)
-                return result
-            else:
-                print("HTTP Error:", response.status_code)
-                return None
-        except Exception as err:
-            raise Exception("Send Chat Message error", err)
-
-    def img_to_md5(self, img_path):
-        # 读取图片文件并计算MD5值
-        with open(img_path, 'rb') as image_file:
-            image_data = image_file.read()
-            return hashlib.md5(image_data).hexdigest()
-
-    def img_to_base64(self, img_path):
-        # 读取图片文件并转换为Base64编码
-        with open(img_path, 'rb') as image_file:
-            image_data = image_file.read()
-            return base64.b64encode(image_data).decode('utf-8')
-
-# 通过企微应用发送消息
-class WxWorkAppBot:
-    def __init__(self, corpid, corpsecret, agentid):
-        self.corpid = corpid
-        self.corpsecret = corpsecret
-        self.agentid = agentid
-        self.access_token = self._getToken()
-
-    def _getToken(self):
-        try:
-            if all([self.corpid, self.corpsecret]):
-                url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid={corpid}&corpsecret={corpsecret}".format(
-                    corpid=self.corpid, corpsecret=self.corpsecret)
-                response = requests.get(url)
-                if response.status_code == 200:
-                    result = json.loads(response.text)
-                    return result['access_token']
-                else:
-                    print("HTTP Error:", response.status_code)
-                    return None
-        except Exception as err:
-            raise Exception("get WeChat access Token error", err)
-
-    def _send_msg(self, data):
-        self._check_token()
-        try:
-            send_url = "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token={access_token}".format(
-                access_token=self.access_token)
-            response = requests.post(send_url, json.dumps(data))
-            if response.status_code == 200:
-                result = json.loads(response.text)
-                return result
-            else:
-                print("HTTP Error:", response.status_code)
-                return None
-        except Exception as err:
-            raise Exception("send WeChat Message error", err)
-
-    def _check_token(self):
-        if self.access_token is None:
-            self._getToken()
-
-    def send_msg(self, data):
-        return self._send_msg(data)
-
-    def upload_media(self, filetype, filepath, filename):
-        """
-        上传临时素材到企微并获取media_id
-        :param filetype: 图片（image）、语音（voice）、视频（video），普通文件（file）
-        :param filepath:
-        :param filename:
-        :return: media_id
-        """
-        try:
-            self._check_token()
-            post_file_url = "https://qyapi.weixin.qq.com/cgi-bin/media/upload?access_token={access_token}&type={filetype}".format(
-                filetype=filetype,
-                access_token=self.access_token)
-
-            m = MultipartEncoder(
-                fields={filename: (filename, open(filepath + filename, 'rb'), 'text/plain')},
-            )
-            response = requests.post(url=post_file_url, data=m, headers={'Content-Type': m.content_type})
-            if response.status_code == 200:
-                result = json.loads(response.text)
-                return result['media_id']
-            else:
-                print("HTTP Error:", response.status_code)
-                return None
-        except Exception as err:
-            raise Exception("upload media error", err)
-
-    def get_media(self, media_id):
-        """
-        获取临时素材
-        :param media_id:
-        :return: 返回二进制形式
-        """
-        try:
-            self._check_token()
-            url = "https://qyapi.weixin.qq.com/cgi-bin/media/get"
-            params = {
-                "access_token": self.access_token,
-                "media_id"    : media_id
-            }
-            response = requests.get(url=url, params=params)
-            if response.status_code == 200:
-                content_type = response.headers.get('Content-Type')
-                if content_type == 'application/json':
-                    response_data = json.loads(response.text)
-                    print("Error:", response_data.get("errmsg"))
-                    return None
-                else:
-                    return response.content
-            else:
-                print("HTTP Error:", response.status_code)
-                return None
-        except Exception as err:
-            raise Exception("get media error", err)
+# -*- coding: utf-8 -*-
+"""
+-------------------------------------------------
+@version    : v1.0
+@author     : qsir
+@contact    : qsir@vxnote.com
+@software   : PyCharm
+@filename   : wxwork.py
+@create time: 2025/08/03 
+@modify time: 2025/08/03 
+@describe   : 
+-------------------------------------------------
+"""
+import json
+import os
+import hashlib
+import base64
+import requests
+from requests_toolbelt import MultipartEncoder
+from datetime import datetime
+
+# 通过企微群机器人发送消息
+class WxWorkBot:
+    def __init__(self, key):
+        self.key = key
+
+    def upload_media(self, filepath):
+        """
+        上传临时素材，给企微群里发文件消息时需要先将文件上传至企微临时素材中
+        :param filepath:
+        :return: 临时素材的media_id
+        """
+        try:
+            headers = {
+                'Content-Type': 'multipart/form-data',
+            }
+            with open(filepath, 'rb') as f:
+                files = {
+                    'media': (os.path.basename(filepath), f.read())
+                }
+                response = requests.post(
+                    f'https://qyapi.weixin.qq.com/cgi-bin/webhook/upload_media?key={self.key}&type=file',
+                    headers=headers, files=files)
+                response_text = json.loads(response.text)
+                if str(response_text.get('errcode')) != '0':
+                    raise Exception(response_text)
+                if response.status_code == 200:
+                    result = json.loads(response.text)
+                    return result['media_id']
+                else:
+                    print("HTTP Error:", response.status_code)
+                    return None
+        except Exception as err:
+            raise Exception("upload_media error", err)
+
+    def send_file(self, file_path):
+        if not os.path.exists(file_path):
+            print('文件不存在: ', file_path)
+            return
+        """
+        发送文件到群里
+        :param file_path:
+        :return:
+        """
+        media_id = self.upload_media(file_path)
+        data = {
+            "msgtype": "file",
+            "file"   : {
+                "media_id": media_id
+            }
+        }
+        return self.send_msg(data)
+
+    def send_text(self, content, mentioned_list=None, mentioned_mobile_list=None):
+        """
+        发送文本消息
+        :param content:
+        :param mentioned_list: 需要@的人userid
+        :param mentioned_mobile_list: 需要@的人手机号
+        :return:
+        """
+        data = {
+            "msgtype": "text",
+            "text"   : {
+                "content": content
+            }
+        }
+        if mentioned_list is not None and mentioned_list:
+            data['text'].update({"mentioned_list": mentioned_list})
+        if mentioned_mobile_list is not None and mentioned_mobile_list:
+            data['text'].update({"mentioned_mobile_list": mentioned_mobile_list})
+
+        self.send_msg(data)
+
+    def send_markdown(self, content):
+        """
+        发送Markdown消息
+        :param content:
+        :return:
+        """
+        data = {
+            "msgtype" : "markdown",
+            "markdown": {
+                "content": content
+            }
+        }
+        self.send_msg(data)
+
+    def send_notify(self, title, sub_title_list, data_list):
+        """
+        发送Markdown消息
+        :param content:
+        :return:
+        """
+
+        current_date = datetime.now().strftime("%Y-%m-%d")
+        header = f"{current_date} {title}\n\n"
+
+        arr_color = ['warning', 'info', 'warning']
+        arr_sub_header = [f"<font color='{arr_color[index]}'>{title}</font>" for index, title in enumerate(sub_title_list)]
+        sub_header = "\t".join(arr_sub_header) + "\n\n"
+
+        # 获取每个元素的行索引和列索引
+        arr_content = [
+            [
+                f'{value}' if col_idx == 0 else f"<font color='{arr_color[col_idx - 1]}'>{value}</font>"
+                for col_idx, value in enumerate(row)
+            ]  # 每行的元素组成一个子列表
+            for row_idx, row in enumerate(data_list)  # 外层循环控制行
+        ]
+        # 将二维数组转换为字符串
+        content = "\n".join(
+            # 对每行的元素列表使用 join()，用 \t 连接
+            "\t".join(row) for row in arr_content
+        )
+
+        data = {
+            "msgtype" : "markdown",
+            "markdown": {
+                "content": header + sub_header + content
+            }
+        }
+        self.send_msg(data)
+
+    def send_img(self, img_path):
+        """
+        发送图片消息
+        图片（base64编码前）最大不能超过2M，支持JPG,PNG格式
+        :param img_path:
+        :return:
+        """
+        data = {
+            "msgtype": "image",
+            "image"  : {
+                "base64": self.img_to_base64(img_path),
+                "md5"   : self.img_to_md5(img_path)
+            }
+        }
+        self.send_msg(data)
+
+    def send_news(self, title, description, url, picurl):
+        """
+        发送图文消息
+        :param title: 标题
+        :param description: 描述
+        :param url: 跳转URL
+        :param picurl: 图文图片地址
+        :return:
+        """
+        data = {
+            "msgtype": "news",
+            "news"   : {
+                "articles": [
+                    {
+                        "title"      : title,
+                        "description": description,
+                        "url"        : url,
+                        "picurl"     : picurl
+                    }
+                ]
+            }
+        }
+        self.send_msg(data)
+
+    def send_msg(self, data):
+        """
+        发送机器人通用消息到企微群
+        :param data: 消息内容json数据
+        :return:
+        """
+        try:
+            header = {
+                "Content-Type": "application/json"
+            }
+            response = requests.post(f"https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={self.key}", headers=header, data=json.dumps(data))
+            response_text = json.loads(response.text)
+            if str(response_text.get('errcode')) != '0':
+                raise Exception(response_text)
+            if response.status_code == 200:
+                result = json.loads(response.text)
+                return result
+            else:
+                print("HTTP Error:", response.status_code)
+                return None
+        except Exception as err:
+            raise Exception("Send Chat Message error", err)
+
+    def img_to_md5(self, img_path):
+        # 读取图片文件并计算MD5值
+        with open(img_path, 'rb') as image_file:
+            image_data = image_file.read()
+            return hashlib.md5(image_data).hexdigest()
+
+    def img_to_base64(self, img_path):
+        # 读取图片文件并转换为Base64编码
+        with open(img_path, 'rb') as image_file:
+            image_data = image_file.read()
+            return base64.b64encode(image_data).decode('utf-8')
+
+# 通过企微应用发送消息
+class WxWorkAppBot:
+    def __init__(self, corpid, corpsecret, agentid):
+        self.corpid = corpid
+        self.corpsecret = corpsecret
+        self.agentid = agentid
+        self.access_token = self._getToken()
+
+    def _getToken(self):
+        try:
+            if all([self.corpid, self.corpsecret]):
+                url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid={corpid}&corpsecret={corpsecret}".format(
+                    corpid=self.corpid, corpsecret=self.corpsecret)
+                response = requests.get(url)
+                if response.status_code == 200:
+                    result = json.loads(response.text)
+                    return result['access_token']
+                else:
+                    print("HTTP Error:", response.status_code)
+                    return None
+        except Exception as err:
+            raise Exception("get WeChat access Token error", err)
+
+    def _send_msg(self, data):
+        self._check_token()
+        try:
+            send_url = "https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token={access_token}".format(
+                access_token=self.access_token)
+            response = requests.post(send_url, json.dumps(data))
+            if response.status_code == 200:
+                result = json.loads(response.text)
+                return result
+            else:
+                print("HTTP Error:", response.status_code)
+                return None
+        except Exception as err:
+            raise Exception("send WeChat Message error", err)
+
+    def _check_token(self):
+        if self.access_token is None:
+            self._getToken()
+
+    def send_msg(self, data):
+        return self._send_msg(data)
+
+    def upload_media(self, filetype, filepath, filename):
+        """
+        上传临时素材到企微并获取media_id
+        :param filetype: 图片（image）、语音（voice）、视频（video），普通文件（file）
+        :param filepath:
+        :param filename:
+        :return: media_id
+        """
+        try:
+            self._check_token()
+            post_file_url = "https://qyapi.weixin.qq.com/cgi-bin/media/upload?access_token={access_token}&type={filetype}".format(
+                filetype=filetype,
+                access_token=self.access_token)
+
+            m = MultipartEncoder(
+                fields={filename: (filename, open(filepath + filename, 'rb'), 'text/plain')},
+            )
+            response = requests.post(url=post_file_url, data=m, headers={'Content-Type': m.content_type})
+            if response.status_code == 200:
+                result = json.loads(response.text)
+                return result['media_id']
+            else:
+                print("HTTP Error:", response.status_code)
+                return None
+        except Exception as err:
+            raise Exception("upload media error", err)
+
+    def get_media(self, media_id):
+        """
+        获取临时素材
+        :param media_id:
+        :return: 返回二进制形式
+        """
+        try:
+            self._check_token()
+            url = "https://qyapi.weixin.qq.com/cgi-bin/media/get"
+            params = {
+                "access_token": self.access_token,
+                "media_id"    : media_id
+            }
+            response = requests.get(url=url, params=params)
+            if response.status_code == 200:
+                content_type = response.headers.get('Content-Type')
+                if content_type == 'application/json':
+                    response_data = json.loads(response.text)
+                    print("Error:", response_data.get("errmsg"))
+                    return None
+                else:
+                    return response.content
+            else:
+                print("HTTP Error:", response.status_code)
+                return None
+        except Exception as err:
+            raise Exception("get media error", err)

{qrpa-1.0.27 → qrpa-1.0.29}/qrpa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.0.27
+Version: 1.0.29
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>