qrpa 1.0.28__py3-none-any.whl → 1.0.30__py3-none-any.whl

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/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/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/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/shein_lib.py

@@ -1611,6 +1611,9 @@ class SheinLib:
 
         spu_list = response_text['info']['list']
 
+        skc_list = [item['skc'] for item in spu_list]
+        self.get_sku_price_v2(skc_list)
+
         total = response_text['info']['count']
         totalPage = math.ceil(total / pageSize)
         for page in range(2, totalPage + 1):
@@ -1619,6 +1622,10 @@ class SheinLib:
             payload = dictPayload
             response_text = fetch(self.web_page, url, payload)
             spu_list_new = response_text['info']['list']
+
+            skc_list = [item['skc'] for item in spu_list_new]
+            self.get_sku_price_v2(skc_list)
+
             spu_list += spu_list_new
             time.sleep(0.3)
 

{qrpa-1.0.28.dist-info → qrpa-1.0.30.dist-info}/METADATA

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

{qrpa-1.0.28.dist-info → qrpa-1.0.30.dist-info}/RECORD

@@ -1,15 +1,15 @@
 qrpa/RateLimitedSender.py,sha256=hqvb1qspDFaW4RsLuVufylOrefkMgixANKeBaGEqYb4,1421
-qrpa/__init__.py,sha256=OMQjTO0rE2XDyxsM6wVeWfI1rKFyXRGO5oPU6iLqfoA,980
+qrpa/__init__.py,sha256=p4n9kXm1j9G-GWKDPWQa1WIyrDUeC33zeM27xky9otg,1019
 qrpa/db_migrator.py,sha256=2VmhzcMsU0MKpl-mNCwKyV8tLTqyEysSpP27-S_rQZ8,21862
-qrpa/feishu_bot_app.py,sha256=Pyxt8rBuHJl5KYZjLAwYbC48odUsWlKFNjWBwiUig8o,9482
+qrpa/feishu_bot_app.py,sha256=2oUEdfvROzFazKrNoZ0pRbww9YWSU9cTzTdwcCYS7Ug,9482
 qrpa/fun_base.py,sha256=qg6SvR-GEj2TclB1OL9eLu711jV-bysXJ5Eh2gW9pE8,10600
-qrpa/fun_excel.py,sha256=qGiTupcGJdZyVZL-LMxkZDTpOPhobzxZesU2Tr8iOl0,111619
+qrpa/fun_excel.py,sha256=gWRNZ44dVSfPkIV6baObI84Bk-CV35Eb4EtYVqre8xI,114220
 qrpa/fun_file.py,sha256=yzjDV16WL5vRys7J4uQcNzIFkX4D5MAlSCwxcD-mwQo,11966
 qrpa/fun_web.py,sha256=5QLQorAhRzMOGMRh4eCJ2UH8ZhVHvxkHwobWhmgU5qM,6286
 qrpa/fun_win.py,sha256=-LnTeocdTt72NVH6VgLdpAT9_C5oV9okeudXG6CftMA,8034
 qrpa/shein_daily_report_model.py,sha256=H8oZmIN5Pyqe306W1_xuz87lOqLQ_LI5RjXbaxDkIzE,12589
-qrpa/shein_excel.py,sha256=sRbUsEkFeQVGYsmhtK6nNaoSLdS0jLrm2bffhtQfFks,101399
-qrpa/shein_lib.py,sha256=rbrJDO48KoZZBlmlBotQpXp1i_zY2o6q9HN_9aVjAKI,101008
+qrpa/shein_excel.py,sha256=mDqnamzNi8e_T1RnTYZAJAeVhT3CDl9shBqZ1IetbSk,102632
+qrpa/shein_lib.py,sha256=A9sKidNf1NVFomXA3-UzckYjcpQx4QDIYvLVbQfHl3o,101218
 qrpa/shein_sqlite.py,sha256=ZQwD0Gz81q9WY7tY2HMEYvSF9r3N_G_Aur3bYfST9WY,5707
 qrpa/shein_ziniao.py,sha256=nSqqcEPh4nVQtUxUnIRzeZfTLyXywGPjPZn5pP-w57U,18309
 qrpa/temu_chrome.py,sha256=CbtFy1QPan9xJdJcNZj-EsVGhUvv3ZTEPVDEA4-im40,2803
@@ -18,7 +18,7 @@ qrpa/temu_lib.py,sha256=hYB59zsLS3m3NTic_duTwPMOTSxlHyQVa8OhHnHm-1g,7199
 qrpa/time_utils.py,sha256=ef0hhbN_6b-gcnz5ETIVOoxemIMvcxGVGGIRnHnGaBo,29564
 qrpa/time_utils_example.py,sha256=shHOXKKF3QSzb0SHsNc34M61wEkkLuM30U9X1THKNS8,8053
 qrpa/wxwork.py,sha256=Vy8PGEtlTWt4-1laVhuqpJUGCFH2JymgbjvH00aaBog,10946
-qrpa-1.0.28.dist-info/METADATA,sha256=9Ruc1VWX2khZoETKzoLTmxkRmQCdW3d2Ie0979gNQ_E,231
-qrpa-1.0.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qrpa-1.0.28.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
-qrpa-1.0.28.dist-info/RECORD,,
+qrpa-1.0.30.dist-info/METADATA,sha256=dvFOSHAXQhbMg8Kd3C8lXFgC17aPTxto1BZ10maRYTU,231
+qrpa-1.0.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qrpa-1.0.30.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
+qrpa-1.0.30.dist-info/RECORD,,