re-common 10.0.43__py3-none-any.whl → 10.0.44__py3-none-any.whl

re_common/v2/baselibrary/tools/data_processer/data_processer.py

@@ -467,7 +467,7 @@ def init_worker(process_func, process_args):
         _init_func()
 
     _async_init_work = _process_args.get("async_init_work", None)
-    if _init_func:
+    if _async_init_work:
         asyncio.run(_async_init_work())
 
 

re_common/v2/baselibrary/tools/hdfs_base_processor.py

@@ -34,6 +34,7 @@ class HDFSBaseProcessor(abc.ABC):
         read_mode: Literal["all", "stream"] = "all",
         retries: int = 3,
         pool_factory: Callable[[], Awaitable[Any]] = None,
+        pool_factory_kwargs: dict = None,
         max_processes: int = None,  # 添加多进程支持
         result_dir: str = None,
     ):
@@ -48,6 +49,7 @@ class HDFSBaseProcessor(abc.ABC):
         self.retries = retries
         self.result_dir = result_dir
         self.pool_factory = pool_factory
+        self.pool_factory_kwargs = pool_factory_kwargs
         self.max_processes = max_processes or max(multiprocessing.cpu_count() - 1, 1)  # 默认使用CPU核心数-1
         self._client = None
 
@@ -64,7 +66,7 @@ class HDFSBaseProcessor(abc.ABC):
             return None
         global _pool
         if _pool is None:
-            _pool = await self.pool_factory()
+            _pool = await self.pool_factory(self.pool_factory_kwargs)
         return _pool
 
     def _list_gz_files(self) -> List[str]:

re_common/v2/baselibrary/utils/db.py

@@ -9,33 +9,7 @@ from collections import namedtuple
 
 from aiomysql import Pool, Connection, Cursor
 
-DB_CONFIG = {
-    "host": "192.168.98.64",
-    "port": 4000,
-    "user": "dataware_house_baseUser",
-    "password": "FF19AF831AEBD580B450B16BF9264200",
-    "db": "dataware_house_base",
-    "charset": "utf8mb4",
-    "minsize": 16,  # 最小连接数
-    "maxsize": 128,  # 最大连接数
-    "autocommit": False,  # 自动提交事务
-    "pool_recycle": 3600,  # 每个连接的回收时间（秒），超过此时间后连接将被关闭并重新创建，避免失效连接
-    "echo": False,  # 打印SQL语句
-}
-
-DB_CONFIG1 = {
-    "host": "192.168.98.64",
-    "port": 4000,
-    "user": "foreign_fulltextUser",
-    "password": "i4hIeasw1qpmhGN2nwL7",
-    "db": "foreign_fulltext",
-    "charset": "utf8mb4",
-    "minsize": 16,  # 最小连接数
-    "maxsize": 128,  # 最大连接数
-    "autocommit": False,  # 自动提交事务
-    "pool_recycle": 3600,  # 每个连接的回收时间（秒），超过此时间后连接将被关闭并重新创建，避免失效连接
-    "echo": False,  # 打印SQL语句
-}
+
 
 
 async def get_pool_only(_DB_CONFIG: dict = None):

re_common/v2/baselibrary/utils/string_bool.py

@@ -3,6 +3,8 @@ import re
 import regex
 import unicodedata
 
+from re_common.v2.baselibrary.decorators.utils import deprecated
+
 
 def is_ascii_alnum(char: str) -> bool:
     #  精准判断是否为英文或数字字符（ASCII 范围）
@@ -122,16 +124,17 @@ def is_all_symbols(text):
     # 检查每个字符是否属于符号类别
     return all(unicodedata.category(char).startswith(('P', 'S')) for char in text)
 
-def is_whole_word_en_re(organ: str, ele_organ: str) -> bool:
+def is_whole_word_en_re(sub_str: str, long_str: str) -> bool:
     """
     与 is_whole_word_en 效果一致
     """
-    if not organ or not ele_organ:
+    if not sub_str or not long_str:
         return False
 
-    pattern = rf"(^|[^a-z0-9-]){re.escape(organ)}([^a-z0-9-]|$)"
-    return re.search(pattern, ele_organ) is not None
+    pattern = rf"(^|[^a-z0-9-]){re.escape(sub_str)}([^a-z0-9-]|$)"
+    return re.search(pattern, long_str) is not None
 
+@deprecated("请使用 is_whole_word_en_re 中的方法代替。")
 def is_whole_word_en(sub_str: str, long_str: str) -> bool:
     regex_pattern = re.compile(r"[^a-z0-9-]", re.IGNORECASE)
 

{re_common-10.0.43.dist-info → re_common-10.0.44.dist-info}/METADATA

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

{re_common-10.0.43.dist-info → re_common-10.0.44.dist-info}/RECORD

@@ -187,7 +187,7 @@ re_common/v2/baselibrary/tools/concurrency.py,sha256=ctKBoeEbq1SGmhPp7oVR_QSXTKV
 re_common/v2/baselibrary/tools/dict_tools.py,sha256=eSMwPTLp3oSjuviC_wlXg0I-dnkkmZfUfCRLX5djWV8,1365
 re_common/v2/baselibrary/tools/dir_file_tools.py,sha256=0ZohO8ZCLjuwx1zh4fY1Zcxv9lBAGJamH_B3ZCFO5AI,801
 re_common/v2/baselibrary/tools/dolphinscheduler.py,sha256=1m7UGYDiuvJUCI6ik6CGM2fO8U5XteJzn55VRbwB9ts,7978
-re_common/v2/baselibrary/tools/hdfs_base_processor.py,sha256=PFTyhth9RBoMTxsOzUxpyEfQegRi_Sd-C0lvIEOCxCg,8746
+re_common/v2/baselibrary/tools/hdfs_base_processor.py,sha256=Gv4YR9JzAlPvGysFNvcS7RgG5skLM05rWpJGu0jbLLU,8869
 re_common/v2/baselibrary/tools/hdfs_bulk_processor.py,sha256=8FjuZbcBXC_27zEQonLKvb0fMGwcIH9MPRTOmdMAuLU,2396
 re_common/v2/baselibrary/tools/hdfs_data_processer.py,sha256=g0DaNjXM1hIUblFQ6YBwnwEBKIXn48X8Y9Eiok4dVlQ,14824
 re_common/v2/baselibrary/tools/hdfs_line_processor.py,sha256=h1J_mOPoNvsjw7zYMsD7rr0Q6bXvVzo9tRJZVAbei1s,2732
@@ -198,7 +198,7 @@ re_common/v2/baselibrary/tools/text_matcher.py,sha256=cPMoFxaA0-ce3tLRxVSs8_3pTY
 re_common/v2/baselibrary/tools/unionfind_tools.py,sha256=VYHZZPXwBYljsm7TjV1B6iCgDn3O3btzNf9hMvQySVU,2965
 re_common/v2/baselibrary/tools/data_processer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 re_common/v2/baselibrary/tools/data_processer/base.py,sha256=1cVDcznux06SlLKINyjjN7yYn3ugH7XirXe_bFjdah0,1734
