byzh-core 0.0.3.1__tar.gz → 0.0.5.0__tar.gz

{byzh_core-0.0.3.1 → byzh_core-0.0.5.0}/PKG-INFO

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

{byzh_core-0.0.3.1 → byzh_core-0.0.5.0}/byzh_core/Barchive/archive.py

@@ -42,7 +42,12 @@ def b_archive_zip(
     :param contain_empty_folder: 是否包含空文件夹
     :return:
     '''
-    output_path = source_path + '.zip' if output_path is None else output_path
+    if output_path is None:
+        if os.path.isdir(source_path):
+            output_path = source_path + '.zip'
+        else:
+            output_path = os.path.splitext(source_path)[0] + '.zip'
+
     if os.path.exists(output_path):
         print(f"检测到{output_path}已存在, 将在3秒后删除...")
         time.sleep(3)

byzh_core-0.0.5.0/byzh_core/Bterminal/__init__.py

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

byzh_core-0.0.5.0/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-0.0.3.1 → byzh_core-0.0.5.0}/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-0.0.3.1 → byzh_core-0.0.5.0}/byzh_core/__init__.py

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

{byzh_core-0.0.3.1 → byzh_core-0.0.5.0}/byzh_core.egg-info/PKG-INFO

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

{byzh_core-0.0.3.1 → byzh_core-0.0.5.0}/byzh_core.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ byzh_core/Btable/__init__.py
 byzh_core/Btable/auto_table.py
 byzh_core/Bterminal/__init__.py
 byzh_core/Bterminal/cmd.py
+byzh_core/Bterminal/run_func.py
 byzh_core/Btqdm/__init__.py
 byzh_core/Btqdm/my_tqdm.py
 byzh_core/Butils/__init__.py

byzh_core-0.0.3.1/byzh_core/Bterminal/__init__.py

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