upplib 2.9.9__py3-none-any.whl → 3.2.2__py3-none-any.whl

upplib/query_log.py

@@ -16,13 +16,19 @@ def query_sls_logs(logstore_name: str = '',
                    query_sql: str = None,
                    trace_id_fixed_length: int = None,
                    replace_n_t: bool = True,
+                   order_by_desc: bool = True,
                    remove_repeat_content: bool = False,
                    time_use_in_content: bool = True,
                    config_name: str = '',
                    country: str = '',
                    start_time: datetime | str | None = None,
+                   forward_seconds: int = 2,
+                   backward_seconds: int = 2,
+                   method_length: int = 31,
                    end___time: datetime | str | None = None,
                    append_file: bool = False,
+                   only_date_msg: bool = False,
+                   msg_delete_prefix: int = 0,
                    file_name_suffix: str = '',
                    clean_up_msg_type: int = 0,
                    default_tz: str = '+07:00') -> None:
@@ -31,15 +37,26 @@ def query_sls_logs(logstore_name: str = '',
         query_sql  : 当有 query_sql 的时候 query 就会被 覆盖
         replace_n_t: 转义 \\n, \\t 这些符号
         file_name_suffix: 在输出的文件后面加一个后缀
+        forward_seconds: 往前查询的秒数
+        backward_seconds: 往后查询的秒数
     """
     if start_time is None and end___time is None:
         start_time, end___time = (t[0], t[1]) if (t := get_from_txt()) and t[0] is not None else (get_timestamp() - 60 * minute, get_timestamp())
+
+    if start_time is None and end___time is not None:
+        start_time = end___time
+        end___time = end___time
+
+    if start_time is not None and end___time is None:
+        start_time = start_time
+        end___time = start_time
+
     if query_sql is not None:
         query = query_sql
     if ' limit ' not in query.lower():
         query += ' LIMIT ' + str(limit)
-    start_time = get_timestamp(start_time)
-    end___time = get_timestamp(end___time)
+    start_time = get_timestamp(start_time) - forward_seconds
+    end___time = get_timestamp(end___time) + backward_seconds
     if not append_file:
         to_print_file(country, logstore_name, mode='w', file_path='', file_name=logstore_name + '_' + str(country) + str(file_name_suffix))
         to_print_file(f'start_time : {to_datetime_str(start_time, tz=default_tz)}')
@@ -60,8 +77,10 @@ def query_sls_logs(logstore_name: str = '',
         if (
                 msg := clean_up_msg(
                     get_log_msg(log.contents, replace_n_t=replace_n_t, default_tz=default_tz, time_use_in_content=time_use_in_content),
+                    method_length=method_length,
                     trace_id_fixed_length=trace_id_fixed_length,
                     clean_up_type=clean_up_msg_type)) is not None:
+            msg = simplify_msg(msg, only_date_msg=only_date_msg, msg_delete_prefix=msg_delete_prefix)
             if remove_repeat_content:
                 log_set.add(msg)
             else:
@@ -69,6 +88,8 @@ def query_sls_logs(logstore_name: str = '',
     if len(log_set) > 0:
         log_list = list(log_set)
         log_list.sort()
+    if order_by_desc:
+        log_list.reverse()
     to_print_file(f"从日志库中查询, 一共获得 {response.get_count()} 条日志, 处理完了以后, 共 {len(log_list)} 条日志")
     for log in log_list:
         to_print_file(log)
@@ -82,6 +103,7 @@ def query_lts_logs(logstore_name: str = '',
                    trace_id_fixed_length: int = None,
                    query_sql: str = None,
                    replace_n_t: bool = True,
+                   order_by_desc: bool = True,
                    remove_repeat_content: bool = False,
                    time_use_in_content: bool = True,
                    config_name: str = 'mx_huaweiyun_lts',
@@ -89,8 +111,13 @@ def query_lts_logs(logstore_name: str = '',
                    log_stream_id='f9555059-d0a8-4a8a-acd2-796ac9aeef2e',
                    country: str = '',
                    start_time: datetime | str | None = None,
+                   forward_seconds: int = 2,
+                   backward_seconds: int = 2,
+                   method_length: int = 31,
                    end___time: datetime | str | None = None,
                    append_file: bool = False,
+                   only_date_msg: bool = False,
+                   msg_delete_prefix: int = 0,
                    file_name_suffix: str = '',
                    clean_up_msg_type: int = 0,
                    default_tz: str = '-06:00') -> None:
@@ -102,12 +129,21 @@ def query_lts_logs(logstore_name: str = '',
     """
     if start_time is None and end___time is None:
         start_time, end___time = (t[0], t[1]) if (t := get_from_txt()) and t[0] is not None else (get_timestamp() - 60 * minute, get_timestamp())
+
+    if start_time is None and end___time is not None:
+        start_time = end___time
+        end___time = end___time
+
+    if start_time is not None and end___time is None:
+        start_time = start_time
+        end___time = start_time
+
     if query_sql is not None:
         query = query_sql
     if ' limit ' not in query.lower():
         query += ' LIMIT ' + str(limit)
-    start_time = get_timestamp_ms(start_time)
-    end___time = get_timestamp_ms(end___time)
+    start_time = get_timestamp_ms(start_time) - forward_seconds * 1000
+    end___time = get_timestamp_ms(end___time) + backward_seconds * 1000
     if not append_file:
         to_print_file(country, logstore_name, mode='w', file_path='', file_name=logstore_name + '_' + str(country) + str(file_name_suffix))
         to_print_file(f'start_time : {to_datetime_str(start_time, tz=default_tz)}')
@@ -127,8 +163,12 @@ def query_lts_logs(logstore_name: str = '',
         whether_to_rows=True,
         time_range=TimeRange(
             sql_time_zone="UTC",
-            start_time=start_time,
-            end_time=end___time,
+            # start_time=start_time,
+            # end_time=end___time,
+            # 兼容问题, 因为 lts 日志库的时间是 utc 时间, 所以要减去 14 小时
+            # 具体的原因可以参考 https://support.huaweicloud.com/intl/zh-cn/api-lts/ListStructuredLogsWithTimeRange.html
+            start_time=start_time - 14 * 60 * 60 * 1000,
+            end_time=end___time - 14 * 60 * 60 * 1000,
             start_time_gt=False,
             end_time_lt=False
         ),
@@ -136,14 +176,16 @@ def query_lts_logs(logstore_name: str = '',
         query=query,
     )
     response = client.list_structured_logs_with_time_range(request)
-    to_print_file(f"从日志库中查询, 一共获得 {len(response.body['result'])} 条日志")
+    # to_print_file(f"从日志库中查询, 一共获得 {len(response.body['result'])} 条日志")
     log_set = set()
     log_list = []
     for log in response.body['result']:
         if (msg := clean_up_msg(
                 get_log_msg(log, replace_n_t=replace_n_t, default_tz=default_tz, time_use_in_content=time_use_in_content),
+                method_length=method_length,
                 trace_id_fixed_length=trace_id_fixed_length,
                 clean_up_type=clean_up_msg_type)) is not None:
+            msg = simplify_msg(msg, only_date_msg=only_date_msg, msg_delete_prefix=msg_delete_prefix)
             if remove_repeat_content:
                 log_set.add(msg)
             else:
@@ -151,6 +193,8 @@ def query_lts_logs(logstore_name: str = '',
     if len(log_set) > 0:
         log_list = list(log_set)
         log_list.sort()
+    if order_by_desc:
+        log_list.reverse()
     to_print_file(f"从日志库中查询, 一共获得 {len(response.body['result'])} 条日志, 处理完了以后, 共 {len(log_list)} 条日志")
     for log in log_list:
         to_print_file(log)

upplib/redis_tool.py

@@ -2,7 +2,7 @@ from upplib import *
 import redis
 
 
-def get_id(config_redis='redis', key_name='a_b', expire_days=50) -> int | None:
+def get_id(config_redis='redis', key_name='a_b_c', expire_days=5) -> int | None:
     """
         获得自增的 id
     """

upplib/util.py

@@ -37,6 +37,8 @@ def get_log_msg(contents: dict,
                 _time_ = to_datetime_str(time_str, default_tz=default_tz)
     if content is None:
         return None
+    if level is not None and content.strip().startswith(level + ' '):
+        content = content[len(level + ' '):].strip()
     return ' '.join(filter(lambda s: s is not None, [_time_, level, content.replace('\n', '\\n').replace('\t', '\\t') if replace_n_t else content]))
 
 

{upplib-2.9.9.dist-info → upplib-3.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: upplib
-Version: 2.9.9
+Version: 3.2.2
 Summary: util
 Author: Luck
 Author-email: wantwaterfish@gmail.com

upplib-3.2.2.dist-info/RECORD

@@ -0,0 +1,23 @@
+upplib/__init__.py,sha256=AzQ1nB4NdyU5Kjnhi6aqjotkljhA2oNioQ1pgxpe8no,828
+upplib/chart.py,sha256=DEcfhr1HlWdITaPWTVlL0CVSr3GiJTV_bWyOPb1UoyA,27667
+upplib/chart_html.py,sha256=39CTD2LbN7LNN3wtb3n-ojN2r_X7RJMWappPgiLSJG4,23144
+upplib/clean_up_msg.py,sha256=yR4D2fIXOT8z9VpClfhBjVnjhexObgNZDhvPu5v_5Y4,19237
+upplib/common_package.py,sha256=2-u66k4WbZnX6-PUaYy8wsblnz41nvtX4Hwo3J5hjO0,832
+upplib/db.py,sha256=-3ZALQSzP92-zIhye6ckrXIctbHsVmwoLiCVOlTyDyo,7058
+upplib/file.py,sha256=R753ZBNE1PxbWNqu9eQ8VvcimahwBkvtu4mlx3qTFoE,8643
+upplib/file_text.py,sha256=JYoRSatwPMVOqXpJ2wszfJ2pVx1Ot2rQ2Jnxm_vj_YY,43106
+upplib/format_data.py,sha256=Qxq-OZ8v6HBRJ-tUcNFem1Imbauk3Y5qJTrAGT0CC4I,10153
+upplib/http_util.py,sha256=8Xya5qpeCKGaglxKnirOlOnbnBU3K52FGV5Y9c8HH9k,16119
+upplib/index.py,sha256=VvQzOzx6vtSLAmFARplPCVNTMq0DKYpMBFRgr7ge1dc,25887
+upplib/mail.py,sha256=pe1ZZlKsah_TiB_Ag3scgiIQegyOznul2awdHur2m4Y,7550
+upplib/mail_html.py,sha256=W2_WT9WhFykmAFageboJ-6E0dnBHBGMG1vQlBb9__M8,4001
+upplib/markdown.py,sha256=YXh2Rtb5gvZ755Ecr3r5FcMoDtd2YcqtOFHFv92jWOQ,5803
+upplib/multi_thread.py,sha256=zOeWG5HGYIzwqiPvef-4ak5bzorf0S3q6Ht8wPit_M0,2705
+upplib/query_log.py,sha256=m93f8wyZeatVs_PF8O5eyC6U5yJfohg7x6muXPUMOJA,9204
+upplib/redis_tool.py,sha256=I1kOqBwfQWVIOAY-hQaaOn1Zrx8BNlK83u-pk4uHPCA,707
+upplib/util.py,sha256=0JXo9eIEC67Cnby-s8IELkbP9m7a6deB4pX7OIGb3zg,4709
+upplib-3.2.2.dist-info/licenses/LICENSE,sha256=WI5JtXXhjcqnIcPllDA1ZtuxNnZ515xjElcILo7z28o,1073
+upplib-3.2.2.dist-info/METADATA,sha256=2xELIy6Z_vIUT8ilixMTe0IVVQz7W9CMt2eyN0v237g,940
+upplib-3.2.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+upplib-3.2.2.dist-info/top_level.txt,sha256=VwdHDDPP79e1LqtRu5_w30hHB4gT0zlj1weuQYOqFoA,7
+upplib-3.2.2.dist-info/RECORD,,

{upplib-2.9.9.dist-info → upplib-3.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

upplib-2.9.9.dist-info/RECORD

@@ -1,21 +0,0 @@
-upplib/__init__.py,sha256=nWDutqy89i9JQVsFyjuzCSsFDpT0fPcU7BQv0X7BmgM,764
-upplib/chart.py,sha256=DEcfhr1HlWdITaPWTVlL0CVSr3GiJTV_bWyOPb1UoyA,27667
-upplib/chart_html.py,sha256=39CTD2LbN7LNN3wtb3n-ojN2r_X7RJMWappPgiLSJG4,23144
-upplib/clean_up_msg.py,sha256=qATu9YBCUuHwt-0YR6hjDgCLR1aUn6d_JJ7tcveHbRM,18186
-upplib/common_package.py,sha256=2-u66k4WbZnX6-PUaYy8wsblnz41nvtX4Hwo3J5hjO0,832
-upplib/db.py,sha256=4wkKL1vaoIWacAseQ6wnKa39X9Sfe0JlTvIALEawLBo,7162
-upplib/file.py,sha256=1K9hrIQHIZnkXqkJop2ynQB8-wr92erdIYas_gEhZaQ,6828
-upplib/http_util.py,sha256=8Xya5qpeCKGaglxKnirOlOnbnBU3K52FGV5Y9c8HH9k,16119
-upplib/index.py,sha256=c9_vetGpLbOX1M-IccTfnrKy4uA566heq9IM_Q-phKE,67679
-upplib/mail.py,sha256=pe1ZZlKsah_TiB_Ag3scgiIQegyOznul2awdHur2m4Y,7550
-upplib/mail_html.py,sha256=W2_WT9WhFykmAFageboJ-6E0dnBHBGMG1vQlBb9__M8,4001
-upplib/markdown.py,sha256=YXh2Rtb5gvZ755Ecr3r5FcMoDtd2YcqtOFHFv92jWOQ,5803
-upplib/multi_thread.py,sha256=zOeWG5HGYIzwqiPvef-4ak5bzorf0S3q6Ht8wPit_M0,2705
-upplib/query_log.py,sha256=lzV_sxNOpPt4NQ1cV8fOiqspxJJZVZ5RfC3_TLUsR6w,7246
-upplib/redis_tool.py,sha256=BJUOGnyC7K0wLz11Jny02e-JTI7KYTcYO3xBBCd5QpA,706
-upplib/util.py,sha256=mg6AKh1NVXBgcxK3i2IEGFmrELeqYqQyQVWR4p8R4lo,4586
-upplib-2.9.9.dist-info/licenses/LICENSE,sha256=WI5JtXXhjcqnIcPllDA1ZtuxNnZ515xjElcILo7z28o,1073
-upplib-2.9.9.dist-info/METADATA,sha256=E-Z68PQNoPm-uNOLhNsTe2lz7Q7J97ZJbyrAUp5EqCY,940
-upplib-2.9.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-upplib-2.9.9.dist-info/top_level.txt,sha256=VwdHDDPP79e1LqtRu5_w30hHB4gT0zlj1weuQYOqFoA,7
-upplib-2.9.9.dist-info/RECORD,,