oafuncs 0.0.65__py2.py3-none-any.whl → 0.0.66__py2.py3-none-any.whl

oafuncs/oa_down/hycom_3hourly.py

@@ -4,7 +4,7 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-11-01 10:31:09
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-11-29 20:40:26
+LastEditTime: 2024-11-30 11:40:53
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\hycom_3hourly.py
 Description:
 EditPlatform: vscode
@@ -52,7 +52,7 @@ 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': '20151230'}
+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'}
@@ -412,8 +412,11 @@ def ymdh_in_which_dataset_and_version(time_ymdh):
     if have_data:
         for d, v, trange in zip(d_list, v_list, trange_list):
             print(f'[bold blue]{d} {v} {trange}')
+        return True
     else:
-        raise ValueError(f'[bold red]{time_ymdh} is not in any dataset and version')
+        # raise ValueError(f'{time_ymdh} is not in any dataset and version')
+        print(f'[bold red]{time_ymdh} is not in any dataset and version')
+        return False
 
 
 def ymd_in_which_dataset_and_version(time_ymd):
@@ -439,8 +442,11 @@ def ymd_in_which_dataset_and_version(time_ymd):
     if have_data:
         for d, v, trange in zip(d_list, v_list, trange_list):
             print(f'[bold blue]{d} {v} {trange}')
+        return True
     else:
-        raise ValueError(f'[bold red]{time_ymd} is not in any dataset and version')
+        # raise ValueError(f'[bold red]{time_ymd} is not in any dataset and version')
+        print(f'[bold red]{time_ymd} is not in any dataset and version')
+        return False
 
 
 def direct_choose_dataset_and_version(time_ymdh):
@@ -456,6 +462,7 @@ def direct_choose_dataset_and_version(time_ymdh):
             if time_ymdh >= int(time_s) and time_ymdh <= int(time_e):
                 print(f'[bold purple]dataset: {dataset_name}, version: {version_name} is chosen')
                 return dataset_name, version_name
+    return None, None
 
 
 def direct_choose_dataset_and_version_whole_day(time_ymd):
@@ -673,20 +680,20 @@ def check_dataset_version_single_time(dataset_name, version_name, download_time)
     if not check_hour_is_valid(download_time):
         print('Please ensure the hour is 00, 03, 06, 09, 12, 15, 18, 21')
         raise ValueError('The hour is invalid')
+    have_data = ymdh_in_which_dataset_and_version(download_time)
+    if not have_data:
+        return None, None
     if dataset_name is None and version_name is None:
         print('The dataset_name and version_name are None, so the dataset and version will be chosen according to the download_time.\nIf there is more than one dataset and version in the time range, the first one will be chosen.')
         print('If you wanna choose the dataset and version by yourself, please set the dataset_name and version_name together.')
-        ymdh_in_which_dataset_and_version(download_time)
         dataset_name, version_name = direct_choose_dataset_and_version(download_time)
     elif dataset_name is None and version_name is not None:
         print('Please ensure the dataset_name is not None')
         print('If you do not add the dataset_name, both the dataset and version will be chosen according to the download_time.')
-        ymdh_in_which_dataset_and_version(download_time)
         dataset_name, version_name = direct_choose_dataset_and_version(download_time)
     elif dataset_name is not None and version_name is None:
         print('Please ensure the version_name is not None')
         print('If you do not add the version_name, both the dataset and version will be chosen according to the download_time.')
-        ymdh_in_which_dataset_and_version(download_time)
         dataset_name, version_name = direct_choose_dataset_and_version(download_time)
     else:
         print('The dataset_name and version_name are both set by yourself.')
@@ -715,6 +722,8 @@ def get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max
 def direct_download_single_time(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, download_time='2024083100', depth=None, level_num=None, store_path=None, dataset_name=None, version_name=None, check=False):
     download_time = str(download_time)
     dataset_name, version_name = check_dataset_version_single_time(dataset_name, version_name, download_time)
+    if dataset_name is None and version_name is None:
+        return
 
     if store_path is None:
         store_path = str(Path.cwd())
