mdbq 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

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/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.dist-info → mdbq-2.0.2.dist-info}/METADATA

@@ -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.dist-info → mdbq-2.0.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 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=mHJsxfMncw8PnWXpK3wtF_3SNCEL4SrGCZq9DgP7aCU,72992
+mdbq/aggregation/aggregation.py,sha256=uaclXkIaZVhTqyI6VipI4Re7sXQDtlvVCopA_ONpcKM,73194
 mdbq/aggregation/df_types.py,sha256=U9i3q2eRPTDY8qAPTw7irzu-Tlg4CIySW9uYro81wdk,8125
 mdbq/aggregation/mysql_types.py,sha256=DQYROALDiwjJzjhaJfIIdnsrNs11i5BORlj_v6bp67Y,11062
 mdbq/aggregation/optimize_data.py,sha256=u2Kl_MFtZueXJ57ycy4H2OhXD431RctUYJYCl637uT0,4176
-mdbq/aggregation/query_data.py,sha256=32NjVVYLnfFkzD8TflmNVhpdQTLRRUrb9toMGApSOC8,72379
+mdbq/aggregation/query_data.py,sha256=ixvfjEai-zIN5fUiVg9nSFrzjiBfJv6QC9_mLTvFfg0,72380
 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
@@ -36,7 +36,7 @@ mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
 mdbq/pbix/refresh_all.py,sha256=0uAnBKCd5cx5FLTkawN1GV9yi87rfyMgYal5LABtumQ,7186
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-2.0.0.dist-info/METADATA,sha256=W62UaEWa4gFpi05-KbwcK-QlDVACqo9Mp6GBF3WjpiM,245
-mdbq-2.0.0.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-mdbq-2.0.0.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-2.0.0.dist-info/RECORD,,
+mdbq-2.0.2.dist-info/METADATA,sha256=n4o0hi_JT0eYxpVVIGm-LZnSixtlu_Cc3BfLpdmoEL4,245
+mdbq-2.0.2.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-2.0.2.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-2.0.2.dist-info/RECORD,,

{mdbq-2.0.0.dist-info → mdbq-2.0.2.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