oafuncs 0.0.98.4__py3-none-any.whl → 0.0.98.5__py3-none-any.whl

oafuncs/oa_down/hycom_3hourly.py

@@ -13,7 +13,9 @@ SystemInfo: Windows 11
 Python Version: 3.12
 """
 
+import asyncio
 import datetime
+import logging
 import os
 import random
 import re
@@ -23,13 +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
-from requests.adapters import HTTPAdapter
-import httpx
 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,11 +419,9 @@ 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"{dv_num} -> [bold blue]{d} - {v} : {trange}")
@@ -436,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
 
 
@@ -511,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
@@ -666,140 +668,122 @@ def _correct_time(nc_file):
     modify_nc(nc_file, "time", None, time_difference)
 
 
-def _download_within_python_requests(file_name, target_url, fname):
-    print(f"[bold #f0f6d0]Requesting {file_name} ...")
-
-    # Session configuration
-    session = requests.Session()
-    adapter = HTTPAdapter(pool_connections=10, pool_maxsize=10, max_retries=0)
-    session.mount("http://", adapter)
-    session.mount("https://", adapter)
-
-    # Timeout and retry config
-    num_var = max(target_url.count("var="), 1)
-    max_timeout = 5 * 30 * num_var
-    order_terms = ["1st", "2nd", "3rd"]
-    download_start = datetime.datetime.now()
-    max_attempts = 5
-
-    for attempt in range(max_attempts):
-        if attempt > 0:
-            retry_desc = order_terms[attempt - 1] if attempt - 1 < len(order_terms) else f"{attempt}th"
-            print(f"[bold #ffe5c0]Retrying the {retry_desc} time...")
-            time.sleep(2 + random.uniform(0, 2))
-
-        timeout = random.randint(max_timeout // 5, max_timeout)
-        print(f"[bold #ffe5c0]Timeout: {timeout} seconds")
-
-        try:
-            headers = {"User-Agent": get_ua()}
-            with session.get(target_url, headers=headers, stream=True, timeout=timeout) as response:
-                response.raise_for_status()
-                print(f"[bold #96cbd7]Downloading {file_name} ...")
-                with open(fname, "wb") as f:
-                    for chunk in response.iter_content(chunk_size=32 * 1024):
-                        if chunk:
+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() - download_start
-            print(f"[#3dfc40]File [bold #dfff73]{fname} [#3dfc40]has been downloaded successfully, Time: [#39cbdd]{elapsed}")
-            count_dict["success"] += 1
-            return
-        except Exception as e:
-            if hasattr(e, "response") and getattr(e.response, "status_code", None):
-                err_msg = f"HTTP {e.response.status_code} Error"
-            elif isinstance(e, requests.exceptions.Timeout):
-                err_msg = "Timeout Error"
-            elif isinstance(e, requests.exceptions.ConnectionError):
-                err_msg = "Connection Error"
-            elif isinstance(e, requests.exceptions.RequestException):
-                err_msg = "Request Error"
-            else:
-                err_msg = "Unexpected Error"
-            print(f"[bold red]Download failed for {file_name}: {err_msg}. Details: {e}")
-
-    print(f"[bold #ffe5c0]Download failed after {max_attempts} attempts. Target URL: \n{target_url}")
-    count_dict["fail"] += 1
-
 
+                    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
 
-def _download_within_python(file_name, target_url, fname):
-    print(f"[bold #f0f6d0]Requesting {file_name} ...")
-
-    # 创建 httpx 同步客户端
-    limits = httpx.Limits(max_connections=10, max_keepalive_connections=10)
-    transport = httpx.HTTPTransport(retries=3)
-    client = httpx.Client(limits=limits, transport=transport, timeout=None)
-
-    num_var = max(target_url.count("var="), 1)
-    max_timeout = 5 * 30 * num_var
-    timeout = random.randint(max_timeout // 2, max_timeout)
-    download_start = datetime.datetime.now()
-
-    print(f"[bold #ffe5c0]Timeout: {timeout} seconds")
-    headers = {"User-Agent": get_ua()}
+    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)
 
-    try:
-        response = client.get(target_url, headers=headers, timeout=timeout, follow_redirects=True)
-        response.raise_for_status()
-        print(f"[bold #96cbd7]Downloading {file_name} ...")
-        with open(fname, "wb") as f:
-            for chunk in response.iter_bytes(32 * 1024):
-                if chunk:
-                    f.write(chunk)
-        elapsed = datetime.datetime.now() - download_start
-        print(f"[#3dfc40]File [bold #dfff73]{fname} [#3dfc40]has been downloaded successfully, Time: [#39cbdd]{elapsed}")
-        count_dict["success"] += 1
-    except Exception as e:
-        err_type = type(e).__name__
-        print(f"[bold red]Download failed for {file_name} ...\n{err_type}. Details: {e}")
-        print(f"[bold #ffe5c0]Target URL: \n{target_url}")
-        count_dict["fail"] += 1
-    finally:
-        client.close()
+        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:
-        _download_within_python(file_name, target_url, fname)
+        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):
@@ -1193,7 +1177,7 @@ if __name__ == "__main__":
     options = {
         "variables": var_list,
         "start_time": "2018010100",
-        "end_time": "2021010100",
+        "end_time": "2019063000",
         "output_dir": r"G:\Data\HYCOM\china_sea\hourly_24",
         "lon_min": 105,
         "lon_max": 135,

{oafuncs-0.0.98.4.dist-info → oafuncs-0.0.98.5.dist-info}/METADATA

@@ -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.dist-info → oafuncs-0.0.98.5.dist-info}/RECORD

@@ -21,9 +21,7 @@ oafuncs/_script/plot_dataset.py,sha256=zkSEnO_-biyagorwWXPoihts_cwuvripzEt-l9bHJ
 oafuncs/_script/replace_file_content.py,sha256=eCFZjnZcwyRvy6b4mmIfBna-kylSZTyJRfgXd6DdCjk,5982
 oafuncs/oa_down/User_Agent-list.txt,sha256=pHaMlElMvZ8TG4vf4BqkZYKqe0JIGkr4kCN0lM1Y9FQ,514295
 oafuncs/oa_down/__init__.py,sha256=kRX5eTUCbAiz3zTaQM1501paOYS_3fizDN4Pa0mtNUA,585
-oafuncs/oa_down/hycom_3hourly.py,sha256=heG4L_eyPsc8pgUASCXYYJEdPGAY7rtRWQsiy-qrSxE,54202
-oafuncs/oa_down/hycom_3hourly_20250407.py,sha256=DQd_NmQgmSqu7jsrfpDB7k23mkUEy9kyWs-dLUg7GDw,64472
-oafuncs/oa_down/hycom_3hourly_20250416.py,sha256=X_fcV_xeJtYD-PB3GRdFWNHMPOVUYgh17MgWOtrdIbc,53493
+oafuncs/oa_down/hycom_3hourly.py,sha256=ERH24OOT62IiOSk5IiSnqad_c13zL7-uD5lAMdbJDiQ,53576
 oafuncs/oa_down/idm.py,sha256=4z5IvgfTyIKEI1kOtqXZwN7Jnfjwp6qDBOIoVyOLp0I,1823
 oafuncs/oa_down/literature.py,sha256=2bF9gSKQbzcci9LcKE81j8JEjIJwON7jbwQB3gDDA3E,11331
 oafuncs/oa_down/test_ua.py,sha256=l8MCD6yU2W75zRPTDKUZTJhCWNF9lfk-MiSFqAqKH1M,1398
@@ -37,8 +35,8 @@ oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,5
 oafuncs/oa_sign/meteorological.py,sha256=8091SHo2L8kl4dCFmmSH5NGVHDku5i5lSiLEG5DLnOQ,6489
 oafuncs/oa_sign/ocean.py,sha256=xrW-rWD7xBWsB5PuCyEwQ1Q_RDKq2KCLz-LOONHgldU,5932
 oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
-oafuncs-0.0.98.4.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.4.dist-info/METADATA,sha256=VWSW69LEhmMu9FHH_e0WcNT-YXme3mdxlNvMedU48tY,4242
-oafuncs-0.0.98.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-oafuncs-0.0.98.4.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.4.dist-info/RECORD,,
+oafuncs-0.0.98.5.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.98.5.dist-info/METADATA,sha256=YwSyTAse2NhMIfM_22BNOJCDLh8Mgy3X_G5zvtCKyPc,4242
+oafuncs-0.0.98.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+oafuncs-0.0.98.5.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.98.5.dist-info/RECORD,,