mdbq 2.8.6__py3-none-any.whl → 2.8.7__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 (6) hide show
  1. mdbq/aggregation/query_data.py +3 -3
  2. mdbq/mysql/mysql.py +1 -1
  3. {mdbq-2.8.6.dist-info → mdbq-2.8.7.dist-info}/METADATA +1 -1
  4. {mdbq-2.8.6.dist-info → mdbq-2.8.7.dist-info}/RECORD +6 -6
  5. {mdbq-2.8.6.dist-info → mdbq-2.8.7.dist-info}/WHEEL +0 -0
  6. {mdbq-2.8.6.dist-info → mdbq-2.8.7.dist-info}/top_level.txt +0 -0
mdbq/aggregation/query_data.py CHANGED
@@ -1888,15 +1888,15 @@ class GroupBy:
1888
1888
  df.drop(labels='宝贝id', axis=1, inplace=True)
1889
1889
  if bb_tg is True:
1890
1890
  # 生意经合并推广表，完整的数据表，包含全店所有推广、销售数据
1891
- df = pd.merge(syj, df, how='left', left_on=['日期', '宝贝id'], right_on=['日期', '商品id'])
1891
+ df = pd.merge(syj, df, how='left', left_on=['日期', '店铺名称', '宝贝id'], right_on=['日期', '店铺名称', '商品id'])
1892
1892
  df.drop(labels='商品id', axis=1, inplace=True) # 因为生意经中的宝贝 id 列才是完整的
1893
1893
  df.rename(columns={'宝贝id': '商品id'}, inplace=True)
1894
1894
  # df.to_csv('/Users/xigua/Downloads/test.csv', encoding='utf-8_sig', index=False, header=True)
1895
1895
  else:
1896
1896
  # 推广表合并生意经 , 以推广数据为基准，销售数据不齐全
1897
- df = pd.merge(df, syj, how='left', left_on=['日期', '商品id'], right_on=['日期', '宝贝id'])
1897
+ df = pd.merge(df, syj, how='left', left_on=['日期', '店铺名称', '商品id'], right_on=['日期', '店铺名称', '宝贝id'])
1898
1898
  df.drop(labels='宝贝id', axis=1, inplace=True)
1899
- df.drop_duplicates(subset=['日期', '商品id', '花费', '销售额'], keep='last', inplace=True, ignore_index=True)
1899
+ df.drop_duplicates(subset=['日期', '店铺名称', '商品id', '花费', '销售额'], keep='last', inplace=True, ignore_index=True)
1900
1900
  df.fillna(0, inplace=True)
1901
1901
  df['成本价'] = df['成本价'].astype('float64')
1902
1902
  df['销售额'] = df['销售额'].astype('float64')
mdbq/mysql/mysql.py CHANGED
@@ -68,7 +68,7 @@ class MysqlUpload:
68
68
 
69
69
  return wrapper
70
70
 
71
- # @try_except
71
+ @try_except
72
72
  def df_to_mysql(self, df, table_name, db_name='远程数据源', icm_update=[], service_database={'xigua_lx': 'mysql'}, move_insert=False, df_sql=False, drop_duplicates=False, filename=None, count=None, json_path=None, reset_id=False):
73
73
  """
74
74
  将 df 写入数据库
{mdbq-2.8.6.dist-info → mdbq-2.8.7.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: mdbq
3
- Version: 2.8.6
3
+ Version: 2.8.7
4
4
  Home-page: https://pypi.org/project/mdbq
5
5
  Author: xigua,
6
6
  Author-email: 2587125111@qq.com
{mdbq-2.8.6.dist-info → mdbq-2.8.7.dist-info}/RECORD RENAMED
@@ -5,7 +5,7 @@ mdbq/aggregation/aggregation.py,sha256=fLsYQO7LTUtVFaVOxXry4OZviiIpZMcTLplE-HXW9
5
5
  mdbq/aggregation/df_types.py,sha256=U9i3q2eRPTDY8qAPTw7irzu-Tlg4CIySW9uYro81wdk,8125
6
6
  mdbq/aggregation/mysql_types.py,sha256=YTGyrF9vcRgfkQbpT-e-JdJ7c7VF1dDHgyx9YZRES8w,10934
7
7
  mdbq/aggregation/optimize_data.py,sha256=79uwiM2WqNNFxGpE2wKz742PRq-ZGgFjdOV0vgptHdY,3513
8
- mdbq/aggregation/query_data.py,sha256=e0KqmRsVxmeYRfys6MxNhx6KfO1wgMu7-bRF-nzso3o,100100
8
+ mdbq/aggregation/query_data.py,sha256=rjXFP6dsrbXNdgA840z_xhrR-ka2i-hVdllHD6Yn2O4,100180
9
9
  mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
10
10
  mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
11
11
  mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
@@ -28,7 +28,7 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
28
28
  mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
29
29
  mdbq/mongo/mongo.py,sha256=v9qvrp6p1ZRWuPpbSilqveiE0FEcZF7U5xUPI0RN4xs,31880
30
30
  mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
31
- mdbq/mysql/mysql.py,sha256=5d-Uqikf1R1vszdRNd6dfTO46qlHg8T6rNZPUl9oUPM,45711
31
+ mdbq/mysql/mysql.py,sha256=cpCmGP4qlkZrJBFdQagUiHXPfuS13J_XcSNeQ97NgFY,45709
32
32
  mdbq/mysql/recheck_mysql.py,sha256=jHQSlQy0PlQ_EYICQv_2nairUX3t6OIwPtSELKIpjkY,8702
33
33
  mdbq/mysql/s_query.py,sha256=bgNNIqYLDCHjD5KTFcm6x4u74selpAGs5ouJYuqX86k,8447
34
34
  mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
@@ -45,7 +45,7 @@ mdbq/req_post/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
45
45
  mdbq/req_post/req_tb.py,sha256=PexWSCPJNM6Tv0ol4lAWIhlOwsAr_frnjtcdSHCFiek,36179
46
46
  mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
47
47
  mdbq/spider/aikucun.py,sha256=jHrdGWBJQaSywx7V-U4YuM6vWkwC5SR5tTOOdB3YU_c,17306
48
- mdbq-2.8.6.dist-info/METADATA,sha256=SMIdBPT6crxi8L5pr7RX8UpZiA6helJ9yvxZ2D0Hois,243
49
- mdbq-2.8.6.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
50
- mdbq-2.8.6.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
51
- mdbq-2.8.6.dist-info/RECORD,,
48
+ mdbq-2.8.7.dist-info/METADATA,sha256=cDSdYxyr-otFt0wyENhynpHpw5P800B9oB_GW6bfINs,243
49
+ mdbq-2.8.7.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
50
+ mdbq-2.8.7.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
51
+ mdbq-2.8.7.dist-info/RECORD,,
{mdbq-2.8.6.dist-info → mdbq-2.8.7.dist-info}/WHEEL RENAMED
File without changes