funcguard 0.2.56__tar.gz → 0.2.58__tar.gz

{funcguard-0.2.56 → funcguard-0.2.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funcguard
-Version: 0.2.56
+Version: 0.2.58
 Summary: FuncGuard是一个Python库，提供函数执行超时控制、重试机制、HTTP请求封装和格式化打印工具。
 Home-page: https://github.com/tinycen/funcguard
 Author: tinycen
@@ -16,8 +16,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: requests
 Requires-Dist: pandas
+Requires-Dist: requests
 Requires-Dist: curl_cffi
 Dynamic: author
 Dynamic: author-email
@@ -627,6 +627,7 @@ print(f"当前价格: {current_price}, 变化: {price_change}")  # 输出: 当
 | `pd_convert_columns` / `pd_convert_decimal` / `pd_convert_numeric_series` / `pd_convert_str_datetime` / `pd_convert_datetime_str` / `pd_convert_series` | 类型转换 | [查看](docs/pandas/convert.md) |
 | `pd_load_json` | JSON解析 | [查看](docs/pandas/json.md) |
 | `pd_filter` | 数据筛选 | [查看](docs/pandas/filter.md) |
+| `pd_select_columns` | 列选择（列表或txt文件） | [查看](docs/pandas/filter.md) |
 | `pd_count` / `pd_value_counts` | 条件计数统计 | [查看](docs/pandas/count.md) |
 | `pd_group_agg` | 分组聚合统计 | [查看](docs/pandas/agg.md) |
 | `pd_build_mask` / `pd_build_masks` / `pd_combine_masks` | 掩码构建 | [查看](docs/pandas/mask.md) |

{funcguard-0.2.56 → funcguard-0.2.58}/README.md

@@ -595,6 +595,7 @@ print(f"当前价格: {current_price}, 变化: {price_change}")  # 输出: 当
 | `pd_convert_columns` / `pd_convert_decimal` / `pd_convert_numeric_series` / `pd_convert_str_datetime` / `pd_convert_datetime_str` / `pd_convert_series` | 类型转换 | [查看](docs/pandas/convert.md) |
 | `pd_load_json` | JSON解析 | [查看](docs/pandas/json.md) |
 | `pd_filter` | 数据筛选 | [查看](docs/pandas/filter.md) |
+| `pd_select_columns` | 列选择（列表或txt文件） | [查看](docs/pandas/filter.md) |
 | `pd_count` / `pd_value_counts` | 条件计数统计 | [查看](docs/pandas/count.md) |
 | `pd_group_agg` | 分组聚合统计 | [查看](docs/pandas/agg.md) |
 | `pd_build_mask` / `pd_build_masks` / `pd_combine_masks` | 掩码构建 | [查看](docs/pandas/mask.md) |

funcguard-0.2.58/funcguard/.version

@@ -0,0 +1 @@
+0.2.58

{funcguard-0.2.56 → funcguard-0.2.58}/funcguard/__init__.py

@@ -1,8 +1,6 @@
-try:
-    from importlib.metadata import version as _get_version
-    __version__ = _get_version("funcguard")
-except Exception:
-    __version__ = "unknown"
+from pathlib import Path
+__author__ = "tinycen"
+__version__ = (Path(__file__).parent / ".version").read_text().strip()
 
 from .core import timeout_handler, retry_function, ask_select
 from .tools import send_request, curl_cffi_request, check_url_valid, encode_basic_auth, md5_hash
@@ -33,6 +31,7 @@ from .pd_utils import (
 
     # 数据筛选类
     pd_filter,
+    pd_select_columns,
     pd_build_mask,
     pd_build_masks,
     pd_combine_masks,
@@ -44,15 +43,14 @@ from .pd_utils import (
 )
 from .calculate import format_difference
 
-from .data_models import RequestLog
+from .models import RequestLog
 from .log_utils import setup_logger
 
 
-
-__author__ = "ruocen"
-
 # 暴露主要接口
 __all__ = [
+    "__version__",
+
     # 核心功能
     "timeout_handler",
     "retry_function",
@@ -105,6 +103,7 @@ __all__ = [
     
     # 数据筛选类
     "pd_filter",
+    "pd_select_columns",
 
     # 统计分析类
     "pd_build_mask",

{funcguard-0.2.56 → funcguard-0.2.58}/funcguard/pd_utils/__init__.py

@@ -20,7 +20,7 @@ from .statistics import (
     pd_group_agg, 
     DataFrameStatistics
 )
-from .filter import pd_filter
+from .filter import pd_filter, pd_select_columns
 
 # 启用未来行为：禁止静默降级
 pd.set_option("future.no_silent_downcasting", True)
@@ -44,6 +44,7 @@ __all__ = [
 
     # 数据筛选类
     "pd_filter",
+    "pd_select_columns",
 
     # 统计分析类
     "pd_build_mask",

{funcguard-0.2.56 → funcguard-0.2.58}/funcguard/pd_utils/filter.py

@@ -1,4 +1,5 @@
 import pandas as pd
+from os import PathLike
 
 from .statistics.mask_utils import build_single_mask, build_base_mask, combine_masks
 
@@ -100,3 +101,59 @@ def pd_filter(
         f"不支持的条件类型: {type(first_item)}。"
         "请使用 Tuple（单个条件）、List[Tuple]（多个条件）或 List[pd.Series]（掩码列表）"
     )
+
+
+def pd_select_columns(
+    df: pd.DataFrame,
+    retain_columns: list[str] | str | PathLike[str],
+    raise_on_missing: bool = True
+) -> pd.DataFrame:
+    """
+    根据列名列表或txt文件路径裁剪DataFrame，仅保留指定列
+
+    参数：
+    - df (pd.DataFrame): 输入的DataFrame
+    - columns (list[str] | str):
+        - 列名列表: ['col1', 'col2', 'col3']
+        - txt文件路径: 'C:/path/to/columns.txt' 或 'columns.txt'
+          txt文件每行一个列名，支持空行和注释行（以#开头）
+    - raise_on_missing (bool): 当指定列在DataFrame中不存在时是否报错，
+        默认为True；为False时跳过缺失列
+
+    返回：
+    - pd.DataFrame: 仅保留指定列的新DataFrame
+
+    示例：
+    # 使用列名列表
+    result = pd_select_columns(df, ['name', 'age', 'salary'])
+
+    # 使用txt文件
+    result = pd_select_columns(df, 'config/selected_columns.txt')
+
+    # 跳过缺失列
+    result = pd_select_columns(df, ['name', 'age'], raise_on_missing=False)
+
+    """
+    if df.empty:
+        return df.copy()
+
+    # 处理txt文件路径
+    if isinstance(retain_columns, list):
+        column_list = retain_columns
+    else:
+        column_list = []
+        with open(retain_columns, 'r', encoding='utf-8') as f:
+            for line in f:
+                line = line.strip()
+                # 跳过空行和注释行
+                if line and not line.startswith('#'):
+                    column_list.append(line)
+
+    # 检查列是否存在
+    missing_cols = set(column_list) - set(df.columns)
+    if missing_cols:
+        if raise_on_missing:
+            raise ValueError(f"DataFrame中不存在以下列: {missing_cols}")
+        column_list = [col for col in column_list if col in df.columns]
+
+    return df[column_list].copy()

{funcguard-0.2.56 → funcguard-0.2.58}/funcguard/tools.py

@@ -7,7 +7,7 @@ from curl_cffi import requests as cffi_requests
 
 from typing import Any, Literal
 from .core import retry_function
-from .data_models import RequestLog
+from .models import RequestLog
 
 # HTTP 方法类型别名
 HttpMethod = Literal["GET", "POST", "PUT", "DELETE", "OPTIONS", "HEAD", "TRACE", "PATCH"]

{funcguard-0.2.56 → funcguard-0.2.58}/funcguard.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funcguard
-Version: 0.2.56
+Version: 0.2.58
 Summary: FuncGuard是一个Python库，提供函数执行超时控制、重试机制、HTTP请求封装和格式化打印工具。
 Home-page: https://github.com/tinycen/funcguard
 Author: tinycen
@@ -16,8 +16,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: requests
 Requires-Dist: pandas
+Requires-Dist: requests
 Requires-Dist: curl_cffi
 Dynamic: author
 Dynamic: author-email
@@ -627,6 +627,7 @@ print(f"当前价格: {current_price}, 变化: {price_change}")  # 输出: 当
 | `pd_convert_columns` / `pd_convert_decimal` / `pd_convert_numeric_series` / `pd_convert_str_datetime` / `pd_convert_datetime_str` / `pd_convert_series` | 类型转换 | [查看](docs/pandas/convert.md) |
 | `pd_load_json` | JSON解析 | [查看](docs/pandas/json.md) |
 | `pd_filter` | 数据筛选 | [查看](docs/pandas/filter.md) |
+| `pd_select_columns` | 列选择（列表或txt文件） | [查看](docs/pandas/filter.md) |
 | `pd_count` / `pd_value_counts` | 条件计数统计 | [查看](docs/pandas/count.md) |
 | `pd_group_agg` | 分组聚合统计 | [查看](docs/pandas/agg.md) |
 | `pd_build_mask` / `pd_build_masks` / `pd_combine_masks` | 掩码构建 | [查看](docs/pandas/mask.md) |

{funcguard-0.2.56 → funcguard-0.2.58}/funcguard.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 README.md
 setup.py
+funcguard/.version
 funcguard/__init__.py
 funcguard/calculate.py
 funcguard/core.py
@@ -15,8 +16,8 @@ funcguard.egg-info/dependency_links.txt
 funcguard.egg-info/not-zip-safe
 funcguard.egg-info/requires.txt
 funcguard.egg-info/top_level.txt
-funcguard/data_models/__init__.py
-funcguard/data_models/request_models.py
+funcguard/models/__init__.py
+funcguard/models/request_models.py
 funcguard/pd_utils/__init__.py
 funcguard/pd_utils/convert_utils.py
 funcguard/pd_utils/date_utils.py

{funcguard-0.2.56 → funcguard-0.2.58}/setup.py

@@ -1,3 +1,4 @@
+import os
 from setuptools import setup, find_packages
 
 # 读取README文件
@@ -7,15 +8,19 @@ try:
 except FileNotFoundError:
     long_description = 'A funcguard for Python.'
 
+root_dir = os.path.dirname(__file__)
+
+with open(os.path.join(root_dir, "requirements.txt"), encoding="utf-8") as fh:
+    requirements = [line.strip() for line in fh if line.strip() and not line.startswith("#")]
+
+with open(os.path.join(root_dir, "funcguard", ".version"), encoding="utf-8") as fh:
+    version = "v" + fh.read().strip()
+
 setup(
     name='funcguard',
-    version='0.2.56',
+    version=version,
     packages=find_packages(),
-    install_requires=[
-        'requests',
-        'pandas',
-        'curl_cffi',
-    ],
+    install_requires=requirements,
     author='tinycen',
     author_email='sky_ruocen@qq.com',
     description='FuncGuard是一个Python库，提供函数执行超时控制、重试机制、HTTP请求封装和格式化打印工具。',
@@ -35,4 +40,9 @@ setup(
     python_requires='>=3.10',
     include_package_data=True,
     zip_safe=False,
+    package_data={
+        "funcguard": [
+            ".version",
+        ]
+    },
 )

{funcguard-0.2.56 → funcguard-0.2.58}/funcguard.egg-info/requires.txt

@@ -1,3 +1,3 @@
-requests
 pandas
+requests
 curl_cffi