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

smartpush/export/basic/ExcelExportChecker.py

@@ -192,7 +192,7 @@ def check_excel_for_lu(check_type="content", **kwargs):
         else:
             return False, f"不支持此类型: {check_type}"
     except KeyError as ke:
-        raise ke
+        # raise ke
         print(f"类型对应参数缺失异常：{ke}")
         return False, [str(ke)]
     except Exception as e:

smartpush/export/basic/GetOssUrl.py

@@ -0,0 +1,37 @@
+import requests
+from retry import retry
+import json
+from smartpush.utils.StringUtils import StringUtils
+
+
+def get_oss_address_with_retry(target_id, url, requestHeader, requestParam, **kwargs) -> str:
+    """
+    创建带有动态重试配置的获取 OSS 地址
+    **kwargs 可传参：tries=10, delay=2, backoff=1
+    :param requestParam:
+    :param url:
+    :param target_id:
+    :param requestHeader:
+    :return: 带有重试配置的获取 OSS 地址的
+    """
+
+    @retry(tries=10, delay=2, backoff=1)
+    def get_oss_address():
+        if StringUtils.is_empty(target_id):
+            print(f"缺少参数:target_id")
+            return
+        try:
+            response = requests.request(url=url, headers=requestHeader, data=json.dumps(requestParam), method="post")
+            response.raise_for_status()
+            result = response.json()
+            id_url_dict = {item["id"]: item["url"] for item in result["resultData"]["datas"]}
+            if target_id in id_url_dict:
+                if len(id_url_dict[target_id]) == 1:
+                    return id_url_dict[target_id][0]
+                else:
+                    raise ValueError(f"存在多条 id 为 {target_id} 的记录，记录为：{id_url_dict[target_id]}")
+            else:
+                raise ValueError(f"未找到 id 为 {target_id} 的记录，未包含有效的 OSS 地址,")
+        except (KeyError, json.JSONDecodeError) as e:
+            raise ValueError(f"响应数据格式错误,响应结果: {result},异常: {e}")
+    return get_oss_address()

smartpush/test.py

