oafuncs 0.0.97.5__py3-none-any.whl → 0.0.97.7__py3-none-any.whl

oafuncs/__init__.py

@@ -1,18 +1,5 @@
 #!/usr/bin/env python
 # coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2024-09-17 16:09:20
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-03-09 16:28:01
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\__init__.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
-
 
 # 会导致OAFuncs直接导入所有函数，不符合模块化设计
 # from oafuncs.oa_s.oa_cmap import *
@@ -52,3 +39,5 @@ from .oa_tool import *
 # path: My_Funcs/OAFuncs/oafuncs/_script/
 # from ._script import *
 # ------------------- 2025-03-16 15:56:01 -------------------
+from .oa_date import *
+# ------------------- 2025-03-27 16:56:57 -------------------

oafuncs/oa_date.py

@@ -0,0 +1,90 @@
+#!/usr/bin/env python
+# coding=utf-8
+"""
+Author: Liu Kun && 16031215@qq.com
+Date: 2025-03-27 16:56:57
+LastEditors: Liu Kun && 16031215@qq.com
+LastEditTime: 2025-03-27 16:56:57
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_date.py
+Description:
+EditPlatform: vscode
+ComputerInfo: XPS 15 9510
+SystemInfo: Windows 11
+Python Version: 3.12
+"""
+
+import calendar
+import datetime
+
+__all__ = ["get_days_in_month", "generate_hour_list", "adjust_time"]
+
+
+def get_days_in_month(year, month):
+    return calendar.monthrange(year, month)[1]
+
+
+def generate_hour_list(start_date, end_date, interval_hours=6):
+    """
+    Generate a list of datetime strings with a specified interval in hours.
+
+    Args:
+        start_date (str): Start date in the format "%Y%m%d%H".
+        end_date (str): End date in the format "%Y%m%d%H".
+        interval_hours (int): Interval in hours between each datetime.
+
+    Returns:
+        list: List of datetime strings in the format "%Y%m%d%H".
+    """
+    date_s = datetime.datetime.strptime(start_date, "%Y%m%d%H")
+    date_e = datetime.datetime.strptime(end_date, "%Y%m%d%H")
+    date_list = []
+    while date_s <= date_e:
+        date_list.append(date_s.strftime("%Y%m%d%H"))
+        date_s += datetime.timedelta(hours=interval_hours)
+    return date_list
+
+
+def adjust_time(initial_time, amount, time_unit="hours", output_format=None):
+    """
+    Adjust a given initial time by adding a specified amount of time.
+
+    Args:
+        initial_time (str): Initial time in the format "yyyymmdd" to "yyyymmddHHMMSS".
+                            Missing parts are assumed to be "0".
+        amount (int): The amount of time to add.
+        time_unit (str): The unit of time to add ("seconds", "minutes", "hours", "days").
+        output_format (str, optional): Custom output format for the adjusted time. Defaults to None.
+
+    Returns:
+        str: The adjusted time as a string, formatted according to the output_format or time unit.
+    """
+    # Normalize the input time to "yyyymmddHHMMSS" format
+    time_format = "%Y%m%d%H%M%S"
+    initial_time = initial_time.ljust(14, "0")
+    time_obj = datetime.datetime.strptime(initial_time, time_format)
+
+    # Add the specified amount of time
+    if time_unit == "seconds":
+        time_obj += datetime.timedelta(seconds=amount)
+    elif time_unit == "minutes":
+        time_obj += datetime.timedelta(minutes=amount)
+    elif time_unit == "hours":
+        time_obj += datetime.timedelta(hours=amount)
+    elif time_unit == "days":
+        time_obj += datetime.timedelta(days=amount)
+    else:
+        raise ValueError("Invalid time unit. Use 'seconds', 'minutes', 'hours', or 'days'.")
+
+    # Determine the output format
+    if output_format:
+        return time_obj.strftime(output_format)
+    else:
+        if time_unit == "seconds":
+            default_format = "%Y%m%d%H%M%S"
+        elif time_unit == "minutes":
+            default_format = "%Y%m%d%H%M"
+        elif time_unit == "hours":
+            default_format = "%Y%m%d%H"
+        elif time_unit == "days":
+            default_format = "%Y%m%d"
+        return time_obj.strftime(default_format)

