qrpa 1.0.90__tar.gz → 1.0.91__tar.gz

{qrpa-1.0.90 → qrpa-1.0.91}/PKG-INFO

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

{qrpa-1.0.90 → qrpa-1.0.91}/pyproject.toml

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

{qrpa-1.0.90 → qrpa-1.0.91}/qrpa/fun_excel.py

@@ -14,6 +14,9 @@ import threading
 from playwright.sync_api import sync_playwright
 import psutil
 
+import os, sys
+from pathlib import Path
+
 from .fun_base import log, sanitize_filename, create_file_path, copy_file, add_https, send_exception
 
 excel_color_index = {
@@ -195,13 +198,13 @@ def merge_by_column_v2(sheet, column_name, other_columns):
     # 更安全的数据获取方式，确保获取完整的数据范围
     last_row = get_last_row(sheet, col_letter)
     data = sheet.range(f'{col_letter}1:{col_letter}{last_row}').value
-    
+
     # 确保data是列表格式
     if not isinstance(data, list):
         data = [data]
-    
+
     log(f'数据范围: {col_letter}1:{col_letter}{last_row}, 数据长度: {len(data)}')
-    
+
     start_row = 2  # 从第2行开始，跳过表头
     merge_row_ranges = []  # 用来存储需要合并的行范围 (start_row, end_row)
 
@@ -211,13 +214,13 @@ def merge_by_column_v2(sheet, column_name, other_columns):
         col_name = find_column_by_data(sheet, 1, col)
         if col_name:
             all_columns.append(col_name)
-    
+
     log(f'需要合并的列: {all_columns}')
 
     # 遍历数据行，从第3行开始比较（因为第1行是表头，第2行是第一个数据行）
     for row in range(3, len(data) + 1):
-        log(f'查找 {row}/{len(data)}, 当前值: {data[row-1] if row-1 < len(data) else "超出范围"}, 前一个值: {data[row-2] if row-2 < len(data) else "超出范围"}')
-        
+        log(f'查找 {row}/{len(data)}, 当前值: {data[row - 1] if row - 1 < len(data) else "超出范围"}, 前一个值: {data[row - 2] if row - 2 < len(data) else "超出范围"}')
+
         # 检查值是否发生变化
         if row <= len(data) and data[row - 1] != data[row - 2]:
             # 值发生变化，处理前一组
@@ -233,7 +236,7 @@ def merge_by_column_v2(sheet, column_name, other_columns):
         merge_row_ranges.append((start_row, end_row))
 
     log(f'行合并范围: {merge_row_ranges}')
-    
+
     # 对每个行范围，在所有指定列中执行合并
     for start_row, end_row in merge_row_ranges:
         if start_row < end_row:  # 只有当开始行小于结束行时才合并（多行）
@@ -756,9 +759,33 @@ def download_images_concurrently(image_urls, platform='shein', img_save_dir=None
         results = list(executor.map(lambda url: download_img_v2(url, platform, img_save_path=img_save_dir), image_urls))
     return results
 
+def get_chromium_executable():
+    """
+    返回 Chromium 可执行文件路径，兼容 PyInstaller 打包后的 exe
+    """
+    # PyInstaller 临时目录
+    if getattr(sys, 'frozen', False):
+        base_path = Path(sys._MEIPASS)
+    else:
+        base_path = Path(__file__).parent
+
+    # 尝试查找打包后的浏览器文件
+    possible_path = base_path / "playwright" / "driver" / "package" / "chromium_headless_shell-1169" / "chrome-win" / "headless_shell.exe"
+    if possible_path.exists():
+        return str(possible_path)
+
+    # fallback: 系统 Playwright 安装目录
+    local_appdata = Path(os.environ.get("LOCALAPPDATA", ""))
+    fallback_path = local_appdata / "ms-playwright" / "chromium" / "chrome-win" / "chrome.exe"
+    if fallback_path.exists():
+        return str(fallback_path)
+
+    raise FileNotFoundError("Chromium 可执行文件未找到，请先执行 'playwright install' 下载浏览器。")
+
 def download_img_by_chrome(image_url, save_name):
+    chromium_path = get_chromium_executable()
     with sync_playwright() as p:
-        browser = p.chromium.launch(headless=True)  # 运行时可以看到浏览器
+        browser = p.chromium.launch(headless=True, executable_path=chromium_path)  # 运行时可以看到浏览器
         context = browser.new_context()
         page = context.new_page()
         # 直接通过Playwright下载图片

{qrpa-1.0.90 → qrpa-1.0.91}/qrpa/mysql_module/shein_product_model.py

@@ -64,6 +64,9 @@ class SheinProductSkc(Base):
     created_at = Column(DateTime, default=datetime.now, comment='创建时间')
     updated_at = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='更新时间')
 
+    # 用户备注字段（供后续web界面使用）
+    user_notes = Column(Text, nullable=True, comment='用户备注')
+
     # 定义索引
     __table_args__ = (
         Index('ix_skc_id', 'skc_id'),
@@ -108,6 +111,7 @@ class SheinProductSku(Base):
     price = Column(DECIMAL(10, 2), nullable=True, comment='价格')
     erp_cost_price = Column(DECIMAL(10, 2), nullable=True, comment='ERP成本价')
     erp_supplier_name = Column(String(100), nullable=True, comment='ERP默认供货商')
+    erp_stock = Column(Integer, nullable=True, comment='ERP库存')
 
     # 时间戳
     created_at = Column(DateTime, default=datetime.now, comment='创建时间')
@@ -218,10 +222,10 @@ class SheinProductManager:
         session = self.Session()
         try:
             for data in data_list:
-                
+
                 # 处理SKC数据
                 skc_record = self._upsert_skc_data(session, data)
-                
+
                 # 处理SKU数据
                 for sku_data in data.get('skuList', []):
                     sku_data['local_skc_id'] = skc_record.id
@@ -319,6 +323,7 @@ class SheinProductManager:
             existing_sku.price = sku_data.get('price')
             existing_sku.erp_cost_price = sku_data.get('erp_cost_price')
             existing_sku.erp_supplier_name = sku_data.get('erp_supplier_name')
+            existing_sku.erp_stock = sku_data.get('erp_stock')
             existing_sku.updated_at = datetime.now()
         else:
             # 插入新记录
@@ -473,4 +478,7 @@ def example_usage2():
 
 if __name__ == "__main__":
     pass
-    # example_usage()
+    database_url = "mysql+pymysql://root:123wyk@localhost:3306/lz"
+    manager = SheinProductManager(database_url)
+    manager.create_tables()
+    # example_usage()

{qrpa-1.0.90 → qrpa-1.0.91}/qrpa/shein_excel.py

@@ -2341,7 +2341,7 @@ class SheinExcel:
         self.dealFormula(sheet)  # 有空再封装优化
         colorize_by_field(sheet, 'SPU')
         autofit_column(sheet, ['商品信息', '店铺名称', 'SKC点击率/SKC转化率', '自主参与活动'])
-        column_to_left(sheet, ['店铺名称', 'SKC点击率/SKC转化率', '自主参与活动'])
+        column_to_left(sheet, ['店铺名称', 'SKC点击率/SKC转化率', '自主参与活动','近7天SKU销量/SKC销量/SKC曝光'])
         specify_column_width(sheet, ['商品标题'], 150 / 6)
         add_borders(sheet)
         InsertImageV2(sheet, ['SKC图片', 'SKU图片'], 'shein', 120, None, None, True)

{qrpa-1.0.90 → qrpa-1.0.91}/qrpa/shein_lib.py

@@ -887,6 +887,8 @@ class SheinLib:
                 cost_price = self.bridge.get_sku_cost(sku_item['supplierSku'], self.config.erp_source)
                 sku_item['erp_cost_price'] = cost_price if isinstance(cost_price, (int, float)) else None
                 sku_item['erp_supplier_name'] = self.bridge.get_sku_supplier(sku_item['supplierSku'], self.config.erp_source)
+                stock = self.bridge.get_sku_stock(sku_item['supplierSku'], self.config.erp_source)
+                sku_item['erp_stock'] = stock if isinstance(stock, (int, float)) else None
 
         cache_file = f'{self.config.auto_dir}/shein/product/skc_list_{self.store_username}.json'
         write_dict_to_file_ex(cache_file, {self.store_username: skc_list}, [self.store_username])
@@ -2314,6 +2316,7 @@ class SheinLib:
             skc = str(spu_info['skc'])
             # if not shein_db.exists_sales_1_days_ago(skc):
             #     log(f'未查到昨天销量: {skc}')
+            self.get_skc_week_actual_sales(skc)
             self.get_skc_sales(skc, date_60_days_ago, date_1_days_ago)
             skcCode = spu_info['supplierCode']
             product_name = DictSpuInfo[spu]['product_name_en']
@@ -2434,7 +2437,7 @@ class SheinLib:
                 # SKC趋势数据
                 sku_item.append(skc_trend.get('saleCnt', 0))  # SKC近7天销量
                 sku_item.append(skc_trend.get('epsUvIdx', 0))  # SKC近7天曝光人数
-                sku_item.append(skc_trend.get('goodsUvIdx', 0))  # SKC近7天商详访客
+                sku_item.append(skc_trend.get('goodsUv', 0))  # SKC近7天商详访客
                 sku_item.append(skc_trend.get('epsGdsCtrIdx', 0))  # SKC近7天点击率
                 sku_item.append(skc_trend.get('payUvIdx', 0))  # SKC近7天支付人数
                 sku_item.append(skc_trend.get('gdsPayCtrIdx', 0))  # SKC近7天支付率

{qrpa-1.0.90 → qrpa-1.0.91}/qrpa.egg-info/PKG-INFO

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