mdbq 1.9.2__tar.gz → 1.9.4__tar.gz

{mdbq-1.9.2 → mdbq-1.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 1.9.2
+Version: 1.9.4
 Home-page: https://pypi.org/project/mdbsql
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-1.9.2 → mdbq-1.9.4}/mdbq/aggregation/aggregation.py

@@ -474,10 +474,20 @@ class DatabaseUpdate:
                 elif name.endswith('.xlsx') and '搜索分析-排名定位-商品词下排名' in name:
                     # 京东商品词下排名
                     try:
+                        pattern = re.findall(r'(\d{4}-\d{2}-\d{2})-(\d{4}-\d{2}-\d{2})', name)
+                        if not pattern:
+                            continue
+                        if pattern[0][0] == pattern[0][1]:
+                            print(f'{name}: 检测到数据周期异常，仅支持7天数据')
+                            continue
                         df = pd.read_excel(os.path.join(root, name), header=0, engine='openpyxl')
                         if len(df) == 0:
                             print(f'{name} 报表数据为空')
                             continue
+                        if len(df.columns.tolist()) < 20:
+                            print(f'{name}: 报表可能缺失诊断数据')
+                            os.remove(os.path.join(root, name))
+                            continue
                         df.rename(columns={'商品的ID': 'skuid'}, inplace=True)
                         for col in ['词人气', '搜索点击率']:
                             if col in df.columns.tolist():

{mdbq-1.9.2 → mdbq-1.9.4}/mdbq/clean/data_clean.py

@@ -827,6 +827,14 @@ class DataClean:
                         os.remove(os.path.join(root, name))
                     elif name.endswith('.xlsx') and '搜索分析-排名定位-商品词下排名' in name:
                         # 京东商品词下排名
+                        pattern = re.findall(r'(\d{4}-\d{2}-\d{2})-(\d{4}-\d{2}-\d{2})', name)
+                        if not pattern:
+                            os.remove(os.path.join(root, name))
+                            continue
+                        if pattern[0][0] == pattern[0][1]:
+                            print(f'{name}: 检测到数据周期异常，仅支持7天数据')
+                            os.remove(os.path.join(root, name))
+                            continue
                         new_name = os.path.splitext(name)[0] + '.csv'
                         # print(name)
                         df = pd.read_excel(os.path.join(root, name), header=0, engine='openpyxl')
@@ -834,6 +842,10 @@ class DataClean:
                             print(f'{name} 报表数据为空')
                             os.remove(os.path.join(root, name))
                             continue
+                        if len(df.columns.tolist()) < 20:
+                            print(f'{name}: 报表可能缺失诊断数据')
+                            os.remove(os.path.join(root, name))
+                            continue
                         df.rename(columns={'商品的ID': 'skuid'}, inplace=True)
                         df['skuid'] = df['skuid'].apply(lambda x: f'="{x}"' if x and '=' not in str(x) else x)
                         self.save_to_csv(df, root, new_name)

{mdbq-1.9.2 → mdbq-1.9.4}/mdbq/mysql/mysql.py

@@ -57,6 +57,18 @@ class MysqlUpload:
         }
         self.filename = None
 
+    @staticmethod
+    def try_except(func):  # 在类内部定义一个异常处理方法
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            try:
+                return func(*args, **kwargs)
+            except Exception as e:
+                print(f'{func.__name__}, {e}')  # 将异常信息返回
+
+        return wrapper
+
+    @try_except
     def df_to_mysql(self, df, table_name, db_name='远程数据源', icm_update=[], service_database={'home_lx': 'mysql'}, move_insert=False, df_sql=False, drop_duplicates=False, filename=None, count=None, json_path=None):
         """
         将 df 写入数据库

{mdbq-1.9.2 → mdbq-1.9.4}/mdbq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 1.9.2
+Version: 1.9.4
 Home-page: https://pypi.org/project/mdbsql
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-1.9.2 → mdbq-1.9.4}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='mdbq',
-      version='1.9.2',
+      version='1.9.4',
       author='xigua, ',
       author_email="2587125111@qq.com",
       url='https://pypi.org/project/mdbsql',