mdbq 2.5.9__py3-none-any.whl → 2.6.1__py3-none-any.whl

mdbq/aggregation/aggregation.py

@@ -1301,7 +1301,7 @@ def test2():
 if __name__ == '__main__':
     username, password, host, port = get_myconf.select_config_values(target_service='nas', database='mysql')
     print(username, password, host, port)
-    file_dir(one_file=False, target_service='company')
+    # file_dir(one_file=False, target_service='company')
     # one_file_to_mysql(
     #     file='/Users/xigua/Downloads/爱库存_商品榜单_spu_2024-10-17_2024-10-17.csv',
     #     db_name='爱库存2',
@@ -1310,15 +1310,16 @@ if __name__ == '__main__':
     #     database='mysql'
     # )
 
-    # db_name = '推广数据2'
-    # table_name = '权益报表'
-    # upload_dir(
-    #     path='/Users/xigua/数据中心/原始文件2/推广报表/权益报表12313',
-    #     db_name=db_name,
-    #     collection_name=table_name,
-    #     dbs={'mysql': True, 'mongodb': False},
-    #     target_service='home_lx',
-    # )
+    # 上传一个目录到指定数据库
+    db_name = '天猫_推广数据3'
+    table_name = '主体报表'
+    upload_dir(
+        path='/Users/xigua/数据中心/原始文件3/天猫推广报表/主体报表',
+        db_name=db_name,
+        collection_name=table_name,
+        dbs={'mysql': True, 'mongodb': False},
+        target_service='company',
+    )
 
 
     # # 新版 数据分类

mdbq/aggregation/query_data.py

@@ -748,7 +748,7 @@ class MysqlDatasQuery:
         }
         # projection = {}
         df_crowd = self.download.data_to_df(
-            db_name='达摩盘2',
+            db_name='达摩盘3',
             table_name='我的人群属性',
             start_date=start_date,
             end_date=end_date,

mdbq/clean/clean_upload.py

@@ -90,12 +90,12 @@ class DataClean:
         report_names = [
             {
                 '文件简称': '商品排行',  # 文件名中包含的字符
-                '数据库名': '天猫_生意参谋',
+                '数据库名': '天猫_生意参谋3',
                 '集合名称': '商品排行',
             },
             {
                 '文件简称': '店铺来源_来源构成_万里马官方旗舰店',  # 文件名中包含的字符
-                '数据库名': '天猫_生意参谋',
+                '数据库名': '天猫_生意参谋3',
                 '集合名称': '店铺流量来源构成',
             },
         ]
@@ -1366,6 +1366,7 @@ def main(service_databases=None, is_mysql=False):
     cn.dmp_tm(is_except=['except'])  # 达摩盘
     cn.tg_reports(is_except=['except'])  # 推广报表，天猫淘宝共同清洗
     cn.syj_reports_tm(is_except=['except'])  # 天猫生意经
+    # # 淘宝生意经，不可以和天猫同时运行
     # cn.syj_reports_tb(is_except=['except'])  # 淘宝生意经，不可以和天猫同时运行
     cn.jd_reports(is_except=['except'])  # 清洗京东报表
     cn.sp_scene_clean(is_except=['except'])  # 商品素材
@@ -1399,7 +1400,7 @@ def main(service_databases=None, is_mysql=False):
             '天猫_推广数据3',
             '淘宝_推广数据3',
             # '市场数据3',
-            # '生意参谋3',
+            '天猫_生意参谋3',
             '天猫_生意经3',
             # '淘宝_生意经3',
         ],
@@ -1425,25 +1426,25 @@ def main(service_databases=None, is_mysql=False):
 
 def test():
     # main_key = '单元报表'
-    path = f'/Users/xigua/数据中心/原始文件2/生意参谋/商品排行qweqeqwe'
+    path = f'/Users/xigua/数据中心/原始文件3/天猫推广报表/主体报表'
     for root, dirs, files in os.walk(path, topdown=False):
         for name in files:
             if '~$' in name or '.DS' in name or '.localized' in name or '.jpg' in name or '.png' in name:
                 continue
-            if 'py_xg' in name:
-                continue
-            if 'TM_旧表_字段' in root:
-                continue
+            # if 'py_xg' in name:
+            #     continue
+            # if 'TM_旧表_字段' in root:
+            #     continue
 
             if name.endswith('.csv'):
                 print(name)
                 df = pd.read_csv(os.path.join(root, name), encoding='utf-8_sig', header=0, na_filter=False)
