qrpa 1.1.79__py3-none-any.whl → 1.1.84__py3-none-any.whl

qrpa/fun_excel.py

@@ -19,6 +19,36 @@ from pathlib import Path
 
 from .fun_base import log, sanitize_filename, create_file_path, copy_file, add_https, send_exception
 
+
+def is_valid_image(img_path):
+    """
+    验证图片是否有效且可被 Excel 支持
+    :param img_path: 图片路径
+    :return: True 如果图片有效，否则 False
+    """
+    if not img_path or not os.path.exists(img_path):
+        return False
+    
+    try:
+        with Image.open(img_path) as img:
+            img.verify()  # 验证图片完整性
+        
+        # verify() 后需要重新打开才能继续操作
+        with Image.open(img_path) as img:
+            img.load()  # 尝试加载图片数据
+            
+            # 检查是否是 Excel 支持的格式
+            supported_formats = {'JPEG', 'PNG', 'GIF', 'BMP', 'TIFF', 'EMF', 'WMF'}
+            if img.format and img.format.upper() not in supported_formats:
+                log(f'不支持的图片格式: {img.format}')
+                return False
+                
+        return True
+    except Exception as e:
+        log(f'图片验证失败: {img_path}, 错误: {e}')
+        return False
+
+
 excel_color_index = {
     "无色(自动)"   : 0,  # 透明/默认
     "黑色"         : 1,  # #000000
@@ -867,6 +897,11 @@ def InsertImageV2(sheet, columns=None, platform='shein', img_width=150, img_save
 
                 # 优化图片插入函数调用 (优化点3)
                 try:
+                    # 先验证图片有效性
+                    if not is_valid_image(img_path):
+                        log(f'图片无效或格式不支持，跳过: {img_path}')
+                        continue
+                    
                     # 使用预计算的位置直接插入图片
                     sheet.pictures.add(img_path, top=top + 2, left=left + 2, width=width - 4, height=width - 4)
                     cell_range.value = None
@@ -1099,6 +1134,11 @@ def InsertImageV3(sheet, columns=None, platform='shein', img_widths=None, img_sa
 
                 # 插入图片
                 try:
+                    # 先验证图片有效性
+                    if not is_valid_image(img_path):
+                        log(f'图片无效或格式不支持，跳过: {img_path}')
+                        continue
+                    
                     # 使用预计算的位置直接插入图片
                     sheet.pictures.add(img_path, top=top + 2, left=left + 2, width=width - 4, height=width - 4)
                     cell_range.value = None

qrpa/mysql_module/shein_wallet_model.py

@@ -264,6 +264,21 @@ class SheinStoreWalletManager:
             'supplier_id': supplier_id,
             'is_fp_account': 1 if api_response.get('isFpAccount') else 0,
             'deposit_flag': api_response.get('depositFlag', 1),
+            # 初始化所有字段，避免缺失导致 upsert 失败
+            'currency': None,
+            'withdrawable_amount': None,
+            'no_withdrawable_amount': None,
+            'withdrawing_amount': None,
+            'balance_last_update_time': None,
+            'auto_withdraw_state': 0,
+            'can_withdraw': 1,
+            'no_withdraw_reasons': '[]',
+            'deposit_currency': None,
+            'deposit_amount_paid': None,
+            'deposit_amount_unpaid': None,
+            'deposit_last_update_time': None,
+            'raw_balance_json': None,
+            'raw_deposit_json': None,
         }
         
         # 解析余额信息（取第一个）
@@ -280,6 +295,7 @@ class SheinStoreWalletManager:
                 'can_withdraw': 1 if balance.get('canWithdraw') else 0,
                 'no_withdraw_reasons': json.dumps(balance.get('noWithdrawReasons', []), ensure_ascii=False),
             })
+            record['raw_balance_json'] = json.dumps(balance_list, ensure_ascii=False)
         
         # 解析保证金信息（取第一个）
         deposit_list = api_response.get('depositList', [])
@@ -291,10 +307,7 @@ class SheinStoreWalletManager:
                 'deposit_amount_unpaid': deposit.get('depositAmountUnPaid'),
                 'deposit_last_update_time': deposit.get('lastUpdateTime'),
             })
-        
-        # 保存原始数据
-        record['raw_balance_json'] = json.dumps(balance_list, ensure_ascii=False) if balance_list else None
-        record['raw_deposit_json'] = json.dumps(deposit_list, ensure_ascii=False) if deposit_list else None
+            record['raw_deposit_json'] = json.dumps(deposit_list, ensure_ascii=False)
         
         return record
     

qrpa/shein_lib.py

