funcguard 0.2.47__tar.gz → 0.2.49__tar.gz

{funcguard-0.2.47 → funcguard-0.2.49}/PKG-INFO

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

{funcguard-0.2.47 → funcguard-0.2.49}/funcguard/pd_utils/statistics/mask_utils.py

@@ -1,22 +1,42 @@
+import numpy as np
 import pandas as pd
 from typing import List, Tuple, Optional
 
 
+
 def _is_empty(x):
     """检查值是否为空（NaN/None、空字符串、空列表、空元组、空字典、空集合）"""
-    if pd.isna(x):
-        return True
+    # 处理 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):
+            return True
+    except ValueError:
+        # pd.isna() 返回数组或产生歧义时，说明不是空值
+        pass
     return False
 
 
 def _is_not_empty(x):
     """检查值是否非空（与_is_empty相反）"""
-    if pd.isna(x):
-        return False
+    # 处理 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):
+            return False
+    except ValueError:
+        # pd.isna() 返回数组或产生歧义时，说明有值
+        return True
     return True
 
 

{funcguard-0.2.47 → funcguard-0.2.49}/funcguard.egg-info/PKG-INFO

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

{funcguard-0.2.47 → funcguard-0.2.49}/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.47 → funcguard-0.2.49}/setup.py

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

funcguard-0.2.49/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}]