mdbq 3.6.13__py3-none-any.whl → 3.6.14__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. mdbq/aggregation/optimize_data.py +7 -5
  2. mdbq/aggregation/query_data.py +41 -39
  3. mdbq/mysql/mysql.py +121 -119
  4. mdbq/mysql/s_query.py +9 -7
  5. mdbq/redis/getredis.py +0 -1
  6. {mdbq-3.6.13.dist-info → mdbq-3.6.14.dist-info}/METADATA +1 -1
  7. {mdbq-3.6.13.dist-info → mdbq-3.6.14.dist-info}/RECORD +9 -9
  8. {mdbq-3.6.13.dist-info → mdbq-3.6.14.dist-info}/WHEEL +0 -0
  9. {mdbq-3.6.13.dist-info → mdbq-3.6.14.dist-info}/top_level.txt +0 -0
mdbq/mysql/s_query.py CHANGED
@@ -13,11 +13,13 @@ import os
13
13
  import calendar
14
14
  from mdbq.dataframe import converter
15
15
  from decimal import Decimal
16
+ import logging
16
17
 
17
18
  warnings.filterwarnings('ignore')
18
19
  """
19
20
  程序专门用来下载数据库数据, 并返回 df, 不做清洗数据操作;
20
21
  """
22
+ logger = logging.getLogger(__name__)
21
23
 
22
24
 
23
25
  class QueryDatas:
@@ -44,7 +46,7 @@ class QueryDatas:
44
46
  connection = pymysql.connect(**self.config) # 重新连接数据库
45
47
  with connection.cursor() as cursor:
46
48
  sql = f"SELECT 更新时间 FROM {table_name} WHERE {condition}"
47
- # print(sql)
49
+ # logger.info(sql)
48
50
  cursor.execute(sql)
49
51
  columns = cursor.fetchall()
50
52
  return columns
@@ -91,7 +93,7 @@ class QueryDatas:
91
93
  if projection:
92
94
  selected_columns = [k for k, v in projection.items() if v and k in cols_exist]
93
95
  if not selected_columns:
94
- print("Warning: Projection 参数不匹配任何数据库字段")
96
+ logger.info("Warning: Projection 参数不匹配任何数据库字段")
95
97
  return df
96
98
  else:
97
99
  selected_columns = list(cols_exist)
@@ -115,7 +117,7 @@ class QueryDatas:
115
117
  df[decimal_cols] = df[decimal_cols].astype(float)
116
118
 
117
119
  except Exception as e:
118
- print(f"Database operation failed: {str(e)}")
120
+ logger.info(f"Database operation failed: {str(e)}")
119
121
  finally:
120
122
  if connection:
121
123
  connection.close()
@@ -176,7 +178,7 @@ class QueryDatas:
176
178
  cursor.execute(f"SHOW DATABASES LIKE '{db_name}'") # 检查数据库是否存在
177
179
  database_exists = cursor.fetchone()
178
180
  if not database_exists:
179
- print(f"Database <{db_name}>: 数据库不存在")
181
+ logger.info(f"Database <{db_name}>: 数据库不存在")
180
182
  return False
181
183
  finally:
182
184
  connection.close() # 这里要断开连接
@@ -189,11 +191,11 @@ class QueryDatas:
189
191
  sql = f"SHOW TABLES LIKE '{table_name}'"
190
192
  cursor.execute(sql)
191
193
  if not cursor.fetchone():
192
- print(f'{db_name} -> <{table_name}>: 表不存在')
194
+ logger.info(f'{db_name} -> <{table_name}>: 表不存在')
193
195
  return False
194
196
  return True
195
197
  except Exception as e:
196
- print(e)
198
+ logger.info(e)
197
199
  return False
198
200
  finally:
199
201
  connection.close() # 断开连接
@@ -206,4 +208,4 @@ if __name__ == '__main__':
206
208
 
207
209
  q = QueryDatas(username, password, host, port)
208
210
  res = q.columns_to_list(db_name='视频数据', table_name='bilibili视频', columns_name=['视频bv号', '下载进度'])