-                if '店铺名称' not in df.columns.tolist():
-                    df.insert(loc=1, column='店铺名称', value='万里马官方旗舰店')
-                df.replace(to_replace=['-'], value=0, regex=False, inplace=True)
-                df.replace(to_replace=[','], value='', regex=True, inplace=True)
-                if '统计日期' in df.columns.tolist() and '日期' not in df.columns.tolist():
-                    df.rename(columns={'统计日期': '日期', '商品ID': '商品id'}, inplace=True)
+                # if '店铺名称' not in df.columns.tolist():
+                #     df.insert(loc=1, column='店铺名称', value='万里马官方旗舰店')
+                # df.replace(to_replace=['-'], value=0, regex=False, inplace=True)
+                # df.replace(to_replace=[','], value='', regex=True, inplace=True)
+                # if '统计日期' in df.columns.tolist() and '日期' not in df.columns.tolist():
+                #     df.rename(columns={'统计日期': '日期', '商品ID': '商品id'}, inplace=True)
                 # shop_name = re.findall(r'_([\u4e00-\u9fffA-Za-z]+店)', name)[0]
                 # df.insert(loc=1, column='店铺名称', value=shop_name)
 

mdbq/mysql/mysql.py

@@ -68,7 +68,7 @@ class MysqlUpload:
 
         return wrapper
 
-    # @try_except
+    @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, reset_id=False):
         """
         将 df 写入数据库

{mdbq-2.5.9.dist-info → mdbq-2.6.1.dist-info}/METADATA

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

{mdbq-2.5.9.dist-info → mdbq-2.6.1.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=nPp5fOLktxejNEak3SyTnKLjwzK1l2xjbV45X-I4LFQ,76131
+mdbq/aggregation/aggregation.py,sha256=ZBsaQbazp2J9rQDoTvwRNav1O4g3PrZue31_6iM4k5g,76166
 mdbq/aggregation/df_types.py,sha256=U9i3q2eRPTDY8qAPTw7irzu-Tlg4CIySW9uYro81wdk,8125
 mdbq/aggregation/mysql_types.py,sha256=DQYROALDiwjJzjhaJfIIdnsrNs11i5BORlj_v6bp67Y,11062
 mdbq/aggregation/optimize_data.py,sha256=gdScrgTAb6RbXHZy1LitX7lggMGn1GTLhkYSgztfwew,4903
-mdbq/aggregation/query_data.py,sha256=WKe42Xq1Gi-ELuIT0k2jh3X4-R7heb0ub3Mj3yuCRAk,103635
+mdbq/aggregation/query_data.py,sha256=xVqQBc0kDnm-1giKmAWoKj_obY4GiipgEXY12NhK2AQ,103635
 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=bQwpzQcLxyELqmvQ_kRPSPkt0gyCcUN8jWai-Nmculc,76755
+mdbq/clean/clean_upload.py,sha256=kkogtWDHE28gyJ2ZgwCqhygbhIrQ9Wcs-G9tFEiKwQc,76837
 mdbq/clean/data_clean.py,sha256=ucfslhqXVZoH2QaXHSAWDky0GhIvH9f4GeNaHg4SrFE,104790
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
 mdbq/company/copysh.py,sha256=NvlXCBZBcO2GIT5nLRYYqhOyHWM1-1RE7DHvgbj6jmQ,19723
@@ -26,7 +26,7 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 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=F2AidJpHcof7vXXc3ReG24Et-ki-fKYdy8LeQH_Yh-g,47105
+mdbq/mysql/mysql.py,sha256=io9ZWW0v8PPjj4kKJQhpaoiLSg926wvc963lX9vasBE,47103
 mdbq/mysql/s_query.py,sha256=37GGHzRpycfUjsYEoQgDpdEs9JwjW-LxFXnGwwP2b2Q,8403
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -42,7 +42,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=3EjeTPbwk_qLGMVqDhBZoEPGfD2oM-SBiODjxLL3A8U,16883
-mdbq-2.5.9.dist-info/METADATA,sha256=0KYiPP9keTjCLiq4FSHmrJja0fUWmsa1ty6AWA_I_G0,245
-mdbq-2.5.9.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-2.5.9.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-2.5.9.dist-info/RECORD,,
+mdbq-2.6.1.dist-info/METADATA,sha256=AyfNicxlm5jVQSJdDDP1w9H2XCa8LZzpA2VXYfR887Q,245
+mdbq-2.6.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-2.6.1.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-2.6.1.dist-info/RECORD,,