funcguard 0.1.9__py3-none-any.whl → 0.2.1__py3-none-any.whl

funcguard/__init__.py

@@ -1,7 +1,7 @@
 from .core import timeout_handler, retry_function
 from .tools import send_request
 from .time_utils import time_log, time_diff, time_monitor
-from .printer import print_block, print_line, print_title
+from .printer import print_block, print_line, print_title, print_progress
 
 __author__ = "ruocen"
 
@@ -16,4 +16,5 @@ __all__ = [
     "print_block",
     "print_line",
     "print_title",
+    "print_progress",
 ]

funcguard/printer.py

@@ -1,5 +1,32 @@
 from typing import Any
 
+# 打印进度条
+def print_progress(idx: int, total: int, message: str = "") -> None:
+    """
+    打印进度条，显示当前进度
+    
+    设计原理：
+    - 进度条总长度固定为50个字符，这是终端显示的最佳长度
+    - 使用整除2(//2)将0-100%映射到0-50字符，确保平滑过渡
+    - 已完成部分用'█'表示，未完成部分用'-'表示
+    
+    :param idx: 当前索引（从0开始）
+    :param total: 总数量
+    :param message: 额外消息，默认为空字符串
+    """
+    # 计算当前进度百分比（0-100）
+    percent = int(idx / total * 100)
+    
+    # 构建进度条：
+    bar = '█' * (percent // 2) + '-' * (50 - percent // 2)
+    
+    # 打印进度条：
+    # - \r：回车符，回到行首覆盖之前的内容
+    # - end=''：不换行，保持在同一行更新
+    # - flush=True：立即刷新输出，确保实时显示
+    print(f"\r进度: |{bar}| {percent}% ({idx}/{total}) {message}", end='', flush=True)
+
+
 # 打印带等号的标题（如：=== 初始化分类器 ===）
 def print_title(title: str, separator_char: str = "=", padding_length: int = 3) -> None:
     """

funcguard/time_utils.py

@@ -2,11 +2,10 @@
 时间工具模块，提供时间计算、日志记录和执行时间监控功能
 """
 from datetime import datetime, timezone, timedelta
-from typing import Optional, Union
 
 
 # 打印时间
-def time_log(message, i = 0, max_num = 0, s_time = None, start_from = 0 ) :
+def time_log(message, i = 0, max_num = 0, s_time = None, start_from = 0 , return_field = "progress_info") :
     """
     打印带时间戳的日志信息，支持进度显示和预计完成时间
     
@@ -15,19 +14,29 @@ def time_log(message, i = 0, max_num = 0, s_time = None, start_from = 0 ) :
     :param max_num: 总进度数量
     :param s_time: 开始时间，用于计算预计完成时间
     :param start_from: i是否从0开始，0表示从0开始，1表示从1开始
-    :return: None
+    :param return_field: 返回字段，支持以下：
+        "progress_info" 表示完整进度信息，"remaining_time" 表示剩余时间，"end_time" 表示预计完成时间
+    :return: 根据 return_field 参数返回不同的信息
     """
     now = datetime.now( timezone( timedelta( hours = 8 ) ) )
-    time_log = "{:02d}:{:02d}:{:02d}".format( now.hour, now.minute, now.second )
+    time_str = "{:02d}:{:02d}:{:02d}".format( now.hour, now.minute, now.second )
+    progress_info = eta_time_info = etr_time_info = ""
     if i < 2 or max_num < 2 :
-        print( time_log + " " + message )
+        if return_field in ["end_time", "remaining_time"] :
+            return ""
+        else:
+            print( time_str + " " + message )
 
     else :
         # 根据start_from参数计算实际处理的项目数
         process_item = i + 1 if start_from == 0 else i
-        text = "{}/{}".format( process_item, max_num )
+        progress_info = "{}/{}".format( process_item, max_num )
         # 检查是否应该显示预计完成时间和剩余时间
-        if process_item % 10 == 0 and s_time is not None and process_item < max_num :
+        # 当return_field为"end_time"或"remaining_time"时，每次都计算时间
+        # 否则只在每10个处理一次时计算
+        should_calculate_time = (return_field in ["end_time", "remaining_time"] and process_item < max_num ) or (process_item % 10 == 0 and s_time is not None and process_item < max_num)
+        
+        if should_calculate_time and s_time is not None and process_item < max_num:
             duration = now - s_time
             ev_duration = duration / process_item  # 每项平均耗时
             remaining_items = max_num - process_item
@@ -35,9 +44,20 @@ def time_log(message, i = 0, max_num = 0, s_time = None, start_from = 0 ) :
             end_time = now + time_left
             end_time_str = end_time.strftime( "%Y-%m-%d %H:%M" )
             remaining_time_str = str( timedelta( seconds = int( time_left.total_seconds() ) ) )
-            text = text + "（{}）etr {}".format( end_time_str, remaining_time_str )
-        print( time_log + " " + message + " " + text )
-    return
+            eta_time_info = f"eta {end_time_str}"
+            etr_time_info = f"etr {remaining_time_str}"
+            progress_info = progress_info + f" ( {eta_time_info}  {etr_time_info} )"
+
+        #  Estimated Time of Arrival（预计完成/到达时间）
+        if return_field == "end_time" :
+            return eta_time_info   
+        
+        # Estimated Time Remaining（预计剩余时间）
+        elif return_field == "remaining_time" :
+            return etr_time_info
+
+        print( time_str + " " + message + " " + progress_info )
+    return progress_info
 
 
 # 计算持续时间

funcguard/tools.py

@@ -1,9 +1,7 @@
 import json
 import requests
-from datetime import datetime, timezone, timedelta
 from typing import Optional, Dict, Any, Union
 from .core import retry_function
-from .time_utils import time_log, time_diff, time_monitor
 
 
 # 发起请求

{funcguard-0.1.9.dist-info → funcguard-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funcguard
-Version: 0.1.9
+Version: 0.2.1
 Summary: FuncGuard是一个Python库，提供函数执行超时控制、重试机制、HTTP请求封装和格式化打印工具。
 Home-page: https://github.com/tinycen/funcguard
 Author: tinycen

funcguard-0.2.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+funcguard/__init__.py,sha256=XdbsQ5p2wG9YK9CoI7xWc6UEzFuuOuR_r2dov6D_oiE,469
+funcguard/core.py,sha256=-rFRkE-udxM0wxlcv9Qi_yIQBRdVrGgwza-LYQsVRLg,3632
+funcguard/printer.py,sha256=zjCPPkBrz_D1z8563Vi-raxEti5kLSwahSoqYuP20eg,2455
+funcguard/time_utils.py,sha256=kFwrrLVHIi_UYmSxRzXLmgGUM_hURJ-xoCPa_Set3z4,7268
+funcguard/tools.py,sha256=pw6QCi8BAOTkHKhG3sxqfU3pYzST08YjxTiPvK-SWnU,1972
+tests/__init__.py,sha256=VW6FdWdSC_PL3zEtpkRQfUMf6yVD2OfwtSds82jawTs,26
+funcguard-0.2.1.dist-info/LICENSE,sha256=jgOquECfjiXp5xXQ2zuzItDr4XDBLan-bIzIXl1lS4Y,1064
+funcguard-0.2.1.dist-info/METADATA,sha256=fKt8L1Yj9v-CncSW_8GZ-CdI89WY-qj2aH21X1yiuGY,10598
+funcguard-0.2.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+funcguard-0.2.1.dist-info/top_level.txt,sha256=7wL9mWT062DttKNO7Wi1wYWTZilR2AOPRO0rE3gvtB4,16
+funcguard-0.2.1.dist-info/RECORD,,

funcguard-0.1.9.dist-info/RECORD

@@ -1,11 +0,0 @@
-funcguard/__init__.py,sha256=Tr5d54OPz1tK9nBQKjiYlSKAR0nmqsU4HpRrkRoRS3k,431
-funcguard/core.py,sha256=-rFRkE-udxM0wxlcv9Qi_yIQBRdVrGgwza-LYQsVRLg,3632
-funcguard/printer.py,sha256=Iig_UO4h5LcL0BqCEEdxiu32h4rUq9GJbmf1pC_hd7o,1462
-funcguard/time_utils.py,sha256=AZ3rPJkepnFL3Z66h0miql8-Elox0knn7q1RbqMrpsc,6129
-funcguard/tools.py,sha256=zocd9rMP8fzEPLoU4yfRrTKcX57qF10fFYk38lyhif8,2081
-tests/__init__.py,sha256=VW6FdWdSC_PL3zEtpkRQfUMf6yVD2OfwtSds82jawTs,26
-funcguard-0.1.9.dist-info/LICENSE,sha256=jgOquECfjiXp5xXQ2zuzItDr4XDBLan-bIzIXl1lS4Y,1064
-funcguard-0.1.9.dist-info/METADATA,sha256=YpiwpYYF3e2qBz9MffaN8WavVdH2Y_lpcbeNNt8uQ5M,10598
-funcguard-0.1.9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-funcguard-0.1.9.dist-info/top_level.txt,sha256=7wL9mWT062DttKNO7Wi1wYWTZilR2AOPRO0rE3gvtB4,16
-funcguard-0.1.9.dist-info/RECORD,,