209
- print(res)
211
+ logger.info(res)
mdbq/redis/getredis.py CHANGED
@@ -45,7 +45,6 @@ logging.basicConfig(level=logging.INFO, format='%(asctime)s | %(levelname)s | %(
45
45
  logger = logging.getLogger(__name__)
46
46
 
47
47
  # 创建一个文件处理器，用于将日志写入文件
48
- # file_handler = logging.FileHandler(os.path.join(D_PATH, 'logfile', 'redis.log'))
49
48
  if not os.path.isdir(os.path.join(D_PATH, 'logfile')):
50
49
  os.makedirs(os.path.join(D_PATH, 'logfile'))
51
50
  log_file = os.path.join(D_PATH, 'logfile', 'redis.log')
{mdbq-3.6.13.dist-info → mdbq-3.6.14.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: mdbq
3
- Version: 3.6.13
3
+ Version: 3.6.14
4
4
  Home-page: https://pypi.org/project/mdbq
5
5
  Author: xigua,
6
6
  Author-email: 2587125111@qq.com
{mdbq-3.6.13.dist-info → mdbq-3.6.14.dist-info}/RECORD RENAMED
@@ -3,8 +3,8 @@ mdbq/__version__.py,sha256=y9Mp_8x0BCZSHsdLT_q5tX9wZwd5QgqrSIENLrb6vXA,62
3
3
  mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
4
4
  mdbq/aggregation/aggregation.py,sha256=-yzApnlqSN2L0E1YMu5ml-W827qpKQvWPCOI7jj2kzY,80264
5
5
  mdbq/aggregation/datashow.py,sha256=1AYSIDkdUx-4as1Ax2rPj0cExM9d-qFMrFYLAaPHNuk,54962
6
- mdbq/aggregation/optimize_data.py,sha256=RXIv7cACCgYyehAxMjUYi_S7rVyjIwXKWMaM3nduGtA,3068
7
- mdbq/aggregation/query_data.py,sha256=KrQqe9qzrKAs3s6QNoQZuY8_U36I852dFPiIcv1QIi0,193075
6
+ mdbq/aggregation/optimize_data.py,sha256=87Dc2RQTF-wqp8Gct_e0S_xwiNlzsEmM82mwuHPZKlc,3152
7
+ mdbq/aggregation/query_data.py,sha256=7g1Z2qyU8dgnOHdpN5ltr7BX8ZFRrbVmFpk6s9045Pw,193363
8
8
  mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
9
9
  mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
10
10
  mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -18,10 +18,10 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
18
18
  mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
19
19
  mdbq/mongo/mongo.py,sha256=M9DUeUCMPDngkwn9-ui0uTiFrvfNU1kLs22s5SmoNm0,31899
20
20
  mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
21
- mdbq/mysql/mysql.py,sha256=_jFo2_OC1BNm5wEmoYiBG_TcuNNA2xUWKNhMBfgDiAM,99699
21
+ mdbq/mysql/mysql.py,sha256=1HoOvSZKPHc3Bz1YI_A_5x3JmGvjUN4suCM9oHCF-t4,100465
22
22
  mdbq/mysql/mysql_bak.py,sha256=_jFo2_OC1BNm5wEmoYiBG_TcuNNA2xUWKNhMBfgDiAM,99699
23
23
  mdbq/mysql/recheck_mysql.py,sha256=ppBTfBLgkRWirMVZ31e_ZPULiGPJU7K3PP9G6QBZ3QI,8605
24
- mdbq/mysql/s_query.py,sha256=gzXUZ8J4ibavAii2cTH7PsTSIkkIfow7Qa_4k8OU6yY,8698
24
+ mdbq/mysql/s_query.py,sha256=CL2Ayo2sL11RbLnh9nE-GXA-NpA815-rrlFo24TipKY,8792
25
25
  mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
26
26
  mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
27
27
  mdbq/other/download_sku_picture.py,sha256=GdphR7Q3psXXVuZoyJ4u_6OWn_rWlcbT0iJ-1zPT6O0,45368
@@ -34,11 +34,11 @@ mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,239
34
34
  mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
35
35
  mdbq/pbix/refresh_all_old.py,sha256=_pq3WSQ728GPtEG5pfsZI2uTJhU8D6ra-htIk1JXYzw,7192
36
36
  mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
37
- mdbq/redis/getredis.py,sha256=TJjApXH1w6MA17n_bBEYtjteBZ_ZUp6OTil9uNmdgSk,26722
37
+ mdbq/redis/getredis.py,sha256=4rYk9lMRvvlpY7cV3VNQcSnbDWlZIsZZ-tSq--YqfSQ,26638
38
38
  mdbq/redis/getredis_优化hash.py,sha256=q7omKJCPw_6Zr_r6WwTv4RGSXzZzpLPkIaqJ22svJhE,29104
39
39
  mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
40
40
  mdbq/spider/aikucun.py,sha256=v7VO5gtEXR6_4Q6ujbTyu1FHu7TXHcwSQ6hIO249YH0,22208
41
- mdbq-3.6.13.dist-info/METADATA,sha256=YeJ-D2GfLIL744EmH07-AvofY8PBIUuWRE6Y2Yzb3So,244
42
- mdbq-3.6.13.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
43
- mdbq-3.6.13.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
44
- mdbq-3.6.13.dist-info/RECORD,,
41
+ mdbq-3.6.14.dist-info/METADATA,sha256=6nLgVL5HWxyW9-EBob6LnpGnfncM3l8rOL4nKQtqtbg,244
42
+ mdbq-3.6.14.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
43
+ mdbq-3.6.14.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
44
+ mdbq-3.6.14.dist-info/RECORD,,
{mdbq-3.6.13.dist-info → mdbq-3.6.14.dist-info}/WHEEL RENAMED
File without changes