oafuncs 0.0.60__py2.py3-none-any.whl → 0.0.61__py2.py3-none-any.whl

oafuncs/oa_draw.py

@@ -4,8 +4,8 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-09-17 17:26:11
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-10-20 21:12:58
-FilePath: \\Python\\My_Funcs\\OAFuncs\\OAFuncs\\oa_draw.py
+LastEditTime: 2024-11-21 13:10:47
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_draw.py
 Description:  
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
@@ -26,13 +26,13 @@ import xarray as xr
 from cartopy.mpl.ticker import LatitudeFormatter, LongitudeFormatter
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 
-__all__ = ['create_gif', 'xy2lonlat', 'plot_contourf',
-           'plot_contourf_lonlat', 'plot_quiver', 'plot_contourf_cartopy']
+__all__ = ['create_gif', 'xy2lonlat', 'plot_contourf', 'plot_contourf_lonlat', 'plot_quiver', 'plot_contourf_cartopy']
 
 warnings.filterwarnings('ignore')
 
-
 # ** 将生成图片/已有图片制作成动图
+
+
 def create_gif(image_list: list, gif_name: str, duration=0.2):  # 制作动图，默认间隔0.2
     '''
     func        : 制作动图，将已有图片拼接
@@ -69,8 +69,7 @@ def xy2lonlat(xy, lonlat='lon', decimal=2):
             # degrees = int(abs(x))
             degrees = round(abs(x), decimal)
             direction = "E" if x >= 0 else "W"
-            out_list.append(
-                f"{degrees:.{decimal}f}°{direction}" if x != 0 and x != 180 else f"{degrees}°")
+            out_list.append(f"{degrees:.{decimal}f}°{direction}" if x != 0 and x != 180 else f"{degrees}°")
         return out_list if len(out_list) > 1 else out_list[0]
 
     def format_latitude(y_list):
@@ -81,8 +80,7 @@ def xy2lonlat(xy, lonlat='lon', decimal=2):
             # degrees = int(abs(y))
             degrees = round(abs(y), decimal)
             direction = "N" if y >= 0 else "S"
-            out_list.append(
-                f"{degrees:.{decimal}f}°{direction}" if y != 0 else f"{degrees}°")
+            out_list.append(f"{degrees:.{decimal}f}°{direction}" if y != 0 else f"{degrees}°")
         return out_list if len(out_list) > 1 else out_list[0]
 
     if lonlat == 'lon':
@@ -107,12 +105,6 @@ class _MyFormatter(mpl.ticker.ScalarFormatter):
 
     def __call__(self, x, pos):
         if ((abs(x) < 1e-2) or (abs(x) > 1e4)) and x != 0:
-            # if self.magnitude_max - self.magnitude_min == 1 and (int(math.modf(math.log10(abs(x)))[1]) == self.magnitude_min):
-            #     a, b = '{:.1e}'.format(x).split('e')
-            #     b = int(b)
-            #     return '${}{:.2f} \\times 10^{{{}}}$'.format(' ' if self.p_n and x > 0 else '', float(a)/10, b+1)
-            # else:
-            #     return '${}{} \\times 10^{{{}}}$'.format(' ' if self.p_n and x > 0 else '', *'{:.2e}'.format(x).split('e'))
             if self.magnitude_max - self.magnitude_min == 1 and (int(math.modf(math.log10(abs(x)))[1]) == self.magnitude_min):
                 a, b = '{:.1e}'.format(x).split('e')
                 a = float(a) / 10
@@ -152,20 +144,16 @@ def plot_contourf(pic_data, picname=None, c_map='rainbow', minmax=None, labels=N
     flag = (value_min < 0) and (value_max > 0)
     norm = mpl.colors.TwoSlopeNorm(
         vmin=-1 * v_bry, vcenter=0, vmax=v_bry) if flag else mpl.colors.Normalize(vmin=value_min, vmax=value_max)
-    cticks = [num for num in np.linspace(-1 * v_bry if flag else value_min,
-                                         v_bry if flag else value_max, 9)] if value_min != value_max else None
-    levels = np.linspace(-1 * v_bry, v_bry,
-                         20) if flag else None if value_min == value_max else np.linspace(value_min, value_max, 20)
+    cticks = [num for num in np.linspace(-1 * v_bry if flag else value_min, v_bry if flag else value_max, 9)] if value_min != value_max else None
+    levels = np.linspace(-1 * v_bry, v_bry, 20) if flag else None if value_min == value_max else np.linspace(value_min, value_max, 20)
 
     shape = np.array(pic_data).shape
     x, y = np.meshgrid(np.arange(shape[1]), np.arange(shape[0]))
 
     fig, ax = plt.subplots(figsize=figsize)
     flag_lc = levels is not None and cticks is not None
-    CS = ax.contourf(x, y, pic_data, cmap=cmap, norm=norm, levels=levels, extend='both') if flag_lc else ax.contourf(
-        x, y, pic_data, cmap=cmap, norm=norm, extend='both')
-    cb = fig.colorbar(CS, ax=ax, orientation='vertical', shrink=1, format='%.3g', spacing='uniform', ticks=cticks) if cticks is not None else fig.colorbar(
-        CS, ax=ax, orientation='vertical', shrink=1, format='%.3g', spacing='uniform')
+    CS = ax.contourf(x, y, pic_data, cmap=cmap, norm=norm, levels=levels, extend='both') if flag_lc else ax.contourf(x, y, pic_data, cmap=cmap, norm=norm, extend='both')
+    cb = fig.colorbar(CS, ax=ax, orientation='vertical', shrink=1, format='%.3g', spacing='uniform', ticks=cticks) if cticks is not None else fig.colorbar(CS, ax=ax, orientation='vertical', shrink=1, format='%.3g', spacing='uniform')
     """%.3g采用的是自动调整格式，也可设置为%.3f，则改为3位小数"""
 
     # 将格式化器设置为自定义的函数
@@ -232,10 +220,8 @@ def plot_contourf_lonlat(data, lon, lat, interval=5, picname=None, c_map='rainbo
     plt.contourf(data, cmap=c_map)
     x_space = int(len(lon) * interval / (lon[-1] - lon[0]))
     y_space = int(len(lat) * interval / (lat[-1] - lat[0]))
-    plt.xticks(np.arange(0, len(lon), x_space), [
-               format_longitude(lon[i]) for i in range(0, len(lon), x_space)])
-    plt.yticks(np.arange(0, len(lat), y_space), [
-               format_latitude(lat[i]) for i in range(0, len(lat), y_space)])
+    plt.xticks(np.arange(0, len(lon), x_space), [format_longitude(lon[i]) for i in range(0, len(lon), x_space)])
+    plt.yticks(np.arange(0, len(lat), y_space), [format_latitude(lat[i]) for i in range(0, len(lat), y_space)])
     plt.colorbar()
     plt.savefig(
         picname, bbox_inches='tight') if picname is not None else plt.show()
@@ -288,14 +274,12 @@ def plot_quiver(u, v, lon, lat, picname=None, cmap='coolwarm', scale=0.25, width
                              cmap=cmap,  # 矢量的颜色，多色
                              width=width)
     # plt.quiverkey(quiver_plot, X=0.90, Y=0.975, U=1, label='1 m/s', labelpos='E', fontproperties={'size': 10})
-    plt.quiverkey(quiver_plot, X=0.87, Y=0.975, U=mean_S,
-                  label=f'{mean_S:.2f} m/s', labelpos='E', fontproperties={'size': 10})
+    plt.quiverkey(quiver_plot, X=0.87, Y=0.975, U=mean_S, label=f'{mean_S:.2f} m/s', labelpos='E', fontproperties={'size': 10})
     plt.colorbar(quiver_plot)
     plt.xlabel('X')
     plt.ylabel('Y')
 
-    plt.savefig(
-        picname, bbox_inches='tight') if picname is not None else plt.show()
+    plt.savefig(picname, bbox_inches='tight') if picname is not None else plt.show()
     plt.clf()
     plt.close()
 
@@ -353,8 +337,7 @@ def plot_contourf_cartopy(data, lon, lat, picname=None, cmap='rainbow', cn_fill_
     cticks = cbar_ticks
     norm = mpl.colors.BoundaryNorm(cticks, cmap.N)
 
-    cnplot = ax.contourf(X, Y, data, levels=levels, cmap=cmap,
-                         norm=norm, transform=proj, extend='both', alpha=1, zorder=0)
+    cnplot = ax.contourf(X, Y, data, levels=levels, cmap=cmap, norm=norm, transform=proj, extend='both', alpha=1, zorder=0)
     # cllevels = np.linspace(data_min, data_max, 9)
     # clplot = ax.contour(X, Y, data, levels=levels[9::10], colors='k', linewidths=0.5, transform=proj, zorder=1, alpha=0.8, linestyle='--')
     # 添加色标，并选择位置
@@ -376,15 +359,13 @@ def plot_contourf_cartopy(data, lon, lat, picname=None, cmap='rainbow', cn_fill_
         cax = divider.new_horizontal(size="5%", pad=0.1, axes_class=plt.Axes)
         fig.add_axes(cax)
         # cbar = plt.colorbar(cnplot, cax=cax, orientation='vertical', extend='both', format='%.0f')
-        cbar = fig.colorbar(mpl.cm.ScalarMappable(cmap=cmap, norm=norm),
-                            cax=cax, orientation='vertical', extend='both', format='%.3f')
+        cbar = fig.colorbar(mpl.cm.ScalarMappable(cmap=cmap, norm=norm), cax=cax, orientation='vertical', extend='both', format='%.3f')
         cax.yaxis.set_ticks_position('right')
         cax.yaxis.set_label_position('right')
     else:  # 上方
         cax = divider.new_vertical(size="5%", pad=0.2, axes_class=plt.Axes)
         fig.add_axes(cax)
-        cbar = plt.colorbar(
-            cnplot, cax=cax, orientation='horizontal', extend='both')
+        cbar = plt.colorbar(cnplot, cax=cax, orientation='horizontal', extend='both')
     cbar.ax.tick_params(labelsize=10)
     cbar.ax.xaxis.set_tick_params(direction='in', width=1, length=2)
     # 添加cbar_ticks
@@ -396,11 +377,9 @@ def plot_contourf_cartopy(data, lon, lat, picname=None, cmap='rainbow', cn_fill_
     # cbar.set_ticks(np.arange(round(levels[0]), round(levels[-1]), round((levels[-1]-levels[0])/9)))  # 设置色标刻度
 
     # 单独设置label
-    cbar.set_label(title, fontsize=10,
-                   weight='bold')
+    cbar.set_label(title, fontsize=10, weight='bold')
     # cax.set_position([0.1, 0.2, 0.02, 0.6]) # 调整色标位置
-    fig.savefig(
-        picname, bbox_inches='tight', dpi=600) if picname is not None else plt.show()
+    fig.savefig(picname, bbox_inches='tight', dpi=600) if picname is not None else plt.show()
     plt.close()
 
 
@@ -408,23 +387,20 @@ if __name__ == '__main__':
     # ** 绘制填色图
     data = np.random.randn(100, 100)
     picname = 'test.png'
-    plot_contourf(data, picname, c_map='rainbow', minmax=None,
-                  labels=None, ticks_space=None, ticks=None, figsize=(12, 9))
+    plot_contourf(data, picname, c_map='rainbow', minmax=None, labels=None, ticks_space=None, ticks=None, figsize=(12, 9))
     # ** 绘制矢量场
     u = np.random.randn(100, 100)
     v = np.random.randn(100, 100)
     lon = np.linspace(0, 360, 100)
     lat = np.linspace(-90, 90, 100)
     picname = 'test.png'
-    plot_quiver(u, v, lon, lat, picname, cmap='coolwarm',
-                scale=0.25, width=0.002, x_space=5, y_space=5)
+    plot_quiver(u, v, lon, lat, picname, cmap='coolwarm', scale=0.25, width=0.002, x_space=5, y_space=5)
     # ** 绘制经纬度填色图
     data = np.random.randn(100, 100)
     lon = np.linspace(0, 360, 100)
     lat = np.linspace(-90, 90, 100)
     picname = 'test.png'
-    plot_contourf_lonlat(data, lon, lat, interval=5,
-                         picname=picname, c_map='rainbow')
+    plot_contourf_lonlat(data, lon, lat, interval=5, picname=picname, c_map='rainbow')
     # ** 制作动图
     image_list = ['test1.png', 'test2.png', 'test3.png']
     gif_name = 'test.gif'

oafuncs/oa_file.py

@@ -4,8 +4,8 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-09-17 15:07:13
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-11-11 16:11:23
-FilePath: \\Python\\My_Funcs\\OAFuncs\\OAFuncs\\oa_file.py
+LastEditTime: 2024-11-21 13:07:54
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_file.py
 Description:
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
@@ -19,8 +19,7 @@ import os
 import re
 import shutil
 
-__all__ = ['link_file', 'copy_file', 'rename_files', 'make_folder',
-           'clear_folder', 'remove_empty_folders', 'remove', 'file_size']
+__all__ = ['link_file', 'copy_file', 'rename_files', 'make_folder', 'clear_folder', 'remove_empty_folders', 'remove', 'file_size']
 
 
 def link_file(src_pattern, dst):
@@ -33,30 +32,30 @@ def link_file(src_pattern, dst):
     param      {*} src_pattern # 源文件或目录
     param      {*} dst # 目标文件或目录
     '''
