qrpa 1.0.22__tar.gz → 1.0.24__tar.gz

{qrpa-1.0.22 → qrpa-1.0.24}/PKG-INFO

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

{qrpa-1.0.22 → qrpa-1.0.24}/pyproject.toml

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

{qrpa-1.0.22 → qrpa-1.0.24}/qrpa/__init__.py

@@ -3,7 +3,7 @@ from .db_migrator import DatabaseMigrator, DatabaseConfig, RemoteConfig, create_
 
 from .shein_ziniao import ZiniaoRunner
 
-from .fun_base import log, send_exception, md5_string, hostname, get_safe_value, sanitize_filename
+from .fun_base import log, send_exception, md5_string, hostname, get_safe_value, sanitize_filename, get_file_size, calculate_star_symbols
 
 from .time_utils import TimeUtils
 
@@ -18,3 +18,7 @@ from .shein_excel import SheinExcel
 from .shein_lib import SheinLib
 
 from .fun_excel import InsertImageV2
+
+from .temu_lib import TemuLib
+from .temu_excel import TemuExcel
+from .temu_chrome import temu_chrome_excute

{qrpa-1.0.22 → qrpa-1.0.24}/qrpa/fun_base.py

@@ -105,3 +105,41 @@ def copy_file(source, destination):
         print(f"错误：没有权限复制到 '{destination}'")
     except Exception as e:
         print(f"错误：发生未知错误 - {e}")
+
+def get_file_size(file_path, human_readable=False):
+    """
+    获取文件大小
+
+    :param file_path: 文件路径
+    :param human_readable: 是否返回可读格式（KB, MB, GB）
+    :return: 文件大小（字节数或可读格式）
+    """
+    if not os.path.isfile(file_path):
+        raise FileNotFoundError(f"文件不存在: {file_path}")
+
+    size_bytes = os.path.getsize(file_path)
+
+    if not human_readable:
+        return size_bytes
+
+    # 转换为可读单位
+    units = ["B", "KB", "MB", "GB", "TB"]
+    size = float(size_bytes)
+    for unit in units:
+        if size < 1024:
+            return f"{size:.2f} {unit}"
+        size /= 1024
+
+def calculate_star_symbols(rating):
+    """
+    计算星级对应的符号组合（独立评分逻辑函数）
+    参数:
+    rating (int): 标准化评分（0-5）
+    返回:
+    str: 星级符号字符串（如★★★⭐☆）
+    """
+    full_stars = int(rating)
+    empty_stars = 5 - full_stars
+    star_string = '★' * full_stars
+    star_string += '☆' * empty_stars
+    return star_string

{qrpa-1.0.22 → qrpa-1.0.24}/qrpa/fun_excel.py

@@ -12,6 +12,7 @@ import concurrent.futures
 from collections import defaultdict
 import threading
 from playwright.sync_api import sync_playwright
+import psutil
 
 from .fun_base import log, sanitize_filename, create_file_path, copy_file, add_https, send_exception
 
@@ -89,13 +90,13 @@ def set_cell_prefix_red(cell, n, color_name):
     except Exception as e:
         print(f"设置字体颜色失败: {e}")
 
-def sort_by_column(data, col_index, start_row=2, reverse=True):
-    if not data or start_row >= len(data):
+def sort_by_column(data, col_index, header_rows=2, reverse=True):
+    if not data or header_rows >= len(data):
         return data
 
     try:
-        header = data[:start_row]
-        new_data_sorted = data[start_row:]
+        header = data[:header_rows]
+        new_data_sorted = data[header_rows:]
 
         def get_key(row):
             value = row[col_index]
@@ -541,11 +542,11 @@ def insert_fixed_scale_image(sheet, cell, image_path, scale=1.0):
 
     return None
 
-def InsertImageV2(app, wb, sheet, columns=None, platform='shein', img_width=150, img_save_key=None, dir_name=None, cell_height_with_img=False):
+def InsertImageV2(sheet, columns=None, platform='shein', img_width=150, img_save_key=None, dir_name=None, cell_height_with_img=False):
     if not columns:
         return
 
