mdbq 4.0.36__py3-none-any.whl → 4.0.38__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.36'
+VERSION = '4.0.38'

mdbq/mysql/uploader.py

@@ -1753,6 +1753,75 @@ class MySQLUploader:
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.close()
 
+    # @_execute_with_retry
+    def execute_query(self, sql: str, params: Optional[Tuple] = None) -> List[Dict]:
+        """
+        执行查询SQL语句并返回结果
+        
+        :param sql: SQL查询语句
+        :param params: SQL参数，可选
+        :return: 查询结果列表，每个元素为字典格式
+        :raises: 可能抛出数据库相关异常
+        """
+        if not sql or not isinstance(sql, str):
+            logger.error('无效的SQL语句', {'sql': sql})
+            raise ValueError('SQL语句不能为空且必须是字符串')
+        
+        try:
+            with self._get_connection() as conn:
+                with conn.cursor() as cursor:
+                    cursor.execute(sql, params)
+                    results = cursor.fetchall()
+                    logger.debug('查询执行成功', {
+                        'sql': self._shorten_for_log(sql, 100),
+                        'params': self._shorten_for_log(params, 50),
+                        '结果数量': len(results)
+                    })
+                    return results
+        except Exception as e:
+            logger.error('执行查询时出错', {
+                'sql': self._shorten_for_log(sql, 100),
+                'params': self._shorten_for_log(params, 50),
+                'error': str(e)
+            })
+            raise
+
+    # @_execute_with_retry
+    def execute_update(self, sql: str, params: Optional[Tuple] = None) -> int:
+        """
+        执行更新SQL语句（INSERT、UPDATE、DELETE）并返回影响的行数
+        
+        :param sql: SQL更新语句
+        :param params: SQL参数，可选
+        :return: 影响的行数
+        :raises: 可能抛出数据库相关异常
+        """
+        if not sql or not isinstance(sql, str):
+            logger.error('无效的SQL语句', {'sql': sql})
+            raise ValueError('SQL语句不能为空且必须是字符串')
+        
+        conn = None
+        try:
+            with self._get_connection() as conn:
+                with conn.cursor() as cursor:
+                    affected_rows = cursor.execute(sql, params)
+                    conn.commit()
+                    logger.debug('更新执行成功', {
+                        'sql': self._shorten_for_log(sql, 100),
+                        'params': self._shorten_for_log(params, 50),
+                        '影响行数': affected_rows
+                    })
+                    return affected_rows
+        except Exception as e:
+            logger.error('执行更新时出错', {
+                'sql': self._shorten_for_log(sql, 100),
+                'params': self._shorten_for_log(params, 50),
+                'error': str(e)
+            })
+            if conn is not None:
+                conn.rollback()
+            raise
+
 
 def main():
     dir_path = os.path.expanduser("~")

mdbq/other/error_handler.py

@@ -79,13 +79,17 @@ def log_on_exception(
     log_fields: Optional[List[str]] = None,
 ):
     """
-    :param logger: 日志对象
+    :param logger: 日志对象，需实现 debug/info/warning/error/critical 方法
     :param on_exception: 异常回调，参数为 error_info 字典
     :param default_return: 异常时返回的默认值
     :param log_fields: 只记录 error_info 的部分字段
     """
-    if logger is not None and not isinstance(logger, logging.Logger):
-        raise TypeError(f"logger 参数必须为 logging.Logger 实例或 None，当前类型为: {type(logger)}")
+    if logger is not None:
+        for method in ("debug", "info", "warning", "error", "critical"):
+            if not hasattr(logger, method):
+                raise TypeError(
+                    f"logger 参数必须有 {method} 方法，当前类型为: {type(logger)}"
+                )
     def decorator(func):
         is_async = asyncio.iscoroutinefunction(func)
         @wraps(func)
@@ -142,13 +146,17 @@ def log_on_exception_with_retry(
     log_fields: Optional[List[str]] = None,
 ):
     """
-    :param logger: 日志对象
+    :param logger: 日志对象，需实现 debug/info/warning/error/critical 方法
     :param on_exception: 异常回调，参数为 error_info 字典
     :param default_return: 异常时返回的默认值
     :param log_fields: 只记录 error_info 的部分字段
     """
