mdbq 4.0.34__py3-none-any.whl → 4.0.35__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.34'
+VERSION = '4.0.35'

mdbq/aggregation/query_data.py

@@ -4,6 +4,7 @@ from mdbq.mysql import uploader
 from mdbq.mysql import s_query
 from mdbq.myconf import myconf
 from mdbq.log import mylogger
+from mdbq.other import error_handler
 import datetime
 from dateutil.relativedelta import relativedelta
 import pandas as pd
@@ -218,18 +219,7 @@ class MysqlDatasQuery:
         self.download_manager = download_manager
         self.pf_datas = []
 
-    @staticmethod
-    def try_except(func):
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            try:
-                return func(*args, **kwargs)
-            except Exception as e:
-                logger.info('函数执行错误', {'函数': func.__name__, '错误': str(e), 'args': args, 'kwargs': kwargs})
-
-        return wrapper
-
-    # @try_except
+    # @error_handler.log_on_exception(logger=logger)
     def tg_wxt(self, db_name='聚合数据', table_name='天猫_主体报表', is_maximize=True):
         start_date, end_date = self.months_data(num=self.months)
         projection = {
@@ -716,7 +706,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '推广渠道', '店铺名称', '营销场景', '商品id', '花费', '展现量', '点击量', '自然流量曝光量']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def syj(self, db_name='聚合数据', table_name='生意经_宝贝指标'):
         start_date, end_date = self.months_data(num=self.months)
@@ -791,7 +781,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '店铺名称', '宝贝id']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def tg_rqbb(self, db_name='聚合数据', table_name='天猫_人群报表', is_maximize=True):
         start_date, end_date = self.months_data(num=self.months)
@@ -998,7 +988,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '推广渠道', '店铺名称', '营销场景', '商品id', '人群名字']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def tg_gjc(self, db_name='聚合数据', table_name='天猫_关键词报表', is_maximize=True):
         start_date, end_date = self.months_data(num=self.months)
@@ -1160,7 +1150,7 @@ class MysqlDatasQuery:
             return pd.DataFrame()
         return df
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def tg_cjzb(self, db_name='聚合数据', table_name='天猫_超级直播', is_maximize=True):
         start_date, end_date = self.months_data(num=self.months)
@@ -1297,7 +1287,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '推广渠道', '店铺名称', '营销场景', '人群名字', '计划名字']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     def pxb_zh(self, db_name='聚合数据', table_name='天猫_品销宝账户报表', is_maximize=True):
         start_date, end_date = self.months_data(num=self.months)
         projection = {
@@ -1406,7 +1396,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '推广渠道', '店铺名称', '营销场景', '报表类型', '花费', '展现量']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     def idbm(self, db_name='聚合数据', table_name='商品id编码表'):
         """ 用生意经日数据制作商品 id 和编码对照表 """
         projection = {
@@ -1455,7 +1445,7 @@ class MysqlDatasQuery:
             'unique_keys': [['宝贝id']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def sp_picture(self, db_name='聚合数据', table_name='商品id图片对照表'):
         """  """
@@ -1690,7 +1680,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '店铺名称', '商品id']],  # 唯一约束列表
         }
 
-    # @try_except
+    # @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def dplyd(self, db_name='聚合数据', table_name='店铺流量来源构成'):
         """ 新旧版取的字段是一样的 """
@@ -1795,7 +1785,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '店铺名称', '类别', '来源构成', '一级来源', '二级来源', '三级来源']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def sp_cost(self, db_name='聚合数据', table_name='商品成本'):
         """ 电商定价 """
@@ -1832,7 +1822,7 @@ class MysqlDatasQuery:
             'unique_keys': [['款号']],  # 唯一约束列表
         }
 
-    # @try_except
+    # @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def jdjzt(self, db_name='聚合数据', table_name='京东_京准通'):
         start_date, end_date = self.months_data(num=self.months)
@@ -1936,7 +1926,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '店铺名称', '产品线', '触发sku_id', '跟单sku_id', '花费']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def jdqzyx(self, db_name='聚合数据', table_name='京东_京准通_全站营销'):
         start_date, end_date = self.months_data(num=self.months)
@@ -2003,7 +1993,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '店铺名称', '产品线']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def jd_gjc(self, db_name='聚合数据', table_name='京东_关键词报表'):
         start_date, end_date = self.months_data(num=self.months)
@@ -2102,7 +2092,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '产品线', '计划id', '搜索词', '关键词']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def sku_sales(self, db_name='聚合数据', table_name='京东_sku_商品明细'):
         start_date, end_date = self.months_data(num=self.months)
@@ -2164,7 +2154,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '店铺名称', '商品id']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def spu_sales(self, db_name='聚合数据', table_name='京东_spu_商品明细'):
         start_date, end_date = self.months_data(num=self.months)
