oafuncs 0.0.97.12__tar.gz → 0.0.97.13__tar.gz

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

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

{oafuncs-0.0.97.12 → oafuncs-0.0.97.13}/oafuncs/_script/cprogressbar.py

@@ -1,14 +1,16 @@
 # progressbar.py
-import sys
+import re
 import shutil
+import sys
 import time
 import warnings
-from typing import Iterable, Any, List, Union
+from typing import Any, Iterable, List, Optional, Union
+
 import numpy as np
 
 try:
-    from matplotlib.colors import LinearSegmentedColormap, to_rgb, to_hex
-    from matplotlib.cm import get_cmap
+    import matplotlib
+    from matplotlib.colors import LinearSegmentedColormap, to_hex, to_rgb
 except ImportError:
     raise ImportError("This module requires matplotlib. Install with: pip install matplotlib")
 
@@ -26,20 +28,28 @@ class ColorProgressBar:
         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
+        self._gradient_colors = self._generate_gradient() if cmap and self._count else None
 
-    def _generate_gradient(self) -> List[str]:
+    def _generate_gradient(self) -> Optional[List[str]]:
         """生成渐变色列表（修复内置colormap支持）"""
         try:
             if isinstance(self.cmap, list):
                 cmap = LinearSegmentedColormap.from_list("custom_cmap", self.cmap)
+            elif hasattr(self.cmap, "__call__") and hasattr(self.cmap, "N"):
+                # 直接处理已经是colormap对象的情况
+                cmap = self.cmap
             else:
-                # 正确获取Matplotlib内置colormap
-                cmap = get_cmap(self.cmap)
+                # 兼容不同版本的matplotlib
+                try:
+                    # 新版本matplotlib (>=3.6)
+                    cmap = matplotlib.colormaps[self.cmap]
+                except (AttributeError, KeyError):
+                    # 旧版本matplotlib
+                    cmap = matplotlib.cm.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)}")
+            warnings.warn(f"Colormap generation failed: {str(e)}. cmap type: {type(self.cmap)}")
             return None
 
     def _hex_to_ansi(self, hex_color: str) -> str:
@@ -53,10 +63,10 @@ class ColorProgressBar:
 
     def _resolve_color(self, index: int) -> str:
         """解析当前应使用的颜色"""
-        if self._gradient_colors and index < len(self._gradient_colors):
+        if self._gradient_colors and 0 <= index < len(self._gradient_colors):
             try:
                 return self._hex_to_ansi(self._gradient_colors[index])
-            except IndexError:
+            except (IndexError, ValueError):
                 pass
 
         return self._process_color_value(self.base_color)
@@ -80,20 +90,27 @@ class ColorProgressBar:
             warnings.warn(f"Color parsing failed: {e}, using cyan")
             return preset_map["cyan"]
 
+    def _strip_ansi(self, text: str) -> str:
+        """移除所有ANSI转义序列"""
+        ansi_escape = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
+        return ansi_escape.sub("", text)
+
     def _format_bar(self, progress: float, width: int) -> str:
         """格式化进度条显示"""
         filled = "▊"
         empty = " "
-        max_width = width - 50
+        # 为其他信息保留更多空间
+        max_width = max(10, width - 60)  # 至少保留10个字符的进度条
         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
+        rate = index / max(elapsed, 1e-6)  # 确保分母不为零
         remaining = (self._count - index) / rate if self._count else 0
         return rate, remaining
 
@@ -102,35 +119,56 @@ class ColorProgressBar:
         self._last_update = self._start_time
         reset_code = "\033[0m"
 
+        # 判断是否在终端环境中
+        is_terminal = hasattr(self._file, "isatty") and self._file.isatty()
+
+        try:
+            term_width = self.bar_length or (shutil.get_terminal_size().columns if is_terminal else 80)
+        except (AttributeError, OSError):
+            term_width = 80  # 默认终端宽度
+
         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:
