re-common 10.0.38__tar.gz → 10.0.40__tar.gz

{re_common-10.0.38/re_common.egg-info → re_common-10.0.40}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: re_common
-Version: 10.0.38
+Version: 10.0.40
 Summary: a library about all python projects
 Home-page: https://gitee.com/xujiangios/re-common
 Author: vic
@@ -11,6 +11,14 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-python
+Dynamic: summary
 
 
     这是一个基础类，依赖很多的第三方包，是一个用得到的第三方库的封装，可以在此基础上迅速构建项目

{re_common-10.0.38 → re_common-10.0.40}/re_common/v2/baselibrary/business_utils/baseencodeid.py

@@ -10,7 +10,7 @@ class BaseLngid(object):
     def __int__(self):
         pass
 
-    def basBaseEncodeID(self, strRaw):
+    def BaseEncodeID(self, strRaw):
         r""" 自定义base编码 """
 
         strEncode = base64.b32encode(strRaw.encode('utf8')).decode('utf8')

re_common-10.0.40/re_common/v2/baselibrary/utils/elasticsearch.py

@@ -0,0 +1,46 @@
+# elasticsearch[async]~=8.11.1
+from typing import Any, Dict, List
+from elasticsearch import AsyncElasticsearch, helpers
+
+DEFAULT_CONFIG = {
+    "hosts": [
+        "http://192.168.32.97:9200",
+        "http://192.168.32.99:9200",
+        "http://192.168.32.101:9200",
+        "http://192.168.32.103:9200",
+    ],
+    "basic_auth": ("elastic", "Zl2bWsOuvqi0IUwpvGhK"),
+    "timeout": 60,
+}
+
+
+def get_es(config=DEFAULT_CONFIG):
+    es = AsyncElasticsearch(**config)
+    return es
+
+
+async def update(es: AsyncElasticsearch, index: str, doc_id: str, doc: Dict[str, Any], doc_as_upsert: bool = False):
+    return await es.update(index=index, id=doc_id, doc=doc, doc_as_upsert=doc_as_upsert)
+
+
+async def bulk_update(es: AsyncElasticsearch, index: str, docs: List[Dict[str, Any]], doc_as_upsert: bool = False):
+    """
+    批量更新ES文档
+
+    docs 格式示例：
+    [
+        {"_id": "1", "doc": {"field1": "value1"}},
+        {"_id": "2", "doc": {"field2": "value2"}},
+    ]
+    """
+    actions = []
+    for item in docs:
+        action = {
+            "_op_type": "update",
+            "_index": index,
+            "_id": item["_id"],
+            "doc": item["doc"],
+            "doc_as_upsert": doc_as_upsert,
+        }
+        actions.append(action)
+    return await helpers.async_bulk(es, actions=actions)

{re_common-10.0.38 → re_common-10.0.40}/re_common/v2/baselibrary/utils/stringutils.py

@@ -5,7 +5,6 @@ from itertools import combinations
 
 import regex
 import unicodedata
-from parsel import Selector
 
 from re_common.v2.baselibrary.utils.string_smi import JaroDamerauLevenshteinMaxSim
 
@@ -32,31 +31,23 @@ def bj2qj(src):
     return ''.join(buf)
 
 
-def qj2bj(src):
-    """
-    全角转半角
-    :param src:
-    :return:
-    """
-    if src is None:
-        return src
-
-    SBC_CHAR_START = 0xFF01
-    SBC_CHAR_END = 0xFF5E
-    CONVERT_STEP = 0xFEE0
-    DBC_SPACE = ' '
-    SBC_SPACE = '　'
-
-    buf = []
-    for char in src:
-        if SBC_CHAR_START <= ord(char) <= SBC_CHAR_END:
-            buf.append(chr(ord(char) - CONVERT_STEP))
-        elif char == SBC_SPACE:
-            buf.append(DBC_SPACE)
-        else:
-            buf.append(char)
-
-    return ''.join(buf)
+def qj2bj(text):
+    if text is None:
+        return text
+    # 预构建全角到半角的转换映射表（只需构建一次）
+    if not hasattr(qj2bj, 'trans_table'):
+        trans_map = {}
+        # 处理全角空格
+        trans_map[0x3000] = 0x0020
+        # 处理全角字符范围FF01-FF5E
+        for code in range(0xFF01, 0xFF5F):
+            trans_map[code] = code - 0xFEE0
+        # 创建转换表（字符到字符的映射）
+        qj2bj.trans_table = str.maketrans(
+            {chr(k): chr(v) for k, v in trans_map.items()}
+        )
+    # 使用预编译的转换表进行高效替换
+    return text.translate(qj2bj.trans_table)
 
 
 """

{re_common-10.0.38 → re_common-10.0.40/re_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: re_common
-Version: 10.0.38
+Version: 10.0.40
 Summary: a library about all python projects
 Home-page: https://gitee.com/xujiangios/re-common
 Author: vic
@@ -11,6 +11,14 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-python
+Dynamic: summary
 
 
     这是一个基础类，依赖很多的第三方包，是一个用得到的第三方库的封装，可以在此基础上迅速构建项目

{re_common-10.0.38 → re_common-10.0.40}/re_common.egg-info/SOURCES.txt

@@ -216,6 +216,7 @@ re_common/v2/baselibrary/utils/basehdfs.py
 re_common/v2/baselibrary/utils/basepika.py
 re_common/v2/baselibrary/utils/basetime.py
 re_common/v2/baselibrary/utils/db.py
+re_common/v2/baselibrary/utils/elasticsearch.py
 re_common/v2/baselibrary/utils/json_cls.py
 re_common/v2/baselibrary/utils/mq.py
 re_common/v2/baselibrary/utils/n_ary_expression_tree.py

{re_common-10.0.38 → re_common-10.0.40}/setup.py

@@ -34,7 +34,7 @@ long_description = """
 """
 setuptools.setup(
     name="re_common",
-    version="10.0.38",
+    version="10.0.40",
     author="vic",
     author_email="xujiang5@163.com",
     description="a library about all python projects",