funcguard 0.2.46__tar.gz → 0.2.48__tar.gz

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

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

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

@@ -172,7 +172,9 @@ def ask_select(
     try:
         choice = int(user_input)
         if 0 <= choice < len(items):
-            return items[choice][0]
+            selected_key, selected_label = items[choice]
+            print(f"\n已选择 {choice}：{selected_label}")
+            return selected_key
     except ValueError:
         pass
 

{funcguard-0.2.46 → funcguard-0.2.48}/funcguard/pd_utils/filter.py

@@ -41,6 +41,7 @@ def pd_filter(
     - 比较运算：>, >=, <, <=, ==, !=
     - 集合运算：in, not in
     - 空值判断：null, not null
+    - 空值/空容器判断：empty, not empty（覆盖 NaN/None、空字符串、空列表、空元组、空字典、空集合）
     - 字符串匹配：contains, not contains, startswith, endswith
 
     示例：

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

@@ -1,7 +1,43 @@
+import numpy as np
 import pandas as pd
 from typing import List, Tuple, Optional
 
 
+
+def _is_empty(x):
+    """检查值是否为空（NaN/None、空字符串、空列表、空元组、空字典、空集合）"""
+    # 处理 numpy/pandas 数组类型（0维数组也会被isinstance识别）
+    if isinstance(x, (np.ndarray, pd.Series)):
+        return x.size == 0
+    # 使用 try-except 避免 pd.isna() 在某些类型上的歧义
+    try:
+        if pd.isna(x):
+            return True
+    except ValueError:
+        # pd.isna() 返回数组或产生歧义时，说明不是空值
+        pass
+    if isinstance(x, (str, list, tuple, dict, set)):
+        return len(x) == 0
+    return False
+
+
+def _is_not_empty(x):
+    """检查值是否非空（与_is_empty相反）"""
+    # 处理 numpy/pandas 数组类型
+    if isinstance(x, (np.ndarray, pd.Series)):
+        return x.size > 0
+    # 使用 try-except 避免 pd.isna() 在某些类型上的歧义
+    try:
+        if pd.isna(x):
+            return False
+    except ValueError:
+        # pd.isna() 返回数组或产生歧义时，说明有值
+        return True
+    if isinstance(x, (str, list, tuple, dict, set)):
+        return len(x) > 0
+    return True
+
+
 def build_single_mask(df: pd.DataFrame, condition: Tuple) -> pd.Series:
     """
     构建单个掩码，用于简单条件判断
@@ -64,9 +100,9 @@ def build_single_mask(df: pd.DataFrame, condition: Tuple) -> pd.Series:
         return df[column].notnull()
 
     elif op == "empty":
-        return df[column].isnull() | (df[column] == "")
+        return df[column].apply(_is_empty)
     elif op == "not empty":
-        return df[column].notnull() & (df[column] != "")
+        return df[column].apply(_is_not_empty)
 
     elif op == "contains":
         return df[column].str.contains(value, na=False)

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

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

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

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