smartpush 1.0.5__py3-none-any.whl → 1.0.6__py3-none-any.whl

smartpush/export/basic/ExcelExportChecker.py

@@ -3,11 +3,11 @@ import os
 import re
 from io import BytesIO
 from urllib.parse import unquote
-
 import pandas as pd
 import numpy as np
 import warnings
 from requests import request
+
 """
 用于excel校验
 """
@@ -25,7 +25,7 @@ def read_excel_from_oss(url="", method="get"):
         print(f"读取oss报错 {url} 时出错：{e}")
 
 
-def read_excel_and_write_to_dict(excel_data=None, file_name=None):
+def read_excel_and_write_to_dict(excel_data=None, file_name=None, **kwargs):
     """excel内容并写入到内存dict中
     :param excel_data：excel的io对象, 参数和file_name互斥
     :file_name: excel文件名称，目前读取check_file目录下文件，参数和excel_data互斥
@@ -37,7 +37,7 @@ def read_excel_and_write_to_dict(excel_data=None, file_name=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")
+            df = pd.read_excel(excel_data, engine="openpyxl", **kwargs)
         # 将DataFrame转换为字典，以行为单位存储数据
         row_dict = {}  # 创建一个空字典来存储按行转换的数据
         for index, row in df.iterrows():  # 遍历DataFrame中的每一行
@@ -47,7 +47,7 @@ def read_excel_and_write_to_dict(excel_data=None, file_name=None):
         print(f"excel写入dict时出错：{e}")
 
 
-def read_excel_and_write_to_list(excel_data=None, file_name=None):
+def read_excel_and_write_to_list(excel_data=None, file_name=None, **kwargs):
     """excel内容并写入到内存list中
     :param excel_data：excel的io对象, 参数和file_name互斥
     :file_name: excel文件名称，目前读取check_file目录下文件，参数和excel_data互斥
@@ -89,7 +89,8 @@ def read_excel_and_write_to_list(excel_data=None, file_name=None):
 
         with warnings.catch_warnings():
             warnings.filterwarnings("ignore", category=UserWarning, module=re.escape('openpyxl.styles.stylesheet'))
-            df = pd.read_excel(excel_data, engine="openpyxl")
+            df = pd.read_excel(excel_data, engine="openpyxl", **kwargs)
+            print(df)
         # 将DataFrame转换为字典，以行为单位存储数据
         rows_list = df.values.tolist()
         return rows_list
@@ -97,17 +98,36 @@ def read_excel_and_write_to_list(excel_data=None, file_name=None):
         print(f"excel写入list时出错：{e}")
 
 
-def read_excel_and_write_to_csv(excel_data, file_name):
+def read_excel_and_write_to_csv(excel_data, file_name, **kwargs):
     """excel内容并写入到csv中"""
     try:
         df = pd.read_excel(excel_data, engine="openpyxl")
         local_csv_path = os.path.join(os.path.dirname(os.getcwd()) + "/temp_file/" + file_name)
-        df.to_csv(local_csv_path, index=False)
+        df.to_csv(local_csv_path, index=False, **kwargs)
         return local_csv_path
     except Exception as e:
         print(f"excel写入csv时出错：{e}")
 
 
+def read_excel_data_to_oss_link(oss, sheet_name=None, **kwargs) -> dict:
+    """
+    1、根据oss link 直接读出 dict-list
+    2、支持多sheet，默认heet_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)
+        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}")
+
+
 def check_excel(check_type="content", **kwargs):
     """对比excel
     :param: type: 需要对比类型，
@@ -122,9 +142,10 @@ def check_excel(check_type="content", **kwargs):
             if "actual" in kwargs.keys() and "expected" in kwargs.keys():
                 return check_excel_content(actual=kwargs["actual"], expected=kwargs["expected"])
             else:
-                return check_excel_content(actual=read_excel_and_write_to_list(excel_data=read_excel_from_oss(url=kwargs["actual_oss"])),
-                                           expected=read_excel_and_write_to_list(excel_data=read_excel_from_oss(url=kwargs["expected_oss"]))
-                                           )
+                return check_excel_content(
+                    actual=read_excel_and_write_to_list(excel_data=read_excel_from_oss(url=kwargs["actual_oss"])),
+                    expected=read_excel_and_write_to_list(excel_data=read_excel_from_oss(url=kwargs["expected_oss"]))
+                )
         elif check_type == "excelName":
             return check_excel_name(actual_oss=kwargs["actual_oss"], expected_oss=kwargs["expected_oss"])
         elif check_type == "all":
@@ -140,6 +161,62 @@ def check_excel(check_type="content", **kwargs):
         return False, [e]
 
 
