qrpa 1.0.51__tar.gz → 1.0.52__tar.gz

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

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

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

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

{qrpa-1.0.51 → qrpa-1.0.52}/qrpa/fun_base.py

@@ -13,6 +13,11 @@ from .RateLimitedSender import RateLimitedSender
 
 from typing import TypedDict
 
+# 自定义错误类型，继承自 Exception
+class NetWorkIdleTimeout(Exception):
+    """这是一个自定义错误类型"""
+    pass
+
 # 定义一个 TypedDict 来提供配置结构的类型提示
 
 class ZiNiao(TypedDict):
@@ -161,7 +166,6 @@ def remove_columns(matrix, indices):
     # 遍历每行，只保留不在indices中的列
     return [[row[i] for i in indices_to_keep] for row in matrix]
 
-
 def filter_columns(matrix, indices):
     """
     过滤二维列表，只保留指定索引的列
@@ -182,7 +186,6 @@ def filter_columns(matrix, indices):
     # 将过滤后的列转回二维列表
     return [list(row) for row in zip(*filtered_columns)]
 
-
 # # 示例使用
 # matrix = [
 #     [1, 2, 3, 4],
@@ -216,7 +219,6 @@ def add_column_to_2d_list(data, new_col, index=None):
         new_data.append(row)
     return new_data
 
-
 def add_prefixed_column(data, header, value):
     """
     给二维列表增加第一列，第一行为 header，后面为 value。
@@ -232,7 +234,6 @@ def add_prefixed_column(data, header, value):
     new_col = [header] + [value] * (len(data) - 1)
     return [[new_col[i]] + row for i, row in enumerate(data)]
 
-
 def add_suffixed_column(data, header, value):
     """
     给二维列表增加第一列，第一行为 header，后面为 value。
@@ -248,7 +249,6 @@ def add_suffixed_column(data, header, value):
     new_col = [header] + [value] * (len(data) - 1)
     return [row + [new_col[i]] for i, row in enumerate(data)]
 
-
 def merge_2d_lists_keep_first_header(data1, data2):
     """
     合并两个二维列表，只保留第一个列表的标题（即第一行）。
@@ -268,7 +268,6 @@ def merge_2d_lists_keep_first_header(data1, data2):
 
     return [header] + rows1 + rows2
 
-
 def insert_total_row(data, row_index=1, label="合计"):
     """
     在指定行插入一行，第一列为 label，其余为空字符串。
@@ -286,7 +285,6 @@ def insert_total_row(data, row_index=1, label="合计"):
 
     return data[:row_index] + [new_row] + data[row_index:]
 
-
 def insert_empty_column_after(data, col_index, new_header="单价成本"):
     """
     在二维列表中指定列的后面插入一个新列，标题为 new_header，其余内容为空字符串。
@@ -308,7 +306,6 @@ def insert_empty_column_after(data, col_index, new_header="单价成本"):
 
     return new_data
 
-
 def insert_empty_column_after_column_name(data, target_col_name, new_header="单价成本"):
     """
     在指定列名对应的列后面插入一个新列，标题为 new_header，其余行为空字符串。
@@ -334,4 +331,4 @@ def insert_empty_column_after_column_name(data, target_col_name, new_header="单
         row.insert(col_index + 1, insert_value)
         new_data.append(row)
 
-    return new_data
+    return new_data

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

@@ -1,5 +1,5 @@
 from .fun_file import read_dict_from_file, write_dict_to_file, read_dict_from_file_ex, write_dict_to_file_ex
-from .fun_base import log, send_exception, md5_string, get_safe_value
+from .fun_base import log, send_exception, md5_string, get_safe_value, NetWorkIdleTimeout
 from .fun_web import fetch, full_screen_shot
 from .time_utils import TimeUtils
 from .wxwork import WxWorkBot
@@ -80,29 +80,13 @@ class SheinLib:
                     web_page.wait_for_load_state("load")
                     web_page.wait_for_timeout(1000)
 
-                    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 'https://sso.geiwohuo.com/#/home' in web_page.url:
 
-                    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 'SHEIN全球商家中心' in web_page.title() or '后台首页' in web_page.title() or '商家后台' in web_page.title():
+                            log(web_page.title(), '中断循环', self.store_username, self.store_name)
+                            web_page.wait_for_load_state("load")
+                            web_page.wait_for_timeout(2000)
+                            break
 
                     if 'mrs.biz.sheincorp.cn' in web_page.url and '商家后台' in web_page.title():
                         web_page.goto('https://sso.geiwohuo.com/#/home')

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

@@ -21,7 +21,7 @@ from playwright.sync_api import TimeoutError as PlaywrightTimeoutError
 from functools import partial
 
 from .fun_win import find_software_install_path
-from .fun_base import log, hostname, send_exception
+from .fun_base import log, hostname, send_exception, NetWorkIdleTimeout
 from .fun_file import check_progress_json_ex, get_progress_json_ex, done_progress_json_ex, write_dict_to_file_ex
 
 class ZiniaoClient:
@@ -260,7 +260,6 @@ class ZiniaoBrowser:
         page.goto(launcher_page)
         page.wait_for_load_state('load')
 
-        # 业务逻辑
         run_func(page, store_username, store_name, task_key)
 
         # 标记完成
@@ -332,7 +331,14 @@ class ZiniaoTaskManager:
                         ip_usable = self.browser.open_ip_check(browser_context, ip_check_url)
                         if ip_usable:
                             print("ip检测通过，打开店铺平台主页")
-                            self.browser.open_launcher_page(browser_context, ret_json.get("launcherPage"), store_username, store_name, run_func, task_key)
+                            # 业务逻辑
+                            try:
+                                self.browser.open_launcher_page(browser_context, ret_json.get("launcherPage"), store_username, store_name, run_func, task_key)
+                            except NetWorkIdleTimeout:
+                                log('捕获到自定义错误: NetWorkIdleTimeout')
+                                self.browser.close_store(store_id)
+                                pass
+
                         else:
                             print("ip检测不通过，请检查")
                     except:

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

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