oafuncs 0.0.67__py2.py3-none-any.whl → 0.0.69__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-30 16:06:37
+LastEditTime: 2024-11-30 20:24:34
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\hycom_3hourly.py
 Description:
 EditPlatform: vscode
@@ -483,7 +483,7 @@ def check_existing_file(file_full_path):
         print(f'[bold #FFA54F]{file_full_path} exists')
         return True
     else:
-        print(f'{file_full_path} does not exist')
+        # print(f'{file_full_path} does not exist')
         return False
 
 
@@ -579,7 +579,7 @@ def get_proxy():
 
 
 def dlownload_file(target_url, store_path, file_name, check=False):
-    print(f'[bold red]Downloading {file_name}...')
+    print(f'[bold #96cbd7]Downloading {file_name}...')
     # 创建会话
     s = requests.Session()
     download_success = False
@@ -590,10 +590,16 @@ def dlownload_file(target_url, store_path, file_name, check=False):
         if check_existing_file(filename):
             return
     clear_existing_file(filename)
-    print(f'Download_start_time: {datetime.datetime.now()}')
+    # print(f'Download_start_time: {datetime.datetime.now()}')
+    download_time_s = datetime.datetime.now()
     while not download_success:
+        if request_times >= 10:
+            # print(f'下载失败，已重试 {request_times} 次\n可先跳过，后续再试')
+            print(f'[bold #ffe5c0]Download failed after {request_times} times\nYou can skip it and try again later')
+            break
         if request_times > 0:
-            print(f'\r正在重试第 {request_times} 次', end="")
+            # print(f'\r正在重试第 {request_times} 次', end="")
+            print(f'[bold #ffe5c0]Retrying the {request_times} time...')
         # 尝试下载文件
         try:
             headers = {'User-Agent': get_ua()}
@@ -604,10 +610,12 @@ def dlownload_file(target_url, store_path, file_name, check=False):
             with open(filename, 'wb') as f:
                 f.write(response.content)
             # print(f'\r文件 {filename} 下载成功', end="")
-            # query_ncfile_time(filename) # 这个函数在linux上目前会出问题
             if os.path.exists(filename):
                 download_success = True
-                print(f'[bold green]文件 {filename} 下载成功')
+                download_time_e = datetime.datetime.now()
+                download_delta = download_time_e - download_time_s
+                print(f'[#65b168]File [bold #dfff73]{filename} [#65b168]has been downloaded successfully, Time: [#39cbdd]{download_delta}')
+                # print(f'Download_end_time: {datetime.datetime.now()}')
 
         except requests.exceptions.HTTPError as errh:
             print(f"Http Error: {errh}")
@@ -620,7 +628,6 @@ def dlownload_file(target_url, store_path, file_name, check=False):
 
         time.sleep(3)
         request_times += 1
-    print(f'Download_end_time: {datetime.datetime.now()}')
 
 
 def check_hour_is_valid(ymdh_str):
