mdbq 2.0.0__tar.gz → 2.0.2__tar.gz

{mdbq-2.0.0 → mdbq-2.0.2}/PKG-INFO

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

{mdbq-2.0.0 → mdbq-2.0.2}/mdbq/aggregation/aggregation.py

@@ -443,15 +443,19 @@ class DatabaseUpdate:
                 elif name.endswith('.csv') and '人群洞察' in name:
                     df = pd.read_csv(os.path.join(root, name), encoding='utf-8_sig', header=0, na_filter=False)
                     df.replace(to_replace=['--'], value='', regex=False, inplace=True)
-                    df = df[df['人群规模'] != '']
+                    df = df[(df['人群规模'] != '') & (df['人群规模'] != '--')]
                     if len(df) == 0:
-                        if is_move:
-                            try:
-                                os.remove(os.path.join(root, name))  # 是否移除原文件
-                                check_remove_file = True
-                            except Exception as e:
-                                print(f'{name},  {e}')
+                        try:
+                            os.remove(os.path.join(root, name))  # 移除原文件
+                        except:
+                            pass
                         continue
+                    if is_move:
+                        try:
+                            os.remove(os.path.join(root, name))  # 是否移除原文件
+                            check_remove_file = True
+                        except Exception as e:
+                            print(f'{name},  {e}')
                 elif name.endswith('.csv') and '客户_客户概况_画像' in name:
                     df = pd.read_csv(os.path.join(root, name), encoding='utf-8_sig', header=0, na_filter=False)
                     check_remove_file = True
@@ -1240,7 +1244,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='home_lx')
+    file_dir(one_file=False, target_service='home_lx')
     # one_file_to_mysql(
     #     file='/Users/xigua/数据中心/原始文件2/京东报表/JD推广_全站营销报表/2024-08/万里马箱包推广1_营销概况_全站营销_2024-08-19_2024-09-02.csv',
     #     db_name='京东数据2',
@@ -1249,15 +1253,15 @@ 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 = '推广数据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',
+    # )
 
 
     # # 新版 数据分类

{mdbq-2.0.0 → mdbq-2.0.2}/mdbq/aggregation/query_data.py

@@ -1535,7 +1535,7 @@ def main():
 
 
 if __name__ == '__main__':
-    data_aggregation(service_databases=[{'company': 'mysql'}], months=1)  # 正常的聚合所有数据
+    data_aggregation(service_databases=[{'home_lx': 'mysql'}], months=24)  # 正常的聚合所有数据
     # data_aggregation_one(service_databases=[{'company': 'mysql'}], months=1)  # 单独聚合某一个数据库，具体库进函数编辑
     # optimize_data.op_data(service_databases=[{'company': 'mysql'}], days=3650)  # 立即启动对聚合数据的清理工作
 

{mdbq-2.0.0 → mdbq-2.0.2}/mdbq.egg-info/PKG-INFO

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

{mdbq-2.0.0 → mdbq-2.0.2}/setup.py

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