smartpush 1.0.9__py3-none-any.whl → 1.1.1__py3-none-any.whl

smartpush/export/basic/ExcelExportChecker.py

@@ -1,11 +1,9 @@
-import contextlib
 import os
 import re
+import warnings
 from io import BytesIO
 from urllib.parse import unquote
 import pandas as pd
-import numpy as np
-import warnings
 from requests import request
 
 """
@@ -25,6 +23,13 @@ def read_excel_from_oss(url="", method="get"):
         print(f"读取oss报错 {url} 时出错：{e}")
 
 
+def read_excel_data(excel_data, **kwargs):
+    with warnings.catch_warnings():
+        warnings.filterwarnings("ignore", category=UserWarning, module=re.escape('openpyxl.styles.stylesheet'))
+        dfs = pd.read_excel(excel_data, sheet_name=None, engine="openpyxl", na_filter=False, **kwargs)
+        return dfs
+
+
 def read_excel_and_write_to_dict(excel_data=None, file_name=None, **kwargs):
     """excel内容并写入到内存dict中
     :param excel_data：excel的io对象, 参数和file_name互斥
@@ -35,19 +40,17 @@ def read_excel_and_write_to_dict(excel_data=None, file_name=None, **kwargs):
             pass
         elif file_name is not None:
             excel_data = os.path.join(os.path.dirname(os.getcwd()) + "/check_file/" + file_name)
-        with warnings.catch_warnings():
-            warnings.filterwarnings("ignore", category=UserWarning, module=re.escape('openpyxl.styles.stylesheet'))
-            df = pd.read_excel(excel_data, engine="openpyxl", **kwargs)
+        dfs = read_excel_data(excel_data)
         # 将DataFrame转换为字典，以行为单位存储数据
         row_dict = {}  # 创建一个空字典来存储按行转换的数据
-        for index, row in df.iterrows():  # 遍历DataFrame中的每一行
+        for index, row in dfs.iterrows():  # 遍历DataFrame中的每一行
             row_dict[index] = row.to_dict()  # 将每一行转换为字典并存储在row_dict中
         return row_dict
     except Exception as e:
         print(f"excel写入dict时出错：{e}")
 
 
-def read_excel_and_write_to_list(excel_data=None, file_name=None, **kwargs):
+def read_excel_and_write_to_list(excel_data=None, sheet_name=None, file_name=None, **kwargs):
     """excel内容并写入到内存list中
     :param excel_data：excel的io对象, 参数和file_name互斥
     :file_name: excel文件名称，目前读取check_file目录下文件，参数和excel_data互斥
@@ -78,6 +81,7 @@ def read_excel_and_write_to_list(excel_data=None, file_name=None, **kwargs):
     storage_options：存储选项。
     dtype_backend：数据类型后端。
     engine_kwargs：传递给引擎的额外参数。
+    @param sheet_name:
 
 
     """
@@ -87,11 +91,13 @@ def read_excel_and_write_to_list(excel_data=None, file_name=None, **kwargs):
         elif file_name is not None:
             excel_data = os.path.join(os.path.dirname(os.getcwd()) + "/check_file/" + file_name)
 
-        with warnings.catch_warnings():
-            warnings.filterwarnings("ignore", category=UserWarning, module=re.escape('openpyxl.styles.stylesheet'))
-            df = pd.read_excel(excel_data, engine="openpyxl", na_filter=False, **kwargs)
-        # 将DataFrame转换为字典，以行为单位存储数据
-        rows_list = df.values.tolist()
+        dfs = read_excel_data(excel_data)
+        rows_list = []
+        # 多sheet处理
+        for name, df in dfs.items():
+            rows_list.append(df.values.tolist())
+        if len(dfs) <= 1:
+            rows_list = rows_list[0]
         return rows_list
     except Exception as e:
         print(f"excel写入list时出错：{e}")
@@ -108,23 +114,35 @@ def read_excel_and_write_to_csv(excel_data, file_name, **kwargs):
         print(f"excel写入csv时出错：{e}")
 
 
-def read_excel_data_to_oss_link(oss, sheet_name=None, **kwargs) -> dict:
+def read_excel_data_for_oss_write_to_dict(oss, **kwargs) -> dict:
     """
     1、根据oss link 直接读出 dict-list
-    2、支持多sheet，默认heet_name =None查全部
+    2、支持多sheet，默认sheet_name =None查全部
     3、返回dict结构 {'sheet_name':[rows_list]}
     """
     try:
