qrpa 1.0.49__tar.gz → 1.0.51__tar.gz

{qrpa-1.0.49 → qrpa-1.0.51}/PKG-INFO

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

{qrpa-1.0.49 → qrpa-1.0.51}/pyproject.toml

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

{qrpa-1.0.49 → qrpa-1.0.51}/qrpa/shein_lib.py

@@ -8,7 +8,7 @@ from .shein_sqlite import insert_sales, get_last_week_sales, get_near_week_sales
 
 import math
 import time
-import json
+import json, traceback
 from datetime import datetime
 from playwright.sync_api import Page
 
@@ -47,10 +47,11 @@ class SheinLib:
                 while not web_page.locator('//div[contains(text(),"商家后台")]').nth(1).is_visible():
 
                     if web_page.locator('xpath=//div[@id="container" and @alita-name="gmpsso"]//button[@type="button" and @id]').nth(0).is_visible():
-                        log("鉴权确定按钮可见 点击'确定'按钮", self.store_username, self.store_name)
-                        web_page.locator('xpath=//div[@id="container" and @alita-name="gmpsso"]//button[@type="button" and @id]').nth(0).click()
-                        web_page.wait_for_load_state("load")
-                        web_page.wait_for_timeout(1000)
+                        if 'https://sso.geiwohuo.com/#/home' not in web_page.url:
+                            log("鉴权确定按钮可见 点击'确定'按钮", self.store_username, self.store_name)
+                            web_page.locator('xpath=//div[@id="container" and @alita-name="gmpsso"]//button[@type="button" and @id]').nth(0).click()
+                            web_page.wait_for_load_state("load")
+                            web_page.wait_for_timeout(1000)
 
                     while web_page.locator('//div[text()="验证码"]').is_visible():
                         log(f'等待输入验证码: {wait_count}', self.store_username, self.store_name)
@@ -67,7 +68,7 @@ class SheinLib:
                         web_page.wait_for_timeout(5000)
                         log('点击"登录"', self.store_username, self.store_name)
                         web_page.locator('//button[contains(@class,"login_btn")]').click()
-                        web_page.wait_for_load_state("load")
+
                         log('再延时5秒', self.store_username, self.store_name)
                         web_page.wait_for_timeout(5000)
 
@@ -81,14 +82,26 @@ class SheinLib:
 
                     if 'SHEIN全球商家中心' in web_page.title() and 'https://sso.geiwohuo.com/#/home' in web_page.url:
                         log('SHEIN全球商家中心 中断循环', self.store_username, self.store_name)
+                        web_page.wait_for_load_state("load")
+                        web_page.wait_for_timeout(1000)
+                        web_page.wait_for_load_state("networkidle")
+                        web_page.wait_for_timeout(1000)
                         break
 
                     if '后台首页' in web_page.title() and 'https://sso.geiwohuo.com/#/home' in web_page.url:
                         log('后台首页 中断循环', self.store_username, self.store_name)
+                        web_page.wait_for_load_state("load")
+                        web_page.wait_for_timeout(1000)
+                        web_page.wait_for_load_state("networkidle")
+                        web_page.wait_for_timeout(1000)
                         break
 
                     if '商家后台' in web_page.title() and 'https://sso.geiwohuo.com/#/home' in web_page.url:
                         log('后台首页 中断循环', self.store_username, self.store_name)
+                        web_page.wait_for_load_state("load")
+                        web_page.wait_for_timeout(1000)
+                        web_page.wait_for_load_state("networkidle")
+                        web_page.wait_for_timeout(1000)
                         break
 
                     if 'mrs.biz.sheincorp.cn' in web_page.url and '商家后台' in web_page.title():
@@ -109,12 +122,14 @@ class SheinLib:
                         web_page.wait_for_load_state("load")
                         web_page.wait_for_timeout(3000)
 
+                break
             except Exception as e:
                 log(f"错误发生: {e}, 重试中...({self.store_username}, {self.store_name})")
