mdbq 1.9.3__py3-none-any.whl → 1.9.5__py3-none-any.whl

mdbq/aggregation/aggregation.py

@@ -477,7 +477,7 @@ class DatabaseUpdate:
                         pattern = re.findall(r'(\d{4}-\d{2}-\d{2})-(\d{4}-\d{2}-\d{2})', name)
                         if not pattern:
                             continue
-                        if pattern[0][0] != pattern[0][1]:
+                        if pattern[0][0] == pattern[0][1]:
                             print(f'{name}: 检测到数据周期异常，仅支持7天数据')
                             continue
                         df = pd.read_excel(os.path.join(root, name), header=0, engine='openpyxl')

mdbq/aggregation/query_data.py

@@ -1061,7 +1061,7 @@ class GroupBy:
             )
             return df
         elif '直播场次分析' in table_name:
-            df.drop_duplicates(subset=['日期', '直播开播时间', '观看人数'], keep='first', inplace=True, ignore_index=True)
+            df.drop_duplicates(subset=['场次id'], keep='first', inplace=True, ignore_index=True)
             return df
         else:
             print(f'<{table_name}>: Groupby 类尚未配置，数据为空')
@@ -1434,7 +1434,7 @@ def data_aggregation(service_databases=[{}], months=1):
                 {
                     '数据库名': '聚合数据',
                     '集合名': '生意参谋_直播场次分析',
-                    '唯一主键': ['日期', '直播开播时间'],
+                    '唯一主键': ['场次id'],
                     '数据主体': sdq.zb_ccfx(),
                 },
             ]

mdbq/clean/data_clean.py

@@ -829,9 +829,11 @@ class DataClean:
                         # 京东商品词下排名
                         pattern = re.findall(r'(\d{4}-\d{2}-\d{2})-(\d{4}-\d{2}-\d{2})', name)
                         if not pattern:
+                            os.remove(os.path.join(root, name))
                             continue
-                        if pattern[0][0] != pattern[0][1]:
+                        if pattern[0][0] == pattern[0][1]:
                             print(f'{name}: 检测到数据周期异常，仅支持7天数据')
+                            os.remove(os.path.join(root, name))
                             continue
                         new_name = os.path.splitext(name)[0] + '.csv'
                         # print(name)

{mdbq-1.9.3.dist-info → mdbq-1.9.5.dist-info}/METADATA

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

{mdbq-1.9.3.dist-info → mdbq-1.9.5.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=A_Zy6FtlmrVmjjXaioUecRYVVDpKQHi3Ase-z8nSV14,67166
+mdbq/aggregation/aggregation.py,sha256=dQdaZZ8PD8uHY5opW9M6EIEONv-q_V-e_XtvITtJNrc,67166
 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=8Cc3fj4-lLkQyazOtb-_CePiiCog3omeiaJ577dfZXU,72435
+mdbq/aggregation/query_data.py,sha256=32NjVVYLnfFkzD8TflmNVhpdQTLRRUrb9toMGApSOC8,72379
 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=LrnliUyiI_9zwbI4GprDuYS-1XoZmSpI_DK6hn-vg9I,100661
+mdbq/clean/data_clean.py,sha256=VI_f9mQ2tHExBytQCCkajbPVpC0yNEOaVCtySe_OW40,100789
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
 mdbq/company/copysh.py,sha256=4PGjvmPzvrmstOaAwHQGFXIGCWqqNXZEOYf1QdUvMlI,17762
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -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-1.9.3.dist-info/METADATA,sha256=gEFZjDAiQ8_FgTxoXwPOdv5UEMcL_so2cCd3yHr3W4A,245
-mdbq-1.9.3.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-mdbq-1.9.3.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-1.9.3.dist-info/RECORD,,
+mdbq-1.9.5.dist-info/METADATA,sha256=qbeZPyNml9_seMx78A_nUdztJUVCi1xK8_E2MpdEu_4,245
+mdbq-1.9.5.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-1.9.5.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-1.9.5.dist-info/RECORD,,

{mdbq-1.9.3.dist-info → mdbq-1.9.5.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