byzh-core 0.0.4.0__py3-none-any.whl → 0.0.5.0__py3-none-any.whl

byzh_core/Bterminal/__init__.py

@@ -1,3 +1,7 @@
 from .cmd import b_run_cmd, b_run_python
+from .run_func import b_Wrapper
 
-__all__ = ['b_run_cmd', 'b_run_python']
+__all__ = [
+    'b_run_cmd', 'b_run_python',
+    'b_Wrapper'
+]

byzh_core/Bterminal/run_func.py

@@ -0,0 +1,61 @@
+from itertools import product
+from typing import Sequence, Callable, Literal
+import warnings
+class b_Wrapper():
+    def __init__(
+            self,
+            mode:Literal["product", "zip"] = "product",
+            **kwargs: Sequence
+    ):
+        self.mode = mode
+        self.keys = []
+
+        for key, value in kwargs.items():
+            setattr(self, key+"_list", value)
+            self.keys.append(key)
+
+        self.values_lst = self._get_values_lst()
+
+    def _get_values_lst(self):
+        temp = [getattr(self, key + "_list") for key in self.keys]
+        if self.mode == "product":
+            return list(product(*temp))
+        elif self.mode == "zip":
+            # 检查是否个数相同
+            if len(set(map(len, temp)))!= 1:
+                warnings.warn("zip模式下, 如果各部分的len不一样, 则超出部分不参与遍历")
+            return list(zip(*temp))
+        else:
+            raise ValueError("Invalid mode")
+
+    def _set_values(self, index):
+        for key, value in zip(self.keys, self.values_lst[index]):
+            setattr(self, key, value)
+
+    def run(self, func: Callable, *args, **kwargs):
+        for i in range(len(self.values_lst)):
+            self._set_values(i)
+            func(*args, **kwargs)
+
+
+if __name__ == '__main__':
+    def demo_func():
+        print(f"x={wrapper.x}, y={wrapper.y}, x+y={wrapper.x + wrapper.y}")
+
+    # 示例 1: product 笛卡尔积模式
+    print("=== product 模式 ===")
+    wrapper = b_Wrapper(
+        mode="product",
+        x=[1, 2, 3],
+        y=[10, 20]
+    )
+    wrapper.run(demo_func)
+
+    # 示例 2: zip 模式
+    print("\n=== zip 模式 ===")
+    wrapper = b_Wrapper(
+        mode="zip",
+        x=[1, 2, 3],
+        y=[10, 20, 30]
+    )
+    wrapper.run(demo_func)

byzh_core/Btqdm/my_tqdm.py

@@ -1,6 +1,7 @@
 import sys
 import time
 import threading
+from typing import Iterable
 
 from ..Butils import B_Color, B_Appearance, B_Background
 
