oafuncs 0.0.97.10__py3-none-any.whl → 0.0.97.12__py3-none-any.whl

oafuncs/_script/cprogressbar.py

@@ -0,0 +1,150 @@
+# progressbar.py
+import sys
+import shutil
+import time
+import warnings
+from typing import Iterable, Any, List, Union
+import numpy as np
+
+try:
+    from matplotlib.colors import LinearSegmentedColormap, to_rgb, to_hex
+    from matplotlib.cm import get_cmap
+except ImportError:
+    raise ImportError("This module requires matplotlib. Install with: pip install matplotlib")
+
+
+class ColorProgressBar:
+    def __init__(self, iterable: Iterable, prefix: str = "", color: Any = "cyan", cmap: Union[str, List[str]] = None, update_interval: float = 0.1, bar_length: int = None):
+        self.iterable = iterable
+        self.prefix = prefix
+        self.base_color = color
+        self.cmap = cmap
+        self.update_interval = update_interval
+        self.bar_length = bar_length
+
+        self._start_time = None
+        self._last_update = 0
+        self._count = len(iterable) if hasattr(iterable, "__len__") else None
+        self._file = sys.stdout
+        self._gradient_colors = self._generate_gradient() if cmap else None
+
+    def _generate_gradient(self) -> List[str]:
+        """生成渐变色列表（修复内置colormap支持）"""
+        try:
+            if isinstance(self.cmap, list):
+                cmap = LinearSegmentedColormap.from_list("custom_cmap", self.cmap)
+            else:
+                # 正确获取Matplotlib内置colormap
+                cmap = get_cmap(self.cmap)
+
+            return [to_hex(cmap(i)) for i in np.linspace(0, 1, self._count)]
+        except Exception as e:
+            warnings.warn(f"Colormap generation failed: {str(e)}")
+            return None
+
+    def _hex_to_ansi(self, hex_color: str) -> str:
+        """将颜色转换为ANSI真彩色代码"""
+        try:
+            rgb = [int(x * 255) for x in to_rgb(hex_color)]
+            return f"\033[38;2;{rgb[0]};{rgb[1]};{rgb[2]}m"
+        except ValueError as e:
+            warnings.warn(f"Invalid color value: {e}, falling back to cyan")
+            return "\033[96m"
+
+    def _resolve_color(self, index: int) -> str:
+        """解析当前应使用的颜色"""
+        if self._gradient_colors and index < len(self._gradient_colors):
+            try:
+                return self._hex_to_ansi(self._gradient_colors[index])
+            except IndexError:
+                pass
+
+        return self._process_color_value(self.base_color)
+
+    def _process_color_value(self, color: Any) -> str:
+        """处理颜色输入格式"""
+        preset_map = {
+            "red": "\033[91m",
+            "green": "\033[92m",
+            "yellow": "\033[93m",
+            "cyan": "\033[96m",
+        }
+
+        if color in preset_map:
+            return preset_map[color]
+
+        try:
+            hex_color = to_hex(color)
+            return self._hex_to_ansi(hex_color)
+        except (ValueError, TypeError) as e:
+            warnings.warn(f"Color parsing failed: {e}, using cyan")
+            return preset_map["cyan"]
+
+    def _format_bar(self, progress: float, width: int) -> str:
+        """格式化进度条显示"""
+        filled = "▊"
+        empty = " "
+        max_width = width - 50
+        filled_length = int(round(max_width * progress))
+        return filled * filled_length + empty * (max_width - filled_length)
+
+    def _calculate_speed(self, index: int, elapsed: float) -> tuple:
+        """计算速率和剩余时间"""
+        if index == 0 or elapsed < 1e-6:
+            return 0.0, 0.0
+
+        rate = index / elapsed
+        remaining = (self._count - index) / rate if self._count else 0
+        return rate, remaining
+
+    def __iter__(self):
+        self._start_time = time.time()
+        self._last_update = self._start_time
+        reset_code = "\033[0m"
+
+        for i, item in enumerate(self.iterable):
+            now = time.time()
+            elapsed = now - self._start_time
+            yield item
+
+            if (now - self._last_update) < self.update_interval and i + 1 != self._count:
+                continue
+
+            term_width = self.bar_length or shutil.get_terminal_size().columns
+            progress = (i + 1) / self._count if self._count else 0
+
+            current_color = self._resolve_color(i) if self._gradient_colors else self._resolve_color(0)
+
+            bar = self._format_bar(progress, term_width)
+            rate, remaining = self._calculate_speed(i + 1, elapsed)
+
+            count_info = f"{i + 1}/{self._count}" if self._count else str(i + 1)
+            percent = f"{progress:.1%}" if self._count else ""
+            rate_info = f"{rate:.1f}it/s" if rate else ""
+            time_info = f"ETA: {remaining:.1f}s" if self._count else f"Elapsed: {elapsed:.1f}s"
+
+            line = (f"\r{self.prefix}{current_color}[{bar}]{reset_code} {count_info} {percent} [{time_info} | {rate_info}]").ljust(term_width)
+
+            self._file.write(line)
+            self._file.flush()
+            self._last_update = now
+
+        self._file.write("\n")
+        self._file.flush()
+
+    @classmethod
+    def gradient_color(cls, colors: List[str], n: int) -> List[str]:
+        """生成渐变色列表"""
+        cmap = LinearSegmentedColormap.from_list("gradient", colors)
+        return [to_hex(cmap(i)) for i in np.linspace(0, 1, n)]
+
+
+# 验证示例
+if __name__ == "__main__":
+    # 正确使用内置colormap
+    for _ in ColorProgressBar(range(100), cmap="viridis", prefix="Viridis: "):
+        time.sleep(0.05)
+
+    # 使用自定义渐变色
+    for _ in ColorProgressBar(range(50), cmap=["#FF0000", "#0000FF"], prefix="Custom: "):
+        time.sleep(0.1)

