kevin-toolbox-dev 1.4.0__py3-none-any.whl → 1.4.2__py3-none-any.whl

kevin_toolbox/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.4.0"
+__version__ = "1.4.2"
 
 
 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 1741603427 --verbose 0'
+    f'--expiration_timestamp 1742652267 --verbose 0'
 )

kevin_toolbox/patches/for_matplotlib/common_charts/plot_confusion_matrix.py

@@ -1,11 +1,20 @@
 import os
+import numpy as np
 from sklearn.metrics import confusion_matrix
 import matplotlib.pyplot as plt
 import seaborn as sns
 from kevin_toolbox.patches.for_os.path import replace_illegal_chars
 
 
-def plot_confusion_matrix(data_s, title, gt_name, pd_name, label_to_value_s=None, output_dir=None, **kwargs):
+def plot_confusion_matrix(data_s, title, gt_name, pd_name, label_to_value_s=None, output_dir=None,
+                          replace_zero_division_with=0, **kwargs):
+    """
+        计算并绘制混淆矩阵
+
+        参数：
+            replace_zero_division_with:         <float> 对于在normalize时引发除0错误的矩阵元素，使用何种值进行替代
+                                                    建议使用 np.nan 或者 0
+    """
     paras = {
         "dpi": 200,
         "normalize": None,  # "true", "pred", "all",
@@ -15,14 +24,28 @@ def plot_confusion_matrix(data_s, title, gt_name, pd_name, label_to_value_s=None
 
     value_set = set(data_s[gt_name]).union(set(data_s[pd_name]))
     if label_to_value_s is None:
-        label_to_value_s = dict()
-    for i in value_set.difference(set(label_to_value_s.values())):
-        label_to_value_s[f'{i}'] = i
-
-    assert set(label_to_value_s.values()).issuperset(value_set)
+        label_to_value_s = {f'{i}': i for i in value_set}
+    else:
+        # assert all(i in value_set for i in label_to_value_s.values())
+        pass
     # 计算混淆矩阵
     cfm = confusion_matrix(y_true=data_s[gt_name], y_pred=data_s[pd_name], labels=list(label_to_value_s.values()),
                            normalize=paras["normalize"])
+    # replace with nan
+    if paras["normalize"] is not None:
+        if paras["normalize"] == "all":
+            if cfm.sum() == 0:
+                cfm[cfm == 0] = replace_zero_division_with
+        else:
+            check_axis = 1 if paras["normalize"] == "true" else 0
+            temp = np.sum(cfm, axis=check_axis, keepdims=False)
+            for i in range(len(temp)):
+                if temp[i] == 0:
+                    if check_axis == 0:
+                        cfm[:, i] = replace_zero_division_with
+                    else:
+                        cfm[i, :] = replace_zero_division_with
+
     # 绘制混淆矩阵热力图
     plt.clf()
     plt.figure(figsize=(8, 6))
@@ -49,14 +72,13 @@ def plot_confusion_matrix(data_s, title, gt_name, pd_name, label_to_value_s=None
 
 
 if __name__ == '__main__':
-    import numpy as np
-
     # 示例真实标签和预测标签
     y_true = np.array([0, 1, 2, 0, 1, 2, 0, 1, 2, 5])
     y_pred = np.array([0, 2, 1, 0, 2, 1, 0, 1, 1, 5])
 
     plot_confusion_matrix(data_s={'a': y_true, 'b': y_pred},
                           title='test', gt_name='a', pd_name='b',
-                          label_to_value_s={"A": 5, "B": 0, "C": 1, "D": 2},
+                          label_to_value_s={"A": 5, "B": 0, "C": 1, "D": 2, "E": 3},
                           # output_dir=os.path.join(os.path.dirname(__file__), "temp"),
-                          normalize="true")
+                          replace_zero_division_with=-1,
+                          normalize="all")

kevin_toolbox/patches/for_streamlit/markdown/show_table.py

@@ -11,7 +11,8 @@ DEFAULT_DISPLAY_MODE_S = {
 
 
 def _show_table_by_columns(matrix, doc_dir, table_name, **kwargs):
-    with st.expander(label=table_name, expanded=True):
+    tab, _ = st.tabs([table_name, "[click to hide table]"])
+    with tab:
         for row in matrix:
             col_ls = st.columns(len(row))
             for col, i in zip(col_ls, row):
@@ -21,7 +22,7 @@ def _show_table_by_columns(matrix, doc_dir, table_name, **kwargs):
 
 METHOD_S = {
     "by_columns": _show_table_by_columns,
-    "by_markdown": lambda text, **kwargs: st.markdown(text=text)
+    "by_markdown": lambda text, **kwargs: st.markdown(text)
 }
 
 
@@ -52,7 +53,7 @@ def show_table(text, doc_dir=None, display_mode_s=None):
             method(text=part, matrix=table_s["matrix"], doc_dir=doc_dir, table_name=f'Table {idx}')
         else:
             # 是表格，且内部无图片，则直接显示
-            show_image(part)
+            show_image(text=part, doc_dir=doc_dir)
 
 # 另一种显示表格的方式是通过 data_editor 来显示，但是对图片的显示效果不好
 # TODO 可以选择是通过 data_editor 还是 columns，或者原始格式（对本地图片不处理或者使用 base64 代替）来显示表格

kevin_toolbox_dev-1.4.2.dist-info/METADATA

@@ -0,0 +1,58 @@
+Metadata-Version: 2.1
+Name: kevin-toolbox-dev
+Version: 1.4.2
+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
+Author: kevin hsu
+Author-email: xukaiming1996@163.com
+License: MIT
+Keywords: mathematics,pytorch,numpy,machine-learning,algorithm
+Platform: UNKNOWN
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+Requires-Dist: torch (>=1.2.0)
+Requires-Dist: numpy (>=1.19.0)
+Provides-Extra: plot
+Requires-Dist: matplotlib (>=3.0) ; extra == 'plot'
+Provides-Extra: rest
+Requires-Dist: pytest (>=6.2.5) ; extra == 'rest'
+Requires-Dist: line-profiler (>=3.5) ; extra == 'rest'
+
+# kevin_toolbox
+
+一个通用的工具代码包集合
+
+
+
+环境要求
+
+```shell
+numpy>=1.19
+pytorch>=1.2
+```
+
+安装方法：
+
+```shell
+pip install kevin-toolbox  --no-dependencies
+```
+
+
+
+[项目地址 Repo](https://github.com/cantbeblank96/kevin_toolbox)
+
+[使用指南 User_Guide](./notes/User_Guide.md)
+
+[免责声明 Disclaimer](./notes/Disclaimer.md)
+
+[版本更新记录](./notes/Release_Record.md)：
+
+- v 1.4.2 （2024-09-23）【bug fix】
+  - patches.for_streamlit.markdown
+    - 【bug fix】fix bug in show_table()，line 56 typo。
+
+

{kevin_toolbox_dev-1.4.0.dist-info → kevin_toolbox_dev-1.4.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-kevin_toolbox/__init__.py,sha256=-Q49VzPSum4_2Fr48x0D8r7urVTtPiLEFQ7Gus40Rkw,410
+kevin_toolbox/__init__.py,sha256=tjqb-s4WQXgWSqjDzizy9JE2ohYzD8NPYKPfprlUa4k,410
 kevin_toolbox/computer_science/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kevin_toolbox/computer_science/algorithm/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 kevin_toolbox/computer_science/algorithm/cache_manager/__init__.py,sha256=p2hddkZ1HfYF9-m2Hx-o9IotwQHd4QwDCePy2ADpTDA,41
@@ -281,7 +281,7 @@ kevin_toolbox/patches/for_matplotlib/color/generate_color_list.py,sha256=TZm-TkO
 kevin_toolbox/patches/for_matplotlib/color/get_format.py,sha256=l_vX8DUsWHNzLwveuF60TLcbQ_P7PvVt1yH_7FjElDs,312
 kevin_toolbox/patches/for_matplotlib/common_charts/__init__.py,sha256=etey2r0LO4PTLnH3VzcRKFe7IHP9I5TMW3DEz3sQx2c,270
 kevin_toolbox/patches/for_matplotlib/common_charts/plot_bars.py,sha256=crS1h79Dz6gGOnqhjuuN2o5pl8CekhCenx9lRz5KPiI,1887
-kevin_toolbox/patches/for_matplotlib/common_charts/plot_confusion_matrix.py,sha256=RVTsQhC04KDOg8wUO8sB66bBG07DKAC2I072UhUTr_o,2256
+kevin_toolbox/patches/for_matplotlib/common_charts/plot_confusion_matrix.py,sha256=KtmUAlKs3_ALFRKAEi0OAXj6SyG5L7LMmoSgOxKvvVs,3213
 kevin_toolbox/patches/for_matplotlib/common_charts/plot_distribution.py,sha256=stuyaULWM_vVW3r9WrpzGqA8rohQrdNKT3Agsbobqck,2396
 kevin_toolbox/patches/for_matplotlib/common_charts/plot_lines.py,sha256=j2GBT_E9tvQhLN2ynCknuBl1MjD6q2TZeNYGvm2IVRA,2034
 kevin_toolbox/patches/for_matplotlib/common_charts/plot_scatters.py,sha256=whO36bmixjwtsjCS6Ah6zEGJAlJyGcD-wmV3dA6u7mk,1658
@@ -324,7 +324,7 @@ kevin_toolbox/patches/for_streamlit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 kevin_toolbox/patches/for_streamlit/markdown/__init__.py,sha256=ZWNRNA7yn3LD_YMjBuUHrXcxDcG4iswIZtCJVCnRVB0,93
 kevin_toolbox/patches/for_streamlit/markdown/show.py,sha256=uSkArSUv8N05TFWsIpXa8f15uhN1Lpm0ZHZst_IytgY,327
 kevin_toolbox/patches/for_streamlit/markdown/show_image.py,sha256=8njiSDiPWWRNwevvpgipxZS3My7bGHp9j0dxLiut_x8,1546
-kevin_toolbox/patches/for_streamlit/markdown/show_table.py,sha256=yW1wrIngbb8xCA5iuDN_jgeet_iaV5PhA1y8OgQbDYg,3218
+kevin_toolbox/patches/for_streamlit/markdown/show_table.py,sha256=4Nv4SYGwLDi9txlUDSZ2B9uWrtvGhcbphIVfdqcSBN8,3254
 kevin_toolbox/patches/for_test/__init__.py,sha256=sFr2VZD1zk8Vtjq2_F8uE4xNovJF6yDY8j1YND5XAw0,49
 kevin_toolbox/patches/for_test/check_consistency.py,sha256=cerf4NywkvWYMvuJUjimfRRVU7D9vL30jTAX0NxxRoM,9422
 kevin_toolbox/patches/for_torch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -342,7 +342,7 @@ kevin_toolbox/patches/for_torch/math/get_y_at_x.py,sha256=bfoVcasZ_tMdhR_1Me0Jli
 kevin_toolbox/patches/for_torch/math/my_around.py,sha256=ptpU3ids50gwf663EpHbw7raj9tNrDGBFZ5t_uMNH14,1378
 kevin_toolbox/patches/for_torch/nn/__init__.py,sha256=aJs3RMqRzQmd8KKDmQW9FxwCqS5yfPqEdg-m0PwlQro,39
 kevin_toolbox/patches/for_torch/nn/lambda_layer.py,sha256=KUuLiX_Dr4bvRmpAaCW5QTDWDcnMPRnw0jg4NNXTFhM,223
-kevin_toolbox_dev-1.4.0.dist-info/METADATA,sha256=jn9h9g9cLt9ai5kkd2Y8aDkTiv31Qg5Ia63M9lQfF4w,4041
-kevin_toolbox_dev-1.4.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-kevin_toolbox_dev-1.4.0.dist-info/top_level.txt,sha256=S5TeRGF-PwlhsaUEPTI-f2vWrpLmh3axpyI6v-Fi75o,14
-kevin_toolbox_dev-1.4.0.dist-info/RECORD,,
+kevin_toolbox_dev-1.4.2.dist-info/METADATA,sha256=9RegVoPtEcZ8XLpxShCiJsg0vsbqvXJlrPCKX02b7IA,1415
+kevin_toolbox_dev-1.4.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+kevin_toolbox_dev-1.4.2.dist-info/top_level.txt,sha256=S5TeRGF-PwlhsaUEPTI-f2vWrpLmh3axpyI6v-Fi75o,14
+kevin_toolbox_dev-1.4.2.dist-info/RECORD,,

kevin_toolbox_dev-1.4.0.dist-info/METADATA

@@ -1,88 +0,0 @@
-Metadata-Version: 2.1
-Name: kevin-toolbox-dev
-Version: 1.4.0
-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
-Author: kevin hsu
-Author-email: xukaiming1996@163.com
-License: MIT
-Keywords: mathematics,pytorch,numpy,machine-learning,algorithm
-Platform: UNKNOWN
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-Requires-Dist: torch (>=1.2.0)
-Requires-Dist: numpy (>=1.19.0)
-Provides-Extra: plot
-Requires-Dist: matplotlib (>=3.0) ; extra == 'plot'
-Provides-Extra: rest
-Requires-Dist: pytest (>=6.2.5) ; extra == 'rest'
-Requires-Dist: line-profiler (>=3.5) ; extra == 'rest'
-
-# kevin_toolbox
-
-一个通用的工具代码包集合
-
-
-
-环境要求
-
-```shell
-numpy>=1.19
-pytorch>=1.2
-```
-
-安装方法：
-
-```shell
-pip install kevin-toolbox  --no-dependencies
-```
-
-
-
-[项目地址 Repo](https://github.com/cantbeblank96/kevin_toolbox)
-
-[使用指南 User_Guide](./notes/User_Guide.md)
-
-[免责声明 Disclaimer](./notes/Disclaimer.md)
-
-[版本更新记录](./notes/Release_Record.md)：
-
-- v 1.4.0 （2024-09-11）【bug fix】【new feature】【incompatible change】
-  - patches
-    - for_matplotlib.common_charts
-      - 【bug fix】fix bug in plot_confusion_matrix() for paras label_to_value_s，删除了对参数 label_to_value_s 的不合理的检验，并且支持更加自由的 label_to_value_s 设置，比如允许 label_to_value_s 中缺少 data_s 中已有的 label_idx，或者含有部分 data_s 中未见的 label_idx。
-      - 【bug fix】fix bug in plot_lines()，对接受的输入 data_s 进行 copy，避免后续操作引起输入意外改变。
-      - 增加测试用例。
-    - for_streamlit.markdown
-      - 【new feature】add show_image()，对 st.markdown 中图片显示部分的改进，能够正确显示本地的图片。
-      - 【new feature】add show_table()，对 st.markdown 中表格显示部分的改进，支持以下多种方式来显示表格。
-      - 【new feature】add show()，st.markdown 的改进版。
-      - 增加测试用例。
-  - data_flow.file
-    - markdown【incompatible change】【new feature】
-      - 【refactor and modify】
-        - generate_table() ==> table.generate_table()
-        - generate_link() ==> link.generate_link()
-        - save_images_in_ndl() ==> utils.save_images_in_ndl()
-        - parse_table() ，可以使用 table.convert_format() 来代替实现表格格式的转换
-      - table
-        - 【new feature】新增 Table_Format、get_format()、convert_format() 用于表格格式的转换，目前支持以下几种格式：
-          - simple_dict 简易字典模式：`{<title>: <list of value>, ...}`
-          - complete_dict 完整字典模式：`{<index>: {"title": <title>, "values": <list of value>}, ...}`
-          - matrix 矩阵形式：`{"matrix": [[...], [...], ...], "orientation":...(, "chunk_nums":..., "chunk_size":...)}`
-        - 【new feature】add find_tables()，查找文本中的表格
-          - 当 b_compact_format 设为 True，此时返回 table_ls，其中每个元素是一个 MATRIX 格式的表格
-          - 当 b_compact_format 设置为 False，此时返回 (table_ls, part_slices_ls, table_idx_ls)，其中 part_slices_ls 是表格和表格前后文本在 text 中对应的 slice，而 table_idx_ls 指出了 part_slices_ls 中第几个元素对应的是表格，table_idx_ls 与 table_ls 依次对应。
-        - 【new feature】add padding_misaligned_values()， 将标题下长度不相等的 values 补齐
-        - convert
-          - 格式转换相关的函数，包括 complete_to_matrix() 和 matrix_to_complete()
-      - link
-        - 【new feature】add find_links()，查找文本中的链接。与find_tables()类似，也支持 b_compact_format 参数。
-      - 增加测试用例。
-
-
-