mdbq 1.6.1__py3-none-any.whl → 1.6.3__py3-none-any.whl

mdbq/aggregation/aggregation.py

@@ -76,7 +76,7 @@ class DatabaseUpdate:
                     continue
                 df = pd.DataFrame()
                 encoding = self.get_encoding(file_path=os.path.join(root, name))  # 用于处理 csv 文件
-                tg_names = ['账户报表', '计划报表', '单元报表', '关键词报表', '人群报表', '宝贝主体报表',
+                tg_names = ['账户报表', '计划报表', '单元报表', '关键词报表', '人群报表', '主体报表',
                             '其他主体报表',
                             '创意报表', '地域报表', '权益报表']
                 for tg_name in tg_names:

mdbq/aggregation/query_data.py

@@ -58,7 +58,7 @@ class MongoDatasQuery:
         }
         df = self.download.data_to_df(
             db_name='推广数据2',
-            collection_name='宝贝主体报表',
+            collection_name='主体报表',
             projection=projection,
         )
         return df
@@ -110,7 +110,7 @@ class MysqlDatasQuery:
         }
         df = self.download.data_to_df(
             db_name='推广数据2',
-            table_name='宝贝主体报表',
+            table_name='主体报表',
             start_date=start_date,
             end_date=end_date,
             projection=projection,
@@ -416,7 +416,7 @@ class GroupBy:
             print(f'query_data.groupby函数中 {table_name} 传入的 df 不是 dataframe 结构')
             return pd.DataFrame()
         # print(table_name)
-        if '宝贝主体报表' in table_name:
+        if '主体报表' in table_name:
             df.rename(columns={
                 '场景名字': '营销场景',
                 '主体id': '商品id',
@@ -817,7 +817,7 @@ class GroupBy:
     def performance(self, bb_tg=True):
          # print(self.data_tgyj)
         tg, syj, idbm, pic, cost = (
-            self.data_tgyj['宝贝主体报表'],
+            self.data_tgyj['主体报表'],
             self.data_tgyj['天猫生意经_宝贝指标'],
             self.data_tgyj['商品id编码表'],
             self.data_tgyj['商品id图片对照表'],
@@ -966,6 +966,10 @@ class GroupBy:
         df.to_excel(os.path.join(path, filename + '.xlsx'), index=index, header=header, engine=engine, freeze_panes=freeze_panes)
         
 
+def g_group():
+    pass
+
+
 def data_aggregation_one(service_databases=[{}], months=1):
     """
     # 单独处理某一个聚合数据库，修改添加 data_dict 的值
@@ -1030,7 +1034,7 @@ def data_aggregation(service_databases=[{}], months=1):
             data_dict = [
                 {
                     '数据库名': '聚合数据',
-                    '集合名': '宝贝主体报表',
+                    '集合名': '主体报表',
                     '唯一主键': ['日期', '推广渠道', '营销场景', '商品id', '花费'],
                     '数据主体': sdq.tg_wxt(),
                 },
@@ -1163,7 +1167,7 @@ def data_aggregation(service_databases=[{}], months=1):
 
 
 if __name__ == '__main__':
-    # data_aggregation(service_databases=[{'home_lx': 'mysql'}], months=1)  # 正常的聚合所有数据
-    data_aggregation_one(service_databases=[{'home_lx': 'mysql'}], months=1)  # 单独聚合某一个数据库，具体库进函数编辑
+    data_aggregation(service_databases=[{'company': 'mysql'}], months=1)  # 正常的聚合所有数据
+    # data_aggregation_one(service_databases=[{'home_lx': 'mysql'}], months=1)  # 单独聚合某一个数据库，具体库进函数编辑
     # optimize_data.op_data(service_databases=[{'company': 'mysql'}], days=3650)  # 立即启动对聚合数据的清理工作
 

mdbq/clean/data_clean.py

@@ -88,7 +88,7 @@ class DataClean:
                     continue
                 encoding = self.get_encoding(file_path=pathlib.Path(root, name))
                 # ----------------- 推广报表 分割线 -----------------
-                tg_names = ['账户报表', '计划报表', '单元报表', '关键词报表', '人群报表', '宝贝主体报表',
+                tg_names = ['账户报表', '计划报表', '单元报表', '关键词报表', '人群报表', '主体报表',
                             '其他主体报表',
                             '创意报表', '地域报表', '权益报表']
                 for tg_name in tg_names:

mdbq/mysql/s_query.py

@@ -61,6 +61,9 @@ class QueryDatas:
                     if value == 1 and key in cols_exist:
                         columns_in.append(key)  # 提取值为 1 的键并清理不在数据表的键
                 columns_in = [f"`{item}`" for item in columns_in]
+                if not columns_in:
+                    print(f'传递的参数 projection，在数据库中没有找到匹配的列，请检查 projection： {projection}')
+                    return df
                 columns_in = ', '.join(columns_in)
                 if '日期' in cols_exist:  # 不论是否指定, 只要数据表有日期，则执行
                     sql = (f"SELECT {columns_in} FROM `{db_name}`.`{table_name}` "

{mdbq-1.6.1.dist-info → mdbq-1.6.3.dist-info}/METADATA

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

{mdbq-1.6.1.dist-info → mdbq-1.6.3.dist-info}/RECORD

@@ -1,15 +1,15 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
 mdbq/__version__.py,sha256=y9Mp_8x0BCZSHsdLT_q5tX9wZwd5QgqrSIENLrb6vXA,62
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
-mdbq/aggregation/aggregation.py,sha256=Fb74FW6EgYGlFiTqcITgBEWeHUAv13A2VN5EIKojOxQ,61703
+mdbq/aggregation/aggregation.py,sha256=mQRNn-S6oqvt9CyREllWMTtR2dYRsVgUe5gcdUCYH8U,61697
 mdbq/aggregation/df_types.py,sha256=oQJS2IBU3_IO6GMgbssHuC2yCjNnbta0QPGrFOwNLnU,7591
 mdbq/aggregation/mysql_types.py,sha256=DQYROALDiwjJzjhaJfIIdnsrNs11i5BORlj_v6bp67Y,11062
 mdbq/aggregation/optimize_data.py,sha256=u2Kl_MFtZueXJ57ycy4H2OhXD431RctUYJYCl637uT0,4176
-mdbq/aggregation/query_data.py,sha256=ChYHLlj8vaTg39bPP8IHETnNUHi4alo-BD2RPdmTqX8,56214
+mdbq/aggregation/query_data.py,sha256=socYDytP4F7zLd1WRokKitQ0bNsK4TQgkO1GDmgi29Q,56214
 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/data_clean.py,sha256=qJqM73cAsd1Kz7KlpCUMBPNfRrbfHeT05zRAH55B54g,89162
+mdbq/clean/data_clean.py,sha256=nkAy_KUnf6iX9nqUE588lebtWmk8Kelnwp_7g-wRfuE,89156
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
 mdbq/company/copysh.py,sha256=WCZ92vCJAy6_ZFeOxWL-U9gArIpyga4xts-s1wKsspY,17268
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -25,7 +25,7 @@ mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=v9qvrp6p1ZRWuPpbSilqveiE0FEcZF7U5xUPI0RN4xs,31880
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
 mdbq/mysql/mysql.py,sha256=Fiha5MUqac36UUhLfOoRybhwbRftub9qUBi63wVz1Pc,43329
-mdbq/mysql/s_query.py,sha256=WD_pwgUA9pSQMvNKUxQoHKQf2LgkV8PyQV9Te3AJYs4,8175
+mdbq/mysql/s_query.py,sha256=fIQvQKPyV7rvSUuxVWXv9S5FmCnIM4GHKconE1Zn5BA,8378
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/porxy.py,sha256=UHfgEyXugogvXgsG68a7QouUCKaohTKKkI4RN-kYSdQ,4961
@@ -35,7 +35,7 @@ mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
 mdbq/pbix/refresh_all.py,sha256=tgy762608HMaXWynbOURIf2UVMuSPybzrDXQnOOcnZU,6102
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-1.6.1.dist-info/METADATA,sha256=RR3orjSkMDrCZdR_zDVwG-w2wz7Rn3ZTV38QktQcGbE,245
-mdbq-1.6.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-1.6.1.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-1.6.1.dist-info/RECORD,,
+mdbq-1.6.3.dist-info/METADATA,sha256=O-aJvN3jsjTj44Y9kK383iiNPIl_GI5_LdGI1wRmf88,245
+mdbq-1.6.3.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-1.6.3.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-1.6.3.dist-info/RECORD,,