@@ -756,20 +765,20 @@ def direct_download_single_time(var, lon_min=0, lon_max=359.92, lat_min=-80, lat
 
 def check_dataset_version_whold_day(dataset_name, version_name, download_time):
     download_time = str(download_time)
+    have_data = ymd_in_which_dataset_and_version(download_time)
+    if not have_data:
+        return None, None
     if dataset_name is None and version_name is None:
         print('The dataset_name and version_name are None, so the dataset and version will be chosen according to the download_time.\nIf there is more than one dataset and version in the time range, the first one will be chosen.')
         print('If you wanna choose the dataset and version by yourself, please set the dataset_name and version_name together.')
-        ymd_in_which_dataset_and_version(download_time)
         dataset_name, version_name = direct_choose_dataset_and_version_whole_day(download_time)
     elif dataset_name is None and version_name is not None:
         print('Please ensure the dataset_name is not None')
         print('If you do not add the dataset_name, both the dataset and version will be chosen according to the download_time.')
-        ymd_in_which_dataset_and_version(download_time)
         dataset_name, version_name = direct_choose_dataset_and_version_whole_day(download_time)
     elif dataset_name is not None and version_name is None:
         print('Please ensure the version_name is not None')
         print('If you do not add the version_name, both the dataset and version will be chosen according to the download_time.')
-        ymd_in_which_dataset_and_version(download_time)
         dataset_name, version_name = direct_choose_dataset_and_version_whole_day(download_time)
     else:
         print('The dataset_name and version_name are both set by yourself.')
@@ -780,6 +789,8 @@ def check_dataset_version_whold_day(dataset_name, version_name, download_time):
 def direct_download_whole_day(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, download_time='20240831', depth=None, level_num=None, store_path=None, dataset_name=None, version_name=None, check=False):
     download_time = str(download_time)[:8]+'00'
     dataset_name, version_name = check_dataset_version_whold_day(dataset_name, version_name, download_time[:8])
+    if dataset_name is None and version_name is None:
+        return
 
     if store_path is None:
         store_path = str(Path.cwd())

oafuncs/oa_tool/email.py

@@ -4,8 +4,8 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-11-21 09:47:41
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-11-21 10:18:08
-FilePath: \\Python\\My_Funcs\\OAFuncs\\OAFuncs\\oa_tool\\email.py
+LastEditTime: 2024-11-29 20:54:43
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_tool\\email.py
 Description:  
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
@@ -88,7 +88,7 @@ def _send_message(title, content, msg_to):
     print('发送内容为：\n{}\n\n'.format(content))
 
 
-def send(title='Title', content='Content', send_to='16031215@qq.com'):
+def send(title='Title', content=None, send_to='16031215@qq.com'):
     '''
     Description: 发送邮件
 
@@ -103,7 +103,11 @@ def send(title='Title', content='Content', send_to='16031215@qq.com'):
     Example:
         send(title='Title', content='Content', '123@qq.com')
     '''
-    _send_message(title, content, send_to)
+    if content is None:
+        # 避免发送空邮件，或有人误调用
+        return
+    else:
+        _send_message(title, content, send_to)
 
 
 if __name__ == "__main__":

{oafuncs-0.0.65.dist-info → oafuncs-0.0.66.dist-info}/METADATA

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

{oafuncs-0.0.65.dist-info → oafuncs-0.0.66.dist-info}/RECORD

@@ -7,7 +7,7 @@ oafuncs/oa_help.py,sha256=ppNktmtNzs15R20MD1bM7yImlTQ_ngMwvoIglePOKXA,1000
 oafuncs/oa_nc.py,sha256=ALAYfqDy5lbUNJsTU29j6ZWkM4wgqQU3p2Fxn5pkvsQ,12102
 oafuncs/oa_python.py,sha256=XPTP3o7zTFzfJR_YhsKfQksa3bSYwXsne9YxlJplCEA,3994
 oafuncs/oa_down/__init__.py,sha256=a6rgxHQi8spvlI-TaVEqnrDNhYsKm5_IQf7ckAZ8U4w,603
-oafuncs/oa_down/hycom_3hourly.py,sha256=MU1QEVrINKXdFLlZf1RDjPO97HMKym8JvxYnyDphslA,65626
+oafuncs/oa_down/hycom_3hourly.py,sha256=AmU3F2-L1L5bKRG8sV3FbLOFTw6ePvmXhu51h60BKKo,65906
 oafuncs/oa_down/hycom_3hourly_wholeday.py,sha256=bEl-hdSPJqN_9IaJIF-la0jEPw-sbCaKnciPirsWgP8,62598
 oafuncs/oa_down/literature.py,sha256=dT3-7-beEzQ9mTP8LNV9Gf3q5Z1Pqqjc6FOS010HZeQ,17833
 oafuncs/oa_down/refs_pdf.py,sha256=wr1sIYO2FUBJTn-K79NylbRUvCAFaee6_fQljxSI_Q8,17979
@@ -16,9 +16,9 @@ oafuncs/oa_sign/meteorological.py,sha256=mLbupsZSq427HTfVbZMvIlFzDHwSzQAbK3X19o8
 oafuncs/oa_sign/ocean.py,sha256=xrW-rWD7xBWsB5PuCyEwQ1Q_RDKq2KCLz-LOONHgldU,5932
 oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
 oafuncs/oa_tool/__init__.py,sha256=IKOlqpWlb4cMDCtq2VKR_RTxQHDNqR_vfqqsOsp_lKQ,466
-oafuncs/oa_tool/email.py,sha256=7EX3VkD8TxYAKPLOuC_yS104p9zbKilZlGfkVa2C6BQ,2947
-oafuncs-0.0.65.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.65.dist-info/METADATA,sha256=H-VYmc1lwVJwwY1Z3RYL-48Ei0jOLZSJLTVxU_1J_N4,22378
-oafuncs-0.0.65.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-oafuncs-0.0.65.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.65.dist-info/RECORD,,
+oafuncs/oa_tool/email.py,sha256=4lJxV_KUzhxgLYfVwYTqp0qxRugD7fvsZkXDe5WkUKo,3052
+oafuncs-0.0.66.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.66.dist-info/METADATA,sha256=n3T2-LjyuhY966ZAVTKOFuCHuKoVFu9RoPyk6YO9E6g,22378
+oafuncs-0.0.66.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+oafuncs-0.0.66.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.66.dist-info/RECORD,,