kevin-toolbox-dev 1.3.6__tar.gz → 1.3.7__tar.gz

{kevin-toolbox-dev-1.3.6 → kevin-toolbox-dev-1.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kevin-toolbox-dev
-Version: 1.3.6
+Version: 1.3.7
 Summary: 一个常用的工具代码包集合
 Home-page: https://github.com/cantbeblank96/kevin_toolbox
 Download-URL: https://github.com/username/your-package/archive/refs/tags/v1.0.0.tar.gz
@@ -86,5 +86,13 @@ pip install kevin-toolbox  --no-dependencies
       - 【new feature】modify Average_Accumulator，在 add() 中新增了 weight 参数用于计算带权重的平均值
       - modify Exponential_Moving_Average，add_sequence() 不再支持 weight_ls 参数，让该接口与其他类更加一致。
     - 添加了测试用例。
+- v 1.3.7 （2024-08-01）【new feature】
+  - patches.for_matplotlib
+    - 【new feature】add clear_border_of_axes()，用于清除 ax 中的坐标轴和 ticks。
+    - 【new feature】add module color，添加用于处理颜色相关的模块，包含以下函数和属性
+      - Color_Format 颜色格式，共有 HEX_STR、RGBA_ARRAY、NATURAL_NAME 三种
+      - get_format()，推断所属颜色格式
+      - convert_format()，在各种颜色格式之间进行转换
+      - generate_color_list()，改进自原来的 for_matplotlib.generate_color_list()，新增了output_format参数用于对颜色格式的控制
 
 

{kevin-toolbox-dev-1.3.6 → kevin-toolbox-dev-1.3.7}/README.md

@@ -67,3 +67,11 @@ pip install kevin-toolbox  --no-dependencies
       - 【new feature】modify Average_Accumulator，在 add() 中新增了 weight 参数用于计算带权重的平均值
       - modify Exponential_Moving_Average，add_sequence() 不再支持 weight_ls 参数，让该接口与其他类更加一致。
     - 添加了测试用例。
+- v 1.3.7 （2024-08-01）【new feature】
+  - patches.for_matplotlib
+    - 【new feature】add clear_border_of_axes()，用于清除 ax 中的坐标轴和 ticks。
+    - 【new feature】add module color，添加用于处理颜色相关的模块，包含以下函数和属性
+      - Color_Format 颜色格式，共有 HEX_STR、RGBA_ARRAY、NATURAL_NAME 三种
+      - get_format()，推断所属颜色格式
+      - convert_format()，在各种颜色格式之间进行转换
+      - generate_color_list()，改进自原来的 for_matplotlib.generate_color_list()，新增了output_format参数用于对颜色格式的控制

{kevin-toolbox-dev-1.3.6 → kevin-toolbox-dev-1.3.7}/kevin_toolbox/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.3.6"
+__version__ = "1.3.7"
 
 
 import os
@@ -12,5 +12,5 @@ os.system(
 os.system(
     f'python {os.path.split(__file__)[0]}/env_info/check_validity_and_uninstall.py '
     f'--package_name kevin-toolbox-dev '
-    f'--expiration_timestamp 1735563213 --verbose 0'
+    f'--expiration_timestamp 1738073103 --verbose 0'
 )

{kevin-toolbox-dev-1.3.6 → kevin-toolbox-dev-1.3.7}/kevin_toolbox/nested_dict_list/serializer/write.py

@@ -211,6 +211,7 @@ def write(var, output_dir, settings=None, traversal_mode=Traversal_Mode.BFS, b_p
                 file_path=os.path.join(temp_output_dir, "record.json"), b_use_suggested_converter=True)
 
     # 打包成 .tar 文件
+    for_os.remove(path=tgt_path, ignore_errors=True)
     if b_pack_into_tar:
         for_os.pack(source=temp_output_dir)
         os.rename(temp_output_dir + ".tar", output_dir + ".tar")

{kevin-toolbox-dev-1.3.6 → kevin-toolbox-dev-1.3.7}/kevin_toolbox/patches/for_matplotlib/__init__.py

@@ -1,4 +1,4 @@
 from .arrow3d import Arrow3D
 from .add_trajectory_2d import add_trajectory_2d
 from .add_trajectory_3d import add_trajectory_3d
-from .generate_color_list import generate_color_list
+from .clear_border_of_axes import clear_border_of_axes

kevin-toolbox-dev-1.3.7/kevin_toolbox/patches/for_matplotlib/clear_border_of_axes.py

@@ -0,0 +1,34 @@
+def clear_border_of_axes(ax):
+    """
+        用于清除 ax 中的坐标轴和 ticks
+    """
+    ax.set_xticks([])
+    ax.set_yticks([])
+    ax.spines['left'].set_color('none')
+    ax.spines['right'].set_color('none')
+    ax.spines['bottom'].set_color('none')
+    ax.spines['top'].set_color('none')
+    return ax
+
+
+if __name__ == '__main__':
+    import matplotlib.pyplot as plt
+
+    #
+    fig, ax = plt.subplots()
+
+    x = [1, 4]
+    y = [1, 10]
+    ax.plot(x, y)
+
+    # 设置坐标轴的范围，以便更好地展示直线
+    ax.set_xlim([0, 5])
+    ax.set_ylim([0, 15])
+
+    # 添加标题和坐标轴标签
+    ax.set_xlabel('X')
+    ax.set_ylabel('Y')
+    clear_border_of_axes(ax)
+
+    # 显示图形
+    plt.show()

kevin-toolbox-dev-1.3.7/kevin_toolbox/patches/for_matplotlib/color/__init__.py

@@ -0,0 +1,4 @@
+from .color_format import Color_Format
+from .get_format import get_format
+from .convert_format import convert_format
+from .generate_color_list import generate_color_list

kevin-toolbox-dev-1.3.7/kevin_toolbox/patches/for_matplotlib/color/color_format.py

@@ -0,0 +1,7 @@
+from enum import Enum
+
+
+class Color_Format(Enum):
+    HEX_STR = "hex_str"  # 例如 '#FF573380'
+    RGBA_ARRAY = "rgba_array"  # 例如 (255, 87, 51, 0.5)
+    NATURAL_NAME = "natural_name"  # 例如 'red'

kevin-toolbox-dev-1.3.7/kevin_toolbox/patches/for_matplotlib/color/convert_format.py

@@ -0,0 +1,108 @@
+from kevin_toolbox.patches.for_matplotlib.color import Color_Format, get_format
+
+
+def hex_to_rgba(hex_color):
+    hex_color = hex_color.lstrip('#')
+    assert len(hex_color) in (6, 8), \
+        f'hex_color should be 6 or 8 characters long (not including #). but got {len(hex_color)}'
+    res = list(int(hex_color[i * 2:i * 2 + 2], 16) for i in range(len(hex_color) // 2))
+    if len(res) not in (3, 4):
+        breakpoint()
+    if len(res) == 4:
+        res[3] /= 255
+    return tuple(res)
+
+
+def rgba_to_hex(rgba):
+    assert len(rgba) in (3, 4), \
+        f'rgba should be 3 or 4 elements long. but got {len(rgba)}'
+    if len(rgba) == 4:
+        rgba = list(rgba)
+        rgba[3] = max(0, min(255, int(255 * rgba[3])))
+    res = "#"
+    for i in rgba:
+        res += f'{i:02X}'
+    return res
+
+
+NAME_TO_HEX = {
+    'blue': '#0000FF',
+    'red': '#FF0000',
+    'green': '#008000',
+    'orange': '#FFA500',
+    'purple': '#800080',
+    'yellow': '#FFFF00',
+    'brown': '#A52A2A',
+    'pink': '#FFC0CB',
+    'gray': '#808080',
+    'olive': '#808000',
+    'cyan': '#00FFFF'
+}
+HEX_TO_NAME = {v: k for k, v in NAME_TO_HEX.items()}
+
+
+def natural_name_to_hex(name):
+    global NAME_TO_HEX
+    name = name.lower()
+    assert name in NAME_TO_HEX, \
+        f'{name} is not a valid color name.'
+    return NAME_TO_HEX[name]
+
+
+def hex_to_natural_name(hex_color):
+    global HEX_TO_NAME
+    hex_color = hex_color.upper()[:7]
+    assert hex_color in HEX_TO_NAME, \
+        f'{hex_color} does not has corresponding color name.'
+    return HEX_TO_NAME[hex_color]
+
+
+CONVERT_PROCESS_S = {
+    (Color_Format.HEX_STR, Color_Format.NATURAL_NAME): hex_to_natural_name,  # (from, to): process
+    (Color_Format.HEX_STR, Color_Format.RGBA_ARRAY): hex_to_rgba,
+    (Color_Format.NATURAL_NAME, Color_Format.HEX_STR): natural_name_to_hex,
+    (Color_Format.NATURAL_NAME, Color_Format.RGBA_ARRAY): lambda x: hex_to_rgba(natural_name_to_hex(x)),
+    (Color_Format.RGBA_ARRAY, Color_Format.HEX_STR): rgba_to_hex,
+    (Color_Format.RGBA_ARRAY, Color_Format.NATURAL_NAME): lambda x: hex_to_natural_name(rgba_to_hex(x))
+}
+
+
+def convert_format(var, output_format, input_format=None):
+    """
+        在各种颜色格式之间进行转换
+
+        参数：
+            var:
+            input_format:       <str> 描述输入的格式。
+                                    支持 HEX_STR、NATURAL_NAME、RGBA_ARRAY 等格式，
+                                    默认为 None，此时将根据输入推断格式
+            output_format:      <str/list of str> 输出的目标格式。
+                                    当输入是一个 tuple/list 时，将输出其中任一格式，具体规则为：
+                                        - 当 input_format 不在可选的输出格式中时，优先按照第一个输出格式进行转换。
+                                            若转换失败，则按照第二个输出格式进行转换。依次类推。
+                                        - 当 input_format 在可选的输出格式中时，不进行转换。
+    """
+    global CONVERT_PROCESS_S
+    if input_format is None:
+        input_format = get_format(var=var)
+    input_format = Color_Format(input_format)
+    if not isinstance(output_format, (list, tuple,)):
+        output_format = [output_format]
+    output_format = [Color_Format(i) for i in output_format]
+
+    if input_format in output_format:
+        return var
+    else:
+        for output_format_i in output_format:
+            try:
+                return CONVERT_PROCESS_S[(input_format, output_format_i)](var)
+            except Exception as e:
+                raise Exception(f'fail to convert {var} from {input_format} to {output_format}, beacause: {e}')
+
+
+if __name__ == '__main__':
+    print(hex_to_rgba('#FF57337F'))
+    print(rgba_to_hex((255, 87, 51, 0.5)))
+    print(natural_name_to_hex('pink'))
+    print(convert_format(var='#FF57337F', input_format='hex_str', output_format='rgba_array'))
+    print(convert_format(var="#0000FF", output_format="rgba_array"))

kevin-toolbox-dev-1.3.7/kevin_toolbox/patches/for_matplotlib/color/generate_color_list.py

@@ -0,0 +1,50 @@
+from kevin_toolbox.patches.for_matplotlib.color import Color_Format, convert_format
+from kevin_toolbox.patches.for_numpy import random
+
+PREDEFINED = ['blue', 'red', 'green', 'orange', 'purple', 'yellow', "brown", "pink", "gray", "olive", "cyan"]
+PREDEFINED = [convert_format(var=i, output_format=Color_Format.HEX_STR) for i in PREDEFINED]
+
+population = tuple('0123456789ABCDEF')
+
+
+def generate_color_list(nums, seed=None, rng=None, exclude_ls=None, output_format=Color_Format.HEX_STR):
+    """
+        生成颜色列表
+
+        参数:
+            nums:           <int> 生成颜色的数量
+            seed,rng:       随机种子或随机生成器，二选一
+            exclude:        <list of str> 需要排除的颜色
+            output_format:  <Color_Format/str> 输出格式
+                            支持 HEX_STR、RGBA_ARRAY 两种格式
+        返回：
+            不包含 alpha 透明度值的颜色列表
+    """
+    global PREDEFINED, population
+    assert output_format in [Color_Format.HEX_STR, Color_Format.RGBA_ARRAY]
+    output_format = Color_Format(output_format)
+    if exclude_ls is None:
+        exclude_ls = []
+    assert isinstance(exclude_ls, (list, tuple))
+    exclude_ls = set(convert_format(var=i, output_format=Color_Format.HEX_STR) for i in exclude_ls)
+    rng = random.get_rng(seed=seed, rng=rng)
+
+    colors = [i for i in PREDEFINED if i not in exclude_ls][:nums]  # 优先输出预定义的颜色
+
+    # 随机生成剩余数量的颜色
+    while len(colors) < nums:
+        c = "#" + ''.join(
+            rng.choice(population, size=6, replace=True))
+        if c not in colors and c not in exclude_ls:
+            colors.append(c)
+    colors = [convert_format(c, output_format=output_format) for c in colors]
+
+    return colors
+
+
+if __name__ == '__main__':
+    color_list = generate_color_list(1, exclude_ls=['blue'])
+    print(color_list)
+
+    color_list = generate_color_list(nums=1, seed=114, exclude_ls=['#0000FF'])
+    print(color_list)

kevin-toolbox-dev-1.3.7/kevin_toolbox/patches/for_matplotlib/color/get_format.py

@@ -0,0 +1,12 @@
+from kevin_toolbox.patches.for_matplotlib.color import Color_Format
+
+
+def get_format(var):
+    if isinstance(var, str):
+        if var.startswith("#"):
+            res = Color_Format.HEX_STR
+        else:
+            res = Color_Format.NATURAL_NAME
+    else:
+        res = Color_Format.RGBA_ARRAY
+    return res

{kevin-toolbox-dev-1.3.6 → kevin-toolbox-dev-1.3.7}/kevin_toolbox/patches/for_matplotlib/common_charts/plot_lines.py

@@ -1,7 +1,7 @@
 import os
 import matplotlib.pyplot as plt
 from kevin_toolbox.patches.for_os.path import replace_illegal_chars
-from kevin_toolbox.patches.for_matplotlib import generate_color_list
+from kevin_toolbox.patches.for_matplotlib.color import generate_color_list
 
 
 def plot_lines(data_s, title, x_name, output_dir=None, **kwargs):

{kevin-toolbox-dev-1.3.6 → kevin-toolbox-dev-1.3.7}/kevin_toolbox/patches/for_matplotlib/common_charts/plot_scatters.py

@@ -1,6 +1,6 @@
 import os
 import matplotlib.pyplot as plt
-from kevin_toolbox.patches.for_matplotlib import generate_color_list
+from kevin_toolbox.patches.for_matplotlib.color import generate_color_list
 from kevin_toolbox.patches.for_os.path import replace_illegal_chars
 
 

{kevin-toolbox-dev-1.3.6 → kevin-toolbox-dev-1.3.7}/kevin_toolbox/patches/for_matplotlib/common_charts/plot_scatters_matrix.py

@@ -2,7 +2,7 @@ import os
 import pandas as pd
 import seaborn as sns
 import matplotlib.pyplot as plt
-from kevin_toolbox.patches.for_matplotlib import generate_color_list
+from kevin_toolbox.patches.for_matplotlib.color import generate_color_list
 from kevin_toolbox.patches.for_os.path import replace_illegal_chars
 
 

{kevin-toolbox-dev-1.3.6 → kevin-toolbox-dev-1.3.7}/kevin_toolbox/patches/for_optuna/build_study.py

@@ -24,7 +24,7 @@ def build_study(output_dir=None, feasible_domain_path=None, **kwargs):
     if "storage" in kwargs:
         if isinstance(kwargs["storage"], (str,)) and kwargs["storage"].startswith("mysql:"):
             temp_ls = list(kwargs["storage"].split(":", 1))
-            temp[0] = "mysql+pymysql"
+            temp_ls[0] = "mysql+pymysql"
             kwargs["storage"] = ":".join(temp_ls)
         elif isinstance(kwargs["storage"], (dict,)):
             kwargs["storage"] = build_storage(output_dir=output_dir, **kwargs["storage"]).url

{kevin-toolbox-dev-1.3.6 → kevin-toolbox-dev-1.3.7}/kevin_toolbox_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kevin-toolbox-dev
-Version: 1.3.6
+Version: 1.3.7
 Summary: 一个常用的工具代码包集合
 Home-page: https://github.com/cantbeblank96/kevin_toolbox
 Download-URL: https://github.com/username/your-package/archive/refs/tags/v1.0.0.tar.gz
@@ -86,5 +86,13 @@ pip install kevin-toolbox  --no-dependencies
       - 【new feature】modify Average_Accumulator，在 add() 中新增了 weight 参数用于计算带权重的平均值
       - modify Exponential_Moving_Average，add_sequence() 不再支持 weight_ls 参数，让该接口与其他类更加一致。
     - 添加了测试用例。
+- v 1.3.7 （2024-08-01）【new feature】
+  - patches.for_matplotlib
+    - 【new feature】add clear_border_of_axes()，用于清除 ax 中的坐标轴和 ticks。
+    - 【new feature】add module color，添加用于处理颜色相关的模块，包含以下函数和属性
+      - Color_Format 颜色格式，共有 HEX_STR、RGBA_ARRAY、NATURAL_NAME 三种
+      - get_format()，推断所属颜色格式
+      - convert_format()，在各种颜色格式之间进行转换
+      - generate_color_list()，改进自原来的 for_matplotlib.generate_color_list()，新增了output_format参数用于对颜色格式的控制
 
 

{kevin-toolbox-dev-1.3.6 → kevin-toolbox-dev-1.3.7}/kevin_toolbox_dev.egg-info/SOURCES.txt

@@ -268,7 +268,12 @@ kevin_toolbox/patches/for_matplotlib/__init__.py
 kevin_toolbox/patches/for_matplotlib/add_trajectory_2d.py
 kevin_toolbox/patches/for_matplotlib/add_trajectory_3d.py
 kevin_toolbox/patches/for_matplotlib/arrow3d.py
-kevin_toolbox/patches/for_matplotlib/generate_color_list.py
+kevin_toolbox/patches/for_matplotlib/clear_border_of_axes.py
+kevin_toolbox/patches/for_matplotlib/color/__init__.py
+kevin_toolbox/patches/for_matplotlib/color/color_format.py
+kevin_toolbox/patches/for_matplotlib/color/convert_format.py
+kevin_toolbox/patches/for_matplotlib/color/generate_color_list.py
+kevin_toolbox/patches/for_matplotlib/color/get_format.py
 kevin_toolbox/patches/for_matplotlib/common_charts/__init__.py
 kevin_toolbox/patches/for_matplotlib/common_charts/plot_bars.py
 kevin_toolbox/patches/for_matplotlib/common_charts/plot_confusion_matrix.py

kevin-toolbox-dev-1.3.6/kevin_toolbox/patches/for_matplotlib/generate_color_list.py

@@ -1,33 +0,0 @@
-import random
-
-PREDEFINED = ['blue', 'red', 'green', 'orange', 'purple', 'yellow', "brown", "pink", "gray", "olive", "cyan"]
-
-
-def generate_color_list(nums, seed=None, exclude_ls=None):
-    """
-        参数:
-            nums:           <int> 生成颜色的数量
-            seed:           随机种子
-            exclude:        <list of str> 需要排除的颜色
-    """
-    global PREDEFINED
-    if exclude_ls is None:
-        exclude_ls = []
-    assert isinstance(exclude_ls, (list, tuple))
-
-    colors = [i for i in PREDEFINED if i not in exclude_ls][:nums]  # 优先输出预定义的颜色
-
-    # 随机生成剩余数量的颜色
-    if seed is not None:
-        random.seed(seed)
-    while len(colors) < nums:
-        c = "#" + ''.join(random.choices('0123456789ABCDEF', k=6))
-        if c not in colors and c not in exclude_ls:
-            colors.append(c)
-
-    return colors
-
-
-if __name__ == '__main__':
-    color_list = generate_color_list(20)
-    print(color_list)