-        with warnings.catch_warnings():
-            warnings.filterwarnings("ignore", category=UserWarning, module=re.escape('openpyxl.styles.stylesheet'))
-            dfs = pd.read_excel(read_excel_from_oss(oss), sheet_name, engine="openpyxl", **kwargs)
+        dfs = read_excel_data(read_excel_from_oss(oss))
         result = {}
         for sheet_name, df in dfs.items():
             rows_list = df.values.tolist()
             result[sheet_name] = rows_list
         return result
     except Exception as e:
-        print(f"excel写入list时出错：{e}")
+        print(f"excel生成dict出错：{e}")
+
+
+def read_excel_header_for_oss_write_to_list(oss) -> list:
+    """
+    1、根据oss link 直接读出excel的头列 list
+    """
+    try:
+        dfs = read_excel_data(read_excel_from_oss(oss))
+        result = []
+        for sheet_name, df in dfs.items():
+            result.append(df.keys().values.tolist())
+        return result
+    except Exception as e:
+        print(f"excel生成header-dict出错：{e}")
 
 
 def check_excel(check_type="content", **kwargs):
@@ -152,7 +170,8 @@ def check_excel(check_type="content", **kwargs):
             expected_content = read_excel_and_write_to_list(excel_data=read_excel_from_oss(url=kwargs["expected_oss"]))
             flag1, content_result = check_excel_content(actual=actual_content, expected=expected_content)
             flag2, name_result = check_excel_name(actual_oss=kwargs["actual_oss"], expected_oss=kwargs["expected_oss"])
-            return flag1 and flag2, {"文件名称": name_result, "导出内容": content_result}
+            flag3 = check_excel_header(actual_oss=kwargs["actual_oss"], expected_oss=kwargs["expected_oss"])
+            return all([flag1, flag2, flag3]), {"文件名称": name_result, "导出内容": content_result}
         else:
             return False, f"不支持此类型: {check_type}"
     except Exception as e:
@@ -169,6 +188,7 @@ comparison_functions = {
     else check_excel_content(kwargs["actual_oss"], kwargs["expected_oss"]),
     # excelName
     "excelName": lambda kwargs: check_excel_name(kwargs["actual_oss"], kwargs["expected_oss"]),
+    'header': lambda kwargs: check_excel_header(kwargs["actual_oss"], kwargs["expected_oss"]),
     # 全部
     "all": lambda kwargs: check_excel_all(kwargs["actual_oss"], kwargs["expected_oss"])
 }