-    src_pattern= str(src_pattern)
+    src_pattern = str(src_pattern)
     # 使用glob.glob来处理可能包含通配符的src
-    src_files= glob.glob(src_pattern)
+    src_files = glob.glob(src_pattern)
     if not src_files:
         raise FileNotFoundError('文件不存在: {}'.format(src_pattern))
 
     # 判断dst是路径还是包含文件名的路径
     if os.path.isdir(dst):
         # 如果dst是路径，则保持源文件的文件名
-        dst_dir= 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)
+            src_file_basename = os.path.basename(src_file)
+            dst_file = os.path.join(dst_dir, src_file_basename)
             if os.path.exists(dst_file):
                 os.remove(dst_file)
             os.symlink(src_file, dst_file)
             print(f'创建符号链接: {src_file} -> {dst_file}')
     else:
         # 如果dst包含文件名，则创建链接后重命名
-        dst_dir= os.path.dirname(dst)
+        dst_dir = os.path.dirname(dst)
         os.makedirs(dst_dir, exist_ok=True)
         # 只处理第一个匹配的文件
-        src_file= src_files[0]
-        dst_file= dst
+        src_file = src_files[0]
+        dst_file = dst
         if os.path.exists(dst_file):
             os.remove(dst_file)
         os.symlink(src_file, dst_file)
