mdbq 4.0.76__py3-none-any.whl → 4.0.78__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.76'
+VERSION = '4.0.78'

mdbq/log/mylogger.py

@@ -200,6 +200,17 @@ class MyLogger:
                     if not extra_data and hasattr(record, 'extra'):
                         extra_data = getattr(record, 'extra', None)
                     if extra_data:
+                        # 优先显示func信息
+                        func_name = extra_data.get('func', '')
+                        module_name = extra_data.get('model', '')
+                        line_number = extra_data.get('lines', '')
+                        if func_name:
+                            msg += f" | Function: {func_name}"
+                        if module_name:
+                            msg += f" | Module: {module_name}"
+                        if line_number:
+                            msg += f" | Line: {line_number}"
+                        
                         context_data = extra_data.get('context_data', {})
                         if context_data:
                             msg += f" | Context: {context_data}"
@@ -207,7 +218,7 @@ class MyLogger:
                         if metrics:
                             msg += f" | Metrics: {metrics}"
                         extra = {k: v for k, v in extra_data.items()
-                                 if k not in ('context_data', '性能指标')}
+                                 if k not in ('context_data', '性能指标', 'func', 'model', 'lines')}
                         if extra:
                             msg += f" | Extra: {extra}"
                     return msg
@@ -413,6 +424,23 @@ class MyLogger:
         if extra:
             log_extra.update(extra)
 
+        # 获取当前调用func
+        try:
+            frame = inspect.currentframe()
+            # 跳过logger内部函数，找到真正的调用者
+            caller_frame = frame.f_back
+            skip_functions = ['_sync_log', 'log', 'debug', 'info', 'warning', 'error', 'critical', 'wrapper', 'log_error_handler', 'decorator']
+            while caller_frame and caller_frame.f_code.co_name in skip_functions:
+                caller_frame = caller_frame.f_back
+            if caller_frame:
+                log_extra['func'] = caller_frame.f_code.co_name
+                log_extra['model'] = caller_frame.f_globals.get('__name__', '')
+                log_extra['lines'] = caller_frame.f_lineno
+            del frame
+        except Exception:
+            # 如果获取函数信息失败，不影响正常日志记录
+            pass
+
         # 添加上下文信息
         if hasattr(self._context, 'data') and self._context.data:
             log_extra['context_data'] = self._context.data.copy()

mdbq/mysql/uploader.py

@@ -11,7 +11,6 @@ from mdbq.log import mylogger
 from mdbq.myconf import myconf
 from typing import Union, List, Dict, Optional, Any, Tuple, Set
 from dbutils.pooled_db import PooledDB
-import sys
 from decimal import Decimal, InvalidOperation
 import math
 import json
@@ -986,7 +985,6 @@ class MySQLUploader:
                 logger.error('数据表不存在', {
                     '库': db_name,
                     '表': table_name,
-                    'func': sys._getframe().f_code.co_name,
                 })
                 raise ValueError(f"数据表不存在: `{db_name}`.`{table_name}`")
         if table_existed and unique_keys:
@@ -1019,7 +1017,6 @@ class MySQLUploader:
                 '库': db_name,
                 '表': table_name,
                 '列': self._shorten_for_log(table_columns),
-                'func': sys._getframe().f_code.co_name,
             })
             raise ValueError(f"获取列失败 `{db_name}`.`{table_name}`")
         for col in set_typ:
@@ -1028,7 +1025,6 @@ class MySQLUploader:
                     '库': db_name,
                     '表': table_name,
                     '列': col,
-                    'func': sys._getframe().f_code.co_name,
                 })
                 raise ValueError(f"列不存在: `{col}` -> `{db_name}`.`{table_name}`")
         if date_column and date_column in table_columns:
@@ -1151,7 +1147,6 @@ class MySQLUploader:
                 logger.error('数据转字典时发生错误', {
                     'error': str(e),
                     'data': self._shorten_for_log(data),
-                    'func': sys._getframe().f_code.co_name,
                 })
                 raise ValueError(f"数据转字典时发生错误: {e}")
         elif isinstance(data, dict):
@@ -1167,7 +1162,6 @@ class MySQLUploader:
         else:
             logger.error('数据结构必须是字典、列表、字典列表或dataframe', {
                 'data': self._shorten_for_log(data),
-                'func': sys._getframe().f_code.co_name,
             })
             raise ValueError("数据结构必须是字典、列表、字典列表或dataframe")
 
@@ -1175,9 +1169,7 @@ class MySQLUploader:
         data = self.normalize_column_names(data)
 
         if not set_typ:
-            logger.warning('set_typ为空, 将自动推断数据类型, 可能存在数据类型识别错误', {
-                'func': sys._getframe().f_code.co_name,
-            })
+            logger.warning('set_typ为空, 将自动推断数据类型, 可能存在数据类型识别错误')
         # set_typ的键清洗
         if not set_typ:
             set_typ = {}
@@ -1227,7 +1219,6 @@ class MySQLUploader:
                             '行': row_idx,
                             '报错': str(e),
                             'row': self._shorten_for_log(row),
-                            'func': sys._getframe().f_code.co_name,
                         })
                         raise ValueError(f"行:{row_idx}, 列:`{col_name}`-> 报错: {str(e)}")
             prepared_data.append(prepared_row)
