mdbq 2.4.1__py3-none-any.whl → 2.4.3__py3-none-any.whl

mdbq/aggregation/query_data.py

@@ -1521,6 +1521,12 @@ class GroupBy:
                     '冬',
                 ]
             },
+            {
+                '类别': '一键起量',
+                '值': [
+                    '一键起量',
+                ]
+            },
             {
                 '类别': '款式',
                 '值': [
@@ -1572,7 +1578,6 @@ class GroupBy:
                     '老花',
                     '包包',
                     '通勤',
-                    '高级感',
                     '轻奢',
                     '包',
                     '新款',
@@ -1582,6 +1587,14 @@ class GroupBy:
                     '精致',
                     '奢侈',
                     '袋',
+                    '腰带',
+                    '裤带',
+                    '女士',
+                    '复古',
+                    '高级',
+                    '容量',
+                    '时尚',
+                    '商务',
                 ],
             },
         ]

mdbq/dataframe/converter.py

@@ -40,6 +40,9 @@ class DataFrameConverter(object):
         df.reset_index(inplace=True, drop=True)  # 重置索引，避免下面的 df.loc[0, col] 会出错
 
         for col in cols:
+            if col.lower() == 'id':
+                df.pop(col)  # 等待插入的 df 不能包含 id 列，否则可能跟现有 id 主键冲突
+                continue
             # 百分比在某些数据库中不兼容, 转换百分比为小数
             df[col] = df[col].apply(lambda x: float(float((str(x).rstrip("%"))) / 100) if str(x).endswith('%') and '~' not in str(x) else x)
             # 尝试转换合适的数据类型

{mdbq-2.4.1.dist-info → mdbq-2.4.3.dist-info}/METADATA

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

{mdbq-2.4.1.dist-info → mdbq-2.4.3.dist-info}/RECORD

@@ -5,7 +5,7 @@ mdbq/aggregation/aggregation.py,sha256=CS_gMBwPKQo7uId8BrsYNTjtCZKzRVV7gT4PfE2Q4
 mdbq/aggregation/df_types.py,sha256=U9i3q2eRPTDY8qAPTw7irzu-Tlg4CIySW9uYro81wdk,8125
 mdbq/aggregation/mysql_types.py,sha256=DQYROALDiwjJzjhaJfIIdnsrNs11i5BORlj_v6bp67Y,11062
 mdbq/aggregation/optimize_data.py,sha256=Wis40oL04M7E1pkvgNPjyVFAUe-zgjimjIVAikxYY8Y,4418
-mdbq/aggregation/query_data.py,sha256=-YDu1aQDKaHty2PDlwWqP2sOE35YgpMjHxRZsU1IOTw,95631
+mdbq/aggregation/query_data.py,sha256=b-beZv7JHMUe7jK0wr-cNClMVYOop3meb1fAGSadfIQ,96001
 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
@@ -19,7 +19,7 @@ mdbq/config/products.py,sha256=hN9UMkM6j76HYMulTYdtr3mOhh9QdpvvrLH14a_mbFY,5980
 mdbq/config/set_support.py,sha256=xkZCX6y9Bq1ppBpJAofld4B2YtchA7fl0eT3dx3CrSI,777
 mdbq/config/update_conf.py,sha256=taL3ZqKgiVWwUrDFuaYhim9a72Hm4BHRhhDscJTziR8,4535
 mdbq/dataframe/__init__.py,sha256=2HtCN8AdRj53teXDqzysC1h8aPL-mMFy561ESmhehGQ,22
-mdbq/dataframe/converter.py,sha256=ljCLblx7CMygQtH7eeC-XznBT3hKDG2huSwQ0xuRjEQ,3813
+mdbq/dataframe/converter.py,sha256=LT3ULDXIQA7BUz5t5SLizazjyOHLjPJDLOwa0lRqP34,3984
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
@@ -41,7 +41,7 @@ mdbq/req_post/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/req_post/req_tb.py,sha256=PexWSCPJNM6Tv0ol4lAWIhlOwsAr_frnjtcdSHCFiek,36179
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=Olq7IJP9itM4wuNxZeHOG-Q3i8wWyB4hY8TUGGwCvQ0,14104
-mdbq-2.4.1.dist-info/METADATA,sha256=fFux_keD8d_VJEwvggepJaPw3vfFzypq3YEGbBfEGzc,245
-mdbq-2.4.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-2.4.1.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-2.4.1.dist-info/RECORD,,
+mdbq-2.4.3.dist-info/METADATA,sha256=Uhgb1ytjq7-MAb48QIiqM6z6DNJ8RQGHj97NgME-3w8,245
+mdbq-2.4.3.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-2.4.3.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-2.4.3.dist-info/RECORD,,