oafuncs 0.0.97.11__tar.gz → 0.0.97.12__tar.gz

{oafuncs-0.0.97.11/oafuncs.egg-info → oafuncs-0.0.97.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.97.11
+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.12/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-0.0.97.11 → oafuncs-0.0.97.12}/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-0.0.97.11 → oafuncs-0.0.97.12}/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)
@@ -1181,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, 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:
@@ -1214,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-0.0.97.11 → oafuncs-0.0.97.12}/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.11 → oafuncs-0.0.97.12/oafuncs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.97.11
+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.11 → oafuncs-0.0.97.12}/oafuncs.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ oafuncs.egg-info/top_level.txt
 oafuncs/_data/OAFuncs.png
 oafuncs/_data/hycom_3hourly.png
 oafuncs/_script/auto_optimized_parallel_executor.py
+oafuncs/_script/cprogressbar.py
 oafuncs/_script/netcdf_merge.py
 oafuncs/_script/parallel_example_usage.py
 oafuncs/_script/plot_dataset.py

{oafuncs-0.0.97.11 → oafuncs-0.0.97.12}/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.97.11"  # 下次用98.0，98.1已经被用过了
+VERSION = "0.0.97.12"  # 下次用98.0，98.1已经被用过了
 
 # What packages are required for this module to be executed?
 REQUIRED = [