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

oafuncs/oa_down/hycom_3hourly.py

@@ -4,8 +4,8 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-11-01 10:31:09
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-11-12 16:22:33
-FilePath: \\Python\\My_Funcs\\OAFuncs\\OAFuncs\\oa_down\\hycom_3hourly.py
+LastEditTime: 2024-11-21 12:55:56
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\hycom_3hourly.py
 Description:
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
@@ -234,8 +234,7 @@ def draw_time_range(pic_save_folder=None):
     plt.tight_layout()
     if pic_save_folder:
         plt.savefig(Path(pic_save_folder) / 'HYCOM_time_range.png')
-        print(f'[bold green]HYCOM_time_range.png has been saved in {
-              pic_save_folder}')
+        print(f'[bold green]HYCOM_time_range.png has been saved in {pic_save_folder}')
     else:
         plt.savefig('HYCOM_time_range.png')
         print('[bold green]HYCOM_time_range.png has been saved in the current folder')
@@ -247,8 +246,7 @@ def draw_time_range(pic_save_folder=None):
 def transform_time(time_str):
     # old_time = '2023080203'
     # time_new = '2023-08-02T03%3A00%3A00Z'
-    time_new = f'{time_str[:4]}-{time_str[4:6]
-                                 }-{time_str[6:8]}T{time_str[8:10]}%3A00%3A00Z'
+    time_new = f'{time_str[:4]}-{time_str[4:6]}-{time_str[6:8]}T{time_str[8:10]}%3A00%3A00Z'
     return time_new
 
 
@@ -271,8 +269,7 @@ def get_time_list(time_s, time_e, delta_hour):
 
 
 def get_nearest_level_index(depth):
-    level_depth = [0.0, 2.0, 4.0, 6.0, 8.0, 10.0, 12.0, 15.0, 20.0, 25.0, 30.0, 35.0, 40.0, 45.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 125.0,
-                   150.0, 200.0, 250.0, 300.0, 350.0, 400.0, 500.0, 600.0, 700.0, 800.0, 900.0, 1000.0, 1250.0, 1500.0, 2000.0, 2500.0, 3000.0, 4000.0, 5000]
+    level_depth = [0.0, 2.0, 4.0, 6.0, 8.0, 10.0, 12.0, 15.0, 20.0, 25.0, 30.0, 35.0, 40.0, 45.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 125.0, 150.0, 200.0, 250.0, 300.0, 350.0, 400.0, 500.0, 600.0, 700.0, 800.0, 900.0, 1000.0, 1250.0, 1500.0, 2000.0, 2500.0, 3000.0, 4000.0, 5000]
     return min(range(len(level_depth)), key=lambda i: abs(level_depth[i]-depth))
 
 
@@ -325,11 +322,9 @@ def set_query_dict_full(var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh):
 
 def get_query_dict_single_depth(var, lon_min, lon_max, lat_min, lat_max, depth, time_str_ymdh):
     if var in ['ssh']:
-        query_dict = set_query_dict_no_vertical(
-            var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh)
+        query_dict = set_query_dict_no_vertical(var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh)
     else:
-        query_dict = set_query_dict_depth_or_level(
-            var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh)
+        query_dict = set_query_dict_depth_or_level(var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh)
     if var in ['u', 'v', 'temp', 'salinity']:
         print('Please ensure the depth is in the range of 0-5000 m')
         query_dict['vertCoord'] = get_nearest_level_index(depth)+1
