oafuncs 0.0.97.15__tar.gz → 0.0.97.16__tar.gz

{oafuncs-0.0.97.15/oafuncs.egg-info → oafuncs-0.0.97.16}/PKG-INFO

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

{oafuncs-0.0.97.15 → oafuncs-0.0.97.16}/oafuncs/_script/cprogressbar.py

@@ -153,6 +153,7 @@ class ColorProgressBar:
         update_interval: float = 0.1,
         bar_length: int = None,
         speed_estimate_period: float = 30.0,
+        next_line: bool = False,
     ):
         self.iterable = iterable
         self.description = description
@@ -161,7 +162,7 @@ class ColorProgressBar:
         self.update_interval = update_interval
         self.bar_length = bar_length
         self.speed_estimate_period = speed_estimate_period
-        self.mark_num = random.randint(0, 13)  # 随机选择填充字符的数量
+        self.next_line = next_line
 
         # 线程安全锁
         self._lock = threading.RLock()
@@ -187,6 +188,10 @@ class ColorProgressBar:
         self._is_terminal = hasattr(self._file, "isatty") and self._file.isatty()
         self._is_jupyter = "ipykernel" in sys.modules
 
+        # 输出样式
+        filled_list = ["▊", "█", "▓", "▒", "░", "#", "=", ">", "▌", "▍", "▎", "▏", "*"]
+        self.filled = random.choice(filled_list)
+
     def _generate_gradient(self) -> Optional[List[str]]:
         """生成渐变色列表（修复内置colormap支持）"""
         try:
@@ -253,11 +258,7 @@ class ColorProgressBar:
 
     def _format_bar(self, progress: float, width: int) -> str:
         """格式化进度条显示"""
-        filled_list = ["▊", "█", "▓", "▒", "░", "#", "=", ">", "▌", "▍", "▎", "▏", "*"]
-        # filled = "░"
-        # filled = filled_list[2]  # 选择中间的填充字符
-        # filled = random.choice(filled_list)  # 随机选择填充字符
-        filled = filled_list[min(self.mark_num, len(filled_list) - 1)]  # 随机选择填充字符
+        filled = self.filled
         empty = " "
         # 为其他信息保留更多空间
         max_width = max(10, width - 60)  # 至少保留10个字符的进度条
@@ -363,7 +364,10 @@ class ColorProgressBar:
                 self._file.write(f"{line}\n")
             elif self._is_terminal:
                 # 标准终端环境，覆盖同一行
-                self._file.write(f"\r{line}")
+                if self.next_line:
+                    self._file.write(f"\r{line}\n")
+                else:
+                    self._file.write(f"\r{line}")
             else:
                 # 非交互式环境，仅在完成时输出
                 if self.task.finished:
@@ -395,7 +399,7 @@ class ColorProgressBar:
 
         finally:
             # 完成后进行清理
-            if self._is_terminal and not self._is_jupyter:
+            if self._is_terminal and not self._is_jupyter and not self.next_line:
                 self._file.write("\n")
                 self._file.flush()
 
@@ -406,28 +410,46 @@ class ColorProgressBar:
         return [to_hex(cmap(i)) for i in np.linspace(0, 1, n)]
 
 
+def cpbar(
+    iterable,
+    description="Working...",
+    total=None,
+    completed=0,
+    color="cyan",
+    cmap=None,
+    update_interval=0.1,
+    bar_length=None,
+    speed_estimate_period=30.0,
+    next_line=False,
+):
+    """便捷函数，返回 ColorProgressBar 对象"""
+    return ColorProgressBar(
+        iterable=iterable,
+        description=description,
+        total=total,
+        completed=completed,
+        color=color,
+        cmap=cmap,
+        update_interval=update_interval,
+        bar_length=bar_length,
+        speed_estimate_period=speed_estimate_period,
+        next_line=next_line,
+    )
+
+
 # 验证示例
 if __name__ == "__main__":
-    for _ in ColorProgressBar(range(100), description="Diverging:", cmap="diverging_1"):
-        # print("\rTesting...", end="")
+    for _ in cpbar(range(20), description="Diverging:", cmap="diverging_1", next_line=True):
+        print("Processing...")
         time.sleep(0.1)
 
