oafuncs 0.0.97.13__py3-none-any.whl → 0.0.97.15__py3-none-any.whl

oafuncs/oa_nc.py

@@ -14,296 +14,74 @@ Python Version: 3.11
 """
 
 import os
+from typing import List, Optional, Union, Tuple
 
 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"]
+__all__ = ["save", "merge", "modify", "rename", "check", "convert_longitude", "isel", "draw"]
 
 
-def get_var(file, *vars):
-    """
-    Description:
-        Read variables from nc file
-    Parameters:
-        file: str, file path
-        *vars: str, variable name or variable names; should be in same size
-    Example:
-        datas = get_var(file_ecm, 'h', 't', 'u', 'v')
-    Return:
-        datas: list, variable data
-    """
-    ds = xr.open_dataset(file)
-    datas = []
-    for var in vars:
-        data = ds[var]
-        datas.append(data)
-    ds.close()
-    return datas
-
-
-def extract(file, varname, only_value=True):
-    """
-    Description:
-        Extract variables from nc file
-        Return the variable and coordinate dictionary
-    Parameters:
-        file: str, file path
-        varname: str, variable name
-        only_value: bool, whether to keep only the value of the variable and dimension
-    Example:
-        data, dimdict = extract('test.nc', 'h')
-    """
-    ds = xr.open_dataset(file)
-    vardata = ds[varname]
-    ds.close()
-    dims = vardata.dims
-    dimdict = {}
-    for dim in dims:
-        if only_value:
-            dimdict[dim] = vardata[dim].values
-        else:
-            dimdict[dim] = ds[dim]
-    if only_value:
-        vardata = np.array(vardata)
-    return vardata, dimdict
-
-
-def _numpy_to_nc_type(numpy_type):
-    """将NumPy数据类型映射到NetCDF数据类型"""
-    numpy_to_nc = {
-        "float32": "f4",
-        "float64": "f8",
-        "int8": "i1",
-        "int16": "i2",
-        "int32": "i4",
-        "int64": "i8",
-        "uint8": "u1",
-        "uint16": "u2",
-        "uint32": "u4",
-        "uint64": "u8",
-    }
-    # 确保传入的是字符串类型，如果不是，则转换为字符串
-    numpy_type_str = str(numpy_type) if not isinstance(numpy_type, str) else numpy_type
-    return numpy_to_nc.get(numpy_type_str, "f4")  # 默认使用 'float32'
-
-
-def _calculate_scale_and_offset(data, n=16):
-    if not isinstance(data, np.ndarray):
-        raise ValueError("Input data must be a NumPy array.")
-
-    # 使用 nan_to_num 来避免 NaN 值对 min 和 max 的影响
-    data_min = np.nanmin(data)
-    data_max = np.nanmax(data)
-
-    if np.isnan(data_min) or np.isnan(data_max):
-        raise ValueError("Input data contains NaN values, which are not allowed.")
-
-    scale_factor = (data_max - data_min) / (2**n - 1)
-    add_offset = data_min + 2 ** (n - 1) * scale_factor
-
-    return scale_factor, add_offset
-
-
-def save(file, data, varname=None, coords=None, mode="w", scale_offset_switch=True, compile_switch=True):
+def save(file: str, data: Union[np.ndarray, xr.DataArray], varname: Optional[str] = None, coords: Optional[dict] = None, mode: str = "w", scale_offset_switch: bool = True, compile_switch: bool = True) -> None:
     """
     Description:
         Write data to NetCDF file
     Parameters:
         file: str, file path