@@ -0,0 +1,18 @@
+from smartpush.export.basic.ExcelExportChecker import check_excel_for_lu
+from smartpush.export.basic.GetOssUrl import get_oss_address_with_retry
+
+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 = {
+            'cookie': 'osudb_appid=SMARTPUSH;osudb_oar=#01#SID0000121BJe/0W0PdWQj0Wo/Cr4G9H5S58u/YpvUYbOxsyvHQXmU5iToD8h3GX0+/3Af1efOroDv2jIwJIPVx2F1/XCP08l/NOaWMIZ/xm1/ugKB7eA1k1akIdCSTOHJcJ95Ahp7Yz0cBgOwtr8OgF77WNxX;osudb_subappid=1;osudb_uid=4213785247;ecom_http_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NDIwMTEyNDcsImp0aSI6IjY4M2E1NDg1LTEwYjAtNDRhZS04MGMxLWQ1MmFkN2YxNmViNCIsInVzZXJJbmZvIjp7ImlkIjowLCJ1c2VySWQiOiI0MjEzNzg1MjQ3IiwidXNlcm5hbWUiOiIiLCJlbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmVhcHAuY29tIiwidXNlclJvbGUiOiJvd25lciIsInBsYXRmb3JtVHlwZSI6Nywic3ViUGxhdGZvcm0iOjEsInBob25lIjoiIiwibGFuZ3VhZ2UiOiJ6aC1oYW5zLWNuIiwiYXV0aFR5cGUiOiIiLCJhdHRyaWJ1dGVzIjp7ImNvdW50cnlDb2RlIjoiQ04iLCJjdXJyZW5jeSI6IkpQWSIsImN1cnJlbmN5U3ltYm9sIjoiSlDCpSIsImRvbWFpbiI6InNtYXJ0cHVzaDQubXlzaG9wbGluZXN0Zy5jb20iLCJsYW5ndWFnZSI6ImVuIiwibWVyY2hhbnRFbWFpbCI6ImZlbGl4LnNoYW9Ac2hvcGxpbmUuY29tIiwibWVyY2hhbnROYW1lIjoiU21hcnRQdXNoNF9lYzJf6Ieq5Yqo5YyW5bqX6ZO6IiwicGhvbmUiOiIiLCJzY29wZUNoYW5nZWQiOmZhbHNlLCJzdGFmZkxhbmd1YWdlIjoiemgtaGFucy1jbiIsInN0YXR1cyI6MCwidGltZXpvbmUiOiJBc2lhL01hY2FvIn0sInN0b3JlSWQiOiIxNjQ0Mzk1OTIwNDQ0IiwiaGFuZGxlIjoic21hcnRwdXNoNCIsImVudiI6IkNOIiwic3RlIjoiIiwidmVyaWZ5IjoiIn0sImxvZ2luVGltZSI6MTczOTQxOTI0Nzg2OSwic2NvcGUiOlsiZW1haWwtbWFya2V0IiwiY29va2llIiwic2wtZWNvbS1lbWFpbC1tYXJrZXQtbmV3LXRlc3QiLCJlbWFpbC1tYXJrZXQtbmV3LWRldi1mcyIsImFwaS11Yy1lYzIiLCJhcGktc3UtZWMyIiwiYXBpLWVtLWVjMiIsImZsb3ctcGx1Z2luIl0sImNsaWVudF9pZCI6ImVtYWlsLW1hcmtldCJ9.PJGM1sSZyvxTriMK4e1g90krqBUq9OVNc5vEyKxsXyQ;',
+            '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)
+    print(eexcelxcel)

smartpush/utils/StringUtils.py

@@ -0,0 +1,126 @@
+class StringUtils:
+    @staticmethod
+    def to_upper(s):
+        """
+        将字符串转换为大写
+        :param s: 输入的字符串
+        :return: 转换为大写后的字符串
+        """
+        return s.upper() if isinstance(s, str) else s
+
+    @staticmethod
+    def to_lower(s):
+        """
+        将字符串转换为小写
+        :param s: 输入的字符串
+        :return: 转换为小写后的字符串
+        """
+        return s.lower() if isinstance(s, str) else s
+
+    @staticmethod
+    def strip(s):
+        """
+        去除字符串两端的空白字符
+        :param s: 输入的字符串
+        :return: 去除两端空白字符后的字符串
+        """
+        return s.strip() if isinstance(s, str) else s
+
+    @staticmethod
+    def is_digit(s):
+        """
+        判断字符串是否只包含数字
+        :param s: 输入的字符串
+        :return: 如果只包含数字返回 True，否则返回 False
+        """
+        return s.isdigit() if isinstance(s, str) else False
+
+    @staticmethod
+    def substring(s, start, end=None):
+        """
+        截取字符串的子字符串
+        :param s: 输入的字符串
+        :param start: 起始索引
+        :param end: 结束索引（可选）
+        :return: 截取的子字符串
+        """
+        return s[start:end] if isinstance(s, str) else s
+
+    @staticmethod
+    def replace(s, old, new):
+        """
+        替换字符串中的指定子字符串
+        :param s: 输入的字符串
+        :param old: 要替换的旧子字符串
+        :param new: 替换后的新子字符串
+        :return: 替换后的字符串
+        """
+        return s.replace(old, new) if isinstance(s, str) else s
+
+    @staticmethod
+    def split(s, sep=None):
+        """
+        根据指定分隔符分割字符串
+        :param s: 输入的字符串
+        :param sep: 分隔符（可选）
+        :return: 分割后的字符串列表
+        """
+        return s.split(sep) if isinstance(s, str) else s
+
+    @staticmethod
+    def is_empty(s):
+        """
+        判断字符串是否为空
+        :param s: 输入的字符串
+        :return: 如果字符串为空或仅包含空白字符返回 True，否则返回 False
+        """
+        return not s or s.isspace() if isinstance(s, str) or s is None else False
+
+    @staticmethod
+    def contains(s, sub):
+        """
+        判断字符串是否包含指定子字符串
+        :param s: 输入的字符串
+        :param sub: 要检查的子字符串
+        :return: 如果包含返回 True，否则返回 False
+        """
+        return sub in s if isinstance(s, str) and isinstance(sub, str) else False
+
+    @staticmethod
+    def reverse(s):
+        """
+        反转字符串
+        :param s: 输入的字符串
+        :return: 反转后的字符串
+        """
+        return s[::-1] if isinstance(s, str) else s
+
+    @staticmethod
+    def count_substring(s, sub):
+        """
+        统计子字符串在字符串中出现的次数
+        :param s: 输入的字符串
+        :param sub: 要统计的子字符串
+        :return: 子字符串出现的次数
+        """
+        return s.count(sub) if isinstance(s, str) and isinstance(sub, str) else 0
+
+    @staticmethod
+    def startswith(s, prefix):
+        """
+        判断字符串是否以指定前缀开头
+        :param s: 输入的字符串
+        :param prefix: 前缀字符串
+        :return: 如果以指定前缀开头返回 True，否则返回 False
+        """
+        return s.startswith(prefix) if isinstance(s, str) and isinstance(prefix, str) else False
+
+    @staticmethod
+    def endswith(s, suffix):
+        """
+        判断字符串是否以指定后缀结尾
+        :param s: 输入的字符串
+        :param suffix: 后缀字符串
+        :return: 如果以指定后缀结尾返回 True，否则返回 False
+        """
+        return s.endswith(suffix) if isinstance(s, str) and isinstance(suffix, str) else False

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

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

smartpush-1.0.9.dist-info/RECORD

@@ -0,0 +1,13 @@
+smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
+smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
+smartpush/test.py,sha256=GR8R4qMkXgpp884X9RDV04N2TBGavyXQQe8PBitD1jE,2822
+smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
+smartpush/export/basic/ExcelExportChecker.py,sha256=2EMa_KWErJ18un0YPKa9InHyKJ5cIUCnYyCpAjqVqss,12189
+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.0.8.dist-info → smartpush-1.0.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

smartpush/felix_test.py

@@ -1,20 +0,0 @@
-import requests
-
-from smartpush.export.basic import ExcelExportChecker
-
-if __name__ == '__main__':
-
-    ossurl1 = "https://cdn.smartpushedm.com/material_ec2/2025-02-10/4f3c7f2ad92946a894e3df9176341e1c/%E7%94%A8%E6%88%B7%E7%95%99%E5%AD%98.xlsx"
-    ossurl2 = "https://cdn.smartpushedm.com/material_ec2/2025-02-10/238f1f143d34441e9cfd61ba68ce8dd1/%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="content", 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.8.dist-info/RECORD

@@ -1,10 +0,0 @@
-smartpush/__init__.py,sha256=XJrl1vhGATHSeSVqKmPXxYqxyseriUpvY5tLIXir3EE,24
-smartpush/felix_test.py,sha256=CpB1NMDZ4RAtE028XVYfhxTU7RQPSqlWN6ejGO7ww7I,1020
-smartpush/get_jira_info.py,sha256=dmCwkKa94xwyE2hegE1KBI3cV_LbrJ67P9osORUGPt4,2633
-smartpush/export/__init__.py,sha256=D9GbWcmwnetEndFDty5XbVienFK1WjqV2yYcQp3CM84,99
-smartpush/export/basic/ExcelExportChecker.py,sha256=T9eDPgNh5zekCAdKFu67aHjQPhKQKzK1BUGtn7UQuh0,12187
-smartpush/export/basic/__init__.py,sha256=6tcrS-2NSlsJo-UwEsnGUmwCf7jgOsh_UEbM0FD-gYE,70
-smartpush-1.0.8.dist-info/METADATA,sha256=Shg6Xm-PRgQW1n2UFjy9suT2lNAAFMZfjOlYSHJ9VKI,145
-smartpush-1.0.8.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-smartpush-1.0.8.dist-info/top_level.txt,sha256=5_CXqu08EfbPaKLjuSAOAqCmGU6shiatwDU_ViBGCmg,10
-smartpush-1.0.8.dist-info/RECORD,,