qrpa 1.0.49__py3-none-any.whl → 1.0.51__py3-none-any.whl

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/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.dist-info → qrpa-1.0.51.dist-info}/METADATA

@@ -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.dist-info → qrpa-1.0.51.dist-info}/RECORD

@@ -11,10 +11,10 @@ qrpa/fun_web.py,sha256=F6cxwwOxB8twg2XK73oAvKla0FqpwDYJiM37CWmFwXo,6322
 qrpa/fun_win.py,sha256=-LnTeocdTt72NVH6VgLdpAT9_C5oV9okeudXG6CftMA,8034
 qrpa/shein_daily_report_model.py,sha256=H8oZmIN5Pyqe306W1_xuz87lOqLQ_LI5RjXbaxDkIzE,12589
 qrpa/shein_excel.py,sha256=7dWDKP5JlD_2sb3Uv3JK_VJvppGwidsP3UAyPA89Ga8,115472
-qrpa/shein_lib.py,sha256=VdGuVcgbE3Xg1ra6kL9qObq2nHDFrGsp8sTlGki2A8U,108616
+qrpa/shein_lib.py,sha256=UwlXfKwaJ1YpZzkF-FX4dnG09TSLXr82nRc7LAW7z5Q,109743
 qrpa/shein_mysql.py,sha256=MGPJsz13evsLygZWhmitpPzUswiTKZ91VFvr8KA0M40,750
 qrpa/shein_sqlite.py,sha256=ZQwD0Gz81q9WY7tY2HMEYvSF9r3N_G_Aur3bYfST9WY,5707
-qrpa/shein_ziniao.py,sha256=9F2AfROvbUiEDizr9xCc5hlvG6USa5gFGiZC7VPWVo4,18365
+qrpa/shein_ziniao.py,sha256=YQV6f7NThCgppqQ5tUjcmabE5m4TTh1pt2v_uI--Dh0,18365
 qrpa/temu_chrome.py,sha256=CbtFy1QPan9xJdJcNZj-EsVGhUvv3ZTEPVDEA4-im40,2803
 qrpa/temu_excel.py,sha256=ssAQvhtRGaTOLAVM3gS-AnmHPkIiHCT6gTsK1hoi-_8,6990
 qrpa/temu_lib.py,sha256=hYB59zsLS3m3NTic_duTwPMOTSxlHyQVa8OhHnHm-1g,7199
@@ -23,7 +23,7 @@ qrpa/time_utils_example.py,sha256=shHOXKKF3QSzb0SHsNc34M61wEkkLuM30U9X1THKNS8,80
 qrpa/wxwork.py,sha256=gIytG19DZ5g7Tsl0-W3EbjfSnpIqZw-ua24gcB78YEg,11264
 qrpa/mysql_module/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qrpa/mysql_module/shein_return_order_model.py,sha256=oKWr5Q-8LxKO7gLih26MUjD3GqC-C9eH8menVNGoRgw,26010
-qrpa-1.0.49.dist-info/METADATA,sha256=LcDevF0wDIml1CuHl83bdGfW1NgwN-1mMDiYot1aLE0,231
-qrpa-1.0.49.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-qrpa-1.0.49.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
-qrpa-1.0.49.dist-info/RECORD,,
+qrpa-1.0.51.dist-info/METADATA,sha256=0Q-8Rikvv-YdBIm6XD4JXyrnabeB8dprUYVbmND6FMY,231
+qrpa-1.0.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qrpa-1.0.51.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
+qrpa-1.0.51.dist-info/RECORD,,