@@ -72,19 +71,19 @@ def copy_file(src_pattern, dst):
     param      {*} src_pattern # 源文件或目录
     param      {*} dst # 目标文件或目录
     '''
-    src_pattern= str(src_pattern)
+    src_pattern = str(src_pattern)
     # 使用glob.glob来处理可能包含通配符的src
-    src_files= glob.glob(src_pattern)
+    src_files = glob.glob(src_pattern)
     if not src_files:
         raise FileNotFoundError('文件不存在: {}'.format(src_pattern))
 
     # 判断dst是路径还是包含文件名的路径
     if os.path.isdir(dst):
         # 如果dst是路径，则保持源文件的文件名
-        dst_dir= 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)
+            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)
@@ -97,11 +96,11 @@ def copy_file(src_pattern, dst):
             print(f'复制文件或目录: {src_file} -> {dst_file}')
     else:
         # 如果dst包含文件名，则复制后重命名
-        dst_dir= os.path.dirname(dst)
+        dst_dir = os.path.dirname(dst)
         os.makedirs(dst_dir, exist_ok=True)
         # 只处理第一个匹配的文件
-        src_file= src_files[0]
-        dst_file= dst
+        src_file = src_files[0]
+        dst_file = dst
         if os.path.exists(dst_file):
             if os.path.isdir(dst_file):
                 shutil.rmtree(dst_file)
@@ -127,23 +126,23 @@ def rename_files(directory, old_str, new_str):
     param      {*} new_str # 新字符串
     '''
     # 获取目录下的所有文件