+# 定义比较类型和对应处理函数的映射
+comparison_functions = {
+    # 内容
+    "content": lambda kwargs: check_excel_content(kwargs["actual"], kwargs[
+        "expected"])
+    if "actual" in kwargs and "expected" in kwargs
+    else check_excel_content(kwargs["actual_oss"], kwargs["expected_oss"]),
+    # excelName
+    "excelName": lambda kwargs: check_excel_name(kwargs["actual_oss"], kwargs["expected_oss"]),
+    # 全部
+    "all": lambda kwargs: check_excel_all(kwargs["actual_oss"], kwargs["expected_oss"])
+}
+
+
+def check_excel_for_lu(check_type="content", **kwargs):
+    """对比excel
+    :param: type: 需要对比类型，
+            枚举：
+            content：对比两表格内容
+                方式1：传参actual_oss和expected_oss，参数类型str,url
+                放松1：传参actual和expected，参数类型list or dict
+            excelName: 对比两表格文件名称，传oss链接
+            all: 对比所有内容，传oss链接
+    """
+    try:
+        # 根据 check_type 获取对应的处理函数
+        compare_func = comparison_functions.get(check_type)
+        if compare_func:
+            return compare_func(kwargs)
+        else:
+            return False, f"不支持此类型: {check_type}"
+    except KeyError as ke:
+        raise ke
+        print(f"类型对应参数缺失异常：{ke}")
+        return False, [str(ke)]
+    except Exception as e:
+        print(f"对比 Excel 异常：{e}")
+        return False, [str(e)]
+
+
+def check_excel_content_form_oss(actual_oss, expected_oss):
+    """通过 OSS URL 比较 Excel 内容"""
+    expected, actual = read_excel_and_write_to_list(read_excel_from_oss(expected_oss)), read_excel_and_write_to_list(
+        read_excel_from_oss(actual_oss))
+    return check_excel_content(actual=actual, expected=expected)
+
+
+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}
+
+
 def check_excel_name(actual_oss, expected_oss):
     """校验excel文件名称
     :param actual_oss:实际oss链接
@@ -149,7 +226,7 @@ def check_excel_name(actual_oss, expected_oss):
         actual_name = unquote(actual_oss.split("/")[-1])
         expected_name = unquote(expected_oss.split("/")[-1])
         if actual_name == expected_name:
-            return True, "excel文件名称-匹配"
+            return True, "excel文件名称-完成匹配"
         else:
             return False, f"excel文件名称-不匹配, 实际: {actual_name}, 预期: {expected_name}"
     except BaseException as msg:
@@ -162,6 +239,9 @@ def check_excel_content(actual, expected):
        :param expected:预期内容：list或dict类型
      """
     try:
+        # TODO 嵌套list -dict 比较失败
+        print(actual)
+        print(expected)
         if actual == expected:
             return True, ["excel内容-完全匹配"]
         else:
@@ -174,7 +254,8 @@ def check_excel_content(actual, expected):
                 errors.append("excel内容-预期和实际行数相等，为" + str(actual_num) + "行")
             else:
                 errors.append(
-                    "excel内容-行数和预期对比差" + check_row.__str__() + "行" + ", 实际:" + str(actual_num) + "预期: " + str(
+                    "excel内容-行数和预期对比差" + check_row.__str__() + "行" + ", 实际:" + str(
+                        actual_num) + "预期: " + str(
                         expected_num))
             # 断言不匹配行
             if check_row >= 0:
@@ -182,15 +263,20 @@ def check_excel_content(actual, expected):
             else:
                 num = len(actual)
             for i in range(num):
+                # 将nan转换成None
+                actual[i] = [None if isinstance(x, (float, int)) and np.isnan(x) else x for x in actual[i]]
+                expected[i] = [None if isinstance(x, (float, int)) and np.isnan(x) else x for x in expected[i]]
                 if actual[i] == expected[i]:
                     continue
                 else:
                     errors.append(
-                        "excel内容-第" + str(i + 1) + "行不匹配，预期为：" + str(expected[i]) + ", 实际为: " + str(actual[i]))
+                        "excel内容-第" + str(i + 1) + "行不匹配，预期为：" + str(expected[i]) + ", 实际为: " + str(
+                            actual[i]))
             return False, errors
     except Exception as e:
-        print(f"excel内容-服务异常：{e}")
-        return False, [e]
+        raise e
+        # print(f"：excel内容-服务异常{e}")
+        # return False, [e]
 
 
 def del_temp_file(file_name=""):
@@ -203,3 +289,13 @@ def del_temp_file(file_name=""):
         print(f"文件 {file_path} 不存在。")
     except Exception as e:
         print(f"删除文件 {file_path} 时出错：{e}")
