re-common 10.0.5__py3-none-any.whl → 10.0.7__py3-none-any.whl

re_common/v2/baselibrary/utils/author_smi.py

@@ -299,6 +299,7 @@ def AuthorRatio(
     if len(sort_l1) == len(sort_l2) and (is_same_or_initials_match(sort_l1, sort_l2) or set(sort_l1) == set(sort_l2)):
         return 0.99
 
+
     ##############################################################
     # 以上为情况穷举情况，以下为其他情况的相似率计算
     ##############################################################

re_common/v2/baselibrary/utils/n_ary_expression_tree.py

@@ -157,6 +157,70 @@ def parse_expression(tokens):
     return tree
 
 
+def flatten_tree(node):
+    """清理语法树，将嵌套的同级 and/or 节点展平。
+
+    Args:
+        node (Node): 输入的语法树节点
+
+    Returns:
+        Node: 清理后的新语法树节点
+    """
+    # 如果没有子节点，直接返回原节点（条件节点）
+    if not node.children:
+        return Node(value=node.value, children=[])
+
+    # 递归清理所有子节点
+    cleaned_children = [flatten_tree(child) for child in node.children]
+
+    # 如果当前节点是 'and' 或 'or'，展平嵌套的同类节点
+    if node.value in ('and', 'or'):
+        flattened_children = []
+        for child in cleaned_children:
+            # 如果子节点的值与当前节点相同（例如 'or' 下的 'or'），将其子节点提升
+            if child.value == node.value:
+                flattened_children.extend(child.children)
+            else:
+                flattened_children.append(child)
+        return Node(value=node.value, children=flattened_children)
+
+    # 对于其他节点（例如 'not'），保持结构不变，只更新子节点
+    return Node(value=node.value, children=cleaned_children)
+
+
+def pretty_print_tree(node, indent=0, prefix=""):
+    """生成语法树的格式化字符串表示，带有层次缩进。
+
+    Args:
+        node (Node): 要格式化的语法树节点
+        indent (int): 当前缩进级别（空格数），默认从 0 开始
+        prefix (str): 前缀字符串，用于表示当前行的开头
+
+    Returns:
+        str: 格式化后的树形字符串
+    """
+    # 基本缩进单位
+    spaces = " " * indent
+
+    # 如果没有子节点，返回单行表示
+    if not node.children:
+        return f"{spaces}{prefix}Node(value='{node.value}', children=[])"
+
+    # 构建当前节点的字符串
+    result = [f"{spaces}{prefix}Node(value='{node.value}', children=["]
+
+    # 递归处理每个子节点
+    for i, child in enumerate(node.children):
+        is_last = i == len(node.children) - 1
+        child_prefix = " " if is_last else " "
+        result.append(pretty_print_tree(child, indent + 4, child_prefix))
+
+    # 添加结束括号
+    result.append(f"{spaces}])")
+
+    # 将所有行连接成一个字符串
+    return "\n".join(result)
+
 # 测试代码
 expressions = [
     "not A=1 and B= 2",
@@ -173,6 +237,8 @@ for expr in expressions:
         tokens = tokenize(expr)
         print("Tokens:", tokens)
         tree = parse_expression(tokens)
+        tree = flatten_tree(tree)
+        tree = pretty_print_tree(tree)
         print("Tree:", tree)
     except ValueError as e:
         print(f"Error: {e}")

re_common/v2/baselibrary/utils/string_clear.py

@@ -67,9 +67,15 @@ class StringClear(object):
         return self
 
     def replace_dash_with_space(self):
+        # 横杆转空格
         self.obj_str = self.obj_str.replace("-", " ")
         return self
 
+    def strip_quotes(self):
+        # 清理 双引号
+        self.obj_str = self.obj_str.replace("\"", "")
+        return self
+
     def remove_diacritics(self):
         # 去除音标 转换成字母
         self.obj_str = get_diacritic_variant(self.obj_str)
@@ -110,3 +116,50 @@ def rel_clear(str_obj):
             .lower()  # 小写
             .get_str()  # 获取str
             .strip())  # 去掉空格
+
+
+def clear_au_organ(str_obj):
+    """
+    为作者机构定制的清理 与上面比除了不转小写外 还多了些特殊的清理
+    """
+    strs = (StringClear(str_obj)
+            .None_to_str()  # None 转 空字符串
+            .to_str()  # 防止其他类型传入 比如 int double
+            .qj_to_bj()  # 全角转半角
+            .strip_quotes()  # 清理 双引号
+            .clean_symbols()  # 清理已知的符号
+            .collapse_spaces()  # 移除多余空格,连续多个空格变一个
+            .get_str()  # 获取str
+            .strip()  # 去掉空格
+            )
+
+    strs = strs.replace("lt正gt", "").strip()  # 特殊需求
+    return strs
+
+
+def ref_clear(str_obj):
+    # 为 引文 数据定制的清理
+    strs = (StringClear(str_obj)
+            .None_to_str()  # None 转 空字符串
+            .to_str()  # 防止其他类型传入 比如 int double
+            .qj_to_bj()  # 全角转半角
+            .strip_quotes()  # 清理 双引号
+            .clean_symbols()  # 清理已知的符号
+            .collapse_spaces()  # 移除多余空格,连续多个空格变一个
+            .lower()  # 小写
+            .get_str()  # 获取str
+            .strip()  # 去掉空格
+            )
+    return strs
+
+
+def clear_obj(str_obj):
+    # 为对象化定制的清理
+    str_obj = clear_au_organ(str_obj)
+    str_obj = str_obj.replace("ß", "SS")
+    return (StringClear(str_obj)
+            .remove_diacritics()  # 清理音标
+            .upper()
+            .get_str()  # 获取str
+            .strip()  # 去掉空格
+            )

{re_common-10.0.5.dist-info → re_common-10.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: re_common
-Version: 10.0.5
+Version: 10.0.7
 Summary: a library about all python projects
 Home-page: https://gitee.com/xujiangios/re-common
 Author: vic

{re_common-10.0.5.dist-info → re_common-10.0.7.dist-info}/RECORD

@@ -163,6 +163,7 @@ re_common/studio/streamlitstudio/first_app.py,sha256=t7Fw8YDlub7G9q99GgVo_3sPZXU
 re_common/studio/streamlitstudio/uber_pickups.py,sha256=cvrV5e8vRBM2_CpVDBE-f3V4mGFK9SqpRPZK8TEqr6U,785
 re_common/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 re_common/v2/baselibrary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+re_common/v2/baselibrary/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 re_common/v2/baselibrary/s3object/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 re_common/v2/baselibrary/s3object/baseboto3.py,sha256=mXuIFx99pnrPGQ4LJCZwlN1HLbaU-OWLwck0cVzW6hc,11203
 re_common/v2/baselibrary/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -173,13 +174,13 @@ re_common/v2/baselibrary/tools/text_matcher.py,sha256=F4WtLO-b7H6V9TIvOntCD9ZXSQ
 re_common/v2/baselibrary/tools/unionfind_tools.py,sha256=VYHZZPXwBYljsm7TjV1B6iCgDn3O3btzNf9hMvQySVU,2965
 re_common/v2/baselibrary/utils/BusinessStringUtil.py,sha256=tzjVr_-6iPAKTt14hR-BhRshdRgeT_MPJpUQkxcTXns,4084
 re_common/v2/baselibrary/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-re_common/v2/baselibrary/utils/author_smi.py,sha256=zl3VQHgFbPIV9WgyeJNvqr_E39uefYxCGXlAW2s6lzc,13664
+re_common/v2/baselibrary/utils/author_smi.py,sha256=1ebH3AHv19jtJWdlqNdwu6t58HNVLCotuCB6ff1SWiw,13666
 re_common/v2/baselibrary/utils/basedict.py,sha256=tSV85pARe8ZQDY77_h_heS81EWwcgJW076DcA9WQyjY,1161
 re_common/v2/baselibrary/utils/basehdfs.py,sha256=NVV5Q0OMPlM_zTrs9ZDoPJv29GQv5wi9-AP1us5dBrQ,4651
 re_common/v2/baselibrary/utils/json_cls.py,sha256=dHOkWafG9lbQDoub9cbDwT2fDjMKtblQnjFLeA4hECA,286
-re_common/v2/baselibrary/utils/n_ary_expression_tree.py,sha256=B_QOkMM-91_a9a1LptKVcgiePP7VgT1nYACqAMxuIz8,6797
+re_common/v2/baselibrary/utils/n_ary_expression_tree.py,sha256=-05kO6G2Rth7CEK-5lfFrthFZ1Q0-0a7cni7mWZ-2gg,9172
 re_common/v2/baselibrary/utils/string_bool.py,sha256=4VCr1g8pX5YnzZSKctQgQfmhSQ0aw7a8ruhWdiRmBFU,641
-re_common/v2/baselibrary/utils/string_clear.py,sha256=sKKXEqCtItbJxsjgrBXBeubXaiAYuoc0301EOVFzXbk,3627
+re_common/v2/baselibrary/utils/string_clear.py,sha256=k0QyD2FNPDpDvBd91Qhz69K81ydDpcHzHq1HSwaeG_w,5434
 re_common/v2/baselibrary/utils/stringutils.py,sha256=GLXHAm8IulC_8hWrN2aiFQjsoOpjczvcVozmTJj86-A,3864
 re_common/vip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 re_common/vip/base_step_process.py,sha256=VXXiNj0I5CpzXIMCgOPU86bzDJkSBkUS-9CpZIl_GOk,205
@@ -207,8 +208,8 @@ re_common/vip/title/transform/TransformRegulationTitleToZt.py,sha256=LKRdIsWKues
 re_common/vip/title/transform/TransformStandardTitleToZt.py,sha256=-fCKAbSBzXVyQDCE61CalvR9E_QzQMA08QOO_NePFNI,5563
 re_common/vip/title/transform/TransformThesisTitleToZt.py,sha256=QS-uV0cQrpUFAcKucuJQ9Ue2VRQH-inmfn_X3IplfRo,5488
 re_common/vip/title/transform/__init__.py,sha256=m83-CWyRq_VHPYHaALEQlmXrkTdrZ3e4B_kCfBYE-uc,239
-re_common-10.0.5.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-re_common-10.0.5.dist-info/METADATA,sha256=BkA_XQSbOWWG7HRTWW5d9zgsIGCH8-J2jCsvE56NPZo,581
-re_common-10.0.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-re_common-10.0.5.dist-info/top_level.txt,sha256=_H9H23zoLIalm1AIY_KYTVh_H0ZnmjxQIxsvXtLv45o,10
-re_common-10.0.5.dist-info/RECORD,,
+re_common-10.0.7.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+re_common-10.0.7.dist-info/METADATA,sha256=4WDIp2GrlSKpykFERfN59eNiEE0CgOJppUVg_wvEjHk,581
+re_common-10.0.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+re_common-10.0.7.dist-info/top_level.txt,sha256=_H9H23zoLIalm1AIY_KYTVh_H0ZnmjxQIxsvXtLv45o,10
+re_common-10.0.7.dist-info/RECORD,,