oafuncs 0.0.98.4__tar.gz → 0.0.98.5__tar.gz

{oafuncs-0.0.98.4/oafuncs.egg-info → oafuncs-0.0.98.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.4
+Version: 0.0.98.5
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

oafuncs-0.0.98.4/oafuncs/oa_down/hycom_3hourly_20250416.py → oafuncs-0.0.98.5/oafuncs/oa_down/hycom_3hourly.py

@@ -2,9 +2,9 @@
 # coding=utf-8
 """
 Author: Liu Kun && 16031215@qq.com
-Date: 2025-04-16 11:36:15
+Date: 2025-04-07 10:51:09
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-04-16 11:36:16
+LastEditTime: 2025-04-07 10:51:09
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\hycom_3hourly copy.py
 Description:
 EditPlatform: vscode
@@ -13,9 +13,9 @@ SystemInfo: Windows 11
 Python Version: 3.12
 """
 
-
-
+import asyncio
 import datetime
+import logging
 import os
 import random
 import re
@@ -25,11 +25,11 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
 from pathlib import Path
 from threading import Lock
 
+import httpx
 import matplotlib.pyplot as plt
 import netCDF4 as nc
 import numpy as np
 import pandas as pd
-import requests
 import xarray as xr
 from rich import print
 from rich.progress import Progress
@@ -40,6 +40,9 @@ from oafuncs.oa_file import file_size
 from oafuncs.oa_nc import check as check_nc
 from oafuncs.oa_nc import modify as modify_nc
 
+logging.getLogger("httpx").setLevel(logging.WARNING)  # 关闭 httpx 的 INFO 日志，只显示 WARNING 及以上
+
+
 warnings.filterwarnings("ignore", category=RuntimeWarning, message="Engine '.*' loading failed:.*")
 
 __all__ = ["draw_time_range", "download"]
@@ -416,13 +419,13 @@ def _check_time_in_dataset_and_version(time_input, time_end=None):
                     trange_list.append(f"{time_s}-{time_e}")
                     have_data = True
 
-    # 输出结果
-    if match_time is None:
-        print(f"[bold red]{time_input_str} is in the following dataset and version:")
     if have_data:
         if match_time is None:
+            print(f"[bold red]Time {time_input_str} included in:")
+            dv_num = 1
             for d, v, trange in zip(d_list, v_list, trange_list):
-                print(f"[bold blue]{d} {v} {trange}")
+                print(f"{dv_num} -> [bold blue]{d} - {v} : {trange}")
+                dv_num += 1
         if is_single_time:
             return True
         else:
@@ -434,7 +437,7 @@ def _check_time_in_dataset_and_version(time_input, time_end=None):
                 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")
+        print(f"[bold red]Time {time_input_str} has no data")
         return False
 
 
@@ -509,7 +512,8 @@ def _direct_choose_dataset_and_version(time_input, time_end=None):
 
     if dataset_name_out is not None and version_name_out is not None:
         if match_time is None:
-            print(f"[bold purple]dataset: {dataset_name_out}, version: {version_name_out} is chosen")
+            # print(f"[bold purple]dataset: {dataset_name_out}, version: {version_name_out} is chosen")
+            print(f"[bold purple]Chosen dataset: {dataset_name_out} - {version_name_out}")
 
     # 如果没有找到匹配的数据集和版本，会返回 None
     return dataset_name_out, version_name_out
@@ -664,117 +668,122 @@ def _correct_time(nc_file):
     modify_nc(nc_file, "time", None, time_difference)
 
 
+class _HycomDownloader:
+    def __init__(self, tasks, delay_range=(3, 6), timeout_factor=120, max_var_count=5, max_retries=3):
+        """
+        :param tasks: List of (url, save_path)
+        """
+        self.tasks = tasks
+        self.delay_range = delay_range
+        self.timeout_factor = timeout_factor
+        self.max_var_count = max_var_count
+        self.max_retries = max_retries
+        self.count = {"success": 0, "fail": 0}
+
+    def user_agent(self):
+        return get_ua()
+
+    async def _download_one(self, url, save_path):
+        file_name = os.path.basename(save_path)
+        headers = {"User-Agent": self.user_agent()}
+        var_count = min(max(url.count("var="), 1), self.max_var_count)
+        timeout_max = self.timeout_factor * var_count
+        timeout = random.randint(timeout_max // 2, timeout_max)
+
+        retry = 0
+        while retry <= self.max_retries:
+            try:
+                await asyncio.sleep(random.uniform(*self.delay_range))
+                start = datetime.datetime.now()
+                async with httpx.AsyncClient(
+                    timeout=httpx.Timeout(timeout),
+                    limits=httpx.Limits(max_connections=2, max_keepalive_connections=2),
+                    transport=httpx.AsyncHTTPTransport(retries=2),
+                ) as client:
+                    print(f"[bold #f0f6d0]Requesting {file_name} (Attempt {retry + 1}) ...")
+                    response = await client.get(url, headers=headers, follow_redirects=True)
+                    response.raise_for_status()
+                    if not response.content:
+                        raise ValueError("Empty response received")
+
+                    print(f"[bold #96cbd7]Downloading {file_name} ...")
+                    with open(save_path, "wb") as f:
+                        async for chunk in response.aiter_bytes(32 * 1024):
+                            f.write(chunk)
+
+                    elapsed = datetime.datetime.now() - start
+                    print(f"[#3dfc40]File [bold #dfff73]{file_name} [#3dfc40]downloaded, Time: [#39cbdd]{elapsed}")
+                    self.count["success"] += 1
+                    count_dict["success"] += 1
+                    return
+
+            except Exception as e:
+                print(f"[bold red]Failed ({type(e).__name__}): {e}")
+                if retry < self.max_retries:
+                    backoff = 2**retry
+                    print(f"[yellow]Retrying in {backoff:.1f}s ...")
+                    await asyncio.sleep(backoff)
+                    retry += 1
+                else:
+                    print(f"[red]Giving up on {file_name}")
+                    self.count["fail"] += 1
+                    count_dict["fail"] += 1
+                    return
+
+    async def run(self):
+        print(f"📥 Starting download of {len(self.tasks)} files ...")
+        for url, save_path in self.tasks:
+            await self._download_one(url, save_path)
+
+        print("\n✅ All tasks completed.")
+        print(f"✔️  Success: {self.count['success']} | ❌ Fail: {self.count['fail']}")
+
+
 def _download_file(target_url, store_path, file_name, cover=False):
-    fname = Path(store_path) / file_name
+    save_path = Path(store_path) / file_name
     file_name_split = file_name.split("_")
     file_name_split = file_name_split[:-1]
     same_file = "_".join(file_name_split) + "*nc"
 
     if match_time is not None:
-        if check_nc(fname, print_messages=False):
-            if not _check_ftime(fname, if_print=True):
+        if check_nc(save_path, print_messages=False):
+            if not _check_ftime(save_path, if_print=True):
                 if match_time:
-                    _correct_time(fname)
+                    _correct_time(save_path)
                     count_dict["skip"] += 1
                 else:
-                    _clear_existing_file(fname)
+                    _clear_existing_file(save_path)
                     count_dict["no_data"] += 1
             else:
                 count_dict["skip"] += 1
                 print(f"[bold green]{file_name} is correct")
         return
 
-    if not cover and os.path.exists(fname):
-        print(f"[bold #FFA54F]{fname} exists, skipping ...")
+    if not cover and os.path.exists(save_path):
+        print(f"[bold #FFA54F]{save_path} exists, skipping ...")
         count_dict["skip"] += 1
         return
 
     if same_file not in fsize_dict.keys():
-        check_nc(fname, delete_if_invalid=True, print_messages=False)
+        check_nc(save_path, delete_if_invalid=True, print_messages=False)
 
-    get_mean_size = _get_mean_size_move(same_file, fname)
+    get_mean_size = _get_mean_size_move(same_file, save_path)
 
-    if _check_existing_file(fname, get_mean_size):
+    if _check_existing_file(save_path, get_mean_size):
         count_dict["skip"] += 1
         return
 
-    _clear_existing_file(fname)
+    _clear_existing_file(save_path)
 
     if not use_idm:
-        print(f"[bold #f0f6d0]Requesting {file_name} ...")
-        s = requests.Session()
-        download_success = False
-        request_times = 0
-
-        def calculate_wait_time(time_str, target_url):
-            time_pattern = r"\d{10}"
-            times_in_str = re.findall(time_pattern, time_str)
-            num_times_str = len(times_in_str)
-
-            if num_times_str > 1:
-                delta_t = datetime.datetime.strptime(times_in_str[1], "%Y%m%d%H") - datetime.datetime.strptime(times_in_str[0], "%Y%m%d%H")
-                delta_t = delta_t.total_seconds() / 3600
-                delta_t = delta_t / 3 + 1
-            else:
-                delta_t = 1
-            num_var = int(target_url.count("var="))
-            if num_var <= 0:
-                num_var = 1
-            return int(delta_t * 5 * 60 * num_var)
-
-        max_timeout = calculate_wait_time(file_name, target_url)
-        print(f"[bold #912dbc]Max timeout: {max_timeout} seconds")
-
-        download_time_s = datetime.datetime.now()
-        order_list = ["1st", "2nd", "3rd", "4th", "5th", "6th", "7th", "8th", "9th", "10th"]
-        while not download_success:
-            if request_times >= 10:
-                print(f"[bold #ffe5c0]Download failed after {request_times} times\nYou can skip it and try again later")
-                count_dict["fail"] += 1
-                break
-            if request_times > 0:
-                print(f"[bold #ffe5c0]Retrying the {order_list[request_times - 1]} time...")
-            try:
-                referer_center = target_url.split("?")[0].split("ncss/")[-1]
-                headers = {
-                    "User-Agent": get_ua(),  # 后面几项可以不加，依旧能下载
-                    "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
-                    "Accept-Encoding": "gzip, deflate, br, zstd",
-                    "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
-                    "Referer": rf"https://ncss.hycom.org/thredds/ncss/grid/{referer_center}/dataset.html",
-                }
-                response = s.get(target_url, headers=headers, stream=True, timeout=random.randint(5, max_timeout))
-                response.raise_for_status()
-                with open(fname, "wb") as f:
-                    print(f"[bold #96cbd7]Downloading {file_name} ...")
-                    for chunk in response.iter_content(chunk_size=1024):
-                        if chunk:
-                            f.write(chunk)
-
-                f.close()
-
-                if os.path.exists(fname):
-                    download_success = True
-                    download_time_e = datetime.datetime.now()
-                    download_delta = download_time_e - download_time_s
-                    print(f"[#3dfc40]File [bold #dfff73]{fname} [#3dfc40]has been downloaded successfully, Time: [#39cbdd]{download_delta}")
-                    count_dict["success"] += 1
-
-            except requests.exceptions.HTTPError as errh:
-                print(f"Http Error: {errh}")
-            except requests.exceptions.ConnectionError as errc:
-                print(f"Error Connecting: {errc}")
-            except requests.exceptions.Timeout as errt:
-                print(f"Timeout Error: {errt}")
-            except requests.exceptions.RequestException as err:
-                print(f"OOps: Something Else: {err}")
-
-            time.sleep(3)
-            request_times += 1
+        python_downloader = _HycomDownloader([(target_url, save_path)])
+        asyncio.run(python_downloader.run())
+        time.sleep(3 + random.uniform(0, 10))
     else:
         idm_downloader(target_url, store_path, file_name, given_idm_engine)
-        idm_download_list.append(fname)
-        print(f"[bold #3dfc40]File [bold #dfff73]{fname} [#3dfc40]has been submit to IDM for downloading")
+        idm_download_list.append(save_path)
+        # print(f"[bold #3dfc40]File [bold #dfff73]{save_path} [#3dfc40]has been submit to IDM for downloading")
+        time.sleep(3 + random.uniform(0, 10))
 
 
 def _check_hour_is_valid(ymdh_str):
@@ -1167,20 +1176,20 @@ if __name__ == "__main__":
 
     options = {
         "variables": var_list,
-        "start_time": "2025010300",
-        "end_time": "2025010309",
-        "output_dir": r"I:\Data\HYCOM\3hourly_test",
+        "start_time": "2018010100",
+        "end_time": "2019063000",
+        "output_dir": r"G:\Data\HYCOM\china_sea\hourly_24",
         "lon_min": 105,
-        "lon_max": 130,
-        "lat_min": 15,
+        "lon_max": 135,
+        "lat_min": 10,
         "lat_max": 45,
         "workers": 1,
         "overwrite": False,
         "depth": None,
         "level": None,
-        "validate_time": True,
-        "idm_path": r"D:\Programs\Internet Download Manager\IDMan.exe",
-        "interval_hours": 3,
+        "validate_time": None,
+        # "idm_path": r"D:\Programs\Internet Download Manager\IDMan.exe",
+        "interval_hours": 24,
     }
 
     if single_var:

{oafuncs-0.0.98.4 → oafuncs-0.0.98.5/oafuncs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.4
+Version: 0.0.98.5
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

{oafuncs-0.0.98.4 → oafuncs-0.0.98.5}/oafuncs.egg-info/SOURCES.txt

@@ -31,8 +31,6 @@ oafuncs/_script/replace_file_content.py
 oafuncs/oa_down/User_Agent-list.txt
 oafuncs/oa_down/__init__.py
 oafuncs/oa_down/hycom_3hourly.py
-oafuncs/oa_down/hycom_3hourly_20250407.py
-oafuncs/oa_down/hycom_3hourly_20250416.py
 oafuncs/oa_down/idm.py
 oafuncs/oa_down/literature.py
 oafuncs/oa_down/test_ua.py

{oafuncs-0.0.98.4 → oafuncs-0.0.98.5}/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"  # 2025/03/13
-VERSION = "0.0.98.4"
+VERSION = "0.0.98.5"
 
 # What packages are required for this module to be executed?
 REQUIRED = [