oafuncs 0.0.97.6__py3-none-any.whl → 0.0.97.8__py3-none-any.whl

oafuncs/_script/netcdf_merge.py

@@ -0,0 +1,339 @@
+#!/usr/bin/env python
+# coding=utf-8
+"""
+Author: Liu Kun && 16031215@qq.com
+Date: 2025-03-30 11:16:29
+LastEditors: Liu Kun && 16031215@qq.com
+LastEditTime: 2025-03-30 11:16:31
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\_script\\netcdf_merge.py
+Description:
+EditPlatform: vscode
+ComputerInfo: XPS 15 9510
+SystemInfo: Windows 11
+Python Version: 3.12
+"""
+
+import logging
+import os
+from typing import Dict, List, Union
+
+import numpy as np
+import xarray as xr
+from dask.diagnostics import ProgressBar
+
+# 配置日志
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+
+def merge(file_list: Union[str, List[str]], var_name: Union[str, List[str], None] = None, dim_name: str = "time", target_filename: str = "merged.nc", chunk_config: Dict = {"time": 1000}, compression: Union[bool, Dict] = True, sanity_check: bool = True, overwrite: bool = True, parallel: bool = True) -> None:
+    """
+    终极版NetCDF合并函数
+
+    Parameters:
+        file_list: 文件路径列表或单个文件路径
+        var_name: 需要合并的变量（单个变量名/变量列表/None表示全部）
+        dim_name: 合并维度，默认为'time'
+        target_filename: 输出文件路径
+        chunk_config: Dask分块配置，如{"time": 1000}
+        compression: 压缩配置（True启用默认压缩，或自定义编码字典）
+        sanity_check: 是否执行数据完整性校验
+        overwrite: 是否覆盖已存在文件
+        parallel: 是否启用并行处理
+
+    Example:
+        merge(["data1.nc", "data2.nc"],
+             var_name=["temp", "salt"],
+             target_filename="result.nc",
+             chunk_config={"time": 500})
+    """
+    # ------------------------ 参数预处理 ------------------------#
+    file_list = _validate_and_preprocess_inputs(file_list, target_filename, overwrite)
+    all_vars, var_names = _determine_variables(file_list, var_name)
+    static_vars = _identify_static_vars(file_list[0], var_names, dim_name)
+
+    # 估计处理所需的内存
+    _estimate_memory_usage(file_list, var_names, chunk_config)
+
+    # ------------------------ 数据校验阶段 ------------------------#
+    if sanity_check:
+        _perform_sanity_checks(file_list, var_names, dim_name, static_vars)
+
+    # ------------------------ 核心合并逻辑 ------------------------#
+    with xr.set_options(keep_attrs=True):  # 保留元数据属性
+        # 动态变量合并
+        merged_ds = xr.open_mfdataset(
+            file_list,
+            combine="nested",
+            concat_dim=dim_name,
+            data_vars=[var for var in var_names if var not in static_vars],
+            chunks=chunk_config,
+            parallel=parallel,
+            preprocess=lambda ds: ds[var_names],  # 仅加载目标变量
+        )
+
+        # 静态变量处理
+        if static_vars:
+            with xr.open_dataset(file_list[0], chunks=chunk_config) as ref_ds:
+                merged_ds = merged_ds.assign({var: ref_ds[var] for var in static_vars})
+
+    # ------------------------ 时间维度处理 ------------------------#
+    if dim_name == "time":
+        merged_ds = _process_time_dimension(merged_ds)
+
+    # ------------------------ 文件输出 ------------------------#
+    encoding = _generate_encoding_config(merged_ds, compression)
+    _write_to_netcdf(merged_ds, target_filename, encoding)
+
+
+# ------------------------ 辅助函数 ------------------------#
+def _validate_and_preprocess_inputs(file_list: Union[str, List[str]], target_filename: str, overwrite: bool) -> List[str]:
+    """输入参数校验与预处理"""
+    if not file_list:
+        raise ValueError("文件列表不能为空")
+
+    file_list = [file_list] if isinstance(file_list, str) else file_list
+    for f in file_list:
+        if not os.path.exists(f):
+            raise FileNotFoundError(f"输入文件不存在: {f}")
+
+    target_dir = os.path.dirname(os.path.abspath(target_filename))
+    os.makedirs(target_dir, exist_ok=True)
+
+    if os.path.exists(target_filename):
+        if overwrite:
+            logger.warning(f"覆盖已存在文件: {target_filename}")
+            os.remove(target_filename)
+        else:
+            raise FileExistsError(f"目标文件已存在: {target_filename}")
+
+    return file_list
+
+
+def _determine_variables(file_list: List[str], var_name: Union[str, List[str], None]) -> tuple:
+    """确定需要处理的变量列表"""
+    with xr.open_dataset(file_list[0]) as ds:
+        all_vars = list(ds.data_vars.keys())
+
+    if var_name is None:
+        return all_vars, all_vars
+    elif isinstance(var_name, str):
+        if var_name not in all_vars:
+            raise ValueError(f"无效变量名: {var_name}")
+        return all_vars, [var_name]
+    elif isinstance(var_name, list):
+        if not var_name:  # 处理空列表情况
+            logger.warning("提供了空的变量列表，将使用所有变量")
+            return all_vars, all_vars
+        invalid_vars = set(var_name) - set(all_vars)
+        if invalid_vars:
+            raise ValueError(f"无效变量名: {invalid_vars}")
+        return all_vars, var_name
+    else:
+        raise TypeError("var_name参数类型必须是str/list/None")
+
+
+def _identify_static_vars(sample_file: str, var_names: List[str], dim_name: str) -> List[str]:
+    """识别静态变量"""
+    with xr.open_dataset(sample_file) as ds:
+        return [var for var in var_names if dim_name not in ds[var].dims]
+
+
+def _perform_sanity_checks(file_list: List[str], var_names: List[str], dim_name: str, static_vars: List[str]) -> None:
+    """执行数据完整性校验"""
+    logger.info("正在执行数据完整性校验...")
+
+    # 静态变量一致性检查
+    with xr.open_dataset(file_list[0]) as ref_ds:
+        for var in static_vars:
+            ref = ref_ds[var]
+            for f in file_list[1:]:
+                with xr.open_dataset(f) as ds:
+                    if not ref.equals(ds[var]):
+                        raise ValueError(f"静态变量 {var} 不一致\n参考文件: {file_list[0]}\n问题文件: {f}")
+
+    # 动态变量维度检查
+    dim_sizes = {}
+    for f in file_list:
+        with xr.open_dataset(f) as ds:
+            for var in var_names:
+                if var not in static_vars:
+                    dims = ds[var].dims
+                    if dim_name not in dims:
+                        raise ValueError(f"变量 {var} 在文件 {f} 中缺少合并维度 {dim_name}")
+                    dim_sizes.setdefault(var, []).append(ds[var].sizes[dim_name])
+
+    # 检查维度连续性
+    for var, sizes in dim_sizes.items():
+        if len(set(sizes[1:])) > 1:
+            raise ValueError(f"变量 {var} 的 {dim_name} 维度长度不一致: {sizes}")
+
+
+def _process_time_dimension(ds: xr.Dataset) -> xr.Dataset:
+    """时间维度特殊处理"""
+    if "time" not in ds.dims:
+        return ds
+
+    # 排序并去重
+    ds = ds.sortby("time")
+    # 找到唯一时间戳的索引
+    _, index = np.unique(ds["time"], return_index=True)
+    # 无需再次排序索引，因为我们需要保持时间的原始顺序
+    return ds.isel(time=index)
+
+
+def _generate_encoding_config(ds: xr.Dataset, compression: Union[bool, Dict]) -> Dict:
+    """生成压缩编码配置"""
+    if not compression:
+        return {}
+
+    # 默认压缩设置基础
+    def _get_default_encoding(var):
+        return {"zlib": True, "complevel": 3, "dtype": "float32" if ds[var].dtype == "float64" else ds[var].dtype}
+
+    # 处理自定义压缩配置
+    encoding = {}
+    if isinstance(compression, dict):
+        for var in ds.data_vars:
+            encoding[var] = _get_default_encoding(var)
+            encoding[var].update(compression.get(var, {}))  # 使用 dict.update() 合并字典
+    else:
+        for var in ds.data_vars:
+            encoding[var] = _get_default_encoding(var)
+
+    return encoding
+
+
+def _write_to_netcdf(ds: xr.Dataset, filename: str, encoding: Dict) -> None:
+    """改进后的安全写入NetCDF文件"""
+    logger.info("开始写入文件...")
+    unlimited_dims = [dim for dim in ds.dims if ds[dim].encoding.get("unlimited", False)]
+
+    delayed = ds.to_netcdf(filename, encoding=encoding, compute=False, unlimited_dims=unlimited_dims)
+
+    try:
+        with ProgressBar():
+            delayed.compute()
+
+        logger.info(f"合并完成 → {filename}")
+        logger.info(f"文件大小: {os.path.getsize(filename) / 1e9:.2f}GB")
+    except MemoryError as e:
+        _handle_write_error(filename, "内存不足，无法完成文件写入。请尝试调整chunk_config参数减少内存使用", e)
+    except Exception as e:
+        _handle_write_error(filename, f"写入文件失败: {str(e)}", e)
+
+
+def _handle_write_error(filename: str, message: str, exception: Exception) -> None:
+    """统一处理写入文件的异常"""
+    logger.error(message)
+    if os.path.exists(filename):
+        os.remove(filename)
+    raise exception
+
+
+def _estimate_memory_usage(file_list: List[str], var_names: List[str], chunk_config: Dict) -> None:
+    """改进内存使用量估算"""
+    try:
+        total_size = 0
+        sample_file = file_list[0]
+        with xr.open_dataset(sample_file) as ds:
+            for var in var_names:
+                if var in ds:
+                    # 考虑变量的维度大小
+                    var_size = np.prod([ds[var].sizes[dim] for dim in ds[var].dims]) * ds[var].dtype.itemsize
+                    total_size += var_size * len(file_list)
+
+        # 估算Dask处理时的内存使用量 (通常是原始数据的2-3倍)
+        estimated_memory = total_size * 3
+
+        if estimated_memory > 8e9:
+            logger.warning(f"预计内存使用可能较高 (约 {estimated_memory / 1e9:.1f}GB)。如果遇到内存问题，请调整chunk_config参数: {chunk_config}")
+    except Exception as e:
+        logger.debug(f"内存估计失败: {str(e)}")
+
+
+if __name__ == "__main__":
+    # 示例文件列表（请替换为实际文件路径）
+    sample_files = ["data/file1.nc", "data/file2.nc", "data/file3.nc"]
+
+    # 示例1: 基础用法 - 合并全部变量
+    print("\n" + "=" * 40)
+    print("示例1: 合并所有变量（默认配置）")
+    merge(file_list=sample_files, target_filename="merged_all_vars.nc")
+
+    # 示例2: 合并指定变量
+    print("\n" + "=" * 40)
+    print("示例2: 合并指定变量（温度、盐度）")
+    merge(
+        file_list=sample_files,
+        var_name=["temperature", "salinity"],
+        target_filename="merged_selected_vars.nc",
+        chunk_config={"time": 500},  # 更保守的内存分配
+    )
+
+    # 示例3: 自定义压缩配置
+    print("\n" + "=" * 40)
+    print("示例3: 自定义压缩参数")
+    merge(file_list=sample_files, var_name="chlorophyll", compression={"chlorophyll": {"zlib": True, "complevel": 5, "dtype": "float32"}}, target_filename="merged_compressed.nc")
+
+    # 示例4: 处理大型数据集
+    print("\n" + "=" * 40)
+    print("示例4: 大文件分块策略")
+    merge(file_list=sample_files, chunk_config={"time": 2000, "lat": 100, "lon": 100}, target_filename="merged_large_dataset.nc", parallel=True)
+
+    # 示例5: 时间维度特殊处理
+    print("\n" + "=" * 40)
+    print("示例5: 时间维度排序去重")
+    merge(
+        file_list=sample_files,
+        dim_name="time",
+        target_filename="merged_time_processed.nc",
+        sanity_check=True,  # 强制数据校验
+    )
+
+    # 示例6: 覆盖已存在文件
+    print("\n" + "=" * 40)
+    print("示例6: 强制覆盖现有文件")
+    try:
+        merge(
+            file_list=sample_files,
+            target_filename="merged_all_vars.nc",  # 与示例1相同文件名
+            overwrite=True,  # 显式启用覆盖
+        )
+    except FileExistsError as e:
+        print(f"捕获预期外异常: {str(e)}")
+
+    # 示例7: 禁用并行处理
+    print("\n" + "=" * 40)
+    print("示例7: 单线程模式运行")
+    merge(file_list=sample_files, target_filename="merged_single_thread.nc", parallel=False)
+
+    # 示例8: 处理特殊维度
+    print("\n" + "=" * 40)
+    print("示例8: 按深度维度合并")
+    merge(file_list=sample_files, dim_name="depth", var_name=["density", "oxygen"], target_filename="merged_by_depth.nc")
+
+    # 示例9: 混合变量类型处理
+    print("\n" + "=" * 40)
+    print("示例9: 混合静态/动态变量")
+    merge(
+        file_list=sample_files,
+        var_name=["bathymetry", "temperature"],  # bathymetry为静态变量
+        target_filename="merged_mixed_vars.nc",
+        sanity_check=True,  # 验证静态变量一致性
+    )
+
+    # 示例10: 完整配置演示
+    print("\n" + "=" * 40)
+    print("示例10: 全参数配置演示")
+    merge(
+        file_list=sample_files,
+        var_name=None,  # 所有变量
+        dim_name="time",
+        target_filename="merged_full_config.nc",
+        chunk_config={"time": 1000, "lat": 500, "lon": 500},
+        compression={"temperature": {"complevel": 4}, "salinity": {"zlib": False}},
+        sanity_check=True,
+        overwrite=True,
+        parallel=True,
+    )