@@ -640,19 +647,6 @@ def check_dataset_version(dataset_name, version_name, download_time, download_ti
         else:
             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.')
-    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.')
-    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.')
-    else:
-        print('The dataset_name and version_name are both set by yourself.')
-
     # 确保下载时间是一个字符串
     download_time_str = str(download_time)
 
@@ -686,7 +680,7 @@ def get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max
         print('Progress will use the depth')
         which_mode = 'depth'
     elif depth is not None and level_num is None:
-        print(f'Data of single depth ({depth}m) will be downloaded...')
+        print(f'Data of single depth (~{depth} m) will be downloaded...')
         which_mode = 'depth'
     elif level_num is not None and depth is None:
         print(f'Data of single level ({level_num}) will be downloaded...')
@@ -701,6 +695,7 @@ def get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max
 
 
 def direct_download_single_hour(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):
+    print('[bold #ecdbfe]-'*150)
     download_time = str(download_time)
     dataset_name, version_name = check_dataset_version(dataset_name, version_name, download_time)
     if dataset_name is None and version_name is None:
@@ -745,6 +740,7 @@ def direct_download_single_hour(var, lon_min=0, lon_max=359.92, lat_min=-80, lat
 
 
 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):
+    print('[bold #ecdbfe]-'*150)
     download_time = str(download_time)[:8]+'00'
     dataset_name, version_name = check_dataset_version(dataset_name, version_name, download_time, str(download_time)[:8]+'21')
     if dataset_name is None and version_name is None:
@@ -885,9 +881,9 @@ def download_single_hour(var, time_s, time_e=None, lon_min=0, lon_max=359.92, la
             task = progress.add_task("[cyan]Downloading...", total=len(time_list))
             if num_workers is None or num_workers <= 1:
                 # 串行方式
-                for time_str in time_list:
+                for i, time_str in enumerate(time_list):
                     direct_download_single_hour(var, lon_min, lon_max, lat_min, lat_max, time_str, depth, level, store_path, dataset_name, version_name, check)
-                    progress.update(task, advance=1)
+                    progress.update(task, advance=1, description=f'[cyan]Downloading... {i+1}/{len(time_list)}')
             else:
                 # 并行方式
                 if num_workers > 10:
@@ -896,8 +892,8 @@ def download_single_hour(var, time_s, time_e=None, lon_min=0, lon_max=359.92, la
                     num_workers = 10
                 with ThreadPoolExecutor(max_workers=num_workers) as executor:
                     futures = [executor.submit(download_task, var, time_str, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, check) for time_str in time_list]
-                    for future in futures:
-                        future.add_done_callback(lambda _: progress.update(task, advance=1))
+                    for i, future in enumerate(futures):
+                        future.add_done_callback(lambda _: progress.update(task, advance=1, description=f'[cyan]Downloading... {i+1}/{len(time_list)}'))
     else:
         print('Please ensure the time_s is less than the time_e')
 
@@ -956,9 +952,9 @@ def download_whole_day(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_
             task = progress.add_task("[cyan]Downloading...", total=len(time_list))
             if num_workers is None or num_workers <= 1:
                 # 串行方式
-                for time_str in time_list:
+                for i, time_str in enumerate(time_list):
                     direct_download_whole_day(var, lon_min, lon_max, lat_min, lat_max, time_str, depth, level, store_path, dataset_name, version_name, check)
-                    progress.update(task, advance=1)
+                    progress.update(task, advance=1, description=f'[cyan]Downloading... {i+1}/{len(time_list)}')
             else:
                 # 并行方式
                 if num_workers > 10:
@@ -967,8 +963,8 @@ def download_whole_day(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_
                     num_workers = 10
                 with ThreadPoolExecutor(max_workers=num_workers) as executor:
                     futures = [executor.submit(download_task, var, time_str, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, check) for time_str in time_list]
-                    for future in futures:
-                        future.add_done_callback(lambda _: progress.update(task, advance=1))
+                    for i, future in enumerate(futures):
+                        future.add_done_callback(lambda _: progress.update(task, advance=1, description=f'[cyan]Downloading... {i+1}/{len(time_list)}'))
     else:
         print('Please ensure the time_s is less than the time_e')
 
@@ -996,6 +992,20 @@ def download(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, l
     Returns:
     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.')
+    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.')
+    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.')
+    else:
+        print('The dataset_name and version_name are both set by yourself.')
+        print('Please ensure the dataset_name and version_name are correct.')
+
     if resolution == 'hour':
         download_single_hour(var, time_s, time_e, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, num_workers, check)
     elif resolution == 'day':
@@ -1117,6 +1127,7 @@ if __name__ == '__main__':
                     fname = 'surf_el'
                 for time_str in time_list:
                     file_list.append(Path(root_path)/f'HYCOM_{fname}_{time_str}.nc')
+                merge_path_name = Path(root_path)/f'HYCOM_{fname}_{merge_name}.nc'
             if combine_switch:
                 merge5nc(file_list, var_name, 'time', merge_path_name)
             if copy_switch:

oafuncs/oa_down/refs_pdf.py

@@ -4,7 +4,7 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-11-09 13:58:28
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-11-21 13:18:18
+LastEditTime: 2024-11-30 20:29:51
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\refs_pdf.py
 Description:  
 EditPlatform: vscode
@@ -306,6 +306,11 @@ def download5doi(store_path=None, doi_list=None, txt_file=None, excel_file=None,
         download5doi(store_path=r'I:\Delete\ref_pdf', excel_file=r'I:\Delete\ref_pdf\wrong_record.xlsx', col_name='DOI')
     '''
     print('[bold #EE33fA]Note:\n 升级0.0.62版本后，函数路径将改为oafuncs.oa_down.literature.download5doi，此路径将被弃用。')
+    print('[bold #EE33fA]Note:\n 升级0.0.62版本后，函数路径将改为oafuncs.oa_down.literature.download5doi，此路径将被弃用。')
+    print('[bold #EE33fA]Note:\n 升级0.0.62版本后，函数路径将改为oafuncs.oa_down.literature.download5doi，此路径将被弃用。')
+    print('[bold #EE33fA]Note:\n 升级0.0.62版本后，函数路径将改为oafuncs.oa_down.literature.download5doi，此路径将被弃用。')
+    print('[bold #EE33fA]Note:\n 升级0.0.62版本后，函数路径将改为oafuncs.oa_down.literature.download5doi，此路径将被弃用。')
+    print('[bold #EE33fA]Note:\n 升级0.0.62版本后，函数路径将改为oafuncs.oa_down.literature.download5doi，此路径将被弃用。')
 
     if not store_path:
         store_path = Path.cwd()

{oafuncs-0.0.67.dist-info → oafuncs-0.0.69.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oafuncs
-Version: 0.0.67
+Version: 0.0.69
 Summary: My short description for my project.
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -9,6 +9,9 @@ License: MIT
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11

{oafuncs-0.0.67.dist-info → oafuncs-0.0.69.dist-info}/RECORD

@@ -7,19 +7,17 @@ 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=KlmIhnXNICvqixPrJmHGx1mh9SjVEmO2zSzyzPm28nA,59940
-oafuncs/oa_down/hycom_3hourly_20241130.py,sha256=pXF_-e4DGnuRRkmzlFCPfLcw9Y6H22ui-VX08R38utw,65820
-oafuncs/oa_down/hycom_3hourly_wholeday.py,sha256=bEl-hdSPJqN_9IaJIF-la0jEPw-sbCaKnciPirsWgP8,62598
+oafuncs/oa_down/hycom_3hourly.py,sha256=AcSIxnM8_Gop3Jc2JWxiPGPB_i51yAdRLu38CyPy_1g,60994
 oafuncs/oa_down/literature.py,sha256=dT3-7-beEzQ9mTP8LNV9Gf3q5Z1Pqqjc6FOS010HZeQ,17833
-oafuncs/oa_down/refs_pdf.py,sha256=wr1sIYO2FUBJTn-K79NylbRUvCAFaee6_fQljxSI_Q8,17979
+oafuncs/oa_down/refs_pdf.py,sha256=lgGKO2gQ0hRjuaBYOLeBgksJB_KXYpFcXMDwMQeYVkI,18719
 oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,563
 oafuncs/oa_sign/meteorological.py,sha256=mLbupsZSq427HTfVbZMvIlFzDHwSzQAbK3X19o8anFY,6525
 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=4lJxV_KUzhxgLYfVwYTqp0qxRugD7fvsZkXDe5WkUKo,3052
-oafuncs-0.0.67.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.67.dist-info/METADATA,sha256=puWnV6dPOJTblWRv4VUAQUu9xKnKjSrwtDANjQu5t9s,22378
-oafuncs-0.0.67.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-oafuncs-0.0.67.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.67.dist-info/RECORD,,
+oafuncs-0.0.69.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.69.dist-info/METADATA,sha256=V2O9xc2_-G0H07DxFipqLP2AYO7llEY_QElndbs-ddQ,22531
+oafuncs-0.0.69.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+oafuncs-0.0.69.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.69.dist-info/RECORD,,