+                log(traceback.format_exc())
                 if 'crashed' in str(e) or 'https://sso.geiwohuo.com//#/auth/SSLS' in web_page.url:
-                    web_page.reload()
+                    web_page.goto('https://sso.geiwohuo.com')
                     web_page.wait_for_load_state('load')
-                    web_page.wait_for_timeout(3000)
+                    web_page.wait_for_timeout(10000)
                 retries += 1
                 if retries >= MAX_RETRIES:
                     log(f"达到最大重试次数，停止尝试({self.store_username}, {self.store_name})")
@@ -122,6 +137,9 @@ class SheinLib:
                 time.sleep(2)  # 错误时等待2秒后重试
 
         log('鉴权处理结束')
+        # web_page.wait_for_load_state("load")
+        # web_page.wait_for_load_state("networkidle")
+        web_page.wait_for_timeout(3000)
 
     # 获取质检报告pdf地址
     def get_qc_report_url(self, deliverCode, purchaseCode):
@@ -229,27 +247,29 @@ class SheinLib:
             has_valid_package = item.get('hasPackage') == 1
             is_valid_yesterday = TimeUtils.is_yesterday(item['completeTime'], None) if item.get('completeTime') else False
             returnOrderId = item['id']
-            return_box_detail = self.get_return_order_box_detail(returnOrderId)
+            item['return_box_detail'] = []
             item['qc_report_url'] = ''
             item['report_url'] = ''
             item['store_username'] = self.store_username
             item['store_name'] = self.store_name
             item['store_manager'] = self.config.shein_store_manager.get(str(self.store_username).lower())
-            if has_valid_package and len(return_box_detail) > 0:
+            if has_valid_package:
+                return_box_detail = self.get_return_order_box_detail(returnOrderId)
+                if len(return_box_detail) > 0:
 
-                if int(item['returnScrapType']) == 1:
-                    purchaseCode = item['sellerOrderNo']
-                    delivery_code = item['sellerDeliveryNo']
-                    item['qc_report_url'] = self.get_qc_report_url(delivery_code, purchaseCode)
+                    if int(item['returnScrapType']) == 1:
+                        purchaseCode = item['sellerOrderNo']
+                        delivery_code = item['sellerDeliveryNo']
+                        item['qc_report_url'] = self.get_qc_report_url(delivery_code, purchaseCode)
 
-                if int(item['returnScrapType']) == 2:
-                    item['report_url'] = self.get_inspect_report_url(returnOrderId)
+                    if int(item['returnScrapType']) == 2:
+                        item['report_url'] = self.get_inspect_report_url(returnOrderId)
 
-                item['return_box_detail'] = return_box_detail
+                    item['return_box_detail'] = return_box_detail
 
-                all_list_item.append(item)
-                if is_valid_yesterday:
-                    today_list_item.append(item)
+                    all_list_item.append(item)
+                    if is_valid_yesterday:
+                        today_list_item.append(item)
 
         cache_file = f'{self.config.auto_dir}/shein/cache/shein_return_order_list_{TimeUtils.today_date()}.json'
         write_dict_to_file_ex(cache_file, {self.store_username: today_list_item}, [self.store_username])

{qrpa-1.0.49 → qrpa-1.0.51}/qrpa/shein_ziniao.py

@@ -412,7 +412,7 @@ class ZiniaoRunner:
             raise RuntimeError("店铺列表为空")
 
         # 多线程并发执行任务
-        max_threads = 5 if (hostname().lower() == 'krrpa') else 3
+        max_threads = 1 if (hostname().lower() == 'krrpa') else 3
         log(f'当前启用线程数: {max_threads}')
         self.task_manager.run_with_thread_pool(browser_list, max_threads, run, task_key, just_store_username, is_skip_store)
 

{qrpa-1.0.49 → qrpa-1.0.51}/qrpa.egg-info/PKG-INFO

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