-    for _ in ColorProgressBar(range(100), description="Colorful:", cmap="colorful_1"):
-        time.sleep(0.1)
-
-    for _ in ColorProgressBar(range(100), description="Viridis:", cmap="viridis"):
+    for _ in ColorProgressBar(range(20), description="Viridis:", cmap="viridis"):
         time.sleep(0.1)
 
     # 使用自定义渐变色
     for _ in ColorProgressBar(range(50), description="Custom_cmap:", cmap=["#FF0000", "#0000FF"]):
         time.sleep(0.1)
 
-    for _ in ColorProgressBar(range(50), description="Default:"):
-        time.sleep(0.1)
-
-    for _ in ColorProgressBar(range(50), description="Custom_color:", color="#FF00FF"):
-        time.sleep(0.1)
-
     # 测试无法获取长度的迭代器
     def infinite_generator():
         i = 0

{oafuncs-0.0.97.15 → oafuncs-0.0.97.16}/oafuncs/oa_down/hycom_3hourly.py

@@ -1097,7 +1097,7 @@ 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_tool import pbar
     from oafuncs.oa_cmap import get as get_cmap
     
     _get_initial_data()

{oafuncs-0.0.97.15 → oafuncs-0.0.97.16}/oafuncs/oa_tool.py

@@ -1,21 +1,8 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2025-04-04 20:17:42
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-04-04 20:17:45
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_tool.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
-from typing import Iterable
+from typing import Any, Iterable, List, Optional, Union
 
 __all__ = ["PEx", "email", "pbar"]
 
+
 class PEx:
     """
     PEx 封装了 ParallelExecutor，
@@ -37,7 +24,7 @@ class PEx:
 
     def __init__(self, *args, **kwargs):
         """
-        初始化 PEx 实例，内部创建一个 ParallelExecutor 实例。
+        初始化 PEx 实例，内部创建一个 ParallelExecutor 实例
 
         参数:
             *args: 传递给 ParallelExecutor 的位置参数。
@@ -47,7 +34,7 @@ class PEx:
 
     def __getattr__(self, attr):
         """
-        将所有未定义的属性访问委托给内部的 ParallelExecutor 实例。
+        将所有未定义的属性访问委托给内部的 ParallelExecutor 实例
 
         参数:
             attr (str): 要访问的属性名称。
@@ -58,26 +45,36 @@ class PEx:
         return getattr(self.executor, attr)
 
 
-def email(title="Title", content=None, send_to="16031215@qq.com"):
+def email(title="Title", content=None, send_to="10001@qq.com"):
     from ._script.email import send
+
     send(title, content, send_to)
 
 
-def pbar(iterable: Iterable, description: str = "Working ...", color: str = "cyan", cmap: str = None, lupdate_interval: float = 0.1, bar_length: int = 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)
-    """
+def pbar(
+    iterable: Iterable=range(100),
+    description: str = "Working...",
+    total: Optional[float] = None,
+    completed: float = 0,
+    color: Any = "cyan",
+    cmap: Union[str, List[str], None] = None,
+    update_interval: float = 0.1,
+    bar_length: Optional[int] = None,
+    speed_estimate_period: float = 30.0,
+    next_line: bool = False,
+):
     from ._script.cprogressbar import ColorProgressBar
 
-    return ColorProgressBar(iterable=iterable, description=description, color=color, cmap=cmap, update_interval=lupdate_interval, bar_length=bar_length, **kwargs)
+    """便捷函数，返回 ColorProgressBar 对象"""
+    return ColorProgressBar(
+        iterable=iterable,
+        description=description,
+        total=total,
+        completed=completed,
+        color=color,
+        cmap=cmap,
+        update_interval=update_interval,
+        bar_length=bar_length,
+        speed_estimate_period=speed_estimate_period,
+        next_line=next_line,
+    )

{oafuncs-0.0.97.15 → oafuncs-0.0.97.16/oafuncs.egg-info}/PKG-INFO

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

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