-    files= os.listdir(directory)
+    files = os.listdir(directory)
 
     # 构建正则表达式以匹配要替换的字符串
-    pattern= re.compile(re.escape(old_str))
+    pattern = re.compile(re.escape(old_str))
 
     # 遍历目录下的文件
     for filename in files:
         # 检查文件名中是否包含要替换的字符串
         if pattern.search(filename):
             # 构建新的文件名
-            new_filename= pattern.sub(new_str, filename)
+            new_filename = pattern.sub(new_str, filename)
 
             # 构建旧文件的完整路径
-            old_path= os.path.join(directory, filename)
+            old_path = os.path.join(directory, filename)
 
             # 构建新文件的完整路径
-            new_path= os.path.join(directory, new_filename)
+            new_path = os.path.join(directory, new_filename)
 
             # 重命名文件
             os.rename(old_path, new_path)
@@ -161,7 +160,7 @@ def make_folder(rootpath: str, folder_name: str, clear=0) -> str:
     param       {*} rootpath # 根目录
     param       {*} folder_name # 文件夹名称
     '''
-    folder_path= os.path.join(str(rootpath), str(folder_name))
+    folder_path = os.path.join(str(rootpath), str(folder_name))
     if clear:
         shutil.rmtree(folder_path, ignore_errors=True)
     os.makedirs(folder_path, exist_ok=True)
@@ -177,12 +176,12 @@ def clear_folder(folder_path):
     clear_folder(r'E:\Data\2024\09\17\var1')
     param        {*} folder_path # 文件夹路径
     '''
