upplib 2.9.5__tar.gz → 3.3.4__tar.gz

{upplib-2.9.5 → upplib-3.3.4}/PKG-INFO

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

{upplib-2.9.5 → upplib-3.3.4}/upplib/__init__.py

@@ -8,6 +8,9 @@ from upplib.util import *
 
 # 有关文件操作类的包
 from upplib.file import *
+from upplib.file_text import *
+
+from upplib.config_data import *
 
 # 有关 图表的 html 代码的包
 from upplib.chart_html import *
@@ -31,3 +34,4 @@ from upplib.multi_thread import *
 
 from upplib.query_log import *
 from upplib.redis_tool import *
+from upplib.format_data import *

{upplib-2.9.5 → upplib-3.3.4}/upplib/clean_up_msg.py

@@ -3,7 +3,31 @@ from datetime import datetime, timezone, timedelta
 from typing import Any, Optional, Union
 
 
-def clean_up_msg(msg: str = None, clean_up_type: int = 1, trace_id_fixed_length: int = None) -> str | None:
+def simplify_msg(msg: str = None,
+                 only_date_msg: bool = False,
+                 msg_delete_prefix: int = 0,
+                 ) -> str | None:
+    """
+        only_date_msg: 只输出日期+消息
+        msg_delete_prefix: 删除消息的前缀的数量
+    """
+    res_msg = msg
+    if only_date_msg:
+        # 只需要日期+消息的部分，其他的不需要了
+        msg_date = res_msg.partition(' ')[0]
+        msg_1 = res_msg.split(' - ')[2]
+        res_msg = msg_date.strip() + ' ' + msg_1.strip()
+    if msg_delete_prefix > 0:
+        msg_date, _, msg_1 = res_msg.partition(' ')
+        res_msg = msg_date.strip() + ' ' + msg_1.strip()[msg_delete_prefix:]
+    return res_msg
+
+
+def clean_up_msg(msg: str = None,
+                 clean_up_type: int = 1,
+                 trace_id_fixed_length: int = None,
+                 method_length: int = 31
+                 ) -> str | None:
     if msg is None:
         return None
     formatters: list[Callable[[str], Optional[str]]] = [
@@ -17,7 +41,7 @@ def clean_up_msg(msg: str = None, clean_up_type: int = 1, trace_id_fixed_length:
         i + 1: formatter for i, formatter in enumerate(formatters)
     }
     if clean_up_type in formatter_map:
-        return formatter_map[clean_up_type](msg, trace_id_fixed_length)
+        return formatter_map[clean_up_type](msg, trace_id_fixed_length, method_length)
     return msg
 
 
@@ -39,7 +63,7 @@ def get_thread_id_for_log(thread_id_str: str = None) -> str:
     return f' -{suffix}- '
 
 
-def clean_up_msg_1(msg: str = None, trace_id_fixed_length: int = None) -> str:
+def clean_up_msg_1(msg: str = None, trace_id_fixed_length: int = None, method_length: int = 31) -> str:
     try:
         """
             2025-09-28T19:38:41.146111-06:00 com.leo.digest.aop.ApiLogAspect - traceId: - (catTraceId:rcs-gateway-0a0f2154-488625-102) - ===>API GatewayFacadeImpl#gatewayRequest START
@@ -61,7 +85,7 @@ def clean_up_msg_1(msg: str = None, trace_id_fixed_length: int = None) -> str:
         method, _, other = msg0.strip().partition(' - traceId:')
         other = msg0.strip() if not other else other
         thread_id = get_thread_id_for_log(method.strip().partition('] ')[0].rpartition('-')[2]) if '] ' in method else ' '
-        method = method.strip()[-31:].rjust(31)
+        method = method.strip()[-method_length:].rjust(method_length)
         if '(catTraceId:' in other:
             trace_id = re.search(r'\(catTraceId:([^)]+)\)', other).group(1).strip()
             other_after = other.strip().partition(trace_id)[2][3:].strip()
@@ -81,7 +105,7 @@ def clean_up_msg_1(msg: str = None, trace_id_fixed_length: int = None) -> str:
         return msg
 
 
-def clean_up_msg_2(msg: str = None, trace_id_fixed_length: int = None) -> str:
+def clean_up_msg_2(msg: str = None, trace_id_fixed_length: int = None, method_length: int = 31) -> str:
     try:
         """
             2025-10-09T13:45:49.687123+08:00 INFO 8 --- [nio-8080-exec-4] c.l.r.b.s.device.impl.DeviceServiceImpl  : (catTraceId:customer-product-0a5a0329-488885-107496) - checkDeviceId lock key: 1073852969169211259
@@ -93,7 +117,7 @@ def clean_up_msg_2(msg: str = None, trace_id_fixed_length: int = None) -> str:
         time1, _, msg0 = msg.strip().partition(' ')
         thread_id = get_thread_id_for_log(msg0.strip().rpartition('] ')[0].rpartition('-')[2])
         method, _, other = msg0.strip().rpartition(' : ')
-        method = method.strip()[-31:].rjust(31)
+        method = method.strip()[-method_length:].rjust(method_length)
         trace_id = ''
         if '(catTraceId:' in other:
             trace_id = re.search(r'\(catTraceId:([^)]+)\)', other).group(1)
@@ -105,7 +129,7 @@ def clean_up_msg_2(msg: str = None, trace_id_fixed_length: int = None) -> str:
         return msg
 
 
-def clean_up_msg_3(msg: str = None, trace_id_fixed_length: int = None) -> str:
+def clean_up_msg_3(msg: str = None, trace_id_fixed_length: int = None, method_length: int = 31) -> str:
     try:
         """
             2025-10-09T14:25:28.096+07:00 INFO com.itn.idn.review.aop.LogAspect - traceId:db57046b7cba9d5c55fa5ff93727c4df - ReviewBackController.queryCreditCasesByUserIdsV2: request log info-------------> {"userIds":[1011450014961537063]}
@@ -114,7 +138,7 @@ def clean_up_msg_3(msg: str = None, trace_id_fixed_length: int = None) -> str:
         SEP_S = ' - traceId:'
         time1, _, msg0 = msg.strip().partition(' ')
         msg1 = msg0.strip().split(SEP_S)
-        method = ' ' + msg1[0].strip()[-31:].rjust(31)
+        method = ' ' + msg1[0].strip()[-method_length:].rjust(method_length)
         trace_id, _, other = msg1[1].strip().partition(' - ')
         trace_id = f' - {trace_id} - ' if trace_id else ' - '
         return f'{time1}{method}{trace_id}{other}'
@@ -122,7 +146,7 @@ def clean_up_msg_3(msg: str = None, trace_id_fixed_length: int = None) -> str:
         return msg
 
 
-def clean_up_msg_4(msg: str = None, trace_id_fixed_length: int = None) -> str:
+def clean_up_msg_4(msg: str = None, trace_id_fixed_length: int = None, method_length: int = 15) -> str:
     try:
         """
             2025-10-11T10:49:24.071000+07:00 INFO [TID: N/A] [8] [strategyAsyncExecutor-1] [FlowExecutor] [-] [33f7a5cfed3548f9aa3cc39079d1e407]:(catTraceId:rcs-provider-server-0a1e0d61-488931-966531) - requestId has generated
@@ -138,7 +162,7 @@ def clean_up_msg_4(msg: str = None, trace_id_fixed_length: int = None) -> str:
         time1, _, msg0 = msg.strip().partition(' ')
         msg1 = msg0.split(SEP_S)
         thread_id = get_thread_id_for_log(msg1[2].strip().rpartition('-')[2])
-        method = msg1[3].strip().strip()[-15:].strip().replace('[', '').rjust(15)
+        method = msg1[3].strip().strip()[-method_length:].strip().replace('[', '').rjust(method_length)
         if ']:(catTraceId:' in msg1[5]:
             trace_id = re.search(r'\(catTraceId:([^)]+)\)', msg0).group(1)
             other = msg0.partition(trace_id)[2][3:].strip()
@@ -152,7 +176,7 @@ def clean_up_msg_4(msg: str = None, trace_id_fixed_length: int = None) -> str:
         return msg
 
 
-def clean_up_msg_5(msg: str = None, trace_id_fixed_length: int = None) -> str:
+def clean_up_msg_5(msg: str = None, trace_id_fixed_length: int = None, method_length: int = 31) -> str:
     try:
         """
             2025-10-10T09:59:36.118111+07:00 [http-nio-8080-exec-13][AUDIT.1070150904958674814][20251010095936118AUDIT04869][jcl_20250109000001][][MAIN] INFO - (catTraceId:xdecisionengine-0a1e0845-488906-400194) - putAll to context ,value={"app":"kredi","ip":"192.168.1.8","session_id":"","source_type":"ANDROID","product_name":"kredi"} - cn.xinfei.xdecision.engine.domain.context.PipelineContextHolder.()
@@ -173,7 +197,7 @@ def clean_up_msg_5(msg: str = None, trace_id_fixed_length: int = None) -> str:
             msg0, _, method = msg0.rpartition(' - ')
         else:
             method = msg0.rpartition(') - [')[2].strip().rpartition('] ')[0].strip()
-        method = method.strip().replace('.()', '')[-31:].rjust(31)
+        method = method.strip().replace('.()', '')[-method_length:].rjust(method_length)
         trace_id = ''
         other = ''
         if '(catTraceId:' in msg0:

upplib-3.3.4/upplib/config_data.py

@@ -0,0 +1,71 @@
+from upplib import *
+from upplib.common_package import *
+from upplib.file import *
+
+__CONFIG_PATH = '.upp.config'
+
+__CONFIG_PATH_BAK = '_upp.config'
+
+
+# 将数据写入到 config 中
+def set_config_data(file_name: str = 'config',
+                    param: dict[str, Any] = None) -> None:
+    set_data_in_user_home(file_name, {} if param is None else param)
+
+
+# 从 config 中获得 配置数据
+def get_config_data(file_name: str = 'config') -> dict[str, Any]:
+    # print('get_config_data', file_name)
+    config_data = get_data_from_user_home(file_name)
+    # print('get_data_from_user_home', config_data)
+    if not config_data:
+        config_data = get_data_from_path(file_name)
+    # print('get_data_from_path', config_data)
+    return config_data
+
+
+# 在当前用户的主目录中, 获得指定文件的数据
+def get_data_from_user_home(file_name: str = 'config') -> dict[str, Any]:
+    return get_data_from_path(file_name, os.path.expanduser("~"))
+
+
+# 将 data 数据,在当前用户的主目录中, 获得指定文件的数据
+def set_data_in_user_home(file_name: str = 'config',
+                          param: dict[str, Any] = None) -> None:
+    set_data_in_path(file_name, {} if param is None else param, os.path.expanduser("~"))
+
+
+# 在当前的目录中, 获得指定文件的数据
+def get_data_from_path(file_name: str = 'config',
+                       file_path: str = None) -> dict[str, Any]:
+    param = get_data_from_path_detail(file_name, file_path, __CONFIG_PATH)
+    return param if param else get_data_from_path_detail(file_name, file_path, __CONFIG_PATH_BAK)
+
+
+def get_data_from_path_detail(file_name: str = 'config',
+                              file_path: str = None,
+                              path_name: str = __CONFIG_PATH) -> dict[str, Any]:
+    config_path = file_path + '/' + path_name if file_path else path_name
+    # print('config_path_1', config_path)
+    if not os.path.exists(config_path):
+        # print('config_path_2', config_path)
+        return {}
+    file_path = config_path + '/' + file_name + '.json'
+    # print('config_path_3', file_path)
+    if not os.path.exists(file_path):
+        return {}
+    # print('to_json_from_file', file_path)
+    return to_json_from_file(file_path)
+
+
+# 在当前的目录中, 设置数据到指定路径下
+def set_data_in_path(file_name: str = 'config',
+                     param: str = None,
+                     file_path: str = '') -> None:
+    config_path = file_path + '/' + __CONFIG_PATH
+    if not os.path.exists(config_path):
+        os.mkdir(config_path)
+    file_path = config_path + '/' + file_name + '.json'
+    text_file = open(file_path, 'w', encoding='utf-8')
+    text_file.write(to_str({} if param is None else param))
+    text_file.close()

{upplib-2.9.5 → upplib-3.3.4}/upplib/db.py

@@ -173,10 +173,6 @@ def extract_sql(log_content: str = '') -> tuple[str | None, str | None]:
     return sql, total_sql
 
 
-def format_sql(sql: str) -> str:
-    return sqlparse.format(sql, reindent=True, keyword_case="upper")
-
-
 def deal_sql(sql: str) -> str:
     sql = sql.replace('\n', ' ')
     sql = re.sub(r'\s+', ' ', sql).strip()

{upplib-2.9.5 → upplib-3.3.4}/upplib/file.py

@@ -1,38 +1,80 @@
 from upplib import *
 from upplib.index import *
+from upplib.index import is_win
 
 
 def get_file(file_path: str = None,
-             path_prefix: str = None,
-             prefix: str = None,
+             path_startswith: str = None,
+             startswith: str = None,
              path_contain: str = None,
              contain: str = None,
-             path_suffix: str = None,
-             suffix: str = None) -> list[str]:
+             sort_asc: bool | None = True,
+             path_endswith: str = None,
+             endswith: str = None) -> list[str]:
     """
     有关文件的操作
     查询指定文件夹下面的所有的文件信息, 也可以是指定的文件
-    file_path     : 文件路径
-    path_prefix   : 文件路径,以 prefix 开头
-    prefix        : 文件名称,以 prefix 开头
-    path_contain  : 文件路径,含有
-    contain       : 文件名称,含有
-    path_suffix   : 文件路径,以 suffix 结尾
-    suffix        : 文件名称,以 suffix 结尾
+    file_path         : 文件路径
+    path_startswith   : 文件路径,以 path_startswith 开头
+    startswith        : 文件名称,以 startswith 开头
+    path_contain      : 文件路径,含有
+    contain           : 文件名称,含有
+    sort_asc          : 是否按升序排序，也就是从小到大排序
+    path_endswith     : 文件路径,以 path_endswith 结尾
+    endswith          : 文件名称,以 endswith 结尾
     return list
     """
     if file_path is None:
         file_path = os.path.dirname(os.path.abspath('.'))
     list_data = []
-    get_file_all(file_path, list_data, path_prefix, prefix, path_contain, contain, path_suffix, suffix)
+    get_file_all(file_path, list_data, path_startswith, startswith, path_contain, contain, path_endswith, endswith)
     # 去一下重复的数据
-    return list(set(list_data))
+    r_list = list(set(list_data))
+    if sort_asc is not None:
+        if sort_asc:
+            r_list.sort(reverse=False)
+        else:
+            r_list.sort(reverse=True)
+    return r_list
+
+
+def get_file_folder(file_name_one: str = None) -> str:
+    """
+    返回这个文件的文件夹路径
+    param file_name_one : 这个文件的全路径
+    return str : 这个文件的文件夹路径
+    """
+    file_sep = '\\' if is_win() else '/'
+    file_name_list = file_name_one.split(file_sep)
+    all_file_path = file_sep.join(file_name_list[0:-1])
+    return all_file_path
+
+
+def remove_folder_file(file_path: str = None,
+                       path_startswith: str = None,
+                       startswith: str = None,
+                       path_contain: str = None,
+                       contain: str = None,
+                       path_endswith: str = None,
+                       endswith: str = None):
+    """
+    删除指定文件夹下面的指定的文件
+    """
+    file_part_all_list = get_file(file_path=file_path,
+                                  path_startswith=path_startswith,
+                                  startswith=startswith,
+                                  path_contain=path_contain,
+                                  contain=contain,
+                                  path_endswith=path_endswith,
+                                  endswith=endswith)
+    for file_part_all_one in file_part_all_list:
+        os.remove(file_part_all_one)
 
 
 def get_folder(file_path: str = None,
-               prefix: str = None,
+               startswith: str = None,
                contain: str = None,
-               suffix: str = None) -> list[str]:
+               endswith: str = None) -> list[str]:
     """
     有关文件的操作, 只查询文件夹
     查询指定文件夹下面的所有的文件信息, 也可以是指定的文件
@@ -42,17 +84,17 @@ def get_folder(file_path: str = None,
     if file_path is None:
         file_path = os.path.dirname(os.path.abspath('.'))
     list_data = []
-    get_folder_all(file_path, list_data, prefix, contain, suffix)
+    get_folder_all(file_path, list_data, startswith, contain, endswith)
     # 去一下重复的数据
     return list(set(list_data))
 
 
 # 是否包含指定的文件
 def contain_file(file_path: str = None,
-                 prefix: str = None,
+                 startswith: str = None,
                  contain: str = None,
-                 suffix: str = None) -> bool:
-    return len(get_file(file_path, prefix, contain, suffix)) > 0
+                 endswith: str = None) -> bool:
+    return len(get_file(file_path, startswith, contain, endswith)) > 0
 
 
 def get_file_data_line(file_path: str = None,
@@ -84,78 +126,77 @@ def get_file_data_line(file_path: str = None,
 # 查询指定文件夹下面的所有的文件信息, 也可以是指定的文件
 def get_file_all(file_path: str = None,
                  list_data: list = None,
-                 path_prefix: str = None,
-                 prefix: str = None,
+                 path_startswith: str = None,
+                 startswith: str = None,
                  path_contain: str = None,
                  contain: str = None,
-                 path_suffix: str = None,
-                 suffix: str = None) -> None:
+                 path_endswith: str = None,
+                 endswith: str = None) -> None:
     if os.path.isdir(file_path):
         for root, dir_names, file_names in os.walk(file_path):
             for file_name in file_names:
-                if (get_file_check(os.path.join(root, file_name), path_prefix, path_contain, path_suffix)
-                        and get_file_check(file_name, prefix, contain, suffix)):
+                if (get_file_check(os.path.join(root, file_name), path_startswith, path_contain, path_endswith)
+                        and get_file_check(file_name, startswith, contain, endswith)):
                     list_data.append(os.path.join(root, file_name))
             for dir_name in dir_names:
-                get_file_all(os.path.join(root, dir_name), list_data, path_prefix, prefix, path_contain, contain, path_suffix, suffix)
-    elif (get_file_check(file_path, prefix, contain, suffix)
-          and get_file_check(file_path, path_prefix, path_contain, path_suffix)):
+                get_file_all(os.path.join(root, dir_name), list_data, path_startswith, startswith, path_contain, contain, path_endswith, endswith)
+    elif (get_file_check(file_path, startswith, contain, endswith)
+          and get_file_check(file_path, path_startswith, path_contain, path_endswith)):
         list_data.append(file_path)
 
 
 # 查询指定文件夹下面的所有的文件信息, 也可以是指定的文件
 def get_folder_all(file_path: str = None,
                    list_data: list = None,
-                   prefix: str = None,
+                   startswith: str = None,
                    contain: str = None,
-                   suffix: str = None) -> None:
+                   endswith: str = None) -> None:
     if os.path.isdir(file_path):
         for root, dir_names, file_names in os.walk(file_path):
             for dir_name in dir_names:
                 dir_name_path = os.path.join(root, dir_name)
-                if get_file_check(dir_name_path, prefix, contain, suffix):
+                if get_file_check(dir_name_path, startswith, contain, endswith):
                     list_data.append(dir_name_path)
                 else:
-                    get_folder_all(dir_name_path, list_data, prefix, contain, suffix)
+                    get_folder_all(dir_name_path, list_data, startswith, contain, endswith)
 
 
-def get_file_check(
-        name: str = None,
-        prefix: str = None,
-        contain: str = None,
-        suffix: str = None) -> bool:
+def get_file_check(name: str = None,
+                   startswith: str = None,
+                   contain: str = None,
+                   endswith: str = None) -> bool:
     """
     检查文件是否符合要求
-    prefix  : 前缀
-    contain : 包含这个字符
-    suffix  : 后缀
+    startswith  : 以这个开头
+    contain     : 包含这个字符
+    endswith    : 以这个结尾
     """
     if name is None or name == '':
         return False
     p = True
     c = True
     s = True
-    if prefix is not None:
-        p = name.startswith(prefix)
+    if startswith is not None:
+        p = name.startswith(startswith)
     if contain is not None:
         c = name.find(contain) > -1
-    if suffix is not None:
-        s = name.endswith(suffix)
+    if endswith is not None:
+        s = name.endswith(endswith)
     return p and c and s
 
 
 def find_file_by_content(file_path: str = '',
                          contain_txt: str = None,
-                         prefix: str = None,
+                         startswith: str = None,
                          contain: str = None,
-                         suffix: str = None) -> bool | None:
+                         endswith: str = None) -> bool | None:
     """
     检查文件内容是否包含指定的字符串
     慎用,否则, 执行时间可能比较长
     """
-    list_file = get_file(file_path, prefix, contain, suffix)
+    list_file = get_file(file_path, startswith, contain, endswith)
     if len(list_file) == 0:
-        to_log(f'no_matched_file : {file_path} , {contain_txt} , {prefix} , {contain} , {suffix}')
+        to_log(f'no_matched_file : {file_path} , {contain_txt} , {startswith} , {contain} , {endswith}')
         return False
     if contain_txt is None:
         to_log(list_file)