@@ -538,7 +538,11 @@ class SheinLib:
         result = {
             'list'       : withdraw_list,
             'count'      : total,
-            'depositFlag': deposit_flag
+            'depositFlag': deposit_flag,
+            # 额外保存店铺信息，供后续导入数据库使用
+            'store_username': self.store_username,
+            'store_name': self.store_name,
+            'supplier_id': supplier_id,
         }
 
         # 缓存结果
@@ -556,15 +560,11 @@ class SheinLib:
         self.web_page.goto('https://sso.geiwohuo.com/#/mws/seller/new-account-overview')
         self.web_page.wait_for_load_state('load')
 
-        # 缓存文件路径：按店铺缓存文件
+        # 缓存文件路径：按店铺缓存文件（不使用缓存，每次都重新拉取）
         import os
         cache_dir = f'{self.config.auto_dir}/shein/wallet_balance'
         os.makedirs(cache_dir, exist_ok=True)
         cache_file = f'{cache_dir}/wallet_balance_detail_{self.store_username}_{TimeUtils.today_date()}.json'
-        cached_data = read_dict_from_file(cache_file, 3600 * 12)
-        if cached_data and len(cached_data) > 0:
-            log(f'返回缓存的钱包余额详情: {self.store_name}')
-            return cached_data
 
         log(f'正在获取 {self.store_name} 钱包余额详情')
         url = "https://sso.geiwohuo.com/mws/mwms/sso/balance/query"
@@ -611,6 +611,11 @@ class SheinLib:
             }
             result['depositList'].append(deposit_item)
 
+        # 额外保存店铺信息，供后续导入数据库使用
+        result['store_username'] = self.store_username
+        result['store_name'] = self.store_name
+        result['supplier_id'] = supplier_id
+
         # 缓存结果
         write_dict_to_file(cache_file, result)
 

qrpa/shein_ziniao.py

@@ -9,6 +9,7 @@ import time, datetime
 import traceback
 import uuid
 import json
+import ctypes
 from concurrent.futures import ThreadPoolExecutor
 from typing import Literal, Optional, Callable, List, Dict, Any
 
@@ -474,6 +475,33 @@ class ZiniaoRunner:
                 threads_num: int = 3,
                 ):
         """主执行入口"""
