oafuncs 0.0.98.12__py3-none-any.whl → 0.0.98.13__py3-none-any.whl

oafuncs/_script/netcdf_merge.py

@@ -3,10 +3,8 @@ from typing import List, Optional, Union
 
 import numpy as np
 import xarray as xr
-from dask.diagnostics import ProgressBar
 
 from oafuncs import pbar
-from oafuncs._script.netcdf_write import _calculate_scale_and_offset  # 新增导入
 
 
 def merge_nc(file_list: Union[str, List[str]], var_name: Optional[Union[str, List[str]]] = None, dim_name: Optional[str] = None, target_filename: Optional[str] = None) -> None:
@@ -27,6 +25,7 @@ def merge_nc(file_list: Union[str, List[str]], var_name: Optional[Union[str, Lis
         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')
     """
+    from oafuncs._script.netcdf_write import save_to_nc
 
     if target_filename is None:
         target_filename = "merged.nc"
@@ -53,7 +52,7 @@ def merge_nc(file_list: Union[str, List[str]], var_name: Optional[Union[str, Lis
     # 初始化合并数据字典
     merged_data = {}
 
-    for i, file in pbar(enumerate(file_list), description="Reading files", color="#f8bbd0", total=len(file_list)):
+    for i, file in pbar(enumerate(file_list), description="Reading files", total=len(file_list)):
         with xr.open_dataset(file) as ds:
             for var in var_names:
                 data_var = ds[var]
@@ -66,48 +65,24 @@ def merge_nc(file_list: Union[str, List[str]], var_name: Optional[Union[str, Lis
                     else:
                         merged_data[var] = data_var.fillna(0)
 
-    for var in pbar(merged_data, description="Merging variables", color="#9b45d1"):
+    for var in pbar(merged_data, description="Merging variables"):
         if isinstance(merged_data[var], list):
             # 判断类型，时间类型用NaT填充
             if np.issubdtype(merged_data[var][0].dtype, np.datetime64):
                 merged_data[var] = xr.concat(merged_data[var], dim=dim_name).fillna(np.datetime64("NaT"))
             else:
                 merged_data[var] = xr.concat(merged_data[var], dim=dim_name).fillna(0)
-        # print(f"Variable '{var}' merged: min={merged_data[var].min().values:.3f}, max={merged_data[var].max().values:.3f}, mean={merged_data[var].mean().values:.3f}")
 
-    # 修改写入数据部分，支持压缩并设置基数和比例因子
-    # print("\nWriting data to file ...")
     if os.path.exists(target_filename):
         print("Warning: The target file already exists. Removing it ...")
         os.remove(target_filename)
-
-    with xr.Dataset(merged_data) as merged_dataset:
-        encoding = {}
-        for var in merged_dataset.data_vars:
-            data = merged_dataset[var].values
-            if data.dtype.kind in {"i", "u", "f"}:  # 仅对数值型数据进行压缩
-                # 统一调用 netcdf_write 中的 scale/offset 计算
-                scale_factor, add_offset = _calculate_scale_and_offset(data, n=16)
-                encoding[var] = {
-                    "zlib": True,
-                    "complevel": 4,
-                    "dtype": "int16",
-                    "scale_factor": scale_factor,
-                    "add_offset": add_offset,
-                    "_FillValue": -32767,
-                }
-            else:
-                encoding[var] = {"zlib": True, "complevel": 4}
-
-        # 确保写入时不会因编码问题导致数据丢失
-        # merged_dataset.to_netcdf(target_filename, encoding=encoding)
-        delayed_write = merged_dataset.to_netcdf(target_filename, encoding=encoding, compute=False)
-        with ProgressBar():
-            delayed_write.compute()
+    
+    save_to_nc(target_filename, merged_data)
 
     print(f'\nFile "{target_filename}" has been successfully created.')
 
 
+
 # Example usage
 if __name__ == "__main__":
     files_to_merge = ["file1.nc", "file2.nc", "file3.nc"]

oafuncs/oa_tool.py

@@ -2,6 +2,7 @@ import datetime
 import logging
 from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Union
 
+
 from rich import print
 
 from ._script.parallel import ParallelExecutor
@@ -174,6 +175,8 @@ def pbar(
     """
     from ._script.cprogressbar import ColorProgressBar
     import random
+    
+    # number = random.randint(1, 999)
 
     def _generate_random_color_hex():
         """Generate a random color in hexadecimal format."""
@@ -186,9 +189,11 @@ def pbar(
         color = _generate_random_color_hex()
 
     style = f"bold {color if color != 'None' else 'green'}"
+    # print(f"[{style}]~*^* {description} *^*~ -> {number:03d}[/{style}]")
     print(f"[{style}]~*^* {description} *^*~[/{style}]")
 
-    description=''
+    # description=f'{number:03d}'
+    description = ""
     
     return ColorProgressBar(
         iterable=iterable,

{oafuncs-0.0.98.12.dist-info → oafuncs-0.0.98.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.12
+Version: 0.0.98.13
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

{oafuncs-0.0.98.12.dist-info → oafuncs-0.0.98.13.dist-info}/RECORD

@@ -7,12 +7,12 @@ oafuncs/oa_file.py,sha256=j9gXJgPOJsliu4IOUc4bc-luW4yBvQyNCEmMyDVjUwQ,16404
 oafuncs/oa_help.py,sha256=_4AZgRDq5Or0vauNvq5IDDHIBoBfdOQtzak-mG1wwAw,4537
 oafuncs/oa_nc.py,sha256=lLEPjj4qgdEw1al0r1nKGZUnMP_ejT8A2NKD4lrs2kc,11936
 oafuncs/oa_python.py,sha256=NkopwkYFGSEuVljnTBvXCl6o2CeyRNBqRXSsUl3euEE,5192
-oafuncs/oa_tool.py,sha256=EqOlGPq3Rx2ohqVnGuCZhMvr2o9_XgglrETMbAdEifM,8471
+oafuncs/oa_tool.py,sha256=rpPkLqWhqMmqlCc5wjL8qMTg3gThCkSrYJckbX_0iJc,8631
 oafuncs/_data/hycom.png,sha256=MadKs6Gyj5n9-TOu7L4atQfTXtF9dvN9w-tdU9IfygI,10945710
 oafuncs/_data/oafuncs.png,sha256=o3VD7wm-kwDea5E98JqxXl04_78cBX7VcdUt7uQXGiU,3679898
 oafuncs/_script/cprogressbar.py,sha256=UIgGcLFs-6IgWlITuBLaQqrpt4OAK3Mst5RlCiNfZdQ,15772
 oafuncs/_script/email.py,sha256=lL4HGKrr524-g0xLlgs-4u7x4-u7DtgNoD9AL8XJKj4,3058
-oafuncs/_script/netcdf_merge.py,sha256=ncNxstXJ77Ftyac5b1yRriVoBxbTVtaU111NU_7k_QA,5282
+oafuncs/_script/netcdf_merge.py,sha256=vWvrFUmzwZgTCn2E_9iBKmPLf93ekvD3Ud2NOQgJxGQ,3829
 oafuncs/_script/netcdf_modify.py,sha256=sGRUYNhfGgf9JV70rnBzw3bzuTRSXzBTL_RMDnDPeLQ,4552
 oafuncs/_script/netcdf_write.py,sha256=iO1Qv9bp6RLiw1D8Nrv7tX_8X-diUZaX3Nxhk6pJ5Nw,8556
 oafuncs/_script/parallel.py,sha256=T9Aie-e4LcbKlFTLZ0l4lhEN3SBVa84jRcrAsIm8s0I,8767
@@ -37,8 +37,8 @@ oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,5
 oafuncs/oa_sign/meteorological.py,sha256=8091SHo2L8kl4dCFmmSH5NGVHDku5i5lSiLEG5DLnOQ,6489
 oafuncs/oa_sign/ocean.py,sha256=xrW-rWD7xBWsB5PuCyEwQ1Q_RDKq2KCLz-LOONHgldU,5932
 oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
-oafuncs-0.0.98.12.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.12.dist-info/METADATA,sha256=TfDApyqtzs-wBr9sBG2sYBVHZFfJht6g1N3JtCQSHfU,4273
-oafuncs-0.0.98.12.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-oafuncs-0.0.98.12.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.12.dist-info/RECORD,,
+oafuncs-0.0.98.13.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.98.13.dist-info/METADATA,sha256=S7BtUR9AaROiwbgyU3-wFsbVo8ySvRNUR3M9x383uA8,4273
+oafuncs-0.0.98.13.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+oafuncs-0.0.98.13.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.98.13.dist-info/RECORD,,