+
+
+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"))
+    eexcelxcel = check_excel_for_lu("all",expected_oss="https://sl-smartfile.oss-ap-southeast-1.aliyuncs.com/material/2025-01-24/3e1048ec9a7949b3be3727e71f4be645"
+        "/AutoTest-%E5%9B%BA%E5%AE%9AB-2025-01-24%20%E5%89%B5%E5%BB%BA%E7%9A%84Email12%E6%95%B0%E6%8D%AE%E6%A6%82%E8"
+        "%A7%88.xlsx", actual_oss = "https://sl-smartfile.oss-ap-southeast-1.aliyuncs.com/material/2025-01-24/3e1048ec9a7949b3be3727e71f4be645"
+        "/AutoTest-%E5%9B%BA%E5%AE%9AB-2025-01-24%20%E5%89%B5%E5%BB%BA%E7%9A%84Email12%E6%95%B0%E6%8D%AE%E6%A6%82%E8"
+        "%A7%88.xlsx")
+    print(eexcelxcel)

smartpush/felix_test.py

@@ -4,10 +4,17 @@ from smartpush.export.basic import ExcelExportChecker
 
 if __name__ == '__main__':
 
-    ossurl1 = "https://sl-smartfile.oss-ap-southeast-1.aliyuncs.com/material_ec2/2025-01-16/8556e34c8d4d45f0bb2d42dc8871a90b/%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"
-    ossurl2 = "https://sl-smartfile.oss-ap-southeast-1.aliyuncs.com/material_ec2/2025-01-16/8556e34c8d4d45f0bb2d42dc8871a90b/%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"
+    ossurl1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-10/94202be5d244428aa5fd560ce7ede732/%E7%94%A8%E6%88%B7%E7%95%99%E5%AD%98.xlsx"
+    ossurl2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-10/6df986e7855049f7846ae5fe1098c331/%E7%94%A8%E6%88%B7%E7%95%99%E5%AD%98.xlsx"
+    #
+    # # a = ExcelExportChecker.read_excel_and_write_to_list(excel_data=ExcelExportChecker.read_excel_from_oss(url=ossurl1))
+    # # b = ExcelExportChecker.read_excel_and_write_to_list(excel_data=ExcelExportChecker.read_excel_from_oss(url=ossurl2))
+    # # print(ExcelExportChecker.check_excel(actual=a, expected=b))
+    print(ExcelExportChecker.check_excel(check_type="all", actual_oss=ossurl1, expected_oss=ossurl2))
 
-    a = ExcelExportChecker.read_excel_and_write_to_list(excel_data=ExcelExportChecker.read_excel_from_oss(url=ossurl1))
-    b = ExcelExportChecker.read_excel_and_write_to_list(excel_data=ExcelExportChecker.read_excel_from_oss(url=ossurl2))
-    print(ExcelExportChecker.check_excel(actual=a, expected=b))
-    # print(ExcelExportChecker.check_excel_name(actual_oss=ossurl1, expected_oss=ossurl2))
+    # a = ['2025-01-02', 1, '100%', 0.0, '0%', 0.0, '0%', nan, nan]
+    # b = ['2025-01-02', 1, '100%', 0.0, '0%', 0.0, '0%', nan, nan]
+    # if a == b:
+    #     print(1)
+    # else:
+    #     print(2)

{smartpush-1.0.5.dist-info → smartpush-1.0.6.dist-info}/METADATA

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

smartpush-1.0.6.dist-info/RECORD

@@ -0,0 +1,10 @@
+smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
+smartpush/felix_test.py,sha256=V6TMemTQDzz-tKRHEatUYQeEXLrbefKW7jLiBJ9wy7k,1016
+smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
+smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
+smartpush/export/basic/ExcelExportChecker.py,sha256=HsxDvEjrbz7eOqGUWFl0nstDfFNEMHeQcu4xL03nZuk,13818
+smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
+smartpush-1.0.6.dist-info/METADATA,sha256=Gq0meSdGsWSClFVvUfb3q2nyJCvwU09DqdskXexIys0,145
+smartpush-1.0.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+smartpush-1.0.6.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
+smartpush-1.0.6.dist-info/RECORD,,

smartpush-1.0.5.dist-info/RECORD

@@ -1,10 +0,0 @@
-smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
-smartpush/felix_test.py,sha256=Lx5APlgJQ1bUY-632rE-BMW494IbXnUSWZjMj0GZgO4,904
-smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
-smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=ZGBIB9EW_x6EcKt9M2Q9CXj3vteJW63HqnFF7a9pOSY,9201
-smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
-smartpush-1.0.5.dist-info/METADATA,sha256=qrXsMdpp3mo7roF1p2NcErmSAEMJZ2PUChNXZuYode8,145
-smartpush-1.0.5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-smartpush-1.0.5.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.0.5.dist-info/RECORD,,