oafuncs/oa_down/hycom_3hourly.py

@@ -35,8 +35,8 @@ import xarray as xr
 from rich import print
 from rich.progress import Progress
 
-from oafuncs._oa_down.idm import downloader as idm_downloader
-from oafuncs._oa_down.user_agent import get_ua
+from oafuncs.oa_down.idm import downloader as idm_downloader
+from oafuncs.oa_down.user_agent import get_ua
 from oafuncs.oa_file import file_size, mean_size
 from oafuncs.oa_nc import check as check_nc
 from oafuncs.oa_nc import modify as modify_nc

oafuncs/oa_down/literature.py

@@ -22,7 +22,7 @@ import pandas as pd
 import requests
 from rich import print
 from rich.progress import track
-from oafuncs._oa_down.user_agent import get_ua
+from oafuncs.oa_down.user_agent import get_ua
 from oafuncs.oa_file import remove
 from oafuncs.oa_data import ensure_list
 

oafuncs/oa_nc.py

@@ -19,6 +19,7 @@ import netCDF4 as nc
 import numpy as np
 import xarray as xr
 from rich import print
+from typing import Dict, List, Union
 
 __all__ = ["get_var", "extract", "save", "merge", "modify", "rename", "check", "convert_longitude", "isel", "draw"]
 