@@ -1318,6 +1309,14 @@ class MySQLUploader:
         - 如需"跳过"行为，设置 update_on_duplicate=False 即可。
         """
         # upload_start = time.time()
+        # 检查data参数是否为None
+        if data is None:
+            logger.error('data参数不能为None', {
+                '库': db_name,
+                '表': table_name,
+            })
+            raise ValueError("data参数不能为None，请传入有效的数据")
+            
         if isinstance(data, list) or (hasattr(data, 'shape') and hasattr(data, '__len__')):
             initial_row_count = len(data)
         else:
@@ -1374,7 +1373,6 @@ class MySQLUploader:
                         '表': table_name,
                         '批次': batch_id,
                         '分表方式': partition_by,
-                        'func': sys._getframe().f_code.co_name,
                     })
                     raise ValueError("分表方式必须是 'year' 或 'month' 或 'None'")
 
@@ -1388,7 +1386,6 @@ class MySQLUploader:
                 else:
                     logger.error('数据库不存在', {
                         '库': db_name,
-                        'func': sys._getframe().f_code.co_name,
                     })
                     raise ValueError(f"数据库不存在: `{db_name}`")
 
@@ -1404,7 +1401,6 @@ class MySQLUploader:
                                 '批次': batch_id,
                                 '缺失列': partition_date_column,
                                 'row': self._shorten_for_log(row),
-                                'func': sys._getframe().f_code.co_name,
                             })
                             dropped_rows += 1
                             continue
@@ -1422,7 +1418,6 @@ class MySQLUploader:
                             '表': table_name,
                             'row_data': self._shorten_for_log(row),
                             'error': str(e),
-                            'func': sys._getframe().f_code.co_name,
                         })
                         dropped_rows += 1
                         continue
@@ -1455,7 +1450,6 @@ class MySQLUploader:
                             '分表': part_table,
                             'error': str(e),
                             '数据样例': self._shorten_for_log(part_data, 2),
-                            'func': sys._getframe().f_code.co_name,
                         })
                         continue  # 跳过当前分表，继续处理其他分表
             else:
@@ -1485,7 +1479,6 @@ class MySQLUploader:
                 'error': str(e),
                 'error_type': type(e).__name__,
                 '数据样例': self._shorten_for_log(data, 2),
-                'func': sys._getframe().f_code.co_name,
             })
             return False
         finally:
@@ -1574,7 +1567,6 @@ class MySQLUploader:
                 '错误值': mode,
                 '可选值': valid_modes,
                 '自动使用默认模式': 'batch',
-                'func': sys._getframe().f_code.co_name,
             })
             return 'batch'
         return mode.lower()

{mdbq-4.0.76.dist-info → mdbq-4.0.78.dist-info}/METADATA

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

{mdbq-4.0.76.dist-info → mdbq-4.0.78.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=4-wCvdyrxPRXkaLjZ9P-QAF-qrd2e28_3SNgcFL3hbg,18
+mdbq/__version__.py,sha256=3AA2p5c6tOTM_2v5e5EAeYlqso5Y1D5shirSVp5akUM,18
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
-mdbq/log/mylogger.py,sha256=kPe3wsQNaB1slfX-Z7VMqzZoMoqPfc7ylYXZDBeFzzI,24945
+mdbq/log/mylogger.py,sha256=DyBftCMNLe1pTTXsa830pUtDISJxpJHFIradYtE3lFA,26418
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/myconf/myconf.py,sha256=rHvQCnQRKhQ49AZBke-Z4v28hyOLmHt4MylIuB0H6yA,33516
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
@@ -9,7 +9,7 @@ mdbq/mysql/deduplicator.py,sha256=AB3gL7ZwhcmzGHSu4UY4M6YZVPFZ2wlAN3BCcwAhegQ,73
 mdbq/mysql/mysql.py,sha256=pDg771xBugCMSTWeskIFTi3pFLgaqgyG3smzf-86Wn8,56772
 mdbq/mysql/s_query.py,sha256=nwhyqbxq-V0sGUJbdjiUDEwjpDxiKrzG0PjV6wkrWU4,50474
 mdbq/mysql/unique_.py,sha256=MaztT-WIyEQUs-OOYY4pFulgHVcXR1BfCy3QUz0XM_U,21127
-mdbq/mysql/uploader.py,sha256=68kJIrCnP2dJZ6ilb8MoFzuzGGWU_272WwPfaqt075A,112125
+mdbq/mysql/uploader.py,sha256=xodmN3f5pT1T2yJu01ckgYb_THE__rm81kgNJfqtinc,111530
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/download_sku_picture.py,sha256=X66sVdvVgzoNzmgVJyPtd7bjEvctEKtLPblEPF65EWc,46940
 mdbq/other/error_handler.py,sha256=4p5haAXSY-P78stp4Xwo_MwAngWYqyKj5ogWIuYXMeY,12631
@@ -24,7 +24,7 @@ mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
 mdbq/selenium/__init__.py,sha256=AKzeEceqZyvqn2dEDoJSzDQnbuENkJSHAlbHAD0u0ZI,10
 mdbq/selenium/get_driver.py,sha256=sJYMfkzNprGoHYkppVqxglRSIQm6mO7wvgYvSzTWHdc,20903
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.0.76.dist-info/METADATA,sha256=hRdHNHSJUtMBpcEEnrQsmZHZbCPDMnPD8t07pYgmImI,364
-mdbq-4.0.76.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mdbq-4.0.76.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.76.dist-info/RECORD,,
+mdbq-4.0.78.dist-info/METADATA,sha256=rNd9aQqkIiblLo105u3YNQ9J4FP7efHqNapi4ku8lZ8,364
+mdbq-4.0.78.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.0.78.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.78.dist-info/RECORD,,

{mdbq-4.0.76.dist-info → mdbq-4.0.78.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any