+            # 非终端环境或更新间隔未到时跳过更新
+            if not is_terminal or ((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)
+            # 确保进度条至少有一个字符的宽度
+            effective_width = max(15, term_width - 40)  # 保留更多空间给信息显示
+            bar = self._format_bar(progress, effective_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"
+            time_info = f"ETA: {remaining:.1f}s" if self._count and remaining > 0 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)
+            # 构建新的进度条行
+            line = f"{self.prefix}{current_color}[{bar}]{reset_code} {count_info} {percent} [{time_info} | {rate_info}]"
 
+            # 清除之前的行并强制光标回到行首
+            self._file.write("\r")
+
+            # 确保不超出终端宽度
+            if len(self._strip_ansi(line)) > term_width:
+                line = line[: term_width - 3] + "..."
+
+            # 输出并强制刷新
             self._file.write(line)
             self._file.flush()
             self._last_update = now
 
-        self._file.write("\n")
-        self._file.flush()
+        # 完成后添加换行符
+        if is_terminal:
+            self._file.write("\n")
+            self._file.flush()
 
     @classmethod
     def gradient_color(cls, colors: List[str], n: int) -> List[str]:
@@ -141,10 +179,30 @@ class ColorProgressBar:
 
 # 验证示例
 if __name__ == "__main__":
-    # 正确使用内置colormap
+    # 使用内置colormap示例
+    import oafuncs
+
+    cmap = oafuncs.oa_cmap.get("diverging_1")
+    for _ in ColorProgressBar(range(100), cmap=cmap, prefix="Diverging: "):
+        time.sleep(0.1)
+
     for _ in ColorProgressBar(range(100), cmap="viridis", prefix="Viridis: "):
-        time.sleep(0.05)
+        time.sleep(0.1)
 
     # 使用自定义渐变色
     for _ in ColorProgressBar(range(50), cmap=["#FF0000", "#0000FF"], prefix="Custom: "):
         time.sleep(0.1)
+
+    # 测试无法获取长度的迭代器
+    def infinite_generator():
+        i = 0
+        while True:
+            yield i
+            i += 1
+
+    # 限制为20个元素，但进度条不知道总长度
+    gen = infinite_generator()
+    for i, _ in enumerate(ColorProgressBar(gen, prefix="Unknown length: ")):
+        if i >= 20:
+            break
+        time.sleep(0.1)

{oafuncs-0.0.97.12 → oafuncs-0.0.97.13}/oafuncs/oa_down/hycom_3hourly.py

@@ -13,9 +13,6 @@ SystemInfo: Windows 11
 Python Version: 3.12
 """
 
-
-
-
 import datetime
 import os
 import random
@@ -711,13 +708,13 @@ def _download_file(target_url, store_path, file_name, check=False):
     file_name_split = file_name_split[:-1]
     # same_file = f"{file_name_split[0]}_{file_name_split[1]}*nc"
     same_file = "_".join(file_name_split) + "*nc"
-    
+
     if match_time is not None:
         if check_nc(fname):
             if not _check_ftime(fname, if_print=True):
                 if match_time:
                     _correct_time(fname)
-                    count_dict['skip'] += 1
+                    count_dict["skip"] += 1
                 else:
                     _clear_existing_file(fname)
                     # print(f"[bold #ffe5c0]File time error, {fname}")
@@ -997,7 +994,7 @@ def _done_callback(future, progress, task, total, counter_lock):
     global parallel_counter
     with counter_lock:
         parallel_counter += 1
-        progress.update(task, advance=1, description=f"[cyan]Downloading... {parallel_counter}/{total}")
+        progress.update(task, advance=1, description=f"[cyan]{bar_desc} {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, interval_hour=3):
@@ -1034,19 +1031,19 @@ def _download_hourly_func(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_mi
         print("Downloading a series of files...")
         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))
+            task = progress.add_task(f"[cyan]{bar_desc}", total=len(time_list))
             if ftimes == 1:
                 if num_workers is None or num_workers <= 1:
                     # 串行方式
                     for i, time_str in enumerate(time_list):
                         _prepare_url_to_download(var, lon_min, lon_max, lat_min, lat_max, time_str, None, depth, level, store_path, dataset_name, version_name, check)
-                        progress.update(task, advance=1, description=f"[cyan]Downloading... {i + 1}/{len(time_list)}")
+                        progress.update(task, advance=1, description=f"[cyan]{bar_desc} {i + 1}/{len(time_list)}")
                 else:
                     # 并行方式
                     with ThreadPoolExecutor(max_workers=num_workers) as executor:
                         futures = [executor.submit(_download_task, var, time_str, None, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, check) for time_str in time_list]
                         """ 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)}")) """
+                            future.add_done_callback(lambda _: progress.update(task, advance=1, description=f"[cyan]{bar_desc} {i+1}/{len(time_list)}")) """
                         for feature in as_completed(futures):
                             _done_callback(feature, progress, task, len(time_list), counter_lock)
             else:
@@ -1059,13 +1056,13 @@ def _download_hourly_func(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_mi
                         time_str_end_index = int(min(len(time_list) - 1, int(i * ftimes + ftimes - 1)))
                         time_str_end = time_list[time_str_end_index]
                         _prepare_url_to_download(var, lon_min, lon_max, lat_min, lat_max, time_str, time_str_end, depth, level, store_path, dataset_name, version_name, check)
-                        progress.update(task, advance=1, description=f"[cyan]Downloading... {i + 1}/{total_num}")
+                        progress.update(task, advance=1, description=f"[cyan]{bar_desc} {i + 1}/{total_num}")
                 else:
                     # 并行方式
                     with ThreadPoolExecutor(max_workers=num_workers) as executor:
                         futures = [executor.submit(_download_task, var, new_time_list[i], time_list[int(min(len(time_list) - 1, int(i * ftimes + ftimes - 1)))], lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, check) for i in range(total_num)]
                         """ for i, future in enumerate(futures):