oafuncs/oa_data.py

@@ -22,8 +22,9 @@ import salem
 import xarray as xr
 from scipy.interpolate import griddata
 from scipy.interpolate import interp1d
+from typing import Iterable
 
-__all__ = ["interp_along_dim", "interp_2d", "ensure_list", "mask_shapefile"]
+__all__ = ["interp_along_dim", "interp_2d", "ensure_list", "mask_shapefile", "pbar"]
 
 
 def ensure_list(input_data):
@@ -254,6 +255,26 @@ def mask_shapefile(data: np.ndarray, lons: np.ndarray, lats: np.ndarray, shapefi
         return None
 
 
+def pbar(iterable: Iterable, prefix: str = "", color: str = "cyan", cmap: str = None, **kwargs) -> Iterable:
+    """
+    快速创建进度条的封装函数
+    :param iterable: 可迭代对象
+    :param prefix: 进度条前缀
+    :param color: 基础颜色
+    :param cmap: 渐变色名称
+    :param kwargs: 其他ColorProgressBar支持的参数
+    
+    example:
+    from oafuncs.oa_data import pbar
+    from time import sleep
+    for i in pbar(range(100), prefix="Processing", color="green", cmap="viridis"):
+        sleep(0.1)
+    """
+    from ._script.cprogressbar import ColorProgressBar  # 从progressbar.py导入类
+
+    return ColorProgressBar(iterable=iterable, prefix=prefix, color=color, cmap=cmap, **kwargs)
+
+
 if __name__ == "__main__":
     pass
     """ import time

oafuncs/oa_down/hycom_3hourly.py

@@ -900,7 +900,7 @@ def _get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_ma
 
 
 def _prepare_url_to_download(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, download_time="2024083100", download_time_end=None, depth=None, level_num=None, store_path=None, dataset_name=None, version_name=None, check=False):
-    print("[bold #ecdbfe]-" * 160)
+    print("[bold #ecdbfe]-" * mark_len)
     download_time = str(download_time)
     if download_time_end is not None:
         download_time_end = str(download_time_end)
@@ -1000,7 +1000,7 @@ def _done_callback(future, progress, task, total, counter_lock):
         progress.update(task, advance=1, description=f"[cyan]Downloading... {parallel_counter}/{total}")
 
 
-def _download_hourly_func(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, depth=None, level=None, store_path=None, dataset_name=None, version_name=None, num_workers=None, check=False, ftimes=1, download_interval=3):
+def _download_hourly_func(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, depth=None, level=None, store_path=None, dataset_name=None, version_name=None, num_workers=None, check=False, ftimes=1, interval_hour=3):
     """
     Description:
     Download the data of single time or a series of time
@@ -1032,7 +1032,7 @@ def _download_hourly_func(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_mi
         _prepare_url_to_download(var, lon_min, lon_max, lat_min, lat_max, ymdh_time_s, None, depth, level, store_path, dataset_name, version_name, check)
     elif int(ymdh_time_s) < int(ymdh_time_e):
         print("Downloading a series of files...")
-        time_list = get_time_list(ymdh_time_s, ymdh_time_e, int(download_interval), "hour")
+        time_list = get_time_list(ymdh_time_s, ymdh_time_e, interval_hour, "hour")
         with Progress() as progress:
             task = progress.add_task("[cyan]Downloading...", total=len(time_list))
             if ftimes == 1:
@@ -1050,7 +1050,8 @@ def _download_hourly_func(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_mi
                         for feature in as_completed(futures):
                             _done_callback(feature, progress, task, len(time_list), counter_lock)
             else:
-                new_time_list = get_time_list(ymdh_time_s, ymdh_time_e, 3 * ftimes, "hour")
+                # new_time_list = get_time_list(ymdh_time_s, ymdh_time_e, 3 * ftimes, "hour")
+                new_time_list = get_time_list(ymdh_time_s, ymdh_time_e, interval_hour * ftimes, "hour")
                 total_num = len(new_time_list)
                 if num_workers is None or num_workers <= 1:
                     # 串行方式
@@ -1071,7 +1072,7 @@ def _download_hourly_func(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_mi
         print("[bold red]Please ensure the time_s is no more than time_e")
 
 
-def download(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, depth=None, level=None, store_path=None, dataset_name=None, version_name=None, num_workers=None, check=False, ftimes=1, idm_engine=None, fill_time=None, download_interval_hour=3):
+def download(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, depth=None, level=None, store_path=None, dataset_name=None, version_name=None, num_workers=None, check=False, ftimes=1, idm_engine=None, fill_time=None, interval_hour=3):
     """
     Description:
         Download the data of single time or a series of time
@@ -1094,7 +1095,7 @@ def download(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, l
         ftimes: int, the number of time in one file, default is 1, if set to 1, the data of single time will be downloaded; the maximum is 8, if set to 8, the data of 8 times will be downloaded in one file
         idm_engine: str, the IDM engine, default is None, if set, the IDM will be used to download the data; example: "D:\\Programs\\Internet Download Manager\\IDMan.exe"
         fill_time: bool or None, the mode to fill the time, default is None. None: only download the data; True: modify the real time of data to the time in the file name; False: check the time in the file name and the real time of data, if not match, delete the file
-        download_interval_hour: int, the interval time to download the data, default is 3, if set, the interval time will be used to download the data; example: 3, 6, ...
+        interval_hour: int, the interval time to download the data, default is 3, if set, the interval time will be used to download the data; example: 3, 6, ...
 
     Returns:
         None
@@ -1180,30 +1181,47 @@ def download(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, l
 
     global match_time
     match_time = fill_time
+    
+    global mark_len
+    mark_len = 150
 
-    _download_hourly_func(var, time_s, time_e, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, num_workers, check, ftimes, download_interval_hour)
+    _download_hourly_func(var, time_s, time_e, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, num_workers, check, ftimes, int(interval_hour))
 
     if idm_engine is not None:
+        print("[bold #ecdbfe]*" * mark_len)
+        print("[bold #3dfc40]All files have been submitted to IDM for downloading")
+        print("[bold #ecdbfe]*" * mark_len)
         if idm_download_list:
+            file_download_time = 60 # 预设下载时间为1分钟
             for f in idm_download_list:
+                file_download_start_time = time.time()
                 wait_success = 0
                 success = False
                 while not success:
                     if check_nc(f):
                         count_dict["success"] += 1
                         success = True
+                        print(f"[bold #3dfc40]File [bold #dfff73]{f} [#3dfc40]has been downloaded successfully")
+                        file_download_end_time = time.time()
+                        file_download_time = file_download_end_time - file_download_start_time
+                        file_download_time = int(file_download_time)
+                        print(f"[bold #3dfc40]Time: {file_download_time} seconds")
+                        file_download_time = max(60, file_download_time) # 预设下载时间为1分钟起步
                     else:
                         wait_success += 1
-                        time.sleep(3)
-                        if wait_success >= 20:
+                        print(f"[bold #ffe5c0]Waiting {file_download_time} seconds to check the file {f}...")
+                        time.sleep(file_download_time)
+                        if wait_success >= 10:
                             success = True
                             # print(f'{f} download failed')
+                            print(f'[bold #ffe5c0]Waiting for more than 10 times, skipping the file {f}...')
                             count_dict["fail"] += 1
+                print('[bold #ecdbfe]-' * mark_len)
 
     count_dict["total"] = count_dict["success"] + count_dict["fail"] + count_dict["skip"] + count_dict["no_data"]
-    print("[bold #ecdbfe]-" * 160)
+    print("[bold #ecdbfe]=" * mark_len)
     print(f"[bold #ff80ab]Total: {count_dict['total']}\nSuccess: {count_dict['success']}\nFail: {count_dict['fail']}\nSkip: {count_dict['skip']}\nNo data: {count_dict['no_data']}")
-    print("[bold #ecdbfe]-" * 160)
+    print("[bold #ecdbfe]=" * mark_len)
     if count_dict["fail"] > 0:
         print("[bold #be5528]Please try again to download the failed data later")
     if count_dict["no_data"] > 0:
@@ -1213,7 +1231,7 @@ def download(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, l
             print(f"[bold #f90000]These are {count_dict['no_data']} data that do not exist in any dataset and version")
         for no_data in count_dict["no_data_list"]:
             print(f"[bold #d81b60]{no_data}")
-    print("[bold #ecdbfe]-" * 160)
+    print("[bold #ecdbfe]=" * mark_len)
 
 
 def how_to_use():

oafuncs/oa_down/idm.py

@@ -2,9 +2,9 @@
 # coding=utf-8
 """
 Author: Liu Kun && 16031215@qq.com
-Date: 2025-01-11 16:19:12
+Date: 2025-03-27 16:51:26
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-01-11 16:25:47
+LastEditTime: 2025-04-01 16:09:03
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\idm.py
 Description:
 EditPlatform: vscode
@@ -16,7 +16,6 @@ Python Version: 3.12
 import datetime
 import os
 from subprocess import call
-
 from rich import print
 
 __all__ = ["downloader"]
@@ -46,5 +45,11 @@ def downloader(task_url, folder_path, file_name, idm_engine=r"D:\Programs\Intern
     # 开始任务队列
     call([idm_engine, "/s"])
     # print(f"IDM下载器：{file_name}下载任务已添加至队列...")
-    print("[purple]-" * 50 + f"\n{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\n" + "[purple]-" * 50)
+    # print("[purple]-" * 150 + f"\n{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\n" + "[purple]-" * 150)
+    print("[purple]*" * 100)
+    time_str = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    time_str = time_str.center(100, " ")
+    print(f"[bold purple]{time_str}")
     print(f"[green]IDM Downloader: {file_name} download task has been added to the queue...[/green]")
+    print("[purple]*" * 100)
+    print('\n')

{oafuncs-0.0.97.10.dist-info → oafuncs-0.0.97.12.dist-info}/METADATA

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

{oafuncs-0.0.97.10.dist-info → oafuncs-0.0.97.12.dist-info}/RECORD

@@ -1,6 +1,6 @@
 oafuncs/__init__.py,sha256=T_-VtnWWllV3Q91twT5Yt2sUapeA051QbPNnBxmg9nw,1456
 oafuncs/oa_cmap.py,sha256=OfJ2DOBOGX5X1GihE6CPcTV8bAFdDqJSXV7vbqUgV9s,7552
-oafuncs/oa_data.py,sha256=32elvoBHibTunDXAK9ptQ-e-xrXxKM4GrPiMqWNv_lE,12169
+oafuncs/oa_data.py,sha256=7Mm2tFpKScs7TDgPiHDS0l_xVqb65WZvuQJCZ9BbK5Y,12953
 oafuncs/oa_date.py,sha256=--3uXYq3_n9HBJbY1io1H1PE-FyiVxbQCyFUcudxQks,3210
 oafuncs/oa_draw.py,sha256=d23R6OEco7EbvcrL5YsnrSupnKKUn55hLw1B_d-kxOg,12308
 oafuncs/oa_file.py,sha256=nYTsMataaC790lSqxjuMB4uVqUJz_tMm_kRve4CHql4,17235
@@ -10,14 +10,15 @@ oafuncs/oa_python.py,sha256=Q-6UGGw_dJff7Ef8i87fsLPoGeHV5jBzfb-7HP4THR0,4018
 oafuncs/_data/OAFuncs.png,sha256=y1_x-mUP3gFjcy6m8FqfvQO_HgjzPhQKfXjnSHjslZE,3436152
 oafuncs/_data/hycom_3hourly.png,sha256=azt_uPcXtl_8CSKRLLPCIf5pPrcxMiOzvoFQnwb0zUo,12411415
 oafuncs/_script/auto_optimized_parallel_executor.py,sha256=4QaEk9AM-IneHm8KKSQ6MjSLNSaAWM4AQ-8OWXYdsaI,17300
+oafuncs/_script/cprogressbar.py,sha256=F3LlFsKojP58mqcAqHRw3u-ffftXaYiN5dKj7zDi0iI,5658
 oafuncs/_script/netcdf_merge.py,sha256=mKHnjStCqP7bwUMVA5k9ZKwT1ZVv1PR-ehMKdpHMJ4s,14439
 oafuncs/_script/parallel_example_usage.py,sha256=uLvE7iwkMn9Cyq6-wk5_RpbQk7PXM9d16-26lTknW9s,2646
 oafuncs/_script/plot_dataset.py,sha256=zkSEnO_-biyagorwWXPoihts_cwuvripzEt-l9bHJ2E,13989
 oafuncs/_script/replace_file_concent.py,sha256=eCFZjnZcwyRvy6b4mmIfBna-kylSZTyJRfgXd6DdCjk,5982
 oafuncs/oa_down/User_Agent-list.txt,sha256=pazxSip8_lphEBOPHG902zmIBUg8sBKXgmqp_g6j_E4,661062
 oafuncs/oa_down/__init__.py,sha256=kRX5eTUCbAiz3zTaQM1501paOYS_3fizDN4Pa0mtNUA,585
-oafuncs/oa_down/hycom_3hourly.py,sha256=RlNJe5TLth1YjbnlJPgWtxkNKTy7rSYCo9Cwb9iID1s,65571
-oafuncs/oa_down/idm.py,sha256=XfYCNnQWADxOhhJd-T8sNYN0nGiRrAs7zbQcsB5-UmI,1668
+oafuncs/oa_down/hycom_3hourly.py,sha256=TnLyXEFJthl4NOeuCXW5DM-h0T6JxhIVATW7XOC4sqw,66837
+oafuncs/oa_down/idm.py,sha256=pqktP4aKDxR3k8XLy9ceQQovvb4jjjT1VGF955PHIG8,1898
 oafuncs/oa_down/literature.py,sha256=2bF9gSKQbzcci9LcKE81j8JEjIJwON7jbwQB3gDDA3E,11331
 oafuncs/oa_down/test_ua.py,sha256=0IQq3NjqfNr7KkyjS_U-a4mYu-r-E7gzawwo4IfEa6Y,10851
 oafuncs/oa_down/user_agent.py,sha256=TsPcAxFmMTYAEHRFjurI1bQBJfDhcA70MdHoUPwQmks,785
@@ -33,8 +34,8 @@ oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw
 oafuncs/oa_tool/__init__.py,sha256=AvrCNR2-xad9ZRjthIdAoSk8UX4vOpEWLg6CV1NQNKc,161
 oafuncs/oa_tool/email.py,sha256=4lJxV_KUzhxgLYfVwYTqp0qxRugD7fvsZkXDe5WkUKo,3052
 oafuncs/oa_tool/parallel.py,sha256=LBFWEKPcILVCbfSulETJE4wGPiOw1P_Fl9DzjYoCqgk,21844
-oafuncs-0.0.97.10.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.97.10.dist-info/METADATA,sha256=_nG65EsnOtswb-cfau1QhHjKq9iuhBPwUpYqp-L7_pw,4226
-oafuncs-0.0.97.10.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-oafuncs-0.0.97.10.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.97.10.dist-info/RECORD,,
+oafuncs-0.0.97.12.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.97.12.dist-info/METADATA,sha256=sWGGWvxD_dWTX6bNz5sdMoJe4r3-GemQnSJY2P79dFw,4226
+oafuncs-0.0.97.12.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+oafuncs-0.0.97.12.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.97.12.dist-info/RECORD,,