@@ -2235,7 +2225,7 @@ class MysqlDatasQuery:
         start_date = f'{start_date.year}-{start_date.month}-01'  # 替换为 n 月以前的第一天
         return pd.to_datetime(start_date), pd.to_datetime(end_date)
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def se_search(self, db_name='聚合数据', table_name='天猫店铺来源_手淘搜索'):
         start_date, end_date = self.months_data(num=self.months)
@@ -2299,7 +2289,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '店铺名称', '词类型', '搜索词']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def zb_ccfx(self, db_name='聚合数据', table_name='生意参谋_直播场次分析'):
         start_date, end_date = self.months_data(num=self.months)
@@ -2437,7 +2427,7 @@ class MysqlDatasQuery:
             'unique_keys': [['场次id']],  # 唯一约束列表
         }
 
-    # @try_except
+    # @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def tg_by_day(self, db_name='聚合数据', table_name='多店推广场景_按日聚合'):
         """
@@ -2896,7 +2886,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '店铺名称', '营销场景']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def aikucun_bd_spu(self, db_name='聚合数据', table_name='爱库存_商品spu榜单'):
         start_date, end_date = self.months_data(num=self.months)
@@ -3109,7 +3099,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '店铺名称', '场景id', '父渠道id']],  # 唯一约束列表
         }
 
-    # @try_except
+    # @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def dmp_crowd(self, db_name='聚合数据', table_name='达摩盘_人群报表'):
         start_date, end_date = self.months_data(num=self.months)
@@ -3215,7 +3205,7 @@ class MysqlDatasQuery:
             'unique_keys': [['日期', '店铺名称', '人群id', '营销渠道', '计划基础信息', '推广单元信息']],  # 唯一约束列表
         }
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     def ret_keyword(self, keyword, as_file=False):
         """ 推广关键词报表，关键词分类， """
         datas = [
@@ -3379,7 +3369,7 @@ class MysqlDatasQuery:
                 break
         return result
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     def set_crowd(self, keyword, as_file=False):
         """ 推广人群报表，人群分类， """
         result_a = re.findall('_a$|_a_|_ai|^a_', str(keyword), re.IGNORECASE)
@@ -3413,7 +3403,7 @@ class MysqlDatasQuery:
         if not is_res:
             return ''
 
-    @try_except
+    @error_handler.log_on_exception(logger=logger)
     def set_crowd2(self, keyword, as_file=False):
         """ 推广人群报表，人群分类， """
         datas = [
@@ -3508,7 +3498,7 @@ class MysqlDatasQuery:
                 break
         return result
 
-    # @try_except
+    # @error_handler.log_on_exception(logger=logger)
     @upload_data_decorator()
     def performance_concat(self, db_name, table_name, bb_tg=True):
         tg = [item['数据主体'] for item in self.pf_datas if item['集合名称'] == '天猫汇总表调用'][0]

mdbq/log/mylogger.py

@@ -549,7 +549,7 @@ def main():
         sensitive_fields=[],  #  敏感字段列表
         enable_metrics=False,  # 是否启用性能指标
     )
-    logger.info('123')
+    logger.info('123', extra={'extra_data': {'test': 'test'}})
     logger.shutdown()
 
 

mdbq/other/error_handler.py

@@ -0,0 +1,119 @@
+import traceback
+import sys
+from functools import wraps
+import inspect
+
+
+def log_on_exception(logger=None):
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            try:
+                return func(*args, **kwargs)
+            except Exception as e:
+                stack_lines = traceback.format_exc().splitlines(keepends=True)
+                if len(stack_lines) > 40:
+                    stack_summary = ''.join(stack_lines[:20]) + '\n...\n' + ''.join(stack_lines[-20:])
+                else:
+                    stack_summary = ''.join(stack_lines)
+                error_info = {
+                    '函数': func.__name__,
+                    '模块': func.__module__,
+                    '类型': type(e).__name__,
+                    '消息': str(e),
+                    '签名': str(inspect.signature(func)),
+                    'args': [str(arg) for arg in args] if args else [],
+                    'kwargs': {k: str(v) for k, v in kwargs.items()} if kwargs else {},
+                    '函数文件': func.__code__.co_filename,
+                    '函数行号': func.__code__.co_firstlineno,
+                    '异常行号': traceback.extract_tb(sys.exc_info()[2])[-1].lineno if sys.exc_info()[2] else None,
+                    '异常文件': traceback.extract_tb(sys.exc_info()[2])[-1].filename if sys.exc_info()[2] else None,
+                    '堆栈': stack_summary,
+                }
+                if logger:
+                    logger.error(f"执行失败", {'details': error_info})
+
+                # print(error_info)
+                # raise  # 重新抛出异常
+                
+                return None  # 或者返回其他默认值
+        
+        return wrapper
+    return decorator
+
+
+def log_on_exception_with_retry(max_retries=3, delay=1, logger=None):
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            last_exception = None
+            
+            for attempt in range(max_retries):
+                try:
+                    return func(*args, **kwargs)
+                except Exception as e:
+                    import time
+                    last_exception = e
+                    error_info = {
+                        '函数': func.__name__,
+                        '重试': attempt + 1,
+                        '最大重试': max_retries,
+                        '类型': type(e).__name__,
+                        '消息': str(e),
+                    }
+                    
+                    if logger:
+                        logger.warning(f"函数 {func.__name__} 第 {attempt + 1} 次尝试失败", {'details': error_info})
+                    
+                    if attempt < max_retries - 1:
+                        time.sleep(delay)
+                        if logger:
+                            logger.info(f"⏳ 第 {attempt + 1} 次尝试失败，{delay}秒后重试...")
+                    else:
+                        if logger:
+                            logger.error(f"❌ 函数 {func.__name__} 在 {max_retries} 次尝试后仍然失败")
+            
+            final_error_info = {
+                '函数': func.__name__,
+                '最终错误类型': type(last_exception).__name__,
+                '最终错误消息': str(last_exception),
+                '总尝试次数': max_retries,
+                '堆栈跟踪': traceback.format_exc(),
+            }
+            
+            if logger:
+                logger.error(f"函数 {func.__name__} 最终执行失败", {'details': final_error_info})
+            
+            return None
+            
+        return wrapper
+    return decorator
+
+
+if __name__ == "__main__":
+    import logging
+    test_logger = logging.getLogger(__name__)
+    test_logger.setLevel(logging.INFO)
+    
+    @log_on_exception(logger=test_logger)
+    def divide_numbers(a, b):
+        """测试函数：除法运算"""
+        return a / b
+    
+    @log_on_exception_with_retry(max_retries=2, delay=0.5, logger=test_logger)
+    def fetch_data(url):
+        import random
+        """测试函数：模拟数据获取"""
+        if random.random() < 0.7:  # 70% 概率失败
+            raise ConnectionError("网络连接失败")
+        return "数据获取成功"
+    
+    # 测试基本错误处理
+    print("=== 测试基本错误处理 ===")
+    result1 = divide_numbers(10, 0)
+    result2 = divide_numbers(10, 2)
+    print(f"结果: {result2}")
+    
+    print("\n=== 测试重试机制 ===")
+    result3 = fetch_data("http://example.com")
+    print(f"最终结果: {result3}") 

{mdbq-4.0.34.dist-info → mdbq-4.0.35.dist-info}/METADATA

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

{mdbq-4.0.34.dist-info → mdbq-4.0.35.dist-info}/RECORD

@@ -1,9 +1,9 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=D_wa3H06nsA6Arfalq9RVMZHoFDp3ZG4xsE24b2Lu8E,18
+mdbq/__version__.py,sha256=B_ZDOEojo89VxQM2P_TRRgrJ65zx2UcvpOaQkIohFPI,18
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
-mdbq/aggregation/query_data.py,sha256=VICC4R0yNktmfWHItn7X0769DyRBa2hBXhJOTp3Zh2w,169282
+mdbq/aggregation/query_data.py,sha256=WtTFMN78jn43Y-nBTPAXhAK56w3wDuv_cj4YtzzGbZk,169797
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
-mdbq/log/mylogger.py,sha256=9w_o5mYB3FooIxobq_lSa6oCYTKIhPxDFox-jeLtUHI,21714
+mdbq/log/mylogger.py,sha256=uC_KHsoCkxKKMVZTKYhe06Y5g6nUYuQYSEmK7YHLtlc,21754
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/myconf/myconf.py,sha256=rHvQCnQRKhQ49AZBke-Z4v28hyOLmHt4MylIuB0H6yA,33516
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
@@ -14,6 +14,7 @@ mdbq/mysql/unique_.py,sha256=MaztT-WIyEQUs-OOYY4pFulgHVcXR1BfCy3QUz0XM_U,21127
 mdbq/mysql/uploader.py,sha256=SVlrLxoYBEpTu_I771wAehJQVFWOCqXp-lNk2JNYFOE,81881
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/download_sku_picture.py,sha256=X66sVdvVgzoNzmgVJyPtd7bjEvctEKtLPblEPF65EWc,46940
+mdbq/other/error_handler.py,sha256=ZeuvQM4qRYGA1a9gCijwYZ-NbA4coijMkbC2tqTNBU0,4590
 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
@@ -24,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.34.dist-info/METADATA,sha256=m5KXyEfQlxynSXm8ht6Owk0UZ-zi8MOo2AKy9lmYODg,364
-mdbq-4.0.34.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-4.0.34.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.34.dist-info/RECORD,,
+mdbq-4.0.35.dist-info/METADATA,sha256=okq1WCntJO--DHv5eIqIAwDggX6rHeFRfIR2xZQqnGs,364
+mdbq-4.0.35.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.0.35.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.35.dist-info/RECORD,,