funcguard 0.2.48__tar.gz → 0.2.50__tar.gz

{funcguard-0.2.48 → funcguard-0.2.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funcguard
-Version: 0.2.48
+Version: 0.2.50
 Summary: FuncGuard是一个Python库，提供函数执行超时控制、重试机制、HTTP请求封装和格式化打印工具。
 Home-page: https://github.com/tinycen/funcguard
 Author: tinycen
@@ -102,12 +102,12 @@ except Exception as e:
 ```python
 from funcguard import ask_select
 
-# 基础用法 - 选择属性填写模式
+# 基础用法 - 选择属性填写模式（默认超时10秒）
 result = ask_select(
     options={True: "需要填写属性", False: "不需要填写属性", "all": "不限制"},
     default_key="all",
     prompt="请选择属性填写模式",
-    timeout=5
+    timeout=10
 )
 print(f"用户选择: {result}")  # 返回 True, False 或 "all"
 
@@ -116,7 +116,7 @@ env = ask_select(
     options={"dev": "开发环境", "test": "测试环境", "prod": "生产环境"},
     default_key="dev",
     prompt="请选择部署环境",
-    timeout=3
+    timeout=10
 )
 print(f"当前环境: {env}")
 
@@ -125,7 +125,16 @@ count = ask_select(
     options={10: "10条", 50: "50条", 100: "100条"},
     default_key=50,
     prompt="查询数量",
-    timeout=5
+    timeout=10
+)
+print(f"查询 {count} 条数据")
+
+# 无超时模式 - 一直等待用户输入
+count = ask_select(
+    options={10: "10条", 50: "50条", 100: "100条"},
+    default_key=50,
+    prompt="查询数量",
+    timeout=None
 )
 print(f"查询 {count} 条数据")
 ```

{funcguard-0.2.48 → funcguard-0.2.50}/README.md

@@ -75,12 +75,12 @@ except Exception as e:
 ```python
 from funcguard import ask_select
 
-# 基础用法 - 选择属性填写模式
+# 基础用法 - 选择属性填写模式（默认超时10秒）
 result = ask_select(
     options={True: "需要填写属性", False: "不需要填写属性", "all": "不限制"},
     default_key="all",
     prompt="请选择属性填写模式",
-    timeout=5
+    timeout=10
 )
 print(f"用户选择: {result}")  # 返回 True, False 或 "all"
 
@@ -89,7 +89,7 @@ env = ask_select(
     options={"dev": "开发环境", "test": "测试环境", "prod": "生产环境"},
     default_key="dev",
     prompt="请选择部署环境",
-    timeout=3
+    timeout=10
 )
 print(f"当前环境: {env}")
 
@@ -98,7 +98,16 @@ count = ask_select(
     options={10: "10条", 50: "50条", 100: "100条"},
     default_key=50,
     prompt="查询数量",
-    timeout=5
+    timeout=10
+)
+print(f"查询 {count} 条数据")
+
+# 无超时模式 - 一直等待用户输入
+count = ask_select(
+    options={10: "10条", 50: "50条", 100: "100条"},
+    default_key=50,
+    prompt="查询数量",
+    timeout=None
 )
 print(f"查询 {count} 条数据")
 ```

{funcguard-0.2.48 → funcguard-0.2.50}/funcguard/core.py

@@ -95,7 +95,7 @@ def ask_select(
     options: dict,
     default_key = None,
     prompt: str = "请选择",
-    timeout: int = 5,
+    timeout: int | None = 10,
 ):
     """
     显示一个数字选择菜单，接受用户输入，超时自动返回默认值。
@@ -105,7 +105,7 @@ def ask_select(
                  例如: {True: "需要填写属性", False: "不需要填写属性", "all": "不限制"}
         default_key: 超时或输入无效时的默认返回值，若为None则使用最后一个选项的键
         prompt: 提示语前缀
-        timeout: 超时时间（秒），默认5秒
+        timeout: 超时时间（秒），默认10秒；若为None则不设置超时，一直等待用户输入
 
     返回:
         用户选择的选项键（options中的某个键），或default_key
@@ -115,7 +115,7 @@ def ask_select(
         ...     {True: "需要填写属性", False: "不需要填写属性", "all": "不限制"},
         ...     default_key="all",
         ...     prompt="请选择属性填写模式",
-        ...     timeout=5,
+        ...     timeout=10,
         ... )
     """
     # 确保选项非空
@@ -149,12 +149,17 @@ def ask_select(
     thread = Thread(target=input_thread, daemon=True)
     thread.start()
 
-    # 倒计时显示
-    remaining = timeout
-    while remaining > 0 and thread.is_alive():
-        print(f"\r{prompt} ({option_lines})，{remaining} 秒后自动选择[{default_label}]: ", end="", flush=True)
-        time.sleep(1)
-        remaining -= 1
+    # 倒计时显示（仅当设置了timeout时）
+    if timeout is not None:
+        remaining = timeout
+        while remaining > 0 and thread.is_alive():
+            print(f"\r{prompt} ({option_lines})，{remaining} 秒后自动选择[{default_label}]: ", end="", flush=True)
+            time.sleep(1)
+            remaining -= 1
+    else:
+        # 无超时，直接显示提示并等待用户输入
+        print(f"{prompt} ({option_lines}): ", end="", flush=True)
+        thread.join()
 
     # 等待线程结束（如果用户已输入）或超时
     thread.join(0)
@@ -164,18 +169,18 @@ def ask_select(
     except Empty:
         user_input = None
 
-    if user_input is None:
+    if user_input is None and timeout is not None:
         print(f"\n超时，自动选择[{default_label}]")
         return default_key
 
     # 验证输入
     try:
-        choice = int(user_input)
+        choice = int(user_input)  # pyright: ignore[reportArgumentType]
         if 0 <= choice < len(items):
             selected_key, selected_label = items[choice]
             print(f"\n已选择 {choice}：{selected_label}")
             return selected_key
-    except ValueError:
+    except (ValueError, TypeError):
         pass
 
     # 输入无效，返回默认值

{funcguard-0.2.48 → funcguard-0.2.50}/funcguard/pd_utils/statistics/mask_utils.py

@@ -9,6 +9,9 @@ def _is_empty(x):
     # 处理 numpy/pandas 数组类型（0维数组也会被isinstance识别）
     if isinstance(x, (np.ndarray, pd.Series)):
         return x.size == 0
+    # 原生容器优先按长度判断，避免 pd.isna([]) 返回空数组引发歧义
+    if isinstance(x, (str, list, tuple, dict, set)):
+        return len(x) == 0
     # 使用 try-except 避免 pd.isna() 在某些类型上的歧义
     try:
         if pd.isna(x):
@@ -16,8 +19,6 @@ def _is_empty(x):
     except ValueError:
         # pd.isna() 返回数组或产生歧义时，说明不是空值
         pass
-    if isinstance(x, (str, list, tuple, dict, set)):
-        return len(x) == 0
     return False
 
 
@@ -26,6 +27,9 @@ def _is_not_empty(x):
     # 处理 numpy/pandas 数组类型
     if isinstance(x, (np.ndarray, pd.Series)):
         return x.size > 0
+    # 原生容器优先按长度判断，避免 pd.isna([]) 返回空数组引发歧义
+    if isinstance(x, (str, list, tuple, dict, set)):
+        return len(x) > 0
     # 使用 try-except 避免 pd.isna() 在某些类型上的歧义
     try:
         if pd.isna(x):
@@ -33,8 +37,6 @@ def _is_not_empty(x):
     except ValueError:
         # pd.isna() 返回数组或产生歧义时，说明有值
         return True
-    if isinstance(x, (str, list, tuple, dict, set)):
-        return len(x) > 0
     return True
 
 

{funcguard-0.2.48 → funcguard-0.2.50}/funcguard.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funcguard
-Version: 0.2.48
+Version: 0.2.50
 Summary: FuncGuard是一个Python库，提供函数执行超时控制、重试机制、HTTP请求封装和格式化打印工具。
 Home-page: https://github.com/tinycen/funcguard
 Author: tinycen
@@ -102,12 +102,12 @@ except Exception as e:
 ```python
 from funcguard import ask_select
 
-# 基础用法 - 选择属性填写模式
+# 基础用法 - 选择属性填写模式（默认超时10秒）
 result = ask_select(
     options={True: "需要填写属性", False: "不需要填写属性", "all": "不限制"},
     default_key="all",
     prompt="请选择属性填写模式",
-    timeout=5
+    timeout=10
 )
 print(f"用户选择: {result}")  # 返回 True, False 或 "all"
 
@@ -116,7 +116,7 @@ env = ask_select(
     options={"dev": "开发环境", "test": "测试环境", "prod": "生产环境"},
     default_key="dev",
     prompt="请选择部署环境",
-    timeout=3
+    timeout=10
 )
 print(f"当前环境: {env}")
 
@@ -125,7 +125,16 @@ count = ask_select(
     options={10: "10条", 50: "50条", 100: "100条"},
     default_key=50,
     prompt="查询数量",
-    timeout=5
+    timeout=10
+)
+print(f"查询 {count} 条数据")
+
+# 无超时模式 - 一直等待用户输入
+count = ask_select(
+    options={10: "10条", 50: "50条", 100: "100条"},
+    default_key=50,
+    prompt="查询数量",
+    timeout=None
 )
 print(f"查询 {count} 条数据")
 ```

{funcguard-0.2.48 → funcguard-0.2.50}/funcguard.egg-info/SOURCES.txt

@@ -29,4 +29,5 @@ funcguard/pd_utils/statistics/agg_utils.py
 funcguard/pd_utils/statistics/count_utils.py
 funcguard/pd_utils/statistics/df_statistics.py
 funcguard/pd_utils/statistics/mask_utils.py
-tests/__init__.py
+tests/__init__.py
+tests/test_pd_filter_empty.py

{funcguard-0.2.48 → funcguard-0.2.50}/setup.py

@@ -9,7 +9,7 @@ except FileNotFoundError:
 
 setup(
     name='funcguard',
-    version='0.2.48',
+    version='0.2.50',
     packages=find_packages(),
     install_requires=[
         'requests',

funcguard-0.2.50/tests/test_pd_filter_empty.py

@@ -0,0 +1,34 @@
+import math
+
+import pandas as pd
+
+from funcguard.pd_utils.filter import pd_filter
+from funcguard.pd_utils.statistics.mask_utils import _is_empty, _is_not_empty
+
+
+def test_empty_helpers_handle_empty_list_correctly():
+    assert _is_empty([]) is True
+    assert _is_not_empty([]) is False
+    assert _is_empty([1]) is False
+    assert _is_not_empty([1]) is True
+
+
+def test_pd_filter_not_empty_excludes_real_empty_containers_and_nan():
+    df = pd.DataFrame(
+        {
+            "segments": [
+                [],
+                [1, 2],
+                None,
+                math.nan,
+                "",
+                "[]",
+                {},
+                {"a": 1},
+            ]
+        }
+    )
+
+    filtered = pd_filter(df, ("segments", "not empty"))
+
+    assert filtered["segments"].tolist() == [[1, 2], "[]", {"a": 1}]