mdbq 2.7.5__py3-none-any.whl → 2.7.6__py3-none-any.whl

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/clean/clean_upload.py

@@ -440,7 +440,7 @@ class DataClean:
                     sheets4 = ['账户', '推广计划', '推广单元', '创意', '品牌流量包', '定向人群']  # 品销宝
                     file_name4 = os.path.splitext(name)[0]  # 明星店铺报表
                     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 +452,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,10 +462,21 @@ class DataClean:
                             # 以sheet名进一步创建子文件夹
                             # root_new = os.path.join(self.source_path, '推广报表/品销宝', sheet4)
                             self.save_to_csv(df, upload_path, new_file_name4)
+                        if not db_name or not collection_name:
+                            continue
+                        # 一定要单独处理品销宝报表，因为 1 表包含 6个 sheet，都要添加
+                        self.datas.append(
+                            {
+                                '数据库名': db_name,
+                                '集合名称': collection_name,
+                                '数据主体': df,
+                                '文件名': name,
+                            }
+                        )
                     os.remove(os.path.join(root, name))
 
                 # 将数据传入 self.datas 等待更新进数据库
-                if not db_name or not collection_name:
+                if not db_name or not collection_name or '品销宝' in collection_name:
                     # print(f'db_name/collection_name 不能为空')
                     continue
                 self.datas.append(

{mdbq-2.7.5.dist-info → mdbq-2.7.6.dist-info}/METADATA

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

{mdbq-2.7.5.dist-info → mdbq-2.7.6.dist-info}/RECORD

@@ -5,11 +5,11 @@ mdbq/aggregation/aggregation.py,sha256=nn8RjHuiAH68awM893wXX0Bvg0QpsEQ5RXkxFn7H-
 mdbq/aggregation/df_types.py,sha256=U9i3q2eRPTDY8qAPTw7irzu-Tlg4CIySW9uYro81wdk,8125
 mdbq/aggregation/mysql_types.py,sha256=o8mbhmApd1XOHttbzYtV46SjKZ2NAcIpO1FuwIyBuf4,10920
 mdbq/aggregation/optimize_data.py,sha256=79uwiM2WqNNFxGpE2wKz742PRq-ZGgFjdOV0vgptHdY,3513
-mdbq/aggregation/query_data.py,sha256=mEmEQaN4-P9_cRd3ZYV260FvbkKSbGaa7yYoaN0v4uw,98375
+mdbq/aggregation/query_data.py,sha256=QpfIWX197ICqRnRhLZoKgkX9CuWvx_ryfScSaFdDN-Y,98375
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
-mdbq/clean/clean_upload.py,sha256=8L5d03AQKreYeJ-DQUu3BmkSym76zqmEzlcZcWp2OEc,82888
+mdbq/clean/clean_upload.py,sha256=Mlt9h31Wa_VHhTG40jWioRqk8ELZxDEHMurLalYAJ-o,83627
 mdbq/clean/data_clean.py,sha256=ucfslhqXVZoH2QaXHSAWDky0GhIvH9f4GeNaHg4SrFE,104790
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
 mdbq/company/copysh.py,sha256=4VOAvHZfnhsKdeKL0Ho6q2x1OkD6nsZXRLyYdu8YAaE,18011
@@ -45,7 +45,7 @@ mdbq/req_post/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/req_post/req_tb.py,sha256=PexWSCPJNM6Tv0ol4lAWIhlOwsAr_frnjtcdSHCFiek,36179
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=4Y5zd64hZUFtll8AdpUc2napDas-La-A6XzAhb2mLv0,17157
-mdbq-2.7.5.dist-info/METADATA,sha256=MKm3QuPOvdBrche5N9OSCmgf5NPgP4OdLwLfD8seSPs,243
-mdbq-2.7.5.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-mdbq-2.7.5.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-2.7.5.dist-info/RECORD,,
+mdbq-2.7.6.dist-info/METADATA,sha256=g9yVclBoUQygTKxK2ciOGKeyaHjDsdw0um9CiD-HA-k,243
+mdbq-2.7.6.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-2.7.6.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-2.7.6.dist-info/RECORD,,

{mdbq-2.7.5.dist-info → mdbq-2.7.6.dist-info}/WHEEL

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