@@ -338,12 +333,10 @@ def get_query_dict_single_depth(var, lon_min, lon_max, lat_min, lat_max, depth,
 
 def get_query_dict_single_level(var, lon_min, lon_max, lat_min, lat_max, level_num, time_str_ymdh):
     if var in ['ssh']:
-        query_dict = set_query_dict_no_vertical(
-            var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh)
+        query_dict = set_query_dict_no_vertical(var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh)
     else:
         # level_num: 1-40
-        query_dict = set_query_dict_depth_or_level(
-            var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh)
+        query_dict = set_query_dict_depth_or_level(var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh)
     if var in ['u', 'v', 'temp', 'salinity']:
         print('Please ensure the level_num is in the range of 1-40')
         if level_num == 0:
@@ -384,8 +377,6 @@ def ymd_in_which_dataset_and_version(time_ymdh):
     have_data = False
     for dataset_name in data_info['hourly']['dataset'].keys():
         for version_name in data_info['hourly']['dataset'][dataset_name]['version'].keys():
-            # print(data_info['hourly']['dataset'][dataset_name]
-            #       ['version'][version_name]['time_range'].values())
             time_s, time_e = list(
                 data_info['hourly']['dataset'][dataset_name]['version'][version_name]['time_range'].values())
             time_s, time_e = str(time_s), str(time_e)
@@ -401,7 +392,6 @@ def ymd_in_which_dataset_and_version(time_ymdh):
     print(f'[bold red]{time_ymdh} is in the following dataset and version:')
     if have_data:
         for d, v, trange in zip(d_list, v_list, trange_list):
-            # print(f'{time_ymd} is in {d} {v} {trange}')
             print(f'[bold blue]{d} {v} {trange}')
     else:
         raise ValueError(
@@ -412,18 +402,14 @@ def direct_choose_dataset_and_version(time_ymdh):
     time_ymdh = int(time_ymdh)
     for dataset_name in data_info['hourly']['dataset'].keys():
         for version_name in data_info['hourly']['dataset'][dataset_name]['version'].keys():
-            [time_s, time_e] = list(data_info['hourly']['dataset'][dataset_name]['version'][version_name]['time_range'].values(
-            ))
-            # print(time_s, time_e, time_ymd)
+            [time_s, time_e] = list(data_info['hourly']['dataset'][dataset_name]['version'][version_name]['time_range'].values())
             time_s, time_e = str(time_s), str(time_e)
             if len(time_s) == 8:
                 time_s = time_s + '00'
             if len(time_e) == 8:
                 time_e = time_e + '21'
             if time_ymdh >= int(time_s) and time_ymdh <= int(time_e):
-                print(
-                    f'[bold purple]dataset: {dataset_name}, version: {version_name} is chosen')
-                # print(f'{time_ymdh} is in {dataset_name} {version_name}')
+                print(f'[bold purple]dataset: {dataset_name}, version: {version_name} is chosen')
                 return dataset_name, version_name
 
 
@@ -590,13 +576,8 @@ def dlownload_file(target_url, store_path, file_name, check=False):
         try:
             headers = {
                 'User-Agent': get_ua()}
-            # response = s.get(target_url, headers=headers, stream=True)
-            # response = s.get(target_url, headers=headers,
-            #                  proxies=get_proxy(), timeout=5)
             response = s.get(target_url, headers=headers,
                              timeout=5)
-            # response = s.get(target_url, headers=headers)
-            # print(target_url)
             response.raise_for_status()  # 如果请求返回的不是200，将抛出HTTPError异常
 
             # 保存文件

oafuncs/oa_help.py

@@ -4,8 +4,8 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-10-06 19:25:29
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-10-06 19:55:04
-FilePath: \\Python\\My_Funcs\\OAFuncs\\OAFuncs\\oa_help.py
+LastEditTime: 2024-11-21 12:59:18
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_help.py
 Description:  
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
@@ -13,15 +13,14 @@ SystemInfo: Windows 11
 Python Version: 3.11
 '''
 
-import OAFuncs
-
+import oafuncs
 
 def query():
     '''
     description: 查看OAFuncs模块的函数列表
     example: query()
     '''
-    funcs = [func for func in dir(OAFuncs) if callable(getattr(OAFuncs, func))]
+    funcs = [func for func in dir(oafuncs) if callable(getattr(oafuncs, func))]
     print('函数数量：')
     print(len(funcs))
     print('函数列表：')
@@ -35,6 +34,6 @@ def use(func='get_var'):
     example: use('get_var')
     '''
     print('模块全路径：')
-    print(getattr(OAFuncs, func).__module__+'.'+func)
+    print(getattr(oafuncs, func).__module__+'.'+func)
     print('函数提示：')
-    print(getattr(OAFuncs, func).__doc__)
+    print(getattr(oafuncs, func).__doc__)

oafuncs/oa_python.py

@@ -4,8 +4,8 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-10-11 21:02:07
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-10-11 21:47:19
-FilePath: \\Python\\My_Funcs\\OAFuncs\\OAFuncs\\oa_python.py
+LastEditTime: 2024-11-21 10:59:53
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_python.py
 Description:  
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
@@ -17,7 +17,8 @@ import os
 
 __all__ = ['install_lib', 'upgrade_lib']
 
-def install_lib(libs=None,python_exe='python'):
+
+def install_lib(libs=None, python_exe='python'):
     '''
     libs: list, 需要安装的库
     python_exe: str, python版本；如在windows下，将python.exe复制为python312.exe，然后python_exe='python312'
@@ -26,7 +27,7 @@ def install_lib(libs=None,python_exe='python'):
     os.system(python_exe + " -m pip install --upgrade pip")
     if libs is None:
         libs = [
-            # "OAFuncs",  # 自己的库，在这个函数不宜操作，避免报错
+            # "oafuncs",  # 自己的库，在这个函数不宜操作，避免报错
             "requests",  # 网页
             "xlwt",  # excel文件
             "xlrd",  # excel文件
@@ -94,7 +95,7 @@ def install_lib(libs=None,python_exe='python'):
         print("安装失败:", str(e))
 
 
-def upgrade_lib(libs=None,python_exe='python'):
+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

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

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: oafuncs
-Version: 0.0.59
+Version: 0.0.60
 Summary: My short description for my project.
-Home-page: https://github.com/Industry-Pays/oafuncs
+Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
 Author-email: liukun0312@stu.ouc.edu.cn
 License: MIT
@@ -48,12 +48,12 @@ Python Function
 
 <mark>注</mark>：若有需求，可邮件至`liukun0312@stu.ouc.edu.cn`，能力范围内可考虑实现
 
-**精力有限，部分函数使用说明文档未能及时更新/添加，可参考`结构`部分简述，再使用`OAFuncs.oa_help.use('func_name')`函数调取函数本身说明**
+**精力有限，部分函数使用说明文档未能及时更新/添加，可参考`结构`部分简述，再使用`oafuncs.oa_help.use('func_name')`函数调取函数本身说明**
 
 ## PyPI
 
 ```html
-https://pypi.org/project/OAFuncs
+https://pypi.org/project/oafuncs
 ```
 
 ## Github

{oafuncs-0.0.59.dist-info → oafuncs-0.0.60.dist-info}/RECORD

@@ -3,11 +3,11 @@ oafuncs/oa_cmap.py,sha256=-R45Z8_uZ_aGZP3G6pv4iUG9Rv-ZX2ae5P04vW1tQK4,5100
 oafuncs/oa_data.py,sha256=pI9GyROoBRDTM1RFMSxE0Pym2Wi7I7dxaghi2yG2PHQ,8478
 oafuncs/oa_draw.py,sha256=SWwh8t52GvGo-qtZj7NY2Ehi4FVcjsbMCmG_rCwFzz0,18168
 oafuncs/oa_file.py,sha256=-PM7wsbc_CQoW-c2p8IUBR7QkWVLGRi-NamicgOyADc,10231
-oafuncs/oa_help.py,sha256=WV-HyOLJ5yujvEx8XVcXUNBs7cI6jVKuqbg1htUpSFs,1002
+oafuncs/oa_help.py,sha256=ppNktmtNzs15R20MD1bM7yImlTQ_ngMwvoIglePOKXA,1000
 oafuncs/oa_nc.py,sha256=59_UvWqm1mqh3323huw0H1-L1TETmUF5st7kEsiHv6U,12432
-oafuncs/oa_python.py,sha256=WTfVA6X09PJBojt3c_119v42a-3O4SDCKCwe0wA0OQQ,3990
+oafuncs/oa_python.py,sha256=XPTP3o7zTFzfJR_YhsKfQksa3bSYwXsne9YxlJplCEA,3994
 oafuncs/oa_down/__init__.py,sha256=s-XGVJ4z5m3pwIJGfifvkbSt_VFVqtrfFvP7fJxbs04,538
-oafuncs/oa_down/hycom_3hourly.py,sha256=4EgEK1zMZA_FgGcCO1HW2lH3Rn5cZpTDNcLgjx6tQDM,45443
+oafuncs/oa_down/hycom_3hourly.py,sha256=xtK4nKFBIgBD24_ryDYvFbk746NdFsm3UmX4iG3XbiQ,44667
 oafuncs/oa_down/refs_pdf.py,sha256=HTOkAerWpyRatY-zh4vyjh2vkOnmM2thrmU4O67VZCQ,18104
 oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,563
 oafuncs/oa_sign/meteorological.py,sha256=B0Nr-w6gUnNSJvtrNSg4fslJH1rzhdpglcJQA9ixNbc,6658
@@ -15,8 +15,8 @@ oafuncs/oa_sign/ocean.py,sha256=s9BGtsFECbYGvCFmWRb_mFJwncBn_90aYGyDSEh8iA0,6025
 oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
 oafuncs/oa_tool/__init__.py,sha256=IKOlqpWlb4cMDCtq2VKR_RTxQHDNqR_vfqqsOsp_lKQ,466
 oafuncs/oa_tool/email.py,sha256=7EX3VkD8TxYAKPLOuC_yS104p9zbKilZlGfkVa2C6BQ,2947
-oafuncs-0.0.59.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.59.dist-info/METADATA,sha256=tRIrU7no4F1i2vkLZeLE21pqB6m7h7-n_QAvgYX6BF0,22376
-oafuncs-0.0.59.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-oafuncs-0.0.59.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.59.dist-info/RECORD,,
+oafuncs-0.0.60.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.60.dist-info/METADATA,sha256=pQ_tR-6foCuWYxERjCh3vWuqfLA3cwK-VuiuW8jEESs,22376
+oafuncs-0.0.60.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+oafuncs-0.0.60.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.60.dist-info/RECORD,,