-    folder_path= str(folder_path)
+    folder_path = str(folder_path)
     if os.path.exists(folder_path):
         try:
             # 遍历文件夹中的所有文件和子文件夹
             for filename in os.listdir(folder_path):
-                file_path= os.path.join(folder_path, filename)
+                file_path = os.path.join(folder_path, filename)
                 # 判断是文件还是文件夹
                 if os.path.isfile(file_path) or os.path.islink(file_path):
                     os.unlink(file_path)  # 删除文件或链接
@@ -203,12 +202,12 @@ def remove_empty_folders(path, print_info=1):
     param        {*} path # 文件夹路径
     param        {*} print_info # 是否打印信息
     '''
-    path= str(path)
+    path = str(path)
     # 遍历当前目录下的所有文件夹和文件
     for root, dirs, files in os.walk(path, topdown=False):
         # 遍历文件夹列表
         for folder in dirs:
-            folder_path= os.path.join(root, folder)
+            folder_path = os.path.join(root, folder)
             # 判断文件是否有权限访问
             try:
                 os.listdir(folder_path)
@@ -238,8 +237,8 @@ def remove(pattern):
     '''
     # 使用glob.glob来获取所有匹配的文件
     # 可以使用通配符*来匹配所有文件
-    pattern= str(pattern)
-    file_list= glob.glob(pattern)
+    pattern = str(pattern)
+    file_list = glob.glob(pattern)
     for file_path in file_list:
         if os.path.exists(file_path):
             try:
@@ -268,10 +267,10 @@ def file_size(file_path, unit='KB'):
         return "文件不存在"
 
     # 获取文件大小（字节）
-    file_size= os.path.getsize(file_path)
+    file_size = os.path.getsize(file_path)
 
     # 单位转换字典
-    unit_dict= {
+    unit_dict = {
         'PB': 1024**5,
         'TB': 1024**4,
         'GB': 1024**3,
@@ -284,7 +283,7 @@ def file_size(file_path, unit='KB'):
         return "单位不合法，请选择PB、TB、GB、MB、KB中的一个"
 
     # 转换文件大小到指定单位
-    converted_size= file_size / unit_dict[unit]
+    converted_size = file_size / unit_dict[unit]
 
     return converted_size
 

oafuncs/oa_nc.py

@@ -4,8 +4,8 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-09-17 14:58:50
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-11-05 16:44:20
-FilePath: \\Python\\My_Funcs\\OAFuncs\\OAFuncs\\oa_nc.py
+LastEditTime: 2024-11-21 13:05:51
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_nc.py
 Description:  
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
@@ -20,8 +20,7 @@ import netCDF4 as nc
 import numpy as np
 import xarray as xr
 
-__all__ = ['get_var', 'extract5nc', 'write2nc',
-           'merge5nc', 'modify_var_value', 'modify_var_attr', 'rename_var_or_dim', 'check_ncfile']
+__all__ = ['get_var', 'extract5nc', 'write2nc', 'merge5nc', 'modify_var_value', 'modify_var_attr', 'rename_var_or_dim', 'check_ncfile']
 
 
 def get_var(file, *vars):
@@ -110,18 +109,15 @@ def write2nc(file, data, varname, coords, mode):
                 if dim in ncfile.dimensions:
                     # del nc.dimensions[dim]
                     if len(coord_data) != len(ncfile.dimensions[dim]):
-                        raise ValueError(
-                            "Length of coordinate does not match the dimension length.")
+                        raise ValueError("Length of coordinate does not match the dimension length.")
                     else:
                         add_coords = False
-                        print(
-                            f"Warning: Coordinate '{dim}' already exists. Replacing it.")
+                        print(f"Warning: Coordinate '{dim}' already exists. Replacing it.")
                         ncfile.variables[dim][:] = np.array(coord_data)
             if add_coords:
                 # 创建新坐标
                 ncfile.createDimension(dim, len(coord_data))
-                ncfile.createVariable(dim, _numpy_to_nc_type(
-                    coord_data.dtype), (dim,))
+                ncfile.createVariable(dim, _numpy_to_nc_type(coord_data.dtype), (dim,))
                 ncfile.variables[dim][:] = np.array(coord_data)
 
         # 判断变量是否存在，若存在，则删除原变量
@@ -129,20 +125,17 @@ def write2nc(file, data, varname, coords, mode):
         if varname in ncfile.variables:
             print(f"Warning: Variable '{varname}' already exists.")
             if data.shape != ncfile.variables[varname].shape:
-                raise ValueError(
-                    "Shape of data does not match the variable shape.")
+                raise ValueError("Shape of data does not match the variable shape.")
             else:
                 # 写入数据
                 ncfile.variables[varname][:] = data
                 add_var = False
-                print(
-                    f"Warning: Variable '{varname}' already exists. Replacing it.")
+                print(f"Warning: Variable '{varname}' already exists. Replacing it.")
 
         if add_var:
             # 创建变量及其维度
             dim_names = tuple(coords.keys())  # 使用coords传入的维度名称
-            ncfile.createVariable(
-                varname, _numpy_to_nc_type(data.dtype), dim_names)
+            ncfile.createVariable(varname, _numpy_to_nc_type(data.dtype), dim_names)
             # ncfile.createVariable('data', 'f4', ('time','lev'))
 
             # 写入数据
@@ -150,8 +143,7 @@ def write2nc(file, data, varname, coords, mode):
 
         # 判断维度是否匹配
         if len(data.shape) != len(coords):
-            raise ValueError(
-                "Number of dimensions does not match the data shape.")
+            raise ValueError("Number of dimensions does not match the data shape.")
 
 
 def merge5nc(file_list, var_name, dim_name, target_filename):
@@ -234,11 +226,9 @@ def modify_var_value(nc_file_path, variable_name, new_value):
         # Modify the value of the variable
         variable[:] = new_value
         dataset.close()
-        print(
-            f"Successfully modified variable {variable_name} in {nc_file_path}.")
+        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_var_attr(nc_file_path, variable_name, attribute_name, attribute_value):
@@ -255,13 +245,11 @@ def modify_var_attr(nc_file_path, variable_name, attribute_name, attribute_value
     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.")
+            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.")
+            print(f"Warning: Attribute '{attribute_name}' already exists. Replacing it.")
             variable.setncattr(attribute_name, attribute_value)
         else:
             print(f"Adding attribute '{attribute_name}'...")
@@ -287,24 +275,20 @@ def rename_var_or_dim(ncfile_path, old_name, new_name):
         with nc.Dataset(ncfile_path, 'r+') as dataset:
             # If the old name is not found as a variable or dimension, print a message
             if old_name not in dataset.variables and old_name not in dataset.dimensions:
-                print(
-                    f"Variable or dimension {old_name} not found in the file.")
+                print(f"Variable or dimension {old_name} not found in the file.")
 
             # Attempt to rename the variable
             if old_name in dataset.variables:
                 dataset.renameVariable(old_name, new_name)
-                print(
-                    f"Successfully renamed variable {old_name} to {new_name}.")
+                print(f"Successfully renamed variable {old_name} to {new_name}.")
 
             # Attempt to rename the dimension
             if old_name in dataset.dimensions:
                 # Check if the new dimension name already exists
                 if new_name in dataset.dimensions:
-                    raise ValueError(
-                        f"Dimension name {new_name} already exists in the file.")
+                    raise ValueError(f"Dimension name {new_name} already exists in the file.")
                 dataset.renameDimension(old_name, new_name)
-                print(
-                    f"Successfully renamed dimension {old_name} to {new_name}.")
+                print(f"Successfully renamed dimension {old_name} to {new_name}.")
 
     except Exception as e:
         print(f"An error occurred: {e}")

oafuncs/oa_sign/meteorological.py

@@ -35,8 +35,7 @@ def sign_in_meteorological_home(email, password):
         response = s.get(url)
         response.raise_for_status()
         soup = BeautifulSoup(response.text, 'lxml')
-        login_hash = soup.find('form', attrs={'name': 'login'})[
-            'action'].split('loginhash=')[1]
+        login_hash = soup.find('form', attrs={'name': 'login'})['action'].split('loginhash=')[1]
         return login_hash
 
     def get_login_formhash():
@@ -58,16 +57,14 @@ def sign_in_meteorological_home(email, password):
     def write_response(response, default_path=r'F:\response_气象家园.txt'):
         with open(default_path, 'w', encoding='utf-8') as f:
             f.write('-'*350+'\n')
-            f.write(time.strftime(
-                '%Y-%m-%d %H:%M:%S', time.localtime()) + '\n')
+            f.write(time.strftime('%Y-%m-%d %H:%M:%S', time.localtime()) + '\n')
             f.write(response.text)
             f.write('-'*350+'\n')
 
     def login():
         url = 'http://bbs.06climate.com/member.php?'
         # 登录密码需要转码为 216fc900fb57c27dd3c5e3dfbcac1849
-        mydata['password'] = hashlib.md5(
-            mydata['password'].encode()).hexdigest()
+        mydata['password'] = hashlib.md5(mydata['password'].encode()).hexdigest()
         credentials = {
             'password': mydata['password'],
         }
@@ -97,8 +94,7 @@ def sign_in_meteorological_home(email, password):
             'Referer': 'http://bbs.06climate.com/member.php?mod=logging&action=login',
             'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36',
         }
-        response = s.post(url, params=query_params,
-                          data=from_data, headers=head)
+        response = s.post(url, params=query_params, data=from_data, headers=head)
         if '欢迎' in response.text:
             print('           [bold green]登录成功')
             try:
@@ -126,8 +122,7 @@ def sign_in_meteorological_home(email, password):
             s.cookies.update(cookie)
         response = s.get(url, params=query_params, headers=head)
         response.raise_for_status()
-        success_indicators = ['累计签到', '连续签到', '特奖励',
-                              '明日签到', '另奖励', '连续签到', '再连续签到', '奖励', '签到完毕']
+        success_indicators = ['累计签到', '连续签到', '特奖励', '明日签到', '另奖励', '连续签到', '再连续签到', '奖励', '签到完毕']
         if any(indicator in response.text for indicator in success_indicators):
             print('           [bold green]签到完毕')
         else:
@@ -143,8 +138,7 @@ def sign_in_meteorological_home(email, password):
         cumulate = soup.select('.pperwbm .times')[0].text
         continuous = soup.select('.pperwbm .times')[1].text
         last_sign = soup.select('.pperwbm .times')[2].text
-        info = {credit.split(': ')[0]: credit.split(
-            ':')[1], user_group.split(': ')[0]: user_group.split(':')[1], '累计签到': cumulate+'次', '连续签到': continuous+'次', '上次签到': last_sign}
+        info = {credit.split(': ')[0]: credit.split(':')[1], user_group.split(': ')[0]: user_group.split(':')[1], '累计签到': cumulate+'次', '连续签到': continuous+'次', '上次签到': last_sign}
 
         print('[bold blue]-----------签到信息-----------')
         for k, v in info.items():
@@ -157,8 +151,7 @@ def sign_in_meteorological_home(email, password):
             print(f'[bold blue]{k}:  [bold green]{v}')
         print('[bold blue]------------------------------')
 
-    mydata = {'username': None,
-              'email': email, 'password': password}
+    mydata = {'username': None, 'email': email, 'password': password}
     s = requests.Session()
     print('[bold purple]-----------气象家园-----------')
     cookie = login()

oafuncs/oa_sign/ocean.py

@@ -4,8 +4,8 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-10-14 16:59:26
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-10-14 18:28:11
-FilePath: \\Python\\My_Funcs\\OAFuncs\\OAFuncs\\oa_sign\\ocean.py
+LastEditTime: 2024-11-21 13:16:14
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_sign\\ocean.py
 Description:  
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
@@ -40,14 +40,12 @@ def sign_in_love_ocean(email, password):
         response = s.get(url, params=para_login)
         response.raise_for_status()
         soup = BeautifulSoup(response.text, 'lxml')
-        login_hash = soup.find('form', attrs={'name': 'login'})[
-            'action'].split('loginhash=')[1]
+        login_hash = soup.find('form', attrs={'name': 'login'})['action'].split('loginhash=')[1]
         return login_hash
 
     def _get_login_formhash():
         url = 'https://www.52ocean.cn/member.php?'
-        para_login = {'mod': 'logging', 'action': 'login', 'infloat': 'yes',
-                      'handlekey': 'login', 'inajax': '1', 'ajaxtarget': 'fwin_content_login'}
+        para_login = {'mod': 'logging', 'action': 'login', 'infloat': 'yes', 'handlekey': 'login', 'inajax': '1', 'ajaxtarget': 'fwin_content_login'}
         response = s.get(url, params=para_login)
         response.raise_for_status()
         soup = BeautifulSoup(response.text, 'lxml')
@@ -72,8 +70,7 @@ def sign_in_love_ocean(email, password):
 
     def _login():
         url = 'https://www.52ocean.cn/member.php?'
-        mydata['password'] = hashlib.md5(
-            mydata['password'].encode()).hexdigest()
+        mydata['password'] = hashlib.md5(mydata['password'].encode()).hexdigest()
         credentials = {
             'password': mydata['password'],
         }
@@ -103,8 +100,7 @@ def sign_in_love_ocean(email, password):
             'Referer': 'https://www.52ocean.cn/member.php?',
             'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36'
         }
-        response = s.post(url, params=query_params,
-                          data=from_data, headers=head)
+        response = s.post(url, params=query_params, data=from_data, headers=head)
         if '欢迎' in response.text:
             print('           [bold green]登录成功')
             try:
@@ -146,8 +142,7 @@ def sign_in_love_ocean(email, password):
             print(f'[bold blue]{k}:  [bold green]{v}')
         print('[bold blue]------------------------------')
 
-    mydata = {'username': None,
-              'email': email, 'password': password}  # 不要修改关键字
+    mydata = {'username': None, 'email': email, 'password': password}  # 不要修改关键字
     s = requests.Session()
     print('[bold purple]-----------吾爱海洋-----------')
     cookie = _login()

{oafuncs-0.0.60.dist-info → oafuncs-0.0.61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oafuncs
-Version: 0.0.60
+Version: 0.0.61
 Summary: My short description for my project.
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu