re-common 10.0.43__tar.gz → 10.0.44__tar.gz

{re_common-10.0.43/re_common.egg-info → re_common-10.0.44}/PKG-INFO

@@ -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 → re_common-10.0.44}/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-10.0.43 → re_common-10.0.44}/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-10.0.43 → re_common-10.0.44}/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-10.0.43 → re_common-10.0.44}/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 → re_common-10.0.44/re_common.egg-info}/PKG-INFO

@@ -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 → re_common-10.0.44}/setup.py

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