oafuncs/oa_draw.py

@@ -76,26 +76,51 @@ def fig_minus(ax_x=None, ax_y=None, cbar=None, decimal=None, add_space=False):
 
 
 # ** 将生成图片/已有图片制作成动图
-def gif(image_list: list, gif_name: str, duration=0.2):  # 制作动图，默认间隔0.2
+def gif(image_list: list, gif_name: str, duration=200, resize=None):  # 制作动图，默认间隔0.2
     """
     Description
         Make gif from images
     Parameters
         image_list : list, list of images
         gif_name : str, name of gif
-        duration : float, duration of each frame
+        duration : float, duration of each frame, units: ms
+        resize : tuple, (width, height) to resize images, if None, use first image size
     Returns
         None
     Example
         gif(["1.png", "2.png"], "test.gif", duration=0.2)
     """
     import imageio.v2 as imageio
+    import numpy as np
+    from PIL import Image
 
     frames = []
+
+    # 获取目标尺寸
+    if resize is None and image_list:
+        # 使用第一张图片的尺寸作为标准
+        with Image.open(image_list[0]) as img:
+            resize = img.size
+
+    # 读取并调整所有图片的尺寸
     for image_name in image_list:
-        frames.append(imageio.imread(image_name))
-    imageio.mimsave(gif_name, frames, format="GIF", duration=duration)
-    print("Gif制作完成！")
+        with Image.open(image_name) as img:
+            if resize:
+                img = img.resize(resize, Image.LANCZOS)
+            frames.append(np.array(img))
+
+    # 修改此处：明确使用 duration 值，并将其作为每帧的持续时间（以秒为单位）
+    # 某些版本的 imageio 可能需要以毫秒为单位，或者使用 fps 参数
+    try:
+        # 先尝试直接使用 duration 参数（以秒为单位）
+        imageio.mimsave(gif_name, frames, format="GIF", duration=duration)
+    except Exception as e:
+        print(f"尝试使用fps参数替代duration: {e}")
+        # 如果失败，尝试使用 fps 参数（fps = 1/duration）
+        fps = 1.0 / duration if duration > 0 else 5.0
+        imageio.mimsave(gif_name, frames, format="GIF", fps=fps)
+
+    print(f"Gif制作完成！尺寸: {resize}, 帧间隔: {duration}毫秒")
     return
 
 