@@ -8,7 +9,7 @@ from ..Butils import B_Color, B_Appearance, B_Background
 class B_Tqdm:
     def __init__(
             self,
-            total: int|None = None,
+            range: int|Iterable = None,
             prefix: str = 'Processing',
             suffix: str = '',
             length: int = 20,
@@ -23,7 +24,14 @@ class B_Tqdm:
         :param fill: 填充字符
         """
         super().__init__()
-        self.total = total
+        self.range = range
+        if isinstance(range, Iterable):
+            self.range_len = len(range)
+        elif isinstance(range, int):
+            self.range_len = range
+        else:
+            self.range_len = None
+
         self.prefix = prefix
         self.suffix = suffix
         self.length = length
@@ -61,19 +69,19 @@ class B_Tqdm:
             elapsed_time = time.time() - self.start_time
             elapsed_str = self._format_time(elapsed_time)
             # 预估剩余时间
-            if self.total is not None:
-                estimated_time = elapsed_time / self.current * (self.total - self.current) if self.current > 0 else 0
+            if self.range_len is not None:
+                estimated_time = elapsed_time / self.current * (self.range_len - self.current) if self.current > 0 else 0
                 estimated_str = self._format_time(estimated_time)
             # 计算每秒处理的项数
             speed = self.current / elapsed_time if elapsed_time > 0 else 0
 
             # 更新进度条
-            if self.total is not None:
-                filled_length = int(self.length * self.current // self.total)
+            if self.range_len is not None:
+                filled_length = int(self.length * self.current // self.range_len)
                 bar = self.fill * filled_length + '-' * (self.length - filled_length) * len(self.fill)
 
                 sys.stdout.write(f'\r{pre_show}{self.prefix} |{bar}|'
-                                 f' {self.current}/{self.total} -> {elapsed_str}<{estimated_str} | {speed:.1f} it/s |'
+                                 f' {self.current}/{self.range_len} -> {elapsed_str}<{estimated_str} | {speed:.1f} it/s |'
                                  f' {self.suffix}{B_Color.RESET.value}')
             else:
                 sys.stdout.write(f'\r{pre_show}{self.prefix} | {self.current} iters -> {elapsed_str} | {speed:.1f} it/s |'
@@ -81,6 +89,11 @@ class B_Tqdm:
             sys.stdout.flush()
 
             # 补回车
-            if self.current == self.total:
+            if self.current == self.range_len:
                 sys.stdout.write('\n')
                 sys.stdout.flush()
+
+    def __iter__(self):
+        for item in self.range:
+            yield item
+            self.update()

byzh_core/__init__.py

@@ -2,4 +2,4 @@
 # class      以"B_"开头
 # function   以"b_"开头
 
-__version__ = '0.0.4.0'
+__version__ = '0.0.5.0' # core的最后一位保持0, 留给其他包

{byzh_core-0.0.4.0.dist-info → byzh_core-0.0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: byzh_core
-Version: 0.0.4.0
+Version: 0.0.5.0
 Summary: byzh_core是byzh系列的核心库，包含了一些常用的工具函数和类。
 Author: byzh_rc
 License: MIT

{byzh_core-0.0.4.0.dist-info → byzh_core-0.0.5.0.dist-info}/RECORD

@@ -1,14 +1,15 @@
 byzh_core/B_os.py,sha256=f8XuZZOMnP0Fszg6oPLlo9kxX1ytJBK8cEoHqzVkMVA,4313
-byzh_core/__init__.py,sha256=plOSKHB2dhS8k4n5w2VPpP2Jsnv0K9KHZe7_q6FukFY,110
+byzh_core/__init__.py,sha256=4hnny5zXICtMdVc-cTnIycfuIAiPGlm0hMLv3vW-IUM,156
 byzh_core/__main__.py,sha256=o7-Mn6j1g-VGWhE13goDOMmxKSlXvtrkYVkwt4DrCjo,217
 byzh_core/Barchive/__init__.py,sha256=wUdz646VS0Uhq9lwMkd3YQHCvQhLDqgADoDjFGMqIn0,65
 byzh_core/Barchive/archive.py,sha256=S1hy3qYFEZr5RRmx_Mnq1s2IMUEw973ny1rKSL7J_a0,6721
 byzh_core/Btable/__init__.py,sha256=NlQBjp_mvObEUm4y6wXbGipkNM2N3uNIUidaJkTwFsw,62
 byzh_core/Btable/auto_table.py,sha256=avMeRWydw9L8s3fU0-BSl8a2dCyreIUzW--csm5eR0g,14734
-byzh_core/Bterminal/__init__.py,sha256=B6p6mHVhi5LAHKlvqfrv20E6XNqUsfU2xD753V6-Zf4,83
+byzh_core/Bterminal/__init__.py,sha256=azRLD-kY8Tv2c3llHRBrEJIdVgYw6hAoLgzJeA4PvE0,142
 byzh_core/Bterminal/cmd.py,sha256=0I-d7VPHv9eYJoSrAZOnEK-R-hyjWVY0hRRn3Zoq1fg,3839
+byzh_core/Bterminal/run_func.py,sha256=B2CZSxdSrcBbt7w5_hnOYrUmwrjK5CPqbyyt_YkB_I0,1836
 byzh_core/Btqdm/__init__.py,sha256=G8pvJYizvdTUI3Xw-yELXY7BbjTghCXJLdqUuDoRNZA,141
-byzh_core/Btqdm/my_tqdm.py,sha256=61FeXKrkteKpCvXM5qU2hoMROqFkZW-bs5Rz86KMQSo,3202
+byzh_core/Btqdm/my_tqdm.py,sha256=MMYFwy5dUCzg8fzRWZ7vrpZ-q_DDqoLvywDk8rgSaSM,3578
 byzh_core/Butils/__init__.py,sha256=_0aAm72oynvpFf-v9EAMSqhWBHbTt4Tn85jtv3Yf0z8,236
 byzh_core/Butils/decorator.py,sha256=HaB8F80wsqQuS30jlI8C2d3SmEa0mBNfJEr5-pwGZj0,584
 byzh_core/Butils/text_style.py,sha256=34u2-Rsur63iNQ0m7tHxpFWqnQZWybSxBx7vnhOhqDo,3346
@@ -21,9 +22,9 @@ byzh_core/obsolete/row_table.py,sha256=rIX0-Yvb3RnO0RJBkA4m18gux1zYSnEKTy6uQGcWi
 byzh_core/obsolete/xy_table.py,sha256=-KHK8EUlkJj3Rh0sp_KHI0QFt29AlMASMmR8q8ykUBM,6784
 byzh_core/obsolete/Bconfig/__init__.py,sha256=7lAp7wNetW0AyJcike7ekdY_8wrQQtFjBsi6684t_lU,54
 byzh_core/obsolete/Bconfig/config.py,sha256=_gUNHfW46mTRecYsz_DQn0LENEPifcF3IMHFVE1prgg,10953
-byzh_core-0.0.4.0.dist-info/LICENSE,sha256=-nRwf0Xga4AX5bsWBXXflpDpgX_U23X06oAMcdf0dSY,1089
-byzh_core-0.0.4.0.dist-info/METADATA,sha256=YJoJmbZb8Rq6WTyxdnx5UN2WyksRyurQCTmJhB27UAU,371
-byzh_core-0.0.4.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-byzh_core-0.0.4.0.dist-info/entry_points.txt,sha256=qoN3Uvulj0BcOQVDqsFqP2dBVQzG1QrUtC5wFsghSLo,51
-byzh_core-0.0.4.0.dist-info/top_level.txt,sha256=Xv-pzvl6kPdIbi5UehQcUdGhLtb8-4WhS5dRK1LINwM,10
-byzh_core-0.0.4.0.dist-info/RECORD,,
+byzh_core-0.0.5.0.dist-info/LICENSE,sha256=-nRwf0Xga4AX5bsWBXXflpDpgX_U23X06oAMcdf0dSY,1089
+byzh_core-0.0.5.0.dist-info/METADATA,sha256=iTLK_RVMJco8zDcZrgaU-CYq8gHURWMIvoHFgK5xDbg,371
+byzh_core-0.0.5.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+byzh_core-0.0.5.0.dist-info/entry_points.txt,sha256=qoN3Uvulj0BcOQVDqsFqP2dBVQzG1QrUtC5wFsghSLo,51
+byzh_core-0.0.5.0.dist-info/top_level.txt,sha256=Xv-pzvl6kPdIbi5UehQcUdGhLtb8-4WhS5dRK1LINwM,10
+byzh_core-0.0.5.0.dist-info/RECORD,,