mdbq 2.7.5__tar.gz → 2.7.7__tar.gz

{mdbq-2.7.5 → mdbq-2.7.7}/PKG-INFO

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

{mdbq-2.7.5 → mdbq-2.7.7}/mdbq/aggregation/query_data.py

@@ -2277,7 +2277,7 @@ def main():
 
 if __name__ == '__main__':
     data_aggregation(
-        months=1,
+        months=3,
         is_juhe=True,  # 生成聚合表
         # less_dict=['天猫_品销宝账户报表'],  # 单独聚合某一个数据库
     )

{mdbq-2.7.5 → mdbq-2.7.7}/mdbq/clean/clean_upload.py

@@ -439,8 +439,9 @@ class DataClean:
                     # 品销宝
                     sheets4 = ['账户', '推广计划', '推广单元', '创意', '品牌流量包', '定向人群']  # 品销宝
                     file_name4 = os.path.splitext(name)[0]  # 明星店铺报表
+                    new_df = []
                     for sheet4 in sheets4:
-                        df = pd.read_excel(os.path.join(root, name), sheet_name=sheet4, header=0, engine='xlrd')
+                        df = pd.read_excel(os.path.join(root, name), sheet_name=sheet4, header=0, engine='openpyxl')
                         if len(df) == 0:
                             print(f'{name} 报表数据为空')
                             os.remove(os.path.join(root, name))
@@ -452,6 +453,8 @@ class DataClean:
                             shop_name = re.findall(r'明星店铺_([\u4e00-\u9fffA-Za-z]+店)', name)[0]
                             df.insert(loc=1, column='店铺名称', value=shop_name)
                             df.insert(loc=2, column='报表类型', value=sheet4)
+                            # if '访客触达率' not in df.columns.tolist():
+                            #     df['访客触达率'] = '0'
                             df.fillna(0, inplace=True)
                             df['日期'] = pd.to_datetime(df['日期'], format='%Y-%m-%d', errors='ignore')  # 转换日期列
                             # min_clm = str(df['日期'].min()).split(' ')[0]
@@ -460,6 +463,8 @@ class DataClean:
                             # 以sheet名进一步创建子文件夹
                             # root_new = os.path.join(self.source_path, '推广报表/品销宝', sheet4)
                             self.save_to_csv(df, upload_path, new_file_name4)
+                            new_df.append(df)
+                    df = pd.concat(new_df)  # 品销宝 1 表有 6 个 sheet
                     os.remove(os.path.join(root, name))
 
                 # 将数据传入 self.datas 等待更新进数据库

{mdbq-2.7.5 → mdbq-2.7.7}/mdbq.egg-info/PKG-INFO

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

{mdbq-2.7.5 → mdbq-2.7.7}/setup.py

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