@@ -171,8 +196,8 @@ def add_cartopy(ax, lon=None, lat=None, projection=ccrs.PlateCarree(), gridlines
 
     # set extent
     if lon is not None and lat is not None:
-        lon_min, lon_max = lon.min(), lon.max()
-        lat_min, lat_max = lat.min(), lat.max()
+        lon_min, lon_max = np.nanmin(lon), np.nanmax(lon)
+        lat_min, lat_max = np.nanmin(lat), np.nanmax(lat)
         ax.set_extent([lon_min, lon_max, lat_min, lat_max], crs=projection)
 
 

oafuncs/oa_file.py

@@ -18,10 +18,10 @@ import os
 import re
 import shutil
 
-from ._script.replace_file_concent import replace_direct_content
+
 from rich import print
 
-__all__ = ["find_file", "link_file", "copy_file", "rename_file", "make_folder", "clear_folder", "remove_empty_folder", "remove", "file_size", "mean_size", "make_dir", "replace_content"]
+__all__ = ["find_file", "link_file", "copy_file", "rename_file", "make_folder", "clear_folder", "remove_empty_folder", "remove", "file_size", "mean_size", "make_dir", "replace_content", "move_file"]
 
 
 # ** 查找文件，支持通配符
@@ -157,6 +157,55 @@ def copy_file(src_pattern, dst):
         print(f"Copy and rename file or directory: {src_file} -> {dst_file}")
 
 
+
+# ** 移动文件或目录，支持通配符
+def move_file(src_pattern, dst):
+    """
+    # 描述：移动文件或目录，支持通配符
+    # 使用示例
+    # move_file(r'/data/hejx/liukun/era5/*', r'/data/hejx/liukun/Test/')
+    # move_file(r'/data/hejx/liukun/era5/py.o*', r'/data/hejx/liukun/Test/py.o')
+    # move_file(r'/data/hejx/liukun/era5/py.o*', r'/data/hejx/liukun/Test')
+    param      {*} src_pattern # 源文件或目录
+    param      {*} dst # 目标文件或目录
+    """
+    src_pattern = str(src_pattern)
+    # 使用glob.glob来处理可能包含通配符的src
+    src_files = glob.glob(src_pattern)
+    if not src_files:
+        raise FileNotFoundError("File does not exist: {}".format(src_pattern))
+
+    # 判断dst是路径还是包含文件名的路径
+    if os.path.isdir(dst):
+        # 如果dst是路径，则保持源文件的文件名
+        dst_dir = dst
+        for src_file in src_files:
+            src_file_basename = os.path.basename(src_file)
+            dst_file = os.path.join(dst_dir, src_file_basename)
+            if os.path.exists(dst_file):
+                if os.path.isdir(dst_file):
+                    shutil.rmtree(dst_file)
+                else:
+                    os.remove(dst_file)
+            shutil.move(src_file, dst_file)
+            print(f"Move file or directory: {src_file} -> {dst_file}")
+    else:
+        # 如果dst包含文件名，则移动后重命名
+        dst_dir = os.path.dirname(dst)
+        os.makedirs(dst_dir, exist_ok=True)
+        # 只处理第一个匹配的文件
+        src_file = src_files[0]
+        dst_file = dst
+        if os.path.exists(dst_file):
+            if os.path.isdir(dst_file):
+                shutil.rmtree(dst_file)
+            else:
+                os.remove(dst_file)
+        shutil.move(src_file, dst_file)
+        print(f"Move and rename file or directory: {src_file} -> {dst_file}")
+
+
+
 # ** 重命名文件，支持通配符
 def rename_file(directory, old_str, new_str):
     """
@@ -420,6 +469,7 @@ def replace_content(source_file, content_dict, key_value=False, target_dir=None,
     返回:
     bool: 替换是否成功
     """
+    from ._script.replace_file_concent import replace_direct_content
     if target_dir is None:
         target_dir = os.path.dirname(source_file)
     replace_direct_content(source_file, target_dir, content_dict, key_value=key_value, new_name=new_name)

oafuncs/oa_nc.py

@@ -20,8 +20,6 @@ import numpy as np
 import xarray as xr
 from rich import print
 
-from ._script.plot_dataset import func_plot_dataset
-
 __all__ = ["get_var", "extract", "save", "merge", "modify", "rename", "check", "convert_longitude", "isel", "draw"]
 
 
@@ -280,15 +278,21 @@ def _modify_var(nc_file_path, variable_name, new_value):
     """
     try:
         # Open the NetCDF file
-        dataset = nc.Dataset(nc_file_path, "r+")
-        # Get the variable to be modified
-        variable = dataset.variables[variable_name]
-        # Modify the value of the variable
-        variable[:] = new_value
-        dataset.close()
-        print(f"Successfully modified variable {variable_name} in {nc_file_path}.")
+        with nc.Dataset(nc_file_path, "r+") as dataset:
+            # Check if the variable exists
+            if variable_name not in dataset.variables:
+                raise ValueError(f"Variable '{variable_name}' not found in the NetCDF file.")
+            # Get the variable to be modified
+            variable = dataset.variables[variable_name]
+            # Check if the shape of the new value matches the variable's shape
+            if variable.shape != new_value.shape:
+                raise ValueError(f"Shape mismatch: Variable '{variable_name}' has shape {variable.shape}, "
+                                 f"but new value has shape {new_value.shape}.")
+            # Modify the value of the variable
+            variable[:] = new_value
+        print(f"Successfully modified variable '{variable_name}' in '{nc_file_path}'.")
     except Exception as e:
-        print(f"An error occurred while modifying variable {variable_name} in {nc_file_path}: {e}")
+        print(f"An error occurred while modifying variable '{variable_name}' in '{nc_file_path}': {e}")
 
 
 def _modify_attr(nc_file_path, variable_name, attribute_name, attribute_value):
@@ -306,21 +310,18 @@ def _modify_attr(nc_file_path, variable_name, attribute_name, attribute_value):
         modify_attr('test.nc', 'temperature', 'long_name', 'Temperature in Celsius')
     """
     try:
-        ds = nc.Dataset(nc_file_path, "r+")
-        if variable_name not in ds.variables:
-            raise ValueError(f"Variable '{variable_name}' not found in the NetCDF file.")
-
-        variable = ds.variables[variable_name]
-        if attribute_name in variable.ncattrs():
-            print(f"Warning: Attribute '{attribute_name}' already exists. Replacing it.")
+        with nc.Dataset(nc_file_path, "r+") as ds:
+            # Check if the variable exists
+            if variable_name not in ds.variables:
+                raise ValueError(f"Variable '{variable_name}' not found in the NetCDF file.")
+            # Get the variable
+            variable = ds.variables[variable_name]
+            # Add or modify the attribute
             variable.setncattr(attribute_name, attribute_value)
-        else:
-            print(f"Adding attribute '{attribute_name}'...")
-            variable.setncattr(attribute_name, attribute_value)
-
-        ds.close()
+        print(f"Successfully modified attribute '{attribute_name}' of variable '{variable_name}' in '{nc_file_path}'.")
     except Exception as e:
-        raise RuntimeError(f"An error occurred: {e}")
+        print(f"[red]Error:[/red] Failed to modify attribute '{attribute_name}' of variable '{variable_name}' "
+              f"in file '{nc_file_path}'. [bold]Details:[/bold] {e}")
 
 
 def modify(nc_file, var_name, attr_name=None, new_value=None):
@@ -338,10 +339,13 @@ def modify(nc_file, var_name, attr_name=None, new_value=None):
         modify('test.nc', 'temperature', 'long_name', 'Temperature in Celsius')
         modify('test.nc', 'temperature', None, np.random.rand(100, 50))
     """
-    if attr_name is None:
-        _modify_var(nc_file, var_name, new_value)
-    else:
-        _modify_attr(nc_file, var_name, attr_name, new_value)
+    try:
+        if attr_name is None:
+            _modify_var(nc_file, var_name, new_value)
+        else:
+            _modify_attr(nc_file, var_name, attr_name, new_value)
+    except Exception as e:
+        print(f"An error occurred while modifying '{var_name}' in '{nc_file}': {e}")
 
 
 def rename(ncfile_path, old_name, new_name):
@@ -499,6 +503,7 @@ def draw(output_dir=None, dataset=None, ncfile=None, xyzt_dims=("longitude", "la
     Example:
         draw(ncfile, output_dir, x_dim="longitude", y_dim="latitude", z_dim="level", t_dim="time", fixed_colorscale=False)
     """
+    from ._script.plot_dataset import func_plot_dataset
     if output_dir is None:
         output_dir = str(os.getcwd())
     if isinstance(xyzt_dims, (list, tuple)):

oafuncs/oa_tool/__init__.py

@@ -1,19 +1,7 @@
 #!/usr/bin/env python
 # coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2024-11-21 09:48:00
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-01-11 20:09:09
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_tool\\__init__.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
+
 
 # 会导致OAFuncs直接导入所有函数，不符合模块化设计
 from .email import *
 from .parallel import *
-from .time import *

{oafuncs-0.0.97.5.dist-info → oafuncs-0.0.97.7.dist-info}/METADATA

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

{oafuncs-0.0.97.5.dist-info → oafuncs-0.0.97.7.dist-info}/RECORD

@@ -1,10 +1,11 @@
-oafuncs/__init__.py,sha256=GrygzGa_GDaWm3ERmxjNP1Pr7lrVx0MPOO_FcqkrvB8,1692
+oafuncs/__init__.py,sha256=T_-VtnWWllV3Q91twT5Yt2sUapeA051QbPNnBxmg9nw,1456
 oafuncs/oa_cmap.py,sha256=OfJ2DOBOGX5X1GihE6CPcTV8bAFdDqJSXV7vbqUgV9s,7552
 oafuncs/oa_data.py,sha256=32elvoBHibTunDXAK9ptQ-e-xrXxKM4GrPiMqWNv_lE,12169
-oafuncs/oa_draw.py,sha256=QypQp4vJIrbAyFddEVxd9K9Q4d85PRYqYQi9xDUmSZw,11150
-oafuncs/oa_file.py,sha256=pGtlIXCvzrmhZRkbL0juFOivge2GscfQWVIaz0AS6sQ,15262
+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=7qxmx36ADkd8EGpTzAuFueMiZ2ewp5Sf-eAuRu5n7Xo,20115
+oafuncs/oa_nc.py,sha256=eTioHFT8eeg3T7S5wFUiFm1zU1w8Fo11Un8fjBaPhuY,20860
 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
@@ -15,7 +16,6 @@ oafuncs/_script/replace_file_concent.py,sha256=eCFZjnZcwyRvy6b4mmIfBna-kylSZTyJR
 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=lCdbYQd7o_2jMgwmbrClNo5omrj5b5cnWnp6lnXMloQ,65307
-oafuncs/oa_down/hycom_3hourly_20250129.py,sha256=zbUp5NNBMzDXEqSC0-Z9H_EoM6Fg-6tXymK0AXH9qRk,65553
 oafuncs/oa_down/idm.py,sha256=XfYCNnQWADxOhhJd-T8sNYN0nGiRrAs7zbQcsB5-UmI,1668
 oafuncs/oa_down/literature.py,sha256=2bF9gSKQbzcci9LcKE81j8JEjIJwON7jbwQB3gDDA3E,11331
 oafuncs/oa_down/test_ua.py,sha256=0IQq3NjqfNr7KkyjS_U-a4mYu-r-E7gzawwo4IfEa6Y,10851
@@ -29,12 +29,11 @@ oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,5
 oafuncs/oa_sign/meteorological.py,sha256=mLbupsZSq427HTfVbZMvIlFzDHwSzQAbK3X19o8anFY,6525
 oafuncs/oa_sign/ocean.py,sha256=xrW-rWD7xBWsB5PuCyEwQ1Q_RDKq2KCLz-LOONHgldU,5932
 oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
-oafuncs/oa_tool/__init__.py,sha256=WPrWq_vWWcUVQ32tsjA4jPQiV0LCxhxS0l4vmX43xDg,508
+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/oa_tool/time.py,sha256=n8Ir5QFxJGZlEsOI3frxyQcN92wIvmS7-2SPQHYCg_c,486
-oafuncs-0.0.97.5.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.97.5.dist-info/METADATA,sha256=defSpljPoBK_2UVFLEvAtoNmOl6ghws_g9vTw1lQH-o,4181
-oafuncs-0.0.97.5.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-oafuncs-0.0.97.5.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.97.5.dist-info/RECORD,,
+oafuncs-0.0.97.7.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.97.7.dist-info/METADATA,sha256=L8CwqaBvrrajJfxqWnwWI0r472K1AnLoS6AVtb36Z7Q,4204
+oafuncs-0.0.97.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+oafuncs-0.0.97.7.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.97.7.dist-info/RECORD,,

{oafuncs-0.0.97.5.dist-info → oafuncs-0.0.97.7.dist-info}/WHEEL

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