-    minimize(app)
+    minimize(sheet.book.app)
 
     # 清空所有图片
     clear_all_pictures(sheet)
@@ -1162,6 +1163,9 @@ def check_data(data):
         log(len(row), row)
 
 def write_data(excel_path, sheet_name, data, format_to_text_colunm=None):
+    log('write_data入参:', excel_path, sheet_name, 'data', format_to_text_colunm)
+    close_excel_file(excel_path)
+
     app, wb, sheet = open_excel(excel_path, sheet_name)
     # 清空工作表中的所有数据
     sheet.clear()
@@ -1174,8 +1178,8 @@ def write_data(excel_path, sheet_name, data, format_to_text_colunm=None):
     wb.save()
     close_excel(app, wb)
 
-def colorize_by_field(app, wb, sheet, field):
-    minimize(app)
+def colorize_by_field(sheet, field):
+    minimize(sheet.book.app)
     # 读取数据
     field_column = find_column_by_data(sheet, 1, field)  # 假设 SPU 在 C 列
     if field_column is None:
@@ -2405,6 +2409,7 @@ def format_excel_with_lock(excel_path, sheet_name, format_func, *args, **kwargs)
         log(f"格式化失败: {e}")
         return False
 
+# 经过观察 fortmat时 传入函数需要为类函数且第二个参数必须是 sheet
 def batch_excel_operations(excel_path, operations):
     """
     批量 Excel 操作函数，一次性打开 Excel 执行多个操作
@@ -2439,21 +2444,36 @@ def batch_excel_operations(excel_path, operations):
             sheet.activate()
 
             if operation_type == 'write':
-                data, format_to_text_colunm = args[:2]
+                data, format_to_text_colunm = args[0], args[1:] if len(args) > 1 else None
                 # 清空工作表
                 sheet.clear()
                 # 格式化文本列
-                format_to_text_v2(sheet, format_to_text_colunm)
+                if format_to_text_colunm:
+                    format_to_text_v2(sheet, format_to_text_colunm)
                 # 写入数据
                 sheet.range('A1').value = data
                 log(f"批量操作：写入数据到 {sheet_name}")
 
             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
+                position = args[0]
+                move_sheet_to_position(wb, sheet_name, position)
+
+            elif operation_type == 'active':
+                pass
+                sheet.activate()
+
         # 保存所有更改
         wb.save()
         log(f"批量操作完成: {excel_path}")
@@ -2465,6 +2485,26 @@ def batch_excel_operations(excel_path, operations):
     finally:
         # 释放锁但不关闭 Excel（保持复用）
         excel_lock_manager.release_excel_lock(excel_path)
+        close_excel_with_lock(excel_path, app, wb, True)
+
+def close_excel_file(file_path):
+    file_path = os.path.abspath(file_path).lower()
+
+    for proc in psutil.process_iter(['pid', 'name']):
+        if proc.info['name'] and proc.info['name'].lower() in ['excel.exe', 'wps.exe']:  # 只找 Excel
+            try:
+                for f in proc.open_files():
+                    if os.path.abspath(f.path).lower() == file_path:
+                        print(f"文件被 Excel 占用 (PID: {proc.pid})，正在关闭进程...")
+                        proc.terminate()
+                        proc.wait(timeout=3)
+                        print("已关闭。")
+                        return True
+            except (psutil.NoSuchProcess, psutil.AccessDenied):
+                continue
+
+    print("文件没有被 Excel 占用。")
+    return False
 
 def force_close_excel_file(excel_path):
     """

{qrpa-1.0.22 → qrpa-1.0.24}/qrpa/shein_daily_report_model.py

@@ -365,7 +365,7 @@ class SheinStoreSalesDetailManager:
             # 如果发生错误，回滚事务
             session.rollback()
             print(f"插入数据时发生错误: {e}")
-            raise
+            #raise
         finally:
             # 关闭会话
             session.close()