-re_common/v2/baselibrary/tools/data_processer/data_processer.py,sha256=NEJDBs7M6F9CisDDPt8Eop1Sh2tCarKj35W6oOXz9js,22247
+re_common/v2/baselibrary/tools/data_processer/data_processer.py,sha256=Z3iESmdrRugtlv6fBNYTSVIiwblnv4IkKN2RwfWFtRA,22253
 re_common/v2/baselibrary/tools/data_processer/data_reader.py,sha256=nYXh1qMebfqV_vUBJtcvoV2z-a1pRvM0foZ2ehKXhpg,8098
 re_common/v2/baselibrary/tools/data_processer/data_writer.py,sha256=OgKZ06zRJYNx758rbjxZG_KNgkLuVLlyB1AvyRsJtS4,1447
 re_common/v2/baselibrary/tools/tree_processor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -213,13 +213,13 @@ re_common/v2/baselibrary/utils/basedict.py,sha256=sH3_RZ8u4649-jX2V1uKNNkjJVUijZ
 re_common/v2/baselibrary/utils/basehdfs.py,sha256=wwvk4kvipD-AVWCF0WRzBTM2q2wAvQtanLK-Hjp8FOk,6026
 re_common/v2/baselibrary/utils/basepika.py,sha256=ifOb3UsGj79k40aD9UK6-5BMPw43ZAo0SO3AYD4q4vw,7332
 re_common/v2/baselibrary/utils/basetime.py,sha256=w87FF5adZ12oJfV3oAnN7sr8iNThkgJqT3RsDtWPLmU,3729
-re_common/v2/baselibrary/utils/db.py,sha256=2eCLA4UOAdqGVLBGa3DYsIO61GGpj0zfb4zhXJPtFLQ,5393
+re_common/v2/baselibrary/utils/db.py,sha256=zGSXwZAMDllvccnw-hx71XpkFPEsS07m-Spk-dG6PJ8,4352
 re_common/v2/baselibrary/utils/elasticsearch.py,sha256=USjMAYAhpNQLs-dGjQgwPZNl_g2V22aRyaWDMFOp58c,1357
 re_common/v2/baselibrary/utils/json_cls.py,sha256=M93piYtmgm_wP8E57culTrd_AhHLoGg6PqeAJYdW2SM,438
 re_common/v2/baselibrary/utils/mq.py,sha256=UHpO8iNIHs91Tgp-BgnSUpZwjWquxrGLdpr3FMMv2zw,2858
 re_common/v2/baselibrary/utils/n_ary_expression_tree.py,sha256=-05kO6G2Rth7CEK-5lfFrthFZ1Q0-0a7cni7mWZ-2gg,9172
 re_common/v2/baselibrary/utils/pinyin_utils.py,sha256=OXZfVvMjKfCvEbJ6PIwpwWbupU1CSBXJNDnf3jMhC10,7141
-re_common/v2/baselibrary/utils/string_bool.py,sha256=FsmrUZw1CCUXrfC9ZejdgKO35320wWffiduAGhl_bFQ,6412
+re_common/v2/baselibrary/utils/string_bool.py,sha256=pCLxlJgXSSqnxJziE5lekkRXzeOkfniUq3yQ-WDgO-4,6551
 re_common/v2/baselibrary/utils/string_clear.py,sha256=Ympa0Cs2y_72QeeyMS8de8y_QgtEFJJQ0AgHnylbMUc,7861
 re_common/v2/baselibrary/utils/string_smi.py,sha256=cU0WAWHRGnGoVQx3eCEKeM_q_olFNzRTJe7rSe586SY,741
 re_common/v2/baselibrary/utils/stringutils.py,sha256=hH0pHNvgR_TgulmBPRax9U_sp6bwYG5ksDbdqHRCFvk,10083
@@ -249,8 +249,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.43.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-re_common-10.0.43.dist-info/METADATA,sha256=wLSvL6sw37eaQmsTV3OYThFy_oqzN4Bx1qcXw36SbNQ,787
-re_common-10.0.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-re_common-10.0.43.dist-info/top_level.txt,sha256=_H9H23zoLIalm1AIY_KYTVh_H0ZnmjxQIxsvXtLv45o,10
-re_common-10.0.43.dist-info/RECORD,,
+re_common-10.0.44.dist-info/licenses/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+re_common-10.0.44.dist-info/METADATA,sha256=WEvuEGO-2wJY144wQZ4whteTVYfdilKpJi9JCvbXnEI,787
+re_common-10.0.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+re_common-10.0.44.dist-info/top_level.txt,sha256=_H9H23zoLIalm1AIY_KYTVh_H0ZnmjxQIxsvXtLv45o,10
+re_common-10.0.44.dist-info/RECORD,,