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

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/mysql_module/shein_return_order_model.py

@@ -77,6 +77,7 @@ class SheinReturnOrder(Base):
     return_reason_type = Column(Integer, nullable=True, comment='退货原因类型')
     return_reason_type_name = Column(String(100), nullable=True, comment='退货原因类型名称')
     return_reason = Column(Text, nullable=True, comment='退货原因')
+    reject_pic_url_list = Column(JSON, nullable=True, comment='拒绝图片URL列表')
 
     # 商品信息
     skc_name_list = Column(JSON, nullable=True, comment='SKC名称列表')
@@ -310,6 +311,7 @@ class SheinReturnOrderManager:
             return_reason_type=data.get('returnReasonType'),
             return_reason_type_name=data.get('returnReasonTypeName'),
             return_reason=data.get('returnReason'),
+            reject_pic_url_list=data.get('rejectPicUrlList'),
             skc_name_list=data.get('skcNameList'),
             supplier_code_list=data.get('supplierCodeList'),
             goods_thumb=data.get('goodsThumb'),
@@ -379,6 +381,7 @@ class SheinReturnOrderManager:
         existing_order.return_reason_type = data.get('returnReasonType')
         existing_order.return_reason_type_name = data.get('returnReasonTypeName')
         existing_order.return_reason = data.get('returnReason')
+        existing_order.reject_pic_url_list = data.get('rejectPicUrlList'),
         existing_order.skc_name_list = data.get('skcNameList')
         existing_order.supplier_code_list = data.get('supplierCodeList')
         existing_order.goods_thumb = data.get('goodsThumb')

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

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

{qrpa-1.0.51.dist-info → qrpa-1.0.53.dist-info}/RECORD

@@ -4,17 +4,17 @@ qrpa/db_migrator.py,sha256=2VmhzcMsU0MKpl-mNCwKyV8tLTqyEysSpP27-S_rQZ8,21862
 qrpa/feishu_bot_app.py,sha256=6r2YqCAMUN7y3F7onoABRmHC7S-UPOLHwbhsQnQ3IRc,9452
 qrpa/feishu_client.py,sha256=gXvyhf7r-IqeDhPjM01SfsGf17t8g1ZwUAkhymBkBeg,17544
 qrpa/feishu_logic.py,sha256=yuwb-LeZiHKGlz-W8JobinorHonVa8L-5h12WxnU7_Q,67508
-qrpa/fun_base.py,sha256=qg6SvR-GEj2TclB1OL9eLu711jV-bysXJ5Eh2gW9pE8,10600
+qrpa/fun_base.py,sha256=lMzqPwsbVfe968CUR2MVNImzIskIUZqPCE2tWxYqb5o,10728
 qrpa/fun_excel.py,sha256=iDngd15qBX_HHZh_owftRa5ZArquTneY2JegRdNvk4U,115820
 qrpa/fun_file.py,sha256=yzjDV16WL5vRys7J4uQcNzIFkX4D5MAlSCwxcD-mwQo,11966
 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=UwlXfKwaJ1YpZzkF-FX4dnG09TSLXr82nRc7LAW7z5Q,109743
+qrpa/shein_lib.py,sha256=0NYJ5UnbMbg0dg2Tffd0y7JVcpxxlTqCuFuK_VfskE8,108774
 qrpa/shein_mysql.py,sha256=MGPJsz13evsLygZWhmitpPzUswiTKZ91VFvr8KA0M40,750
 qrpa/shein_sqlite.py,sha256=ZQwD0Gz81q9WY7tY2HMEYvSF9r3N_G_Aur3bYfST9WY,5707
-qrpa/shein_ziniao.py,sha256=YQV6f7NThCgppqQ5tUjcmabE5m4TTh1pt2v_uI--Dh0,18365
+qrpa/shein_ziniao.py,sha256=kAOirjawPf-VxBxHFNpdDHCN2zL-O1U-2xybpmt34Xs,18692
 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
@@ -22,8 +22,8 @@ qrpa/time_utils.py,sha256=ef0hhbN_6b-gcnz5ETIVOoxemIMvcxGVGGIRnHnGaBo,29564
 qrpa/time_utils_example.py,sha256=shHOXKKF3QSzb0SHsNc34M61wEkkLuM30U9X1THKNS8,8053
 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.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,,
+qrpa/mysql_module/shein_return_order_model.py,sha256=zvEQBVODpxQXWveUAF5z-be-DVI3WlF8UgvmwCTWP7o,26237
+qrpa-1.0.53.dist-info/METADATA,sha256=YxiXzx5qK-76GGRhbt8AIi9lctAbYhzGfPKkSJyNF1g,231
+qrpa-1.0.53.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+qrpa-1.0.53.dist-info/top_level.txt,sha256=F6T5igi0fhXDucPPUbmmSC0qFCDEsH5eVijfVF48OFU,5
+qrpa-1.0.53.dist-info/RECORD,,