-                            future.add_done_callback(lambda _: progress.update(task, advance=1, description=f"[cyan]Downloading... {i+1}/{total_num}")) """
+                            future.add_done_callback(lambda _: progress.update(task, advance=1, description=f"[cyan]{bar_desc} {i+1}/{total_num}")) """
                         for feature in as_completed(futures):
                             _done_callback(feature, progress, task, len(time_list), counter_lock)
     else:
@@ -1100,6 +1097,9 @@ def download(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, l
     Returns:
         None
     """
+    from oafuncs.oa_data import pbar
+    from oafuncs.oa_cmap import get as get_cmap
+    
     _get_initial_data()
 
     # 打印信息并处理数据集和版本名称
@@ -1166,57 +1166,71 @@ def download(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, l
 
     global fsize_dict_lock
     fsize_dict_lock = Lock()
-    
+
     if fill_time is not None:
         num_workers = 1
 
-    global use_idm, given_idm_engine, idm_download_list
+    global use_idm, given_idm_engine, idm_download_list, bar_desc
     if idm_engine is not None:
         use_idm = True
         num_workers = 1
         given_idm_engine = idm_engine
         idm_download_list = []
+        bar_desc = "Submitting to IDM ..."
     else:
         use_idm = False
+        bar_desc = "Downloading ..."
 
     global match_time
     match_time = fill_time
-    
+
     global mark_len
-    mark_len = 150
+    mark_len = 100
 
     _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")
+        str_info = "All files have been submitted to IDM for downloading"
+        str_info = str_info.center(mark_len, "*")
+        print(f"[bold #3dfc40]{str_info}")
         print("[bold #ecdbfe]*" * mark_len)
         if idm_download_list:
-            file_download_time = 60 # 预设下载时间为1分钟
-            for f in idm_download_list:
+            """ file_download_time = 60  # 预设下载时间为1分钟
+            for f in pbar(idm_download_list,cmap='bwr',prefix='HYCOM: '):
                 file_download_start_time = time.time()
                 wait_success = 0
                 success = False
                 while not success:
-                    if check_nc(f):
+                    if check_nc(f,print_switch=False):
                         count_dict["success"] += 1
                         success = True
-                        print(f"[bold #3dfc40]File [bold #dfff73]{f} [#3dfc40]has been downloaded successfully")
+                        # 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分钟起步
+                        # print(f"[bold #3dfc40]Time: {file_download_time} seconds")
+                        file_download_time = max(60, file_download_time)  # 预设下载时间为1分钟起步
                     else:
                         wait_success += 1
-                        print(f"[bold #ffe5c0]Waiting {file_download_time} seconds to check the file {f}...")
+                        # 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}...')
+                            print(f"[bold #ffe5c0]Waiting for more than 10 times, skipping the file {f}...")
                             count_dict["fail"] += 1
-                print('[bold #ecdbfe]-' * mark_len)
+                # print("[bold #ecdbfe]-" * mark_len) """
+            remain_list = idm_download_list.copy()
+            for f_count in pbar(range(len(idm_download_list)), cmap=get_cmap('diverging_1'), prefix="HYCOM: "):
+                success = False
+                while not success:
+                    for f in remain_list:
+                        if check_nc(f, print_switch=False):
+                            count_dict["success"] += 1
+                            success = True
+                            remain_list.remove(f)
+                            break
 
     count_dict["total"] = count_dict["success"] + count_dict["fail"] + count_dict["skip"] + count_dict["no_data"]
     print("[bold #ecdbfe]=" * mark_len)

{oafuncs-0.0.97.12 → oafuncs-0.0.97.13}/oafuncs/oa_down/idm.py

@@ -4,7 +4,7 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2025-03-27 16:51:26
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-04-01 16:09:03
+LastEditTime: 2025-04-01 22:31:39
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\idm.py
 Description:
 EditPlatform: vscode
@@ -13,9 +13,11 @@ SystemInfo: Windows 11
 Python Version: 3.12
 """
 
+
 import datetime
 import os
 from subprocess import call
+
 from rich import print
 
 __all__ = ["downloader"]
@@ -50,6 +52,6 @@ def downloader(task_url, folder_path, file_name, idm_engine=r"D:\Programs\Intern
     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(f"[green]IDM Downloader: {file_name} download task has been added to the queue ...[/green]")
     print("[purple]*" * 100)
-    print('\n')
+    print("\n")

{oafuncs-0.0.97.12 → oafuncs-0.0.97.13}/oafuncs/oa_draw.py

@@ -165,13 +165,19 @@ def add_lonlat_unit(lon=None, lat=None, decimal=2):
 
 
 # ** 添加网格线
-def add_gridlines(ax, projection=ccrs.PlateCarree(), color="k", alpha=0.5, linestyle="--", linewidth=0.5):
+def add_gridlines(ax, xline=None, yline=None, projection=ccrs.PlateCarree(), color="k", alpha=0.5, linestyle="--", linewidth=0.5):
+    from matplotlib import ticker as mticker
     # add gridlines
     gl = ax.gridlines(crs=projection, draw_labels=True, linewidth=linewidth, color=color, alpha=alpha, linestyle=linestyle)
     gl.right_labels = False
     gl.top_labels = False
     gl.xformatter = LongitudeFormatter(zero_direction_label=False)
     gl.yformatter = LatitudeFormatter()
+    
+    if xline is not None:
+        gl.xlocator = mticker.FixedLocator(np.array(xline))
+    if yline is not None:
+        gl.ylocator = mticker.FixedLocator(np.array(yline))
 
     return ax, gl
 
@@ -186,7 +192,7 @@ def add_cartopy(ax, lon=None, lat=None, projection=ccrs.PlateCarree(), gridlines
 
     # add gridlines
     if gridlines:
-        ax, gl = add_gridlines(ax, projection)
+        ax, gl = add_gridlines(ax, projection=projection)
 
     # set longitude and latitude format
     lon_formatter = LongitudeFormatter(zero_direction_label=False)

{oafuncs-0.0.97.12 → oafuncs-0.0.97.13}/oafuncs/oa_nc.py

@@ -328,7 +328,7 @@ def rename(ncfile_path, old_name, new_name):
         print(f"An error occurred: {e}")
 
 
-def check(ncfile: str, delete_switch: bool = False) -> bool:
+def check(ncfile: str, delete_switch: bool = False, print_switch: bool = True) -> bool:
     """
     Check if a NetCDF file is corrupted with enhanced error handling.
 
@@ -337,9 +337,10 @@ def check(ncfile: str, delete_switch: bool = False) -> bool:
     is_valid = False
 
     if not os.path.exists(ncfile):
-        print(f"[#ffeac5]Local file missing: [#009d88]{ncfile}")
-        # 提示：提示文件缺失也许是正常的，这只是检查文件是否存在于本地
-        print("[#d6d9fd]Note: File missing may be normal, this is just to check if the file exists locally.")
+        if print_switch:
+            print(f"[#ffeac5]Local file missing: [#009d88]{ncfile}")
+            # 提示：提示文件缺失也许是正常的，这只是检查文件是否存在于本地
+            print("[#d6d9fd]Note: File missing may be normal, this is just to check if the file exists locally.")
         return False
 
     try:
@@ -352,7 +353,8 @@ def check(ncfile: str, delete_switch: bool = False) -> bool:
         # 二次验证确保变量可访问
         with nc.Dataset(ncfile, "r") as ds_verify:
             if not ds_verify.variables:
-                print(f"Empty variables: {ncfile}")
+                if print_switch:
+                    print(f"[red]Empty variables: {ncfile}[/red]")
             else:
                 # 尝试访问元数据
                 _ = ds_verify.__dict__
@@ -363,19 +365,23 @@ def check(ncfile: str, delete_switch: bool = False) -> bool:
                 is_valid = True
 
     except Exception as e:  # 捕获所有异常类型
-        print(f"HDF5 validation failed for {ncfile}: {str(e)}")
+        if print_switch:
+            print(f"[red]HDF5 validation failed for {ncfile}: {str(e)}[/red]")
         error_type = type(e).__name__
         if "HDF5" in error_type or "h5" in error_type.lower():
-            print(f"Critical HDF5 structure error detected in {ncfile}")
+            if print_switch:
+                print(f"[red]Critical HDF5 structure error detected in {ncfile}[/red]")
 
     # 安全删除流程
     if not is_valid:
         if delete_switch:
             try:
                 os.remove(ncfile)
-                print(f"Removed corrupted: {ncfile}")
+                if print_switch:
+                    print(f"[red]Removed corrupted file: {ncfile}[/red]")
             except Exception as del_error:
-                print(f"Delete failed: {ncfile} - {str(del_error)}")
+                if print_switch:
+                    print(f"[red]Failed to delete corrupted file: {ncfile} - {str(del_error)}[/red]")
         return False
 
     return True

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

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

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