mdbq 1.4.9__tar.gz → 1.5.0__tar.gz

{mdbq-1.4.9 → mdbq-1.5.0}/PKG-INFO

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

{mdbq-1.4.9 → mdbq-1.5.0}/mdbq/aggregation/aggregation.py

@@ -833,6 +833,35 @@ class DatabaseUpdate:
                 )
         # return df
 
+    def other_table(self, service_databases=[{'home_lx': 'mysql'}]):
+        """ 上传 support 文件夹下的 主推商品.csv """
+        support_file = set_support.SetSupport(dirname='support').dirname
+        filename = '主推商品.csv'
+        if not os.path.isfile(os.path.join(support_file, filename)):
+            return
+        df = pd.read_csv(os.path.join(support_file, filename), encoding='utf-8_sig', header=0, na_filter=False)
+        for service_database in service_databases:
+            for service_name, database in service_database.items():
+                username, password, host, port = get_myconf.select_config_values(
+                    target_service=service_name,
+                    database=database,
+                )
+                m = mysql.MysqlUpload(
+                    username=username,
+                    password=password,
+                    host=host,
+                    port=port,
+                )
+                m.df_to_mysql(
+                    df=df,
+                    db_name='属性设置2',
+                    table_name='主推商品',
+                    df_sql=False,  # 值为 True 时使用 df.to_sql 函数上传整个表, 不会排重
+                    drop_duplicates=True,  # 值为 True 时检查重复数据再插入，反之直接上传，会比较慢
+                    filename=None,  # 用来追踪处理进度
+                    system_name=service_name,  # 用来追踪处理进度
+                )
+
 
 def upload_dir(path, db_name, collection_name, dbs={'mysql': True, 'mongodb': True}, json_path=None, system_name=None):
     """ 上传一个文件夹到 mysql 或者 mongodb 数据库 """
@@ -1032,12 +1061,5 @@ if __name__ == '__main__':
 
     # test2()
 
-    file = ''
-    df = pd.read_csv(file, encoding='utf-8_sig', header=0, na_filter=False)
-    username, password, host, port = get_myconf.select_config_values(target_service='company', database='mysql')
-    m = mysql.MysqlUpload(username=username, password=password, host=host, port=port)
-    m.df_to_mysql(df=df, db_name='市场数据2', table_name='搜索排行',
-                  drop_duplicates=True,
-                  # icm_update=['日期', '推广费余额'],
-                  system_name='company',
-                  )
+    dp = DatabaseUpdate(path='')
+    dp.other_table(service_databases=[{'company': 'mysql'}])

{mdbq-1.4.9 → mdbq-1.5.0}/mdbq/aggregation/query_data.py

@@ -722,5 +722,5 @@ def data_aggregation(service_databases=[{}], months=1, system_name=None,):
 
 if __name__ == '__main__':
     # data_aggregation(service_databases=[{'home_lx': 'mysql'}], months=1, system_name='home_lx')
-    data_aggregation_one(service_databases=[{'company': 'mysql'}], months=12, system_name='company')
+    data_aggregation_one(service_databases=[{'company': 'mysql'}], months=1, system_name='company')
     # optimize_data.op_data(service_databases=[{'company': 'mysql'}], days=3650)  # 立即启动对聚合数据的清理工作

{mdbq-1.4.9 → mdbq-1.5.0}/mdbq/company/copysh.py

@@ -348,6 +348,7 @@ def main():
             dp.cleaning(is_move=True)  # 公司台式机需要移除自身下载的文件
             dp.upload_df(service_databases=[{'company': 'mysql'}], system_name='company')
             dp.date_table(service_databases=[{'company': 'mysql'}])  # 因为日期表不受 days 参数控制，因此单独更新日期表
+            dp.other_table(service_databases=[{'company': 'mysql'}])  # 上传 support 文件夹下的 主推商品.csv
 
             # 此操作用于修改 .copysh_conf 文件，将 ch_record 改为 false (更新完成)
             w = update_conf.UpdateConf()

{mdbq-1.4.9 → mdbq-1.5.0}/mdbq.egg-info/PKG-INFO

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

{mdbq-1.4.9 → mdbq-1.5.0}/setup.py

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