mns-common 1.3.2.9__tar.gz → 1.3.3.1__tar.gz

{mns_common-1.3.2.9 → mns_common-1.3.3.1}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.3.2.9
+Version: 1.3.3.1

{mns_common-1.3.2.9 → mns_common-1.3.3.1}/mns_common/api/em/east_money_debt_api.py

@@ -22,7 +22,7 @@ max_number = 600
 # 最小返回条数
 min_number = 500
 # 分页条数
-page_number = 200
+page_number = 100
 
 
 # fields_02 = "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,f23,f24,f25,f26,f27,f28,f29,f30,f31,f32,f33,f34,f35,f36,f37,f38,f39,f40,f41,f42,f43,f44,f45,f46,f47,f48,f49,f50,f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61,f62,f63,f64,f65,f66,f67,f68,f69,f70,f71,f72,f73,f74,f75,f76,f77,f78,f79,f80,f81,f82,f83,f84,f85,f86,f87,f88,f89,f90,f91,f92,f93,f94,f95,f96,f97,f98,f99,f100,f101,f102,f103,f104,f105,f106,f107,f108" \
@@ -109,10 +109,12 @@ def get_debt_real_time_quotes():
     # 数据接口正常返回5600以上的数量
     if page_one_df.shape[0] > min_number:
         page_one_df = rename_real_time_quotes_df(page_one_df)
+        page_one_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_one_df
     else:
         page_df = all_debt_ticker_data(fields)
         page_df = rename_real_time_quotes_df(page_df)
+        page_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_df
 
 

{mns_common-1.3.2.9 → mns_common-1.3.3.1}/mns_common/api/em/east_money_etf_api.py

@@ -18,7 +18,7 @@ max_number = 1200
 # 最小返回条数
 min_number = 1000
 # 分页条数
-page_number = 200
+page_number = 100
 
 
 def get_fund_etf_page_df(pn) -> pd.DataFrame:
@@ -347,10 +347,12 @@ def get_etf_real_time_quotes():
     # 数据接口正常返回5600以上的数量
     if page_one_df.shape[0] > min_number:
         page_one_df = rename_etf(page_one_df)
+        page_one_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_one_df
     else:
         page_df = thread_pool_executor()
         page_df = rename_etf(page_df)
+        page_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_df
 
 

{mns_common-1.3.2.9 → mns_common-1.3.3.1}/mns_common/api/em/east_money_stock_api.py

@@ -18,7 +18,7 @@ max_number = 5700
 # 最小返回条数
 min_number = 5600
 # 分页条数
-page_number = 200
+page_number = 100
 
 
 def get_stock_page_data(pn, fields, fs):
@@ -99,10 +99,12 @@ def get_real_time_quotes_all_stocks():
     # 数据接口正常返回5600以上的数量
     if page_one_df.shape[0] > min_number:
         page_one_df = rename_real_time_quotes_df(page_one_df)
+        page_one_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_one_df
     else:
         page_df = all_stock_ticker_data_new(fields, fs)
         page_df = rename_real_time_quotes_df(page_df)
+        page_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_df
 
 

{mns_common-1.3.2.9 → mns_common-1.3.3.1}/mns_common/api/em/east_money_stock_hk_api.py

@@ -17,7 +17,7 @@ max_number = 4600
 # 最小返回条数
 min_number = 4400
 # 分页条数
-page_number = 200
+page_number = 100
 
 fields = ("f352,f2,f3,f5,f6,f8,f10,f11,f22,f12,f14,f15,f16,f17,f18,f20,f21,f26,"
           "f33,f34,f35,f62,f66,f69,f72,f100,f184,f211,f212")
@@ -164,7 +164,7 @@ def hk_real_time_quotes_page_df(cookie, pn):
             2)
         return temp_df
     except Exception as e:
-        logger.error("获取ETF列表,实时行情异常:{}", e)
+        logger.error("获取港股列表,实时行情异常:{}", e)
         return pd.DataFrame()
 
 
@@ -202,9 +202,11 @@ def get_hk_real_time_quotes(cookie):
     page_one_df = hk_real_time_quotes_page_df(cookie, 1)
     # 数据接口正常返回5600以上的数量
     if page_one_df.shape[0] > min_number:
+        page_one_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_one_df
     else:
         page_df = thread_pool_executor(cookie)
+        page_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_df
 
 

{mns_common-1.3.2.9 → mns_common-1.3.3.1}/mns_common/api/em/east_money_stock_us_api.py

@@ -16,7 +16,7 @@ max_number = 12000
 # 最小返回条数
 min_number = 11000
 # 分页条数
-page_number = 200
+page_number = 100
 
 fields = ("f352,f2,f3,f5,f6,f8,f10,f11,f22,f12,f14,f15,f16,f17,f18,f20,f21,f26,"
           "f33,f34,f35,f62,f66,f69,f72,f100,f184,f211,f212")
@@ -91,10 +91,12 @@ def get_us_stock_real_time_quotes(cookie):
     # 数据接口正常返回5600以上的数量
     if page_one_df.shape[0] > min_number:
         page_one_df = rename_us_stock(page_one_df)
+        page_one_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_one_df
     else:
         page_df = thread_pool_executor(cookie)
         page_df = rename_us_stock(page_df)
+        page_df.drop_duplicates('symbol', keep='last', inplace=True)
         return page_df
 
 

{mns_common-1.3.2.9 → mns_common-1.3.3.1}/mns_common/api/em/east_money_stock_v2_api.py

@@ -18,7 +18,7 @@ max_number = 5800
 # 最小返回条数
 min_number = 5600
 # 分页条数
-page_number = 200
+page_number = 100
 
 
 def get_stock_page_data(pn, fields, fs):

{mns_common-1.3.2.9 → mns_common-1.3.3.1}/mns_common/api/k_line/stock_minute_data_api.py

@@ -60,8 +60,8 @@ def get_minute_data(symbol, start_date, end_date, period,
             "close",
             "high",
             "low",
-            "amount",
             "volume",
+            "amount",
             "ava_price",
         ]
         temp_df.index = pd.to_datetime(temp_df["time"])

{mns_common-1.3.2.9 → mns_common-1.3.3.1}/mns_common.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.3.2.9
+Version: 1.3.3.1

{mns_common-1.3.2.9 → mns_common-1.3.3.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='mns_common',
-    version='1.3.2.9',
+    version='1.3.3.1',
     # packages=["mns_common", "mns_common.api",
     #           "mns_common.api.akshare",
     #           "mns_common.api.em",