+        global mem_gb
+
+        def _get_total_memory_gb() -> int:
+            try:
+                import psutil
+                total_bytes = psutil.virtual_memory().total
+            except Exception:
+                if platform.system() == 'Windows':
+                    class MemoryStatus(ctypes.Structure):
+                        _fields_ = [
+                            ('dwLength', ctypes.c_ulong),
+                            ('dwMemoryLoad', ctypes.c_ulong),
+                            ('ullTotalPhys', ctypes.c_ulonglong),
+                            ('ullAvailPhys', ctypes.c_ulonglong),
+                            ('ullTotalPageFile', ctypes.c_ulonglong),
+                            ('ullAvailPageFile', ctypes.c_ulonglong),
+                            ('ullTotalVirtual', ctypes.c_ulonglong),
+                            ('ullAvailVirtual', ctypes.c_ulonglong),
+                            ('sullAvailExtendedVirtual', ctypes.c_ulonglong),
+                        ]
+                    status = MemoryStatus()
+                    status.dwLength = ctypes.sizeof(MemoryStatus)
+                    ctypes.windll.kernel32.GlobalMemoryStatusEx(ctypes.byref(status))
+                    total_bytes = status.ullTotalPhys
+                else:
+                    total_bytes = os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES')
+            return max(1, int(total_bytes // (1024 ** 3)))
         # 前置执行 if run_prepare:
         run_prepare()
 
@@ -494,10 +522,13 @@ class ZiniaoRunner:
         print(browser_list)
 
         # 多线程并发执行任务
-        max_threads = 1 if (hostname().lower() == 'krrpa' or hostname().lower() == 'jyrpa') else threads_num
-        if hostname().lower() == 'krrpa3':
-           max_threads = 6
-        log(f'当前启用线程数: {max_threads}')
+        host = hostname().lower()
+        mem_gb = _get_total_memory_gb()
+        if host in ('krrpa', 'jyrpa'):
+            max_threads = 1
+        else:
+            max_threads = min(10, max(1, mem_gb // 4))
+        log(f'当前启用线程数: {max_threads}, 内存: {mem_gb}GB {mem_gb // 4}')
         self.task_manager.run_with_thread_pool(browser_list, max_threads, run, task_key, just_store_username, is_skip_store)
 
         # 任务重试逻辑

{qrpa-1.1.79.dist-info → qrpa-1.1.84.dist-info}/METADATA

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

{qrpa-1.1.79.dist-info → qrpa-1.1.84.dist-info}/RECORD

@@ -5,16 +5,16 @@ qrpa/feishu_bot_app.py,sha256=h7UbtsLkjMIB2XTVYhWEIvdYzPHdXT1DMd39yXuX-x0,21705
 qrpa/feishu_client.py,sha256=gXvyhf7r-IqeDhPjM01SfsGf17t8g1ZwUAkhymBkBeg,17544
 qrpa/feishu_logic.py,sha256=yuwb-LeZiHKGlz-W8JobinorHonVa8L-5h12WxnU7_Q,67508
 qrpa/fun_base.py,sha256=HYxSinJciciwVSC9dE26nCc17qnbGhTddUdOacI8drQ,10607
-qrpa/fun_excel.py,sha256=n6_akVfefYvRqVb8CoS8HtQ4YFmi33XE4wezQPRQbcw,137803
+qrpa/fun_excel.py,sha256=wCJRWowS8F0i0jfg1x_-G8nx0WB9zvR4ifYr2dbf14s,139307
 qrpa/fun_file.py,sha256=1PNYM71cVWWUjIgrutzw-5mKOGiBAeLrnkXcLMTIBhA,11648
 qrpa/fun_web.py,sha256=0qmnAulHNR72-BGruQ-RQEVwsR60CkgnQMJIV6obUmU,21501
 qrpa/fun_win.py,sha256=vMdVh00dsnVz8Wey4Bq7J3RPZAY8B_bI_IKphOX1cE8,7836
 qrpa/shein_daily_report_model.py,sha256=O8s9qM45WZRoAgxUFRngvmBrc29v7Uf2ye7K8_bcSRg,12214
 qrpa/shein_excel.py,sha256=VWJVqQ6yZ71zCKSBuJXrnEjtyydkDbtTl8SbfaeVXLs,194648
-qrpa/shein_lib.py,sha256=mzmyxk_PiIJZmIR93WwUdrj8iGV8gDeZH5oIvtKeHoE,259253
+qrpa/shein_lib.py,sha256=SJrrn7Fu5Q-rebcWrSNImO-vte8wcA9VHHV48rTycx8,259507
 qrpa/shein_mysql.py,sha256=2LFNBuGSH0VzsuZ717WH0Grt4rT1BnGhpp_UwSA0lxQ,5140
 qrpa/shein_sqlite.py,sha256=i4xwNf60eoG6wbWM1R2i5pDdVW1ZMy6uy9nB-c2WKzk,5554
-qrpa/shein_ziniao.py,sha256=N9_67JXxPBBY3q1-YoUnpGW91Q_Ty9FgOPT-AnW6iiw,22017
+qrpa/shein_ziniao.py,sha256=i6gHsg1VypR8UKoYTFd2Nk1US1VBW3iXMGUavM_9vCQ,23532
 qrpa/temu_chrome.py,sha256=jAYv59Z1uoRSVim81EF2R2tEgQYYForiYhWOCKmy_mo,2747
 qrpa/temu_excel.py,sha256=AqeMyJFjxf8slczbLzK4XKHdIiNZ8T-uDjB6DPj4DwU,6851
 qrpa/temu_lib.py,sha256=myvlEAE5yNtgt1TUrx8fBRpvw883jpyePTPLd0_7tf4,7131
@@ -29,8 +29,8 @@ qrpa/mysql_module/shein_product_model.py,sha256=jBxamujzYxrhxvZnH_kQW4O0QPzwTru_
 qrpa/mysql_module/shein_return_order_model.py,sha256=FoxKJPIg2JRCrK-bblfjWgiuBAklarWNU5_4zAE3SIs,37430
 qrpa/mysql_module/shein_store_model.py,sha256=iTO83PXZNnzaf3qqtIFMFmmQQL9C-pOazOJKXCatVUo,20537
 qrpa/mysql_module/shein_supplier_info_model.py,sha256=dpGCNOi0pu0-p5weuj9gGkBBe5r68-2P-Jv3FNvZQvQ,29860
-qrpa/mysql_module/shein_wallet_model.py,sha256=1v2OGl3n4IxcK1mhBQtb1xzQFlrby17pgob4LHtC5Ko,27662
-qrpa-1.1.79.dist-info/METADATA,sha256=xBPNDnVjoCoimiEhy4yVZbiVEaE8uf9g6h68_C66OkU,231
-qrpa-1.1.79.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qrpa-1.1.79.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
-qrpa-1.1.79.dist-info/RECORD,,
+qrpa/mysql_module/shein_wallet_model.py,sha256=-eg2Rto_WpepbgD72TjDVVoZcV-ZZ2_JbxW5dFAkE38,28219
+qrpa-1.1.84.dist-info/METADATA,sha256=h3CPADwz2FQAOLrI2zLKikQm7u6kdEw4P0SLABTfEFY,231
+qrpa-1.1.84.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qrpa-1.1.84.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
+qrpa-1.1.84.dist-info/RECORD,,