oafuncs 0.0.79__tar.gz → 0.0.81__tar.gz

{oafuncs-0.0.79/oafuncs.egg-info → oafuncs-0.0.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oafuncs
-Version: 0.0.79
+Version: 0.0.81
 Summary: My short description for my project.
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -13,7 +13,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.9.0

oafuncs-0.0.81/oafuncs/__init__.py

@@ -0,0 +1,44 @@
+#!/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: 2024-12-13 12:31:06
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_s\\__init__.py
+Description:
+EditPlatform: vscode
+ComputerInfo: XPS 15 9510
+SystemInfo: Windows 11
+Python Version: 3.12
+"""
+
+
+# 会导致OAFuncs直接导入所有函数，不符合模块化设计
+# from oafuncs.oa_s.oa_cmap import *
+# from oafuncs.oa_s.oa_data import *
+# from oafuncs.oa_s.oa_draw import *
+# from oafuncs.oa_s.oa_file import *
+# from oafuncs.oa_s.oa_help import *
+# from oafuncs.oa_s.oa_nc import *
+# from oafuncs.oa_s.oa_python import *
+
+# ------------------- 2024-12-13 12:31:06 -------------------
+# path: My_Funcs/OAFuncs/oafuncs/
+from .oa_cmap import *
+from .oa_data import *
+from .oa_draw import *
+from .oa_file import *
+from .oa_help import *
+from .oa_nc import *
+from .oa_python import *
+# ------------------- 2024-12-13 12:31:06 -------------------
+# path: My_Funcs/OAFuncs/oafuncs/oa_down/
+from .oa_down import *
+# ------------------- 2024-12-13 12:31:06 -------------------
+# path: My_Funcs/OAFuncs/oafuncs/oa_sign/
+from .oa_sign import *
+# ------------------- 2024-12-13 12:31:06 -------------------
+# path: My_Funcs/OAFuncs/oafuncs/oa_tool/
+from .oa_tool import *
+# ------------------- 2024-12-13 12:31:06 -------------------

{oafuncs-0.0.79 → oafuncs-0.0.81}/oafuncs/oa_cmap.py

@@ -17,11 +17,9 @@ import matplotlib as mpl
 import matplotlib.pyplot as plt
 import numpy as np
 
-__all__ = ["show", "extract_colors", "create_custom", "create_diverging", "create_5rgb_txt", "my_cmap"]
+__all__ = ["show", "cmap2colors", "create_cmap", "create_cmap_rgbtxt", "choose_cmap"]
 
 # ** 将cmap用填色图可视化（官网摘抄函数）
-
-
 def show(colormaps: list):
     """
     Helper function to plot data with associated colormap.
@@ -40,28 +38,28 @@ def show(colormaps: list):
 
 
 # ** 将cmap转为list，即多个颜色的列表
-def extract_colors(cmap, n=256):
+def cmap2colors(cmap, n=256):
     """
     cmap        : cmap名称
     n           : 提取颜色数量
     return      : 提取的颜色列表
-    example     : out_cmap = extract_colors('viridis', 256)
+    example     : out_colors = cmap2colors('viridis', 256)
     """
     c_map = mpl.colormaps.get_cmap(cmap)
-    out_cmap = [c_map(i) for i in np.linspace(0, 1, n)]
-    return out_cmap
+    out_colors = [c_map(i) for i in np.linspace(0, 1, n)]
+    return out_colors
 
 
 # ** 自制cmap，多色，可带位置
-def create_custom(colors: list, nodes=None, under=None, over=None):  # 利用颜色快速配色
+def create_cmap(colors: list, nodes=None, under=None, over=None):  # 利用颜色快速配色
     """
     func        : 自制cmap，自动确定颜色位置（等比例）
     description : colors可以是颜色名称，也可以是十六进制颜色代码
     param        {*} colors 颜色
     param        {*} nodes 颜色位置，默认不提供，等间距
-    return       {*} c_map
-    example     : c_map = mk_cmap(['#C2B7F3','#B3BBF2','#B0CBF1','#ACDCF0','#A8EEED'])
-                c_map = mk_cmap(['aliceblue','skyblue','deepskyblue'],[0.0,0.5,1.0])
+    return       {*} cmap
+    example     : cmap = create_cmap(['#C2B7F3','#B3BBF2','#B0CBF1','#ACDCF0','#A8EEED'])
+                cmap = create_cmap(['aliceblue','skyblue','deepskyblue'],[0.0,0.5,1.0])
     """
     if nodes is None:  # 采取自动分配比例
         cmap_color = mpl.colors.LinearSegmentedColormap.from_list("mycmap", colors)
@@ -74,46 +72,27 @@ def create_custom(colors: list, nodes=None, under=None, over=None):  # 利用颜
     return cmap_color
 
 
-# ** 自制diverging型cmap，默认中间为白色
-
-
-def create_diverging(colors: list):
-    """
-    func        : 自制cmap，双色，中间默认为白色；如果输入偶数个颜色，则中间为白，如果奇数个颜色，则中间色为中间色
-    description : colors可以是颜色名称，也可以是十六进制颜色代码
-    param        {*} colors
-    return       {*}
-    example     : diverging_cmap = mk_cmap_diverging(["#00c0ff", "#a1d3ff", "#DCDCDC", "#FFD39B", "#FF8247"])
-    """
-    # 自定义颜色位置
-    n = len(colors)
-    nodes = np.linspace(0.0, 1.0, n + 1 if n % 2 == 0 else n)
-    newcolors = colors
-    if n % 2 == 0:
-        newcolors.insert(int(n / 2), "#ffffff")  # 偶数个颜色，中间为白色
-    cmap_color = mpl.colors.LinearSegmentedColormap.from_list("mycmap", list(zip(nodes, newcolors)))
-    return cmap_color
-
-
 # ** 根据RGB的txt文档制作色卡（利用Grads调色盘）
-
-
-def create_5rgb_txt(rgb_txt_filepath: str):  # 根据RGB的txt文档制作色卡/根据rgb值制作
+def create_cmap_rgbtxt(rgbtxt_file,split_mark=','):  # 根据RGB的txt文档制作色卡/根据rgb值制作
     """
     func        : 根据RGB的txt文档制作色卡
-    description : rgb_txt_filepath='E:/python/colorbar/test.txt'
-    param        {*} rgb_txt_filepath txt文件路径
+    description : rgbtxt_file='E:/python/colorbar/test.txt'
+    param        {*} rgbtxt_file txt文件路径
     return       {*} camp
-    example     : cmap_color=dcmap(path)
+    example     : cmap=create_cmap_rgbtxt(path,split_mark=',') #
+
+    txt example : 251,251,253
+                225,125,25
+                250,205,255
     """
-    with open(rgb_txt_filepath) as fid:
+    with open(rgbtxt_file) as fid:
         data = fid.readlines()
     n = len(data)
     rgb = np.zeros((n, 3))
     for i in np.arange(n):
-        rgb[i][0] = data[i].split(",")[0]
-        rgb[i][1] = data[i].split(",")[1]
-        rgb[i][2] = data[i].split(",")[2]
+        rgb[i][0] = data[i].split(split_mark)[0]
+        rgb[i][1] = data[i].split(split_mark)[1]
+        rgb[i][2] = data[i].split(split_mark)[2]
     max_rgb = np.max(rgb)
     if max_rgb > 2:  # 如果rgb值大于2，则认为是0-255的值，需要归一化
         rgb = rgb / 255.0
@@ -121,7 +100,7 @@ def create_5rgb_txt(rgb_txt_filepath: str):  # 根据RGB的txt文档制作色卡
     return icmap
 
 
-def my_cmap(cmap_name=None, query=False):
+def choose_cmap(cmap_name=None, query=False):
     """
     description: Choosing a colormap from the list of available colormaps or a custom colormap
     param {*} cmap_name:
@@ -130,9 +109,9 @@ def my_cmap(cmap_name=None, query=False):
     """
 
     my_cmap_dict = {
-        "diverging_1": create_custom(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"]),
-        "cold_1": create_custom(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC"]),
-        "warm_1": create_custom(["#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"]),
+        "diverging_1": create_cmap(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"]),
+        "cold_1": create_cmap(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC"]),
+        "warm_1": create_cmap(["#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"]),
         # "land_1": create_custom(["#3E6436", "#678A59", "#91A176", "#B8A87D", "#D9CBB2"], under="#A6CEE3", over="#FFFFFF"), # 陆地颜色从深绿到浅棕，表示从植被到沙地的递减
         # "ocean_1": create_custom(["#126697", "#2D88B3", "#4EA1C9", "#78B9D8", "#A6CEE3"], under="#8470FF", over="#3E6436"), # 海洋颜色从深蓝到浅蓝，表示从深海到浅海的递减
         # "ocean_land_1": create_custom(
@@ -150,7 +129,7 @@ def my_cmap(cmap_name=None, query=False):
         #         "#3E6436",  # 深绿（高山）
         #     ]
         # ),
-        "colorful_1": create_custom(["#6d00db", "#9800cb", "#F2003C", "#ff4500", "#ff7f00", "#FE28A2", "#FFC0CB", "#DDA0DD", "#40E0D0", "#1a66f2", "#00f7fb", "#8fff88", "#E3FF00"]),
+        "colorful_1": create_cmap(["#6d00db", "#9800cb", "#F2003C", "#ff4500", "#ff7f00", "#FE28A2", "#FFC0CB", "#DDA0DD", "#40E0D0", "#1a66f2", "#00f7fb", "#8fff88", "#E3FF00"]),
     }
     if query:
         for key, _ in my_cmap_dict.items():
@@ -160,7 +139,7 @@ def my_cmap(cmap_name=None, query=False):
         return my_cmap_dict[cmap_name]
     else:
         try:
-            return mpl.cm.get_cmap(cmap_name)
+            return mpl.colormaps.get_cmap(cmap_name)
         except ValueError:
             raise ValueError(f"Unknown cmap name: {cmap_name}")
 
@@ -169,16 +148,16 @@ if __name__ == "__main__":
     # ** 测试自制cmap
     colors = ["#C2B7F3", "#B3BBF2", "#B0CBF1", "#ACDCF0", "#A8EEED"]
     nodes = [0.0, 0.2, 0.4, 0.6, 1.0]
-    c_map = create_custom(colors, nodes)
+    c_map = create_cmap(colors, nodes)
     show([c_map])
 
     # ** 测试自制diverging型cmap
-    diverging_cmap = create_diverging(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"])
+    diverging_cmap = create_cmap(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"])
     show([diverging_cmap])
 
     # ** 测试根据RGB的txt文档制作色卡
     file_path = "E:/python/colorbar/test.txt"
-    cmap_color = create_5rgb_txt(file_path)
+    cmap_rgb = create_cmap_rgbtxt(file_path)
 
     # ** 测试将cmap转为list
-    out_cmap = extract_colors("viridis", 256)
+    out_colors = cmap2colors("viridis", 256)

{oafuncs-0.0.79 → oafuncs-0.0.81}/oafuncs/oa_down/hycom_3hourly.py

@@ -55,17 +55,17 @@ data_info["hourly"]["dataset"]["GLBy0.08"]["version"] = {"93.0": {}}
 # 在网页上提交超过范围的时间，会返回该数据集实际时间范围，从而纠正下面的时间范围
 # 目前只纠正了GLBv0.08 93.0的时间范围，具体到小时了
 # 其他数据集的时刻暂时默认为00起，21止
-data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["53.X"]["time_range"] = {"time_start": "19940101", "time_end": "20151231"}
-data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["56.3"]["time_range"] = {"time_start": "20140701", "time_end": "20160430"}
-data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["57.2"]["time_range"] = {"time_start": "20160501", "time_end": "20170131"}
-data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["92.8"]["time_range"] = {"time_start": "20170201", "time_end": "20170531"}
-data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["57.7"]["time_range"] = {"time_start": "20170601", "time_end": "20170930"}
-data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["92.9"]["time_range"] = {"time_start": "20171001", "time_end": "20171231"}
+data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["53.X"]["time_range"] = {"time_start": "1994010112", "time_end": "2015123109"}
+data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["56.3"]["time_range"] = {"time_start": "2014070112", "time_end": "2016093009"}
+data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["57.2"]["time_range"] = {"time_start": "2016050112", "time_end": "2017020109"}
+data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["92.8"]["time_range"] = {"time_start": "2017020112", "time_end": "2017060109"}
+data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["57.7"]["time_range"] = {"time_start": "2017060112", "time_end": "2017100109"}
+data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["92.9"]["time_range"] = {"time_start": "2017100112", "time_end": "2018032009"}
 data_info["hourly"]["dataset"]["GLBv0.08"]["version"]["93.0"]["time_range"] = {"time_start": "2018010112", "time_end": "2020021909"}
 # GLBu0.08
-data_info["hourly"]["dataset"]["GLBu0.08"]["version"]["93.0"]["time_range"] = {"time_start": "20180919", "time_end": "20181208"}
+data_info["hourly"]["dataset"]["GLBu0.08"]["version"]["93.0"]["time_range"] = {"time_start": "2018091912", "time_end": "2018120909"}
 # GLBy0.08
-data_info["hourly"]["dataset"]["GLBy0.08"]["version"]["93.0"]["time_range"] = {"time_start": "20181204", "time_end": "20300904"}
+data_info["hourly"]["dataset"]["GLBy0.08"]["version"]["93.0"]["time_range"] = {"time_start": "2018120412", "time_end": "20300904"}
 
 # variable
 variable_info = {
@@ -141,10 +141,11 @@ data_info["hourly"]["dataset"]["GLBu0.08"]["version"]["93.0"]["url"] = url_930_u
 uv3z_930_y = {}
 ts3z_930_y = {}
 ssh_930_y = {}
-for y_930_y in range(2018, 2025):
+for y_930_y in range(2018, 2030):
     uv3z_930_y[str(y_930_y)] = rf"https://ncss.hycom.org/thredds/ncss/GLBy0.08/expt_93.0/uv3z/{y_930_y}?"
     ts3z_930_y[str(y_930_y)] = rf"https://ncss.hycom.org/thredds/ncss/GLBy0.08/expt_93.0/ts3z/{y_930_y}?"
     ssh_930_y[str(y_930_y)] = rf"https://ncss.hycom.org/thredds/ncss/GLBy0.08/expt_93.0/ssh/{y_930_y}?"
+# GLBy0.08 93.0 data time range in each year: year-01-01 12:00 to year+1-01-01 09:00
 url_930_y = {
     "uv3z": uv3z_930_y,
     "ts3z": ts3z_930_y,
@@ -372,7 +373,16 @@ def check_time_in_dataset_and_version(time_input, time_end=None):
     if have_data:
         for d, v, trange in zip(d_list, v_list, trange_list):
             print(f"[bold blue]{d} {v} {trange}")
-        return True
+        if is_single_time:
+            return True
+        else:
+            base_url_s = get_base_url(d_list[0], v_list[0], "u", str(time_start))
+            base_url_e = get_base_url(d_list[0], v_list[0], "u", str(time_end))
+            if base_url_s == base_url_e:
+                return True
+            else:
+                print(f"[bold red]{time_start} to {time_end} is in different datasets or versions, so you can't download them together")
+                return False
     else:
         print(f"[bold red]{time_input_str} is not in any dataset and version")
         return False
@@ -456,7 +466,8 @@ def direct_choose_dataset_and_version(time_input, time_end=None):
     return dataset_name_out, version_name_out
 
 
-def get_base_url(dataset_name, version_name, var, year_str):
+def get_base_url(dataset_name, version_name, var, ymdh_str):
+    year_str = int(ymdh_str[:4])
     url_dict = data_info["hourly"]["dataset"][dataset_name]["version"][version_name]["url"]
     classification_method = data_info["hourly"]["dataset"][dataset_name]["version"][version_name]["classification"]
     if classification_method == "year_different":
@@ -472,6 +483,12 @@ def get_base_url(dataset_name, version_name, var, year_str):
         if base_url is None:
             print("Please ensure the var is in [u,v,temp,salt,ssh,u_b,v_b,temp_b,salt_b]")
     elif classification_method == "var_year_different":
+        if dataset_name == "GLBy0.08" and version_name == "93.0":
+            mdh_str = ymdh_str[4:]
+            # GLBy0.08 93.0
+            # data time range in each year: year-01-01 12:00 to year+1-01-01 09:00
+            if mdh_str <= "010109":
+                year_str = int(ymdh_str[:4]) - 1
         base_url = None
         for key, value in var_group.items():
             if var in value:
@@ -482,8 +499,8 @@ def get_base_url(dataset_name, version_name, var, year_str):
     return base_url
 
 
-def get_submit_url(dataset_name, version_name, var, year_str, query_dict):
-    base_url = get_base_url(dataset_name, version_name, var, year_str)
+def get_submit_url(dataset_name, version_name, var, ymdh_str, query_dict):
+    base_url = get_base_url(dataset_name, version_name, var, ymdh_str)
     if isinstance(query_dict["var"], str):
         query_dict["var"] = [query_dict["var"]]
     target_url = base_url + "&".join(f"var={var}" for var in query_dict["var"]) + "&" + "&".join(f"{key}={value}" for key, value in query_dict.items() if key != "var")
@@ -496,10 +513,37 @@ def clear_existing_file(file_full_path):
         print(f"{file_full_path} has been removed")
 
 
+def _get_file_size(file_path, unit="KB"):
+    # 检查文件是否存在
+    if not os.path.exists(file_path):
+        return "文件不存在"
+
+    # 获取文件大小（字节）
+    file_size = os.path.getsize(file_path)
+
+    # 单位转换字典
+    unit_dict = {"PB": 1024**5, "TB": 1024**4, "GB": 1024**3, "MB": 1024**2, "KB": 1024}
+
+    # 检查传入的单位是否合法
+    if unit not in unit_dict:
+        return "单位不合法，请选择PB、TB、GB、MB、KB中的一个"
+
+    # 转换文件大小到指定单位
+    converted_size = file_size / unit_dict[unit]
+
+    return converted_size
+
+
 def check_existing_file(file_full_path):
     if os.path.exists(file_full_path):
         print(f"[bold #FFA54F]{file_full_path} exists")
-        return True
+        fsize = _get_file_size(file_full_path)
+        if fsize < 5:
+            print(f"[bold #FFA54F]{file_full_path} may be incomplete\nFile size: {fsize:.2f} KB")
+            # clear_existing_file(file_full_path)
+            return False
+        else:
+            return True
     else:
         # print(f'{file_full_path} does not exist')
         return False
@@ -567,11 +611,12 @@ def scrape_and_categorize_proxies(choose_protocol="http"):
 
     return proxies_list
 
+
 def get_proxy():
     ip_list = scrape_and_categorize_proxies(choose_protocol="http")
     choose_ip = random.choice(ip_list)
     proxies = {"http": f"http://{choose_ip}", "https": f"http://{choose_ip}"}
-    print(f'Using proxy: {proxies}')
+    print(f"Using proxy: {proxies}")
     return proxies
 
 
@@ -643,7 +688,7 @@ def download_file(target_url, store_path, file_name, check=False):
             # 保存文件
             with open(filename, 'wb') as f:
                 f.write(response.content) """
-            
+
             if find_proxy:
                 proxies = get_proxy()
                 response = s.get(target_url, headers=headers, proxies=proxies, stream=True, timeout=random.randint(5, max_timeout))
@@ -726,7 +771,8 @@ def check_dataset_version(dataset_name, version_name, download_time, download_ti
 
 
 def get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max, dataset_name, version_name, download_time, download_time_end=None):
-    year_str = str(download_time)[:4]
+    # year_str = str(download_time)[:4]
+    ymdh_str = str(download_time)
     if depth is not None and level_num is not None:
         print("Please ensure the depth or level_num is None")
         print("Progress will use the depth")
@@ -738,10 +784,10 @@ def get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max
         print(f"Data of single level ({level_num}) will be downloaded...")
         which_mode = "level"
     else:
-        print("Full depth or full level data will be downloaded...")
+        # print("Full depth or full level data will be downloaded...")
         which_mode = "full"
     query_dict = get_query_dict(var, lon_min, lon_max, lat_min, lat_max, download_time, download_time_end, which_mode, depth, level_num)
-    submit_url = get_submit_url(dataset_name, version_name, var, year_str, query_dict)
+    submit_url = get_submit_url(dataset_name, version_name, var, ymdh_str, query_dict)
     return submit_url
 
 
@@ -992,7 +1038,7 @@ def download(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, l
 
     """ global current_platform
     current_platform = platform.system() """
-    
+
     global find_proxy
     find_proxy = False
 
@@ -1065,7 +1111,7 @@ def how_to_use():
 
 if __name__ == "__main__":
     # help(hycom3h.download)
-    time_s, time_e = "2018070100", "2019123121"
+    time_s, time_e = "2023010100", "2023123121"
     merge_name = f"{time_s}_{time_e}"  # 合并后的文件名
     root_path = r"G:\Data\HYCOM\3hourly"
     location_dict = {"west": 105, "east": 130, "south": 15, "north": 45}
@@ -1081,10 +1127,7 @@ if __name__ == "__main__":
         "salinity_bottom": {"simple_name": "salt_b", "download": 0},
     }
 
-    var_list = []
-    for var_name in download_dict.keys():
-        if download_dict[var_name]["download"] == 1:
-            var_list.append(var_name)
+    var_list = [var_name for var_name in download_dict.keys() if download_dict[var_name]["download"]]
 
     # set depth or level, only one can be True
     # if you wanna download all depth or level, set both False

{oafuncs-0.0.79 → oafuncs-0.0.81}/oafuncs/oa_nc.py

@@ -19,7 +19,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", "longitude_change", "nc_isel"]
 
 
 def get_var(file, *vars):
@@ -38,7 +38,7 @@ def get_var(file, *vars):
     return datas
 
 
-def extract5nc(file, varname):
+def extract5nc(file, varname, only_value=True):
     """
     描述：
     1、提取nc文件中的变量
@@ -47,16 +47,22 @@ def extract5nc(file, varname):
     参数：
     file: 文件路径
     varname: 变量名
+    only_value: 变量和维度是否只保留数值
     example: data, dimdict = extract5nc(file_ecm, 'h')
     """
     ds = xr.open_dataset(file)
     vardata = ds[varname]
+    ds.close()
     dims = vardata.dims
     dimdict = {}
     for dim in dims:
-        dimdict[dim] = ds[dim].values
-    ds.close()
-    return np.array(vardata), dimdict
+        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):
@@ -76,15 +82,27 @@ def _numpy_to_nc_type(numpy_type):
     return numpy_to_nc.get(str(numpy_type), "f4")  # 默认使用 'float32'
 
 
-def write2nc(file, data, varname, coords, mode):
+def _calculate_scale_and_offset(data, n=16):
+    data_min, data_max = np.nanmin(data), np.nanmax(data)
+    scale_factor = (data_max - data_min) / (2 ** n - 1)
+    add_offset = data_min + 2 ** (n - 1) * scale_factor
+    # S = Q * scale_factor + add_offset
+    return scale_factor, add_offset
+
+
+def write2nc(file, data, varname=None, coords=None, mode='w', scale_offset_switch=True, compile_switch=True):
     """
     description: 写入数据到nc文件
+    
     参数：
     file: 文件路径
     data: 数据
     varname: 变量名
     coords: 坐标，字典，键为维度名称，值为坐标数据
     mode: 写入模式，'w'为写入，'a'为追加
+    scale_offset_switch: 是否使用scale_factor和add_offset，默认为True
+    compile_switch: 是否使用压缩参数，默认为True
+    
     example: write2nc(r'test.nc', data, 'data', {'time': np.linspace(0, 120, 100), 'lev': np.linspace(0, 120, 50)}, 'a')
     """
     # 判断mode是写入还是追加
@@ -96,6 +114,21 @@ def write2nc(file, data, varname, coords, mode):
         if not os.path.exists(file):
             print("Warning: File doesn't exist. Creating a new file.")
             mode = "w"
+    
+    complete = False
+    if varname is None and coords is None:
+        try:
+            data.to_netcdf(file)
+            complete = True
+            # 不能在这里return
+        except AttributeError:
+            raise ValueError("If varname and coords are None, data must be a DataArray.")
+    
+    if complete:
+        return
+    
+    kwargs = {'zlib': True, 'complevel': 4} # 压缩参数
+    # kwargs = {"compression": 'zlib', "complevel": 4}  # 压缩参数
 
     # 打开 NetCDF 文件
     with nc.Dataset(file, mode, format="NETCDF4") as ncfile:
@@ -116,8 +149,17 @@ def write2nc(file, data, varname, coords, mode):
             if add_coords:
                 # 创建新坐标
                 ncfile.createDimension(dim, len(coord_data))
-                ncfile.createVariable(dim, _numpy_to_nc_type(coord_data.dtype), (dim,))
+                if compile_switch:
+                    ncfile.createVariable(dim, _numpy_to_nc_type(coord_data.dtype), (dim,), **kwargs)
+                else:
+                    ncfile.createVariable(dim, _numpy_to_nc_type(coord_data.dtype), (dim,))
                 ncfile.variables[dim][:] = np.array(coord_data)
+            
+            if isinstance(coord_data, xr.DataArray):
+                current_var = ncfile.variables[dim]
+                if coord_data.attrs:
+                    for key, value in coord_data.attrs.items():
+                        current_var.setncattr(key, value)
 
         # 判断变量是否存在，若存在，则删除原变量
         add_var = True
@@ -127,22 +169,48 @@ def write2nc(file, data, varname, coords, mode):
                 raise ValueError("Shape of data does not match the variable shape.")
             else:
                 # 写入数据
-                ncfile.variables[varname][:] = data
+                ncfile.variables[varname][:] = np.array(data)
                 add_var = False
                 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)
+            if scale_offset_switch:
+                scale_factor, add_offset = _calculate_scale_and_offset(np.array(data))
+                _FillValue = -32767
+                missing_value = -32767
+                dtype = 'i2' # short类型
+            else:
+                dtype = _numpy_to_nc_type(data.dtype)
+            
+            if compile_switch:
+                ncfile.createVariable(varname, dtype, dim_names, **kwargs)
+            else:
+                ncfile.createVariable(varname, dtype, dim_names)
+            
+            if scale_offset_switch: # 需要在写入数据之前设置scale_factor和add_offset
+                ncfile.variables[varname].setncattr('scale_factor', scale_factor)
+                ncfile.variables[varname].setncattr('add_offset', add_offset)
+                ncfile.variables[varname].setncattr('_FillValue', _FillValue)
+                ncfile.variables[varname].setncattr('missing_value', missing_value)
+                
             # ncfile.createVariable('data', 'f4', ('time','lev'))
 
             # 写入数据
-            ncfile.variables[varname][:] = data
+            ncfile.variables[varname][:] = np.array(data)
 
         # 判断维度是否匹配
         if len(data.shape) != len(coords):
             raise ValueError("Number of dimensions does not match the data shape.")
+    # 判断data是否带有属性信息，如果有，写入属性信息
+    if isinstance(data, xr.DataArray):
+        current_var = ncfile.variables[varname]
+        if data.attrs:
+            for key, value in data.attrs.items():
+                if key in ["scale_factor", "add_offset", "_FillValue", "missing_value"] and scale_offset_switch:
+                    continue
+                current_var.setncattr(key, value)
 
 
 def merge5nc(file_list, var_name=None, dim_name=None, target_filename=None):
@@ -330,6 +398,48 @@ def check_ncfile(ncfile, if_delete=False):
         return False
 
 
+def longitude_change(ds, lon_name="longitude", to_which="180"):
+    """
+    将经度转换为 -180 到 180 之间
+
+    参数：
+    lon (numpy.ndarray): 经度数组
+
+    返回值：
+    numpy.ndarray: 转换后的经度数组
+    """
+    # return (lon + 180) % 360 - 180
+    # ds = ds.assign_coords(longitude=(((ds.longitude + 180) % 360) - 180)).sortby("longitude")
+    if to_which == "180":
+        # ds = ds.assign_coords(**{lon_name: (((ds[lon_name] + 180) % 360) - 180)}).sortby(lon_name)
+        ds = ds.assign_coords(**{lon_name: (ds[lon_name] + 180) % 360 - 180}).sortby(lon_name)
+    elif to_which == "360":
+        # -180 to 180 to 0 to 360
+        ds = ds.assign_coords(**{lon_name: (ds[lon_name] + 360) % 360}).sortby(lon_name)
+    return ds
+
+
+def nc_isel(ncfile, dim_name, slice_list):
+    """
+    Description: 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
+
+    slice_list example: slice_list = [[y*12+m for m in range(11,14)] for y in range(84)]
+                    or
+                        slice_list = [y * 12 + m for y in range(84) for m in range(11, 14)]
+    """
+    ds = xr.open_dataset(ncfile)
+    slice_list = np.array(slice_list).flatten()
+    slice_list = [int(i) for i in slice_list]
+    ds_new = ds.isel(**{dim_name: slice_list})
+    ds.close()
+    return ds_new
+
+
 if __name__ == "__main__":
     data = np.random.rand(100, 50)
     write2nc(r"test.nc", data, "data", {"time": np.linspace(0, 120, 100), "lev": np.linspace(0, 120, 50)}, "a")

{oafuncs-0.0.79 → oafuncs-0.0.81/oafuncs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oafuncs
-Version: 0.0.79
+Version: 0.0.81
 Summary: My short description for my project.
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -13,7 +13,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.9.0

{oafuncs-0.0.79 → oafuncs-0.0.81}/oafuncs.egg-info/SOURCES.txt

@@ -19,7 +19,7 @@ oafuncs/oa_down/User_Agent-list.txt
 oafuncs/oa_down/__init__.py
 oafuncs/oa_down/hycom_3hourly.py
 oafuncs/oa_down/literature.py
-oafuncs/oa_down/test.py
+oafuncs/oa_down/test_ua.py
 oafuncs/oa_sign/__init__.py
 oafuncs/oa_sign/meteorological.py
 oafuncs/oa_sign/ocean.py

{oafuncs-0.0.79 → oafuncs-0.0.81}/setup.py

@@ -18,7 +18,7 @@ URL = 'https://github.com/Industry-Pays/OAFuncs'
 EMAIL = 'liukun0312@stu.ouc.edu.cn'
 AUTHOR = 'Kun Liu'
 REQUIRES_PYTHON = '>=3.9.0'
-VERSION = '0.0.79'
+VERSION = '0.0.81'
 
 # What packages are required for this module to be executed?
 REQUIRED = [
@@ -122,7 +122,7 @@ setup(
     python_requires=REQUIRES_PYTHON,
     url=URL,
     packages=find_packages(
-        exclude=["oa_cmap", "oa_data", "oa_draw", "oa_file", "oa_help", "oa_nc", "oa_python", "oa_down", "oa_sign", "oa_tool", "oa_*"]),
+        exclude=["oa_*", "oa_down", "oa_sign", "oa_tool"]),
     # packages=find_packages(exclude=["nc", "file", "*.tests.*", "tests.*"]),
     # If your package is a single module, use this instead of 'packages':
     # py_modules=['mypackage'],
@@ -144,7 +144,6 @@ setup(
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
-        'Programming Language :: Python :: 3.13',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy'
     ],

oafuncs-0.0.79/oafuncs/__init__.py

@@ -1,26 +0,0 @@
-#!/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: 2024-10-14 17:08:57
-FilePath: \\Python\\My_Funcs\\OAFuncs\\OAFuncs\\__init__.py
-Description:  
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.11
-'''
-
-# 会导致OAFuncs直接导入所有函数，不符合模块化设计
-from .oa_cmap import *
-from .oa_data import *
-from .oa_down import *
-from .oa_draw import *
-from .oa_file import *
-from .oa_help import *
-from .oa_nc import *
-from .oa_python import *
-from .oa_sign import *
-from .oa_tool import *