qrpa 1.0.50__tar.gz → 1.0.51__tar.gz

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

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

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

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

{qrpa-1.0.50 → 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
 
@@ -27,179 +27,8 @@ class SheinLib:
 
         self.deal_auth()
 
-    def deal_auth(self):
-        """处理登录鉴权流程"""
-        web_page = self.web_page
-
-        # 配置常量
-        MAX_RETRIES = 5
-        CAPTCHA_WAIT_INTERVAL = 5
-        PAGE_LOAD_TIMEOUT = 5000
-        SHORT_TIMEOUT = 1000
-
-        # 页面元素选择器 - 集中管理
-        selectors = {
-            'merchant_backend'  : '//div[contains(text(),"商家后台")]',
-            'auth_confirm_btn'  : '//div[@id="container" and @alita-name="gmpsso"]//button[@type="button" and @id]',
-            'captcha_text'      : '//div[text()="验证码"]',
-            'username_input'    : '//input[@name="username"]',
-            'login_btn'         : '//button[contains(@class,"login_btn")]',
-            'product_management': '//span[contains(text(),"商品管理")]',
-            'auth_title'        : '//h1[contains(text(),"鉴权")]'
-        }
-
-        # URL常量
-        home_url = 'https://sso.geiwohuo.com/#/home'
-        base_url = 'https://sso.geiwohuo.com'
-
-        retries = 0
-        wait_count = 0
-        is_captcha_notification_sent = False
-
-        log("开始鉴权处理", self.store_username, self.store_name)
-
-        while retries < MAX_RETRIES:
-            try:
-                retries += 1
-                log(f"鉴权处理第{retries}次尝试", self.store_username, self.store_name)
-
-                # 主循环：等待商家后台页面加载
-                while True:
-                    try:
-                        # 检查商家后台是否已经可见
-                        if web_page.locator(selectors['merchant_backend']).nth(1).is_visible(timeout=SHORT_TIMEOUT):
-                            log('商家后台已可见，鉴权处理完成', self.store_username, self.store_name)
-                            return
-                    except:
-                        pass
-
-                    # 1. 处理鉴权确认弹窗
-                    try:
-                        auth_btn = web_page.locator(selectors['auth_confirm_btn']).nth(0)
-                        if auth_btn.is_visible(timeout=SHORT_TIMEOUT):
-                            log("检测到鉴权确认按钮，点击确定", self.store_username, self.store_name)
-                            auth_btn.click()
-                            web_page.wait_for_load_state("load")
-                            web_page.wait_for_timeout(SHORT_TIMEOUT)
-                            continue
-                    except:
-                        pass
-
-                    # 2. 处理验证码等待
-                    try:
-                        if web_page.locator(selectors['captcha_text']).is_visible(timeout=SHORT_TIMEOUT):
-                            wait_count += 1
-                            log(f'等待验证码输入: 第{wait_count}次', self.store_username, self.store_name)
-
-                            # 只发送一次验证码通知
-                            if not is_captcha_notification_sent:
-                                try:
-                                    img_path = full_screen_shot(web_page, self.config)
-                                    wx_bot = WxWorkBot(self.config.wxwork_bot_exception)
-                                    wx_bot.send_img(img_path)
-                                    wx_bot.send_text(f'{self.store_username},{self.store_name} 需要登录验证码')
-                                    is_captcha_notification_sent = True
-                                    log("验证码通知已发送", self.store_username, self.store_name)
-                                except Exception as notify_error:
-                                    log(f"发送验证码通知失败: {notify_error}", self.store_username, self.store_name)
-
-                            time.sleep(CAPTCHA_WAIT_INTERVAL)
-                            continue
-                    except:
-                        pass
-
-                    # 3. 处理登录按钮点击
-                    try:
-                        if web_page.locator(selectors['username_input']).is_visible(timeout=SHORT_TIMEOUT):
-                            log("检测到用户名输入框，准备点击登录按钮", self.store_username, self.store_name)
-                            web_page.wait_for_timeout(PAGE_LOAD_TIMEOUT)
-                            web_page.locator(selectors['login_btn']).click()
-                            web_page.wait_for_load_state("load")
-                            web_page.wait_for_timeout(PAGE_LOAD_TIMEOUT)
-                            continue
-                    except:
-                        pass
-
-                    # 4. 检查商品管理菜单（成功标识）
-                    try:
-                        if web_page.locator(selectors['product_management']).nth(1).is_visible(timeout=SHORT_TIMEOUT):
-                            log('检测到商品管理菜单，鉴权处理成功', self.store_username, self.store_name)
-                            return
-                    except:
-                        pass
-
-                    # 5. 获取当前页面信息用于状态判断
-                    current_title = web_page.title()
-                    current_url = web_page.url
-
-                    log(f'当前页面状态: {current_title} | {current_url}', self.store_username, self.store_name)
-
-                    # 6. 处理已知的成功状态页面
-                    success_titles = ['SHEIN全球商家中心', '后台首页', '商家后台']
-                    if any(title in current_title for title in success_titles) and home_url in current_url:
-                        log(f'检测到目标页面: {current_title}，跳出循环', self.store_username, self.store_name)
-                        break
-
-                    # 7. 处理需要重定向的页面
-                    if 'mrs.biz.sheincorp.cn' in current_url and '商家后台' in current_title:
-                        log('检测到旧后台地址，重定向到新地址', self.store_username, self.store_name)
-                        web_page.goto(home_url)
-                        web_page.wait_for_load_state("load")
-                        web_page.wait_for_timeout(3000)
-                        continue
-
-                    # 8. 处理鉴权页面
-                    try:
-                        if web_page.locator(selectors['auth_title']).is_visible(timeout=SHORT_TIMEOUT):
-                            log('检测到鉴权页面，刷新重试', self.store_username, self.store_name)
-                            web_page.reload()
-                            web_page.wait_for_load_state('load')
-                            web_page.wait_for_timeout(3000)
-                            continue
-                    except:
-                        pass
-
-                    # 9. 处理SHEIN主页
-                    if current_title == 'SHEIN':
-                        log('当前在SHEIN主页，跳转到商家后台', self.store_username, self.store_name)
-                        web_page.goto(home_url)
-                        web_page.wait_for_load_state("load")
-                        web_page.wait_for_timeout(3000)
-                        continue
-
-                    # 默认等待，然后继续下一轮检查
-                    web_page.wait_for_load_state("load")
-                    web_page.wait_for_timeout(SHORT_TIMEOUT)
-
-                # 如果跳出了内层while循环，说明达到了某种成功状态
-                log('内层循环结束，鉴权处理完成', self.store_username, self.store_name)
-                return
-
-            except Exception as e:
-                error_msg = str(e)
-                log(f"鉴权处理异常: {error_msg}, 第{retries}次重试", self.store_username, self.store_name)
-
-                # 处理页面崩溃或特定认证错误
-                if 'crashed' in error_msg.lower() or 'https://sso.geiwohuo.com//#/auth/SSLS' in web_page.url:
-                    log('检测到页面崩溃或认证错误，重新导航到基础URL', self.store_username, self.store_name)
-                    try:
-                        web_page.goto(base_url)
-                        web_page.wait_for_load_state('load')
-                        web_page.wait_for_timeout(3000)
-                    except Exception as nav_error:
-                        log(f'重新导航失败: {nav_error}', self.store_username, self.store_name)
-
-                # 达到最大重试次数
-                if retries >= MAX_RETRIES:
-                    log(f"达到最大重试次数{MAX_RETRIES}，鉴权处理失败", self.store_username, self.store_name)
-                    break
-
-                time.sleep(2)  # 异常后等待2秒再重试
-
-        log('鉴权处理结束', self.store_username, self.store_name)
-
     # 处理鉴权
-    def deal_auth_old(self):
+    def deal_auth(self):
         web_page = self.web_page
 
         # 定义最大重试次数
@@ -218,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)
@@ -238,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)
 
@@ -252,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():
@@ -280,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.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})")
@@ -293,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):
@@ -400,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.50 → 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.50 → qrpa-1.0.51}/qrpa.egg-info/PKG-INFO

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