@@ -213,7 +233,9 @@ def check_excel_all(actual_oss, expected_oss):
     """
     flag1, content_result = check_excel_content_form_oss(actual_oss, expected_oss)
     flag2, name_result = check_excel_name(actual_oss, expected_oss)
-    return flag1 and flag2, {"文件名称": name_result, "导出内容": content_result}
+    flag3 = check_excel_header(actual_oss, expected_oss)
+    return all([flag1, flag2, flag3]), {"文件名称": name_result, "导出内容": content_result,
+                                        "校验结果": [flag1, flag2, flag3]}
 
 
 def check_excel_name(actual_oss, expected_oss):
@@ -251,7 +273,9 @@ def check_excel_content(actual, expected):
                 errors.append("excel内容-预期和实际行数相等，为" + str(actual_num) + "行")
             else:
                 errors.append(
-                    "excel内容-行数和预期对比差" + check_row.__str__() + "行" + ", 实际:" + str(actual_num) + "预期: " + str(expected_num))
+                    "excel内容-行数和预期对比差" + check_row.__str__() + "行" + ", 实际:" + str(
+                        actual_num) + "预期: " + str(
+                        expected_num))
             # 断言不匹配行
             if check_row >= 0:
                 num = len(expected)
@@ -269,6 +293,18 @@ def check_excel_content(actual, expected):
         return False, [e]
 
 
+def check_excel_header(actual_oss, expected_oss):
+    """
+    比较两个文档第一列的header是否一致
+    @param actual_oss:
+    @param expected_oss:
+    @return:
+    """
+    actual, expected = read_excel_data_for_oss_write_to_dict(actual_oss), read_excel_data_for_oss_write_to_dict(
+        expected_oss)
+    return actual == expected
+
+
 def del_temp_file(file_name=""):
     """删除temp下临时文件"""
     file_path = os.path.join(os.path.dirname(os.getcwd()) + "/temp_file/" + file_name)
@@ -279,4 +315,3 @@ def del_temp_file(file_name=""):
         print(f"文件 {file_path} 不存在。")
     except Exception as e:
         print(f"删除文件 {file_path} 时出错：{e}")
-

smartpush/test.py

@@ -1,10 +1,10 @@
-from smartpush.export.basic.ExcelExportChecker import check_excel_for_lu
+from smartpush.export.basic.ExcelExportChecker import *
 from smartpush.export.basic.GetOssUrl import get_oss_address_with_retry
 
+import urllib3
+
 if __name__ == '__main__':
     # print(check_excel_for_lu("content",actual_oss="https://sl-smartfile.oss-ap-southeast-1.aliyuncs.com/material_ec2_prod/2025-01-20/fcb98e2965314ef2862db65760dcce1f/ab%E5%BC%B9%E7%AA%97%E6%B4%BB%E5%8A%A8-%E8%BD%AC%E5%8C%96%E7%8E%87%E8%8E%B7%E8%83%9C%E9%94%80%E5%94%AE%E9%A2%9D%E6%98%8E%E7%BB%86%E6%95%B0%E6%8D%AE.xlsx",expected_oss="https://sl-smartfile.oss-ap-southeast-1.aliyuncs.com/material_ec2_prod/2025-01-20/fcb98e2965314ef2862db65760dcce1f/ab%E5%BC%B9%E7%AA%97%E6%B4%BB%E5%8A%A8-%E8%BD%AC%E5%8C%96%E7%8E%87%E8%8E%B7%E8%83%9C%E9%94%80%E5%94%AE%E9%A2%9D%E6%98%8E%E7%BB%86%E6%95%B0%E6%8D%AE.xlsx"))
-
-
     _id = 10901
     url = "https://test.smartpushedm.com/api-em-ec2/bulkOps/query"
     requestHeaders = {
@@ -12,7 +12,7 @@ if __name__ == '__main__':
             'Content-Type': 'application/json'}
     requestParams = {'page': 1, 'pageSize': 10, 'type': 'EXPORT', 'status': None, 'startTime': None, 'endTime': None}
     oss=get_oss_address_with_retry(_id, url, requestHeaders, requestParams, tries=1, delay=1, backoff=1)
-    eexcelxcel = check_excel_for_lu("all",
-                                    expected_oss=oss,
-                                    actual_oss=oss)
+    check_excel_for_lu("all",oss,oss)
+    # oss = "https://cdn.smartpushedm.com/material_sf/2025-02-19/c70bb6f3588b4c89bde6ed75813ea4f3/%E5%AF%BC%E5%87%BA%E5%85%A8%E9%83%A8%E5%AE%A2%E6%88%B7.csv"
+    # eexcelxcel =read_excel_and_write_to_list(read_excel_from_oss(oss))
     print(eexcelxcel)

{smartpush-1.0.9.dist-info → smartpush-1.1.1.dist-info}/METADATA

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

{smartpush-1.0.9.dist-info → smartpush-1.1.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
 smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
 smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
-smartpush/test.py,sha256=GR8R4qMkXgpp884X9RDV04N2TBGavyXQQe8PBitD1jE,2822
+smartpush/test.py,sha256=FTfTwcJEZFPz_Rq8pAooOW_qBN1sbVQbm2htF8mgqDo,2939
 smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=2EMa_KWErJ18un0YPKa9InHyKJ5cIUCnYyCpAjqVqss,12189
+smartpush/export/basic/ExcelExportChecker.py,sha256=Y4agi5F8j1sIgM10Z3yKKs6y7rg4p6-6GSyKMpEITzs,13173
 smartpush/export/basic/GetOssUrl.py,sha256=O2-HtcYzbabck9dKgLu8ga21_AiyDIzgdfoDgvqBY3c,1541
 smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
 smartpush/utils/StringUtils.py,sha256=NXomJ4qmyBRAFnGj5hrFRWwQnRQMTcPzy20fk1dunSw,3980
 smartpush/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpush-1.0.9.dist-info/METADATA,sha256=y3_SkqSb2-fPTteG2RZUOBURVjr3W-higEFBqhVJ5io,145
-smartpush-1.0.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-smartpush-1.0.9.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.0.9.dist-info/RECORD,,
+smartpush-1.1.1.dist-info/METADATA,sha256=5tCwRmx5MPLlVdUC695sEQEUDgcVr5TIZJeSVakIJr4,145
+smartpush-1.1.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+smartpush-1.1.1.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.1.1.dist-info/RECORD,,