@@ -181,86 +182,29 @@ def save(file, data, varname=None, coords=None, mode="w", scale_offset_switch=Tr
                     var.setncattr(key, value)
 
 
-def merge(file_list, var_name=None, dim_name=None, target_filename=None):
+def merge(file_list: Union[str, List[str]], var_name: Union[str, List[str], None] = None, dim_name: str = "time", target_filename: str = "merged.nc", chunk_config: Dict = {"time": 1000}, compression: Union[bool, Dict] = True, sanity_check: bool = True, overwrite: bool = True, parallel: bool = True) -> None:
     """
-    Description:
-        Merge variables from multiple NetCDF files along a specified dimension and write to a new file.
-        If var_name is a string, it is considered a single variable; if it is a list and has only one element, it is also a single variable;
-        If the list has more than one element, it is a multi-variable; if var_name is None, all variables are merged.
+    NetCDF合并函数
 
     Parameters:
-        file_list: List of NetCDF file paths
-        var_name: Name of the variable to be extracted or a list of variable names, default is None, which means all variables are extracted
-        dim_name: Dimension name used for merging
-        target_filename: Target file name after merging
+        file_list: 文件路径列表或单个文件路径
+        var_name: 需要合并的变量（单个变量名/变量列表/None表示全部）
+        dim_name: 合并维度，默认为'time'
+        target_filename: 输出文件路径
+        chunk_config: Dask分块配置，如{"time": 1000}
+        compression: 压缩配置（True启用默认压缩，或自定义编码字典）
+        sanity_check: 是否执行数据完整性校验
+        overwrite: 是否覆盖已存在文件
+        parallel: 是否启用并行处理
 
     Example:
-        merge(file_list, var_name='u', dim_name='time', target_filename='merged.nc')
-        merge(file_list, var_name=['u', 'v'], dim_name='time', target_filename='merged.nc')
-        merge(file_list, var_name=None, dim_name='time', target_filename='merged.nc')
+        merge(["data1.nc", "data2.nc"],
+             var_name=["temp", "salt"],
+             target_filename="result.nc",
+             chunk_config={"time": 500})
     """
-    # 看看保存文件是单纯文件名还是包含路径的，如果有路径，需要确保路径存在
-    if target_filename is None:
-        target_filename = "merged.nc"
-    if not os.path.exists(os.path.dirname(str(target_filename))):
-        os.makedirs(os.path.dirname(str(target_filename)))
-
-    if isinstance(file_list, str):
-        file_list = [file_list]
-
-    # 初始化变量名列表
-    var_names = None
-
-    # 判断 var_name 是单变量、多变量还是合并所有变量
-    if var_name is None:
-        # 获取第一个文件中的所有变量名
-        ds = xr.open_dataset(file_list[0])
-        var_names = list(ds.variables.keys())
-        ds.close()
-    elif isinstance(var_name, str):
-        var_names = [var_name]
-    elif isinstance(var_name, list):
-        var_names = var_name
-    else:
-        raise ValueError("var_name must be a string, a list of strings, or None")
-
-    # 初始化合并数据字典
-    merged_data = {}
-
-    # 遍历文件列表
-    print("Reading file ...")
-    for i, file in enumerate(file_list):
-        # 更新track描述进度
-        # print(f"\rReading file {i + 1}/{len(file_list)}...", end="")
-        ds = xr.open_dataset(file)
-        for var_name in var_names:
-            var = ds[var_name]
-            # 如果变量包含合并维度，则合并它们
-            if dim_name in var.dims:
-                if var_name not in merged_data:
-                    merged_data[var_name] = [var]
-                else:
-                    merged_data[var_name].append(var)
-            # 如果变量不包含合并维度，则仅保留第一个文件中的值
-            else:
-                if var_name not in merged_data:
-                    merged_data[var_name] = var
-        ds.close()
-
-    print("\nMerging data ...")
-    for var_name in merged_data:
-        if isinstance(merged_data[var_name], list):
-            merged_data[var_name] = xr.concat(merged_data[var_name], dim=dim_name)
-
-    merged_data = xr.Dataset(merged_data)
-
-    print("\nWriting data to file ...")
-    if os.path.exists(target_filename):
-        print("Warning: The target file already exists.")
-        print("Removing existing file ...")
-        os.remove(target_filename)
-    merged_data.to_netcdf(target_filename)
-    print(f'\nFile "{target_filename}" has been created.')
+    from _script.netcdf_merge import merge as nc_merge
+    nc_merge(file_list, var_name, dim_name, target_filename, chunk_config, compression, sanity_check, overwrite, parallel)
 
 
 def _modify_var(nc_file_path, variable_name, new_value):

{oafuncs-0.0.97.6.dist-info → oafuncs-0.0.97.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.97.6
+Version: 0.0.97.8
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -33,6 +33,7 @@ Requires-Dist: Cartopy
 Requires-Dist: rasterio
 Requires-Dist: salem
 Requires-Dist: psutil
+Requires-Dist: dask
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{oafuncs-0.0.97.6.dist-info → oafuncs-0.0.97.8.dist-info}/RECORD

@@ -5,20 +5,20 @@ oafuncs/oa_date.py,sha256=--3uXYq3_n9HBJbY1io1H1PE-FyiVxbQCyFUcudxQks,3210
 oafuncs/oa_draw.py,sha256=d23R6OEco7EbvcrL5YsnrSupnKKUn55hLw1B_d-kxOg,12308
 oafuncs/oa_file.py,sha256=nYTsMataaC790lSqxjuMB4uVqUJz_tMm_kRve4CHql4,17235
 oafuncs/oa_help.py,sha256=loyzTbjU_0VpSIBvAEUA_tqxG8MVsO0xFE_2hgQ3zMw,4188
-oafuncs/oa_nc.py,sha256=eTioHFT8eeg3T7S5wFUiFm1zU1w8Fo11Un8fjBaPhuY,20860
+oafuncs/oa_nc.py,sha256=ZNcbQBRF2hT22JEt8cINb3irJIiTPf7YUZ4R5sMsfCI,18717
 oafuncs/oa_python.py,sha256=Q-6UGGw_dJff7Ef8i87fsLPoGeHV5jBzfb-7HP4THR0,4018
 oafuncs/_data/OAFuncs.png,sha256=y1_x-mUP3gFjcy6m8FqfvQO_HgjzPhQKfXjnSHjslZE,3436152
 oafuncs/_data/hycom_3hourly.png,sha256=azt_uPcXtl_8CSKRLLPCIf5pPrcxMiOzvoFQnwb0zUo,12411415
 oafuncs/_script/auto_optimized_parallel_executor.py,sha256=4QaEk9AM-IneHm8KKSQ6MjSLNSaAWM4AQ-8OWXYdsaI,17300
+oafuncs/_script/netcdf_merge.py,sha256=kZV9bKChcWppoZfZbMdIgWZuUlmFx5IYtLmO1rMioGk,13400
 oafuncs/_script/parallel_example_usage.py,sha256=uLvE7iwkMn9Cyq6-wk5_RpbQk7PXM9d16-26lTknW9s,2646
 oafuncs/_script/plot_dataset.py,sha256=4PEMXI7NUgLMKwo-33y_AUrmUYS7BzmInCDyFalaZSk,13136
 oafuncs/_script/replace_file_concent.py,sha256=eCFZjnZcwyRvy6b4mmIfBna-kylSZTyJRfgXd6DdCjk,5982
 oafuncs/oa_down/User_Agent-list.txt,sha256=pazxSip8_lphEBOPHG902zmIBUg8sBKXgmqp_g6j_E4,661062
 oafuncs/oa_down/__init__.py,sha256=kRX5eTUCbAiz3zTaQM1501paOYS_3fizDN4Pa0mtNUA,585
-oafuncs/oa_down/hycom_3hourly.py,sha256=Lw7BgK-6hHp93S2D1nf_k-7oKwDxTV8yYP7ZosfZRh0,65309
-oafuncs/oa_down/hycom_3hourly_20250129.py,sha256=wVOSR-n-7OZYNsLujV0XeMrNwZFuF-g6d7cSrGIReBs,65555
+oafuncs/oa_down/hycom_3hourly.py,sha256=lCdbYQd7o_2jMgwmbrClNo5omrj5b5cnWnp6lnXMloQ,65307
 oafuncs/oa_down/idm.py,sha256=XfYCNnQWADxOhhJd-T8sNYN0nGiRrAs7zbQcsB5-UmI,1668
-oafuncs/oa_down/literature.py,sha256=D1ZpHULQ4OJ2WXG2TWgBovuucPrfSeyC0rr3P2vSKjo,11332
+oafuncs/oa_down/literature.py,sha256=2bF9gSKQbzcci9LcKE81j8JEjIJwON7jbwQB3gDDA3E,11331
 oafuncs/oa_down/test_ua.py,sha256=0IQq3NjqfNr7KkyjS_U-a4mYu-r-E7gzawwo4IfEa6Y,10851
 oafuncs/oa_down/user_agent.py,sha256=TsPcAxFmMTYAEHRFjurI1bQBJfDhcA70MdHoUPwQmks,785
 oafuncs/oa_model/__init__.py,sha256=__ImltHkP1bSsIpsmKpDE8QwwA-2Z8K7mZUHGGcRdro,484
@@ -33,8 +33,8 @@ oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw
 oafuncs/oa_tool/__init__.py,sha256=AvrCNR2-xad9ZRjthIdAoSk8UX4vOpEWLg6CV1NQNKc,161
 oafuncs/oa_tool/email.py,sha256=4lJxV_KUzhxgLYfVwYTqp0qxRugD7fvsZkXDe5WkUKo,3052
 oafuncs/oa_tool/parallel.py,sha256=LBFWEKPcILVCbfSulETJE4wGPiOw1P_Fl9DzjYoCqgk,21844
-oafuncs-0.0.97.6.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.97.6.dist-info/METADATA,sha256=3S9GNpCs63Ef6sJ_IcIoizHyQt10hprfwrv2YwxkmZs,4204
-oafuncs-0.0.97.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-oafuncs-0.0.97.6.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.97.6.dist-info/RECORD,,
+oafuncs-0.0.97.8.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.97.8.dist-info/METADATA,sha256=7uztVgipsZwxNit00ccUhDXROuM9uVPmYRxkgBr1pOc,4225
+oafuncs-0.0.97.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+oafuncs-0.0.97.8.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.97.8.dist-info/RECORD,,