-        data: data
-        varname: str, variable name
-        coords: dict, coordinates, key is the dimension name, value is the coordinate data
+        data: np.ndarray or xr.DataArray, data to be written
+        varname: Optional[str], variable name
+        coords: Optional[dict], coordinates, key is the dimension name, value is the coordinate data
         mode: str, write mode, 'w' for write, 'a' for append
         scale_offset_switch: bool, whether to use scale_factor and add_offset, default is True
         compile_switch: bool, whether to use compression parameters, default is True
     Example:
         save(r'test.nc', data, 'u', {'time': np.linspace(0, 120, 100), 'lev': np.linspace(0, 120, 50)}, 'a')
     """
-    # 设置压缩参数
-    kwargs = {"zlib": True, "complevel": 4} if compile_switch else {}
-
-    # 检查文件存在性并根据模式决定操作
-    if mode == "w" and os.path.exists(file):
-        os.remove(file)
-    elif mode == "a" and not os.path.exists(file):
-        mode = "w"
-
-    # 打开 NetCDF 文件
-    with nc.Dataset(file, mode, format="NETCDF4") as ncfile:
-        # 如果 data 是 DataArray 并且没有提供 varname 和 coords
-        if varname is None and coords is None and isinstance(data, xr.DataArray):
-            data.to_netcdf(file, mode=mode)
-            return
-
-        # 添加坐标
-        for dim, coord_data in coords.items():
-            if dim in ncfile.dimensions:
-                if len(coord_data) != len(ncfile.dimensions[dim]):
-                    raise ValueError(f"Length of coordinate '{dim}' does not match the dimension length.")
-                else:
-                    ncfile.variables[dim][:] = np.array(coord_data)
-            else:
-                ncfile.createDimension(dim, len(coord_data))
-                var = ncfile.createVariable(dim, _numpy_to_nc_type(coord_data.dtype), (dim,), **kwargs)
-                var[:] = np.array(coord_data)
-
-                # 如果坐标数据有属性，则添加到 NetCDF 变量
-                if isinstance(coord_data, xr.DataArray) and coord_data.attrs:
-                    for attr_name, attr_value in coord_data.attrs.items():
-                        var.setncattr(attr_name, attr_value)
-
-        # 添加或更新变量
-        if varname in ncfile.variables:
-            if data.shape != ncfile.variables[varname].shape:
-                raise ValueError(f"Shape of data does not match the variable shape for '{varname}'.")
-            ncfile.variables[varname][:] = np.array(data)
-        else:
-            # 创建变量
-            dim_names = tuple(coords.keys())
-            if scale_offset_switch:
-                scale_factor, add_offset = _calculate_scale_and_offset(np.array(data))
-                dtype = "i2"
-                var = ncfile.createVariable(varname, dtype, dim_names, fill_value=-32767, **kwargs)
-                var.setncattr("scale_factor", scale_factor)
-                var.setncattr("add_offset", add_offset)
-            else:
-                dtype = _numpy_to_nc_type(data.dtype)
-                var = ncfile.createVariable(varname, dtype, dim_names, **kwargs)
-            var[:] = np.array(data)
+    from ._script.netcdf_write import save_to_nc
 
-        # 添加属性
-        if isinstance(data, xr.DataArray) and data.attrs:
-            for key, value in data.attrs.items():
-                if key not in ["scale_factor", "add_offset", "_FillValue", "missing_value"] or not scale_offset_switch:
-                    var.setncattr(key, value)
+    save_to_nc(file, data, varname, coords, mode, scale_offset_switch, compile_switch)
 
 
-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})
-    """
-    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):
+def merge(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:
-        Modify the value of a variable in a NetCDF file using the netCDF4 library.
-
+        Merge multiple NetCDF files into one.
     Parameters:
-        nc_file_path (str): The path to the NetCDF file.
-        variable_name (str): The name of the variable to be modified.
-        new_value (numpy.ndarray): The new value of the variable.
-
-    Example:
-        modify_var('test.nc', 'u', np.random.rand(100, 50))
+        file_list: Union[str, List[str]], list of file paths or a single file path
+        var_name: Optional[Union[str, List[str]]], variable names to merge
+        dim_name: Optional[str], dimension name to merge along
+        target_filename: Optional[str], output file name
     """
-    try:
-        # Open the NetCDF file
-        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}")
-
+    from ._script.netcdf_merge import merge_nc
 
-def _modify_attr(nc_file_path, variable_name, attribute_name, attribute_value):
-    """
-    Description:
-        Add or modify an attribute of a variable in a NetCDF file using the netCDF4 library.
+    merge_nc(file_list, var_name, dim_name, target_filename)
 
-    Parameters:
-        nc_file_path (str): The path to the NetCDF file.
-        variable_name (str): The name of the variable to be modified.
-        attribute_name (str): The name of the attribute to be added or modified.
-        attribute_value (any): The value of the attribute.
 
-    Example:
-        modify_attr('test.nc', 'temperature', 'long_name', 'Temperature in Celsius')
-    """
-    try:
-        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)
-        print(f"Successfully modified attribute '{attribute_name}' of variable '{variable_name}' in '{nc_file_path}'.")
-    except Exception as 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):
+def modify(nc_file: str, var_name: str, attr_name: Optional[str] = None, new_value: Optional[Union[str, float, int, np.ndarray]] = None) -> None:
     """
     Description:
         Modify the value of a variable or the value of an attribute in a NetCDF file.
-
     Parameters:
-        nc_file (str): The path to the NetCDF file.
-        var_name (str): The name of the variable to be modified.
-        attr_name (str): The name of the attribute to be modified. If None, the variable value will be modified.
-        new_value (any): The new value of the variable or attribute.
-
-    Example:
-        modify('test.nc', 'temperature', 'long_name', 'Temperature in Celsius')
-        modify('test.nc', 'temperature', None, np.random.rand(100, 50))
+        nc_file: str, the path to the NetCDF file
+        var_name: str, the name of the variable to be modified
+        attr_name: Optional[str], the name of the attribute to be modified. If None, the variable value will be modified
+        new_value: Optional[Union[str, float, int, np.ndarray]], the new value of the variable or attribute
     """
-    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}")
+    from ._script.netcdf_modify import modify_nc
+
+    modify_nc(nc_file, var_name, attr_name, new_value)
 
 
-def rename(ncfile_path, old_name, new_name):
+def rename(ncfile_path: str, old_name: str, new_name: str) -> None:
     """
     Description:
         Rename a variable and/or dimension in a NetCDF file.
-
     Parameters:
-        ncfile_path (str): The path to the NetCDF file.
-        old_name (str): The current name of the variable or dimension.
-        new_name (str): The new name to assign to the variable or dimension.
-
-    example:
-        rename('test.nc', 'temperature', 'temp')
+        ncfile_path: str, the path to the NetCDF file
+        old_name: str, the current name of the variable or dimension
+        new_name: str, the new name to assign to the variable or dimension
     """
     try:
         with nc.Dataset(ncfile_path, "r+") as dataset:
@@ -330,9 +108,14 @@ def rename(ncfile_path, old_name, new_name):
 
 def check(ncfile: str, delete_switch: bool = False, print_switch: bool = True) -> bool:
     """
-    Check if a NetCDF file is corrupted with enhanced error handling.
-
-    Handles HDF5 library errors gracefully without terminating program.
+    Description:
+        Check if a NetCDF file is corrupted with enhanced error handling.
+    Parameters:
+        ncfile: str, the path to the NetCDF file
+        delete_switch: bool, whether to delete the file if it is corrupted
+        print_switch: bool, whether to print messages during the check
+    Returns:
+        bool: True if the file is valid, False otherwise
     """
     is_valid = False
 
@@ -387,18 +170,16 @@ def check(ncfile: str, delete_switch: bool = False, print_switch: bool = True) -
     return True
 
 
-def convert_longitude(ds, lon_name="longitude", convert=180):
+def convert_longitude(ds: xr.Dataset, lon_name: str = "longitude", convert: int = 180) -> xr.Dataset:
     """
     Description:
         Convert the longitude array to a specified range.
-
     Parameters:
-        ds (xarray.Dataset): The xarray dataset containing the longitude data.
-        lon_name (str): The name of the longitude variable, default is "longitude".
-        convert (int): The target range to convert to, can be 180 or 360, default is 180.
-
+        ds: xr.Dataset, the xarray dataset containing the longitude data
+        lon_name: str, the name of the longitude variable, default is "longitude"
+        convert: int, the target range to convert to, can be 180 or 360, default is 180
     Returns:
-        xarray.Dataset: The xarray dataset with the converted longitude.
+        xr.Dataset: The xarray dataset with the converted longitude
     """
     to_which = int(convert)
     if to_which not in [180, 360]:
@@ -412,20 +193,16 @@ def convert_longitude(ds, lon_name="longitude", convert=180):
     return ds.sortby(lon_name)
 
 
-def isel(ncfile, dim_name, slice_list):
+def isel(ncfile: str, dim_name: str, slice_list: List[int]) -> xr.Dataset:
     """
     Description:
-        Choose the data by the index of the dimension
-
+        Choose the data by the index of the dimension.
     Parameters:
         ncfile: str, the path of the netCDF file
         dim_name: str, the name of the dimension
-        slice_list: list, the index of the dimension
-
-    Example:
-        slice_list = [[y*12+m for m in range(11,14)] for y in range(84)]
-        slice_list = [y * 12 + m for y in range(84) for m in range(11, 14)]
-        isel(ncfile, 'time', slice_list)
+        slice_list: List[int], the indices of the dimension
+    Returns:
+        xr.Dataset: The subset dataset
     """
     ds = xr.open_dataset(ncfile)
     slice_list = np.array(slice_list).flatten()
@@ -435,25 +212,20 @@ def isel(ncfile, dim_name, slice_list):
     return ds_new
 
 
-def draw(output_dir=None, dataset=None, ncfile=None, xyzt_dims=("longitude", "latitude", "level", "time"), plot_type="contourf",fixed_colorscale=False):
+def draw(output_dir: Optional[str] = None, dataset: Optional[xr.Dataset] = None, ncfile: Optional[str] = None, xyzt_dims: Union[List[str], Tuple[str, str, str, str]] = ("longitude", "latitude", "level", "time"), plot_type: str = "contourf", fixed_colorscale: bool = False) -> None:
     """
     Description:
-        Draw the data in the netCDF file
-
+        Draw the data in the netCDF file.
     Parameters:
-        ncfile: str, the path of the netCDF file
-        output_dir: str, the path of the output directory
-        x_dim: str, the name of the x dimension
-        y_dim: str, the name of the y dimension
-        z_dim: str, the name of the z dimension
-        t_dim: str, the name of the t dimension
+        output_dir: Optional[str], the path of the output directory
+        dataset: Optional[xr.Dataset], the xarray dataset to plot
+        ncfile: Optional[str], the path of the netCDF file
+        xyzt_dims: Union[List[str], Tuple[str, str, str, str]], the dimensions for plotting
         plot_type: str, the type of the plot, default is "contourf" (contourf, contour)
         fixed_colorscale: bool, whether to use fixed colorscale, default is False
-
-    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_python.py

@@ -1,108 +1,98 @@
 #!/usr/bin/env python
 # coding=utf-8
-'''
+"""
 Author: Liu Kun && 16031215@qq.com
-Date: 2024-10-11 21:02:07
+Date: 2025-03-27 16:51:26
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-11-21 10:59:53
+LastEditTime: 2025-04-05 14:17:07
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_python.py
-Description:  
+Description:
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
 SystemInfo: Windows 11
-Python Version: 3.11
-'''
+Python Version: 3.12
+"""
 
 import os
+
 from rich import print
 
-__all__ = ['install_lib', 'upgrade_lib']
+__all__ = ["install_packages", "upgrade_packages"]
+
+
+def install_packages(packages=None, python_executable="python", package_manager="pip"):
+    """
+    packages: list, libraries to be installed
+    python_executable: str, Python version; for example, on Windows, copy python.exe to python312.exe, then set python_executable='python312'
+    package_manager: str, the package manager to use ('pip' or 'conda')
+    """
+    if not isinstance(packages, (list, type(None))):
+        raise ValueError("The 'packages' parameter must be a list or None")
 
+    if package_manager not in ["pip", "conda"]:
+        raise ValueError("The 'package_manager' parameter must be either 'pip' or 'conda'")
 
-def install_lib(libs=None, python_exe='python'):
-    '''
-    libs: list, 需要安装的库
-    python_exe: str, python版本；如在windows下，将python.exe复制为python312.exe，然后python_exe='python312'
-    '''
-    os.system(python_exe + " -m ensurepip")
-    os.system(python_exe + " -m pip install --upgrade pip")
-    if libs is None:
-        libs = [
-            # "oafuncs",  # 自己的库，在这个函数不宜操作，避免报错
-            "requests",  # 网页
-            "xlwt",  # excel文件
-            "xlrd",  # excel文件
-            "openpyxl",  # excel文件
-            "netCDF4",  # nc文件
-            "numpy",  # 数组
-            "pandas",  # 数据
-            "xarray",  # 数组
-            "scipy",  # 科学计算
-            # "scikit-learn", # 机器学习
-            "matplotlib",  # 绘图
-            # "seaborn",
-            "imageio",  # 图像
-            # "pylustrator",  # 绘图
-            "Cartopy",  # 绘图 #cartopy已经支持python3.11并且可以直接pip安装
-            "seawater",  # 海洋计算
-            "cmaps",  # 颜色
-            "colorcet",   # 颜色
-            "cmasher",     # 颜色
-            "tqdm",  # 进度条
-            # "taichi",      # 加速
-            "icecream",  # 打印调试
-            # "pyperclip",  # 系统剪切板
-            "rich",  # 精美文本终端
-            # "stratify",  # 大气海洋数据垂直插值
-            "dask",  # 并行计算
-            "bs4",  # 网页
-            "pathlib",  # 路径
-            "opencv-contrib-python",  # 图像处理
-            # "pydap",  # 网络数据xarray下载
-            "gsw",  # 海洋计算
-            "global_land_mask",  # 陆地海洋掩码
-            # "cfgrib", # grib文件
-            # "ecmwflibs", # grib文件， 两个库都需要安装
-            "geopandas",  # 矢量数据，shp文件
-            # "geopy",  # 地理位置
-            # "flask",  # 网页
-            "cdsapi",  # 网络数据下载(era5)
-            # 以下不太重要
-            "lxml",  # 网页
-            "keyboard",  # 键盘
-            "zhdate",  # 中国农历
-            "python-pptx",  # ppt
-            "python-docx",  # word
-            "ipywidgets",  # jupyter显示进度条插件
-            "salem",  # 地图投影，可部分替代wrf-python
-            "meteva",  # 气象数据处理，中国气象局开发
-            "wget",  # 下载
-            "pyautogui",  # 鼠标键盘，自动连点脚本需要
-        ]
+    if package_manager == "conda":
+        if not packages:
+            return
+        try:
+            package_count = len(packages)
+            for i, package in enumerate(packages):
+                os.system(f"conda install -c conda-forge {package} -y")
+                print("-" * 100)
+                print(f"Successfully installed {package} ({i + 1}/{package_count})")
+                print("-" * 100)
+        except Exception as e:
+            print(f"Installation failed: {str(e)}")
+        return
+
+    os.system(f"{python_executable} -m ensurepip")
+    os.system(f"{python_executable} -m pip install --upgrade pip")
+    if not packages:
+        return
     try:
-        installed_libs = os.popen(python_exe + ' -m pip list').read()
-        lib_num = len(libs)
-        for i, lib in enumerate(libs):
-            # 判断库是否已经安装，已安装跳过
-            if lib in installed_libs:
-                print(lib, "早已安装")
+        installed_packages = os.popen(f"{python_executable} -m pip list --format=freeze").read().splitlines()
+        installed_packages = {pkg.split("==")[0].lower() for pkg in installed_packages}
+        package_count = len(packages)
+        for i, package in enumerate(packages):
+            # Check if the library is already installed, skip if installed
+            if package.lower() in installed_packages:
+                print(f"{package} is already installed")
                 continue
-            else:
-                os.system(python_exe + " -m " + "pip install " + lib)
-                print('-'*100)
-                print("安装成功", lib, "({}/{})".format(i+1, lib_num))
-                print('-'*100)
+            os.system(f"{python_executable} -m pip install {package}")
+            print("-" * 100)
+            print(f"Successfully installed {package} ({i + 1}/{package_count})")
+            print("-" * 100)
     except Exception as e:
-        print("安装失败:", str(e))
+        print(f"Installation failed: {str(e)}")
+
+
+def upgrade_packages(packages=None, python_executable="python", package_manager="pip"):
+    """
+    packages: list, libraries to be upgraded
+    python_executable: str, Python version; for example, on Windows, copy python.exe to python312.exe, then set python_executable='python312'
+    package_manager: str, the package manager to use ('pip' or 'conda')
+    """
+    if not isinstance(packages, (list, type(None))):
+        raise ValueError("The 'packages' parameter must be a list or None")
 
+    if package_manager not in ["pip", "conda"]:
+        raise ValueError("The 'package_manager' parameter must be either 'pip' or 'conda'")
 
-def upgrade_lib(libs=None, python_exe='python'):
-    if libs is None:
-        installed_libs = os.popen(python_exe + ' -m pip list').read()
-        libs = installed_libs
     try:
-        for lib in libs:
-            os.system(python_exe + " -m " + "pip install --upgrade " + lib)
-        print("升级成功")
+        if package_manager == "conda":
+            if not packages:
+                installed_packages = os.popen("conda list --export").read().splitlines()
+                packages = [pkg.split("=")[0] for pkg in installed_packages if not pkg.startswith("#")]
+            for package in packages:
+                os.system(f"conda update -c conda-forge {package} -y")
+            print("Upgrade successful")
+        else:
+            if not packages:
+                installed_packages = os.popen(f"{python_executable} -m pip list --format=freeze").read().splitlines()
+                packages = [pkg.split("==")[0] for pkg in installed_packages]
+            for package in packages:
+                os.system(f"{python_executable} -m pip install --upgrade {package}")
+            print("Upgrade successful")
     except Exception as e:
-        print("升级失败:", str(e))
+        print(f"Upgrade failed: {str(e)}")

oafuncs/oa_sign/meteorological.py

@@ -4,8 +4,8 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-10-14 16:14:50
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-10-14 18:38:57
-FilePath: \\Python\\My_Funcs\\OAFuncs\\OAFuncs\\oa_sign\\meteorological.py
+LastEditTime: 2025-04-04 20:37:13
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_sign\\meteorological.py
 Description:  
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
@@ -63,7 +63,7 @@ def sign_in_meteorological_home(email, password):
 
     def login():
         url = 'http://bbs.06climate.com/member.php?'
-        # 登录密码需要转码为 216fc900fb57c27dd3c5e3dfbcac1849
+        # 登录密码需要转码
         mydata['password'] = hashlib.md5(mydata['password'].encode()).hexdigest()
         credentials = {
             'password': mydata['password'],