-    if logger is not None and not isinstance(logger, logging.Logger):
-        raise TypeError(f"logger 参数必须为 logging.Logger 实例或 None，当前类型为: {type(logger)}")
+    if logger is not None:
+        for method in ("debug", "info", "warning", "error", "critical"):
+            if not hasattr(logger, method):
+                raise TypeError(
+                    f"logger 参数必须有 {method} 方法，当前类型为: {type(logger)}"
+                )
     def decorator(func):
         is_async = asyncio.iscoroutinefunction(func)
         @wraps(func)

{mdbq-4.0.36.dist-info → mdbq-4.0.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mdbq
-Version: 4.0.36
+Version: 4.0.38
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-4.0.36.dist-info → mdbq-4.0.38.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=zkcTzC4btf-Gh2O0sS9u1Pl3m_UGMa4rkyfG91EfdD0,18
+mdbq/__version__.py,sha256=U1WMRZvqWGnnlhMX5A6NKB6YnAmRd4rS3atED7bLCQo,18
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
 mdbq/aggregation/query_data.py,sha256=WtTFMN78jn43Y-nBTPAXhAK56w3wDuv_cj4YtzzGbZk,169797
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
@@ -11,10 +11,10 @@ mdbq/mysql/deduplicator.py,sha256=AB3gL7ZwhcmzGHSu4UY4M6YZVPFZ2wlAN3BCcwAhegQ,73
 mdbq/mysql/mysql.py,sha256=pDg771xBugCMSTWeskIFTi3pFLgaqgyG3smzf-86Wn8,56772
 mdbq/mysql/s_query.py,sha256=1wJ3HVjHEF6FA-bVeeesRlsf73CZSvVTEQ51CF1OsE4,46786
 mdbq/mysql/unique_.py,sha256=MaztT-WIyEQUs-OOYY4pFulgHVcXR1BfCy3QUz0XM_U,21127
-mdbq/mysql/uploader.py,sha256=SVlrLxoYBEpTu_I771wAehJQVFWOCqXp-lNk2JNYFOE,81881
+mdbq/mysql/uploader.py,sha256=defQ4xCC3j8an9dWjFI3q_Fec0Irewe2FzBZqFL1GJM,84673
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/download_sku_picture.py,sha256=X66sVdvVgzoNzmgVJyPtd7bjEvctEKtLPblEPF65EWc,46940
-mdbq/other/error_handler.py,sha256=XiygzLiOKy-pYE4xcMbF0cEFxKorHHAhSeVZIDbQvhY,12313
+mdbq/other/error_handler.py,sha256=4p5haAXSY-P78stp4Xwo_MwAngWYqyKj5ogWIuYXMeY,12631
 mdbq/other/otk.py,sha256=iclBIFbQbhlqzUbcMMoePXBpcP1eZ06ZtjnhcA_EbmE,7241
 mdbq/other/pov_city.py,sha256=AEOmCOzOwyjHi9LLZWPKi6DUuSC-_M163664I52u9qw,21050
 mdbq/other/ua_sj.py,sha256=JuVYzc_5QZ9s_oQSrTHVKkQv4S_7-CWx4oIKOARn_9U,22178
@@ -25,7 +25,7 @@ mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=XptHjGzbout9IYzWAOQUpMMV5qEgLTU8pL1ZGt8oNEA,21868
-mdbq-4.0.36.dist-info/METADATA,sha256=eyN-znN-wNE2_i3A5WsrJI7WnKXN6kUenvnQH2kqBHU,364
-mdbq-4.0.36.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-4.0.36.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.36.dist-info/RECORD,,
+mdbq-4.0.38.dist-info/METADATA,sha256=edMyLlQlfms58lylwf4zSHXWbqA8C9jFwJ-YHT-p_cs,364
+mdbq-4.0.38.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.0.38.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.38.dist-info/RECORD,,