oafuncs 0.0.98.8__py3-none-any.whl → 0.0.98.10__py3-none-any.whl

oafuncs/_script/cprogressbar.py

@@ -148,7 +148,7 @@ class ColorProgressBar:
         description: str = "Working ...",
         total: Optional[float] = None,
         completed: float = 0,
-        color: Any = "cyan",
+        color: Any = "green",
         cmap: Union[str, List[str]] = None,
         update_interval: float = 0.1,
         bar_length: int = None,

oafuncs/_script/netcdf_merge.py

@@ -1,9 +1,12 @@
 import os
 from typing import List, Optional, Union
-from dask.diagnostics import ProgressBar
+
+import numpy as np
 import xarray as xr
+from dask.diagnostics import ProgressBar
 from oafuncs import pbar
 
+
 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:
     """
     Description:
@@ -22,7 +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')
     """
-    
+
     if target_filename is None:
         target_filename = "merged.nc"
 
@@ -55,11 +58,19 @@ def merge_nc(file_list: Union[str, List[str]], var_name: Optional[Union[str, Lis
                 if dim_name in data_var.dims:
                     merged_data.setdefault(var, []).append(data_var)
                 elif var not in merged_data:
-                    merged_data[var] = data_var.fillna(0)  # 用0填充NaN值
+                    # 判断类型，时间类型用NaT填充
+                    if np.issubdtype(data_var.dtype, np.datetime64):
+                        merged_data[var] = data_var.fillna(np.datetime64("NaT"))
+                    else:
+                        merged_data[var] = data_var.fillna(0)
 
     for var in pbar(merged_data, description="Merging variables", color="#9b45d1"):
         if isinstance(merged_data[var], list):
-            merged_data[var] = xr.concat(merged_data[var], dim=dim_name).fillna(0)
+            # 判断类型，时间类型用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}")
 
     # 修改写入数据部分，支持压缩并设置基数和比例因子

oafuncs/_script/parallel.py

@@ -1,4 +1,3 @@
-import atexit
 import logging
 import multiprocessing as mp
 import platform
@@ -30,6 +29,7 @@ class ParallelExecutor:
         self.running = True
         self.task_history = []
         self._executor = None
+        self._shutdown_called = False
 
         self.mode, default_workers = self._determine_optimal_settings()
         self.max_workers = max_workers or default_workers
@@ -37,7 +37,6 @@ class ParallelExecutor:
 
         self._init_platform_settings()
         self._start_resource_monitor()
-        atexit.register(self.shutdown)
 
         logging.info(f"Initialized {self.__class__.__name__} on {self.platform} (mode={self.mode}, workers={self.max_workers})")
 
@@ -99,16 +98,26 @@ class ParallelExecutor:
 
     def run(self, func: Callable, params: List[Tuple], chunk_size: Optional[int] = None) -> List[Any]:
         chunk_size = chunk_size or self.chunk_size
-        for retry in range(self.max_retries + 1):
-            try:
-                start_time = time.monotonic()
-                results = self._execute_batch(func, params, chunk_size)
-                self._update_settings(time.monotonic() - start_time, len(params))
-                return results
-            except Exception as e:
-                logging.error(f"Attempt {retry + 1} failed: {e}")
-                self._handle_failure()
-        raise RuntimeError(f"Failed after {self.max_retries} retries")
+        try:
+            for retry in range(self.max_retries + 1):
+                try:
+                    start_time = time.monotonic()
+                    results = self._execute_batch(func, params, chunk_size)
+                    self._update_settings(time.monotonic() - start_time, len(params))
+                    return results
+                except Exception as e:
+                    logging.error(f"Attempt {retry + 1} failed: {e}")
+                    self._handle_failure()
+            raise RuntimeError(f"Failed after {self.max_retries} retries")
+        finally:
+            # 仅关闭当前 executor，保留资源监控等运行状态
+            if self._executor:
+                try:
+                    self._executor.shutdown(wait=True)
+                except Exception as e:
+                    logging.error(f"Executor shutdown error: {e}")
+                finally:
+                    self._executor = None
 
     def _execute_batch(self, func: Callable, params: List[Tuple], chunk_size: int) -> List[Any]:
         if not params:
@@ -168,10 +177,14 @@ class ParallelExecutor:
             self._restart_executor()
 
     def shutdown(self):
+        if self._shutdown_called:
+            return
+        self._shutdown_called = True
         self.running = False
+        # 基类不再打印日志，由子类统一处理
         if self._executor:
             try:
-                self._executor.shutdown(wait=False)
+                self._executor.shutdown(wait=True)
             except Exception as e:
                 logging.error(f"Shutdown error: {e}")
             finally:

oafuncs/oa_data.py

@@ -190,8 +190,10 @@ def interp_2d(
     for t_index in range(t):
         for z_index in range(z):
             paras.append((new_src_data[t_index, z_index], origin_points, target_points, interpolation_method, target_shape))
-    excutor = PEx()
-    result = excutor.run(_interp_single_worker, paras)
+    
+    with PEx() as excutor:
+        result = excutor.run(_interp_single_worker, paras)
+    excutor.shutdown()
 
     return np.squeeze(np.array(result))
 

oafuncs/oa_date.py

@@ -64,7 +64,6 @@ def hour_range(start_time: str, end_time: str, hour_interval: int = 6) -> List[s
         date_s += datetime.timedelta(hours=hour_interval)
     return date_list
 
-
 def adjust_time(base_time: str, time_delta: int, delta_unit: str = "hours", output_format: Optional[str] = None) -> str:
     """
     Adjust a given base time by adding a specified time delta.
@@ -89,7 +88,12 @@ def adjust_time(base_time: str, time_delta: int, delta_unit: str = "hours", outp
     """
     # Normalize the input time to "yyyymmddHHMMSS" format
     time_format = "%Y%m%d%H%M%S"
+    if len(base_time) == 4:
+        base_time += "0101"
+    elif len(base_time) == 6:
+        base_time += "01"
     base_time = base_time.ljust(14, "0")
+
     time_obj = datetime.datetime.strptime(base_time, time_format)
 
     # Add the specified amount of time
@@ -101,8 +105,19 @@ def adjust_time(base_time: str, time_delta: int, delta_unit: str = "hours", outp
         time_obj += datetime.timedelta(hours=time_delta)
     elif delta_unit == "days":
         time_obj += datetime.timedelta(days=time_delta)
+    elif delta_unit == "months":
+        # Handle month addition separately
+        month = time_obj.month - 1 + time_delta
+        year = time_obj.year + month // 12
+        month = month % 12 + 1
+        day = min(time_obj.day, month_days(year, month))
+        time_obj = time_obj.replace(year=year, month=month, day=day)
+    elif delta_unit == "years":
+        # Handle year addition separately
+        year = time_obj.year + time_delta
+        time_obj = time_obj.replace(year=year)
     else:
-        raise ValueError("Invalid time unit. Use 'seconds', 'minutes', 'hours', or 'days'.")
+        raise ValueError("Invalid time unit. Use 'seconds', 'minutes', 'hours', 'days', 'months', or 'years'.")
 
     # Determine the output format
     if output_format:
@@ -116,6 +131,10 @@ def adjust_time(base_time: str, time_delta: int, delta_unit: str = "hours", outp
             default_format = "%Y%m%d%H"
         elif delta_unit == "days":
             default_format = "%Y%m%d"
+        elif delta_unit == "months":
+            default_format = "%Y%m"
+        elif delta_unit == "years":
+            default_format = "%Y"
         return time_obj.strftime(default_format)
 
 

oafuncs/oa_file.py

@@ -287,7 +287,11 @@ def remove(target_pattern: str) -> None:
                 (shutil.rmtree if os.path.isdir(file_path) else os.remove)(file_path)
                 print(f"[green]Successfully deleted:[/green] [bold]{file_path}[/bold]")
             else:
-                print(f"[yellow]Skipping unknown file type:[/yellow] [bold]{file_path}[/bold]")
+                if not os.path.exists(file_path):
+                    # print(f"[yellow]File not found:[/yellow] [bold]{file_path}[/bold]")
+                    pass
+                else:
+                    print(f"[yellow]Skipping unknown file type:[/yellow] [bold]{file_path}[/bold]")
         except Exception as e:
             print(f"[red]Failed to delete:[/red] [bold]{file_path}[/bold]. Error: {e}")
 

oafuncs/oa_nc.py

@@ -6,7 +6,7 @@ import numpy as np
 import xarray as xr
 from rich import print
 
-__all__ = ["save", "merge", "modify", "rename", "check", "convert_longitude", "isel", "draw"]
+__all__ = ["save", "merge", "modify", "rename", "check", "convert_longitude", "isel", "draw", "unpack_netcdf"]
 
 
 def save(
@@ -278,6 +278,28 @@ def draw(
         print("[red]No dataset or file provided.[/red]")
 
 
+def unpack_netcdf(src_path, dst_path=None):
+    """解码 NetCDF 并移除 scale_factor/add_offset，写出真实值。
+    若 dst_path 省略，则自动生成新文件名，写出后删除原文件并将新文件改回原名。
+    """
+    # 判断是否要替换原文件
+    delete_orig = dst_path is None
+    if delete_orig:
+        dst_path = src_path.replace(".nc", "_unpacked.nc")
+
+    ds = xr.open_dataset(src_path, decode_cf=True)
+    for var in ds.data_vars:
+        ds[var].attrs.pop("scale_factor", None)
+        ds[var].attrs.pop("add_offset", None)
+        ds[var].encoding.clear()
+    ds.to_netcdf(dst_path, mode="w", format="NETCDF4", engine="netcdf4")
+    ds.close()
+
+    if delete_orig:
+        os.remove(src_path)
+        os.rename(dst_path, src_path)
+
+
 if __name__ == "__main__":
     data = np.random.rand(100, 50)
     save(r"test.nc", data, "data", {"time": np.linspace(0, 120, 100), "lev": np.linspace(0, 120, 50)}, "a")

oafuncs/oa_tool.py

@@ -137,7 +137,7 @@ def pbar(
     description: str = "Working...",
     total: Optional[float] = None,
     completed: float = 0,
-    color: Any = "cyan",
+    color: Any = "None",
     cmap: Union[str, List[str], None] = None,
     update_interval: float = 0.1,
     bar_length: Optional[int] = None,
@@ -173,8 +173,23 @@ def pbar(
         ...     time.sleep(0.1)
     """
     from ._script.cprogressbar import ColorProgressBar
+    import random
 
-    print(f"[blue]{description}[/blue]")
+    def _generate_random_color_hex():
+        """Generate a random color in hexadecimal format."""
+        r = random.randint(0, 255)
+        g = random.randint(0, 255)
+        b = random.randint(0, 255)
+        return '#{r:02x}{g:02x}{b:02x}'.format(r=r, g=g, b=b)
+
+    if color == 'None' and cmap is None:
+        color = _generate_random_color_hex()
+
+    style = f"bold {color if color != 'None' else 'green'}"
+    print(f"[{style}]~*^* {description} *^*~[/{style}]")
+
+    description=''
+    
     return ColorProgressBar(
         iterable=iterable,
         description=description,

{oafuncs-0.0.98.8.dist-info → oafuncs-0.0.98.10.dist-info}/METADATA

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

{oafuncs-0.0.98.8.dist-info → oafuncs-0.0.98.10.dist-info}/RECORD

@@ -1,21 +1,21 @@
 oafuncs/__init__.py,sha256=T_-VtnWWllV3Q91twT5Yt2sUapeA051QbPNnBxmg9nw,1456
 oafuncs/oa_cmap.py,sha256=DimWT4Bg7uE5Lx8hSw1REp7whpsR2pFRStAwk1cowEM,11494
-oafuncs/oa_data.py,sha256=7heyoFOBt_xqe0YSiUdO6tOpmySm0FuG1fHSoAO1NJI,10271
-oafuncs/oa_date.py,sha256=KqU-bHtC74hYsf6VgiA3i2vI__q_toOVR-whFy4cYP8,5523
+oafuncs/oa_data.py,sha256=F0IR7T-BoWZho5aoDI_mWWUuuOvifohkkNLFm9Wlsqs,10312
+oafuncs/oa_date.py,sha256=WhM6cyD4G3IeghjLTHhAMtlvJbA7kwQG2sHnxdTgyso,6303
 oafuncs/oa_draw.py,sha256=Wj2QBgyIPpV_dxaDrH10jqj_puK9ZM9rd-si-3VrsrE,17631
-oafuncs/oa_file.py,sha256=goF5iRXJFFCIKhIjlkCnYYt0EYlJb_4r8AeYNZ0-SOk,16209
+oafuncs/oa_file.py,sha256=j9gXJgPOJsliu4IOUc4bc-luW4yBvQyNCEmMyDVjUwQ,16404
 oafuncs/oa_help.py,sha256=_4AZgRDq5Or0vauNvq5IDDHIBoBfdOQtzak-mG1wwAw,4537
-oafuncs/oa_nc.py,sha256=L1gqXxg93kIDsMOa87M0o-53KVmdqCipnXeF9XfzfY8,10513
+oafuncs/oa_nc.py,sha256=S23QL_GfIaENPr9p7oEeFT34nqJ2-7fiCcFQu72CmjI,11327
 oafuncs/oa_python.py,sha256=NkopwkYFGSEuVljnTBvXCl6o2CeyRNBqRXSsUl3euEE,5192
-oafuncs/oa_tool.py,sha256=UNdiXKWfk860eb01vSGH8XN_Bd3CP7ihaspRrudday0,7983
+oafuncs/oa_tool.py,sha256=EqOlGPq3Rx2ohqVnGuCZhMvr2o9_XgglrETMbAdEifM,8471
 oafuncs/_data/hycom.png,sha256=MadKs6Gyj5n9-TOu7L4atQfTXtF9dvN9w-tdU9IfygI,10945710
 oafuncs/_data/oafuncs.png,sha256=o3VD7wm-kwDea5E98JqxXl04_78cBX7VcdUt7uQXGiU,3679898
-oafuncs/_script/cprogressbar.py,sha256=wRU3SFPFtMI7ER26tTzg223kVKNo5RDWE9CzdIgUsuE,15771
+oafuncs/_script/cprogressbar.py,sha256=UIgGcLFs-6IgWlITuBLaQqrpt4OAK3Mst5RlCiNfZdQ,15772
 oafuncs/_script/email.py,sha256=lL4HGKrr524-g0xLlgs-4u7x4-u7DtgNoD9AL8XJKj4,3058
-oafuncs/_script/netcdf_merge.py,sha256=_EPF9Xj4HOVC9sZpi1lt62-Aq6pMlgsgwaajEBLhW6g,5092
+oafuncs/_script/netcdf_merge.py,sha256=ktmTOgGfLHBNdS4HBc6xFDfO8B7E4DT7d1e6Dtare9Y,5596
 oafuncs/_script/netcdf_modify.py,sha256=sGRUYNhfGgf9JV70rnBzw3bzuTRSXzBTL_RMDnDPeLQ,4552
 oafuncs/_script/netcdf_write.py,sha256=iO1Qv9bp6RLiw1D8Nrv7tX_8X-diUZaX3Nxhk6pJ5Nw,8556
-oafuncs/_script/parallel.py,sha256=dRT7w_rBnR3mZkUlO6v6j05SwBTQpTccOna5CXI5Msg,8196
+oafuncs/_script/parallel.py,sha256=T9Aie-e4LcbKlFTLZ0l4lhEN3SBVa84jRcrAsIm8s0I,8767
 oafuncs/_script/parallel_test.py,sha256=0GBqZOX7IaCOKF2t1y8N8YYu53GJ33OkfsWgpvZNqM4,372
 oafuncs/_script/plot_dataset.py,sha256=zkSEnO_-biyagorwWXPoihts_cwuvripzEt-l9bHJ2E,13989
 oafuncs/_script/replace_file_content.py,sha256=eCFZjnZcwyRvy6b4mmIfBna-kylSZTyJRfgXd6DdCjk,5982
@@ -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.8.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.8.dist-info/METADATA,sha256=Le6ieydYuvZciK8CaFHPBUy47T3geyA48Z6nzSbLMwQ,4272
-oafuncs-0.0.98.8.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-oafuncs-0.0.98.8.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.8.dist-info/RECORD,,
+oafuncs-0.0.98.10.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.98.10.dist-info/METADATA,sha256=iyv12KtjFAqYtbJxBTq3RhgQ55iG5_yfCx4IzVWfJHw,4273
+oafuncs-0.0.98.10.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+oafuncs-0.0.98.10.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.98.10.dist-info/RECORD,,

{oafuncs-0.0.98.8.dist-info → oafuncs-0.0.98.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.1)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any