smartpush 1.2.4__tar.gz → 1.2.6__tar.gz

{smartpush-1.2.4 → smartpush-1.2.6}/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.1
 Name: smartpush
-Version: 1.2.4
+Version: 1.2.6
 Summary: 用于smartpush自动化测试工具包
 Author: 卢泽彬、邵宇飞、周彦龙

{smartpush-1.2.4 → smartpush-1.2.6}/README.md

@@ -33,5 +33,5 @@ assert result
 ```
 ## check_excel_all() 支持拓展参数
 ### check_type = "including"   如果需要预期结果包含可传  eg.联系人导出场景可用
-### ignore_sort = True   如果需要忽略内部的行排序问题可传，eg.email热点点击数据导出无排序可用
+### ignore_sort = 0   如果需要忽略内部的行排序问题可传，eg.email热点点击数据导出无排序可用，传指定第几列，0是第一列
 ### skiprows = 1   传1可忽略第一行，   eg.如flow的导出可用，动态表头不固定时可以跳过读取第一行

{smartpush-1.2.4 → smartpush-1.2.6}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='smartpush',
-    version='1.2.4',
+    version='1.2.6',
     description='用于smartpush自动化测试工具包',
     author='卢泽彬、邵宇飞、周彦龙',
     packages=find_packages(),

{smartpush-1.2.4 → smartpush-1.2.6}/smartpush/export/basic/ReadExcel.py

@@ -1,5 +1,6 @@
 import csv
 import io
+import json
 import os
 import re
 import warnings
@@ -94,15 +95,15 @@ def read_excel_and_write_to_dict(excel_data=None, file_name=None, **kwargs):
             row_dict = {}  # 创建一个空字典来存储按行转换的数据
             for sheet_name, row in dfs.items():
                 row = row.to_dict(orient='records')
-                if kwargs.get("ignore_sort", False):
-                    sorted_data_asc = sorted(row[1:], key=lambda x: x[1], reverse=True)  # 内部排序
+                if kwargs.get("ignore_sort") is not None:
+                    sorted_data_asc = sorted(row[1:], key=lambda x: x.get(kwargs.get("ignore_sort"), 0),
+                                             reverse=True)  # 内部排序
                     sorted_data_asc = [row[0]] + sorted_data_asc
                     row_dict[sheet_name] = sorted_data_asc
                 else:
                     row_dict[sheet_name] = row
         else:
             row_dict = dfs.to_dict()
-        print(row_dict)
         return row_dict
     except zipfile.BadZipFile:
         print(f"文件读取错误，请检查文件是否为无效文件：{dfs}")

{smartpush-1.2.4 → smartpush-1.2.6}/smartpush/test.py

@@ -10,16 +10,16 @@ from smartpush.export.basic.ReadExcel import read_excel_and_write_to_dict
 from smartpush.export.basic.GetOssUrl import get_oss_address_with_retry
 
 if __name__ == '__main__':
-    oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-03-03/195a4a0d37724bd6b86f7a8477aa7b94/%E8%A1%A8%E5%8D%95%E4%BB%BB%E5%8A%A1%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
-    oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-01-23/adf5404751e44e768e24be61000a42f1/%E8%A1%A8%E5%8D%95%E4%BB%BB%E5%8A%A1%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
+    oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-25/58c4a3a885884741b22380c360ac2894/【自动化导出】营销活动URL点击与热图.xlsx"
+    oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/a5e18e3b3a83432daca871953cb8471b/【自动化导出】营销活动URL点击与热图.xlsx"
     # # print(check_excel_all(oss1, oss1))
-    # oss3 = "https://cdn.smartpushedm.com/material_ec2/2025-02-25/58c4a3a885884741b22380c360ac2894/【自动化导出】营销活动URL点击与热图.xlsx"
-    # oss4 = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/58cee630b4c84eec9572b867af4ce692/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8URL%E7%82%B9%E5%87%BB%E4%B8%8E%E7%83%AD%E5%9B%BE.xlsx"
-    # expected_oss = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/757df7e77ce544e193257c0da35a4983/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
-    # actual_oss = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/757df7e77ce544e193257c0da35a4983/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
+    oss3 = "https://cdn.smartpushedm.com/material_ec2/2025-02-25/58c4a3a885884741b22380c360ac2894/【自动化导出】营销活动URL点击与热图.xlsx"
+    oss4 = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/58cee630b4c84eec9572b867af4ce692/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8URL%E7%82%B9%E5%87%BB%E4%B8%8E%E7%83%AD%E5%9B%BE.xlsx"
+    expected_oss = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/757df7e77ce544e193257c0da35a4983/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
+    actual_oss = "https://cdn.smartpushedm.com/material_ec2/2025-02-26/757df7e77ce544e193257c0da35a4983/%E3%80%90%E8%87%AA%E5%8A%A8%E5%8C%96%E5%AF%BC%E5%87%BA%E3%80%91%E8%90%A5%E9%94%80%E6%B4%BB%E5%8A%A8%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx"
 
-    # e_person_oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/b48f34b3e88045d189631ec1f0f23d51/%E5%AF%BC%E5%87%BA%E5%85%A8%E9%83%A8%E5%AE%A2%E6%88%B7.csv"
-    # a_person_oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/c50519d803c04e3b9b52d9f625fed413/%E5%AF%BC%E5%87%BA%E5%85%A8%E9%83%A8%E5%AE%A2%E6%88%B7.csv"
+    e_person_oss1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/b48f34b3e88045d189631ec1f0f23d51/%E5%AF%BC%E5%87%BA%E5%85%A8%E9%83%A8%E5%AE%A2%E6%88%B7.csv"
+    a_person_oss2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-27/c50519d803c04e3b9b52d9f625fed413/%E5%AF%BC%E5%87%BA%E5%85%A8%E9%83%A8%E5%AE%A2%E6%88%B7.csv"
 
     # # #actual_oss= get_oss_address_with_retry("23161","https://cdn.smartpushedm.com/material_ec2_prod/2025-02-20/dae941ec20964ca5b106407858676f89/%E7%BE%A4%E7%BB%84%E6%95%B0%E6%8D%AE%E6%A6%82%E8%A7%88.xlsx","",'{"page":1,"pageSize":10,"type":null,"status":null,"startTime":null,"endTime":null}')
     # # res=read_excel_and_write_to_dict(read_excel_from_oss(actual_oss))
@@ -27,7 +27,7 @@ if __name__ == '__main__':
     # # print(read_excel_and_write_to_dict(read_excel_from_oss(oss1), type=".xlsx"))
     # print(check_excel(check_type="all", actual_oss=actual_oss, expected_oss=expected_oss))
     # print(check_excel_all(actual_oss=oss1, expected_oss=oss2,skiprows =1))
-    # print(check_excel_all(actual_oss=oss1, expected_oss=oss2,ignore_sort=True))
+    print(check_excel_all(actual_oss=oss1, expected_oss=oss2, ignore_sort=0))
     # print(check_excel_all(actual_oss=a_person_oss2, expected_oss=e_person_oss1, check_type="including"))
-    print(check_excel_all(actual_oss=oss1, expected_oss=oss2, ignore_sort=True))
+    # print(check_excel_all(actual_oss=e_person_oss1, expected_oss=a_person_oss2, check_type="person"))
     # read_excel_csv_data(type=)

{smartpush-1.2.4 → smartpush-1.2.6}/smartpush.egg-info/PKG-INFO

@@ -1,5 +1,5 @@
 Metadata-Version: 2.1
 Name: smartpush
-Version: 1.2.4
+Version: 1.2.6
 Summary: 用于smartpush自动化测试工具包
 Author: 卢泽彬、邵宇飞、周彦龙