mns-common 1.3.5.1__py3-none-any.whl → 1.3.5.3__py3-none-any.whl

mns_common/api/em/east_money_debt_api.py

@@ -59,6 +59,17 @@ def get_debt_page_data(fields, pn) -> pd.DataFrame:
     try:
         r = requests.get(url, params)
         data_text = r.text
+
+        if pn == 1:
+            try:
+                begin_index_total = data_text.index('"total":')
+
+                end_index_total = data_text.index('"diff"')
+                max_number = data_text[begin_index_total + 8:end_index_total - 1]
+            except Exception as e:
+                logger.error(f"获取第{pn}页可转债列表异常: {e}")
+                return pd.DataFrame()
+
         begin_index = data_text.index('[')
         end_index = data_text.index(']')
         data_json = data_text[begin_index:end_index + 1]

mns_common/api/em/east_money_etf_api.py

@@ -54,6 +54,13 @@ def get_fund_etf_page_df(pn) -> pd.DataFrame:
     try:
         r = requests.get(url, timeout=15, params=params)
         data_json = r.json()
+        if pn == 1:
+            try:
+                max_number = data_json['data']['total']
+            except Exception as e:
+                logger.error(f"获取第{pn}页ETF列表异常: {e}")
+                return pd.DataFrame()
+
         temp_df = pd.DataFrame(data_json["data"]["diff"])
         temp_df.rename(
             columns={

mns_common/api/em/east_money_stock_api.py

@@ -14,7 +14,7 @@ import datetime
 from loguru import logger
 
 # 最大返回条数
-max_number = 5700
+max_number = 5800
 # 最小返回条数
 min_number = 5600
 # 分页条数
@@ -50,6 +50,16 @@ def get_stock_page_data(pn, fields, fs):
     try:
         r = requests.get(url, params)
         data_text = r.text
+        if pn == 1:
+            try:
+                begin_index_total = data_text.index('"total":')
+
+                end_index_total = data_text.index('"diff"')
+                max_number = data_text[begin_index_total + 8:end_index_total - 1]
+            except Exception as e:
+                logger.error(f"获取第{pn}页股票列表异常: {e}")
+                return pd.DataFrame()
+
         begin_index = data_text.index('[')
         end_index = data_text.index(']')
         data_json = data_text[begin_index:end_index + 1]

mns_common/api/em/east_money_stock_hk_api.py

@@ -49,6 +49,16 @@ def hk_real_time_quotes_page_df(cookie, pn):
         r = requests.get(url_new, headers=headers)
         result = r.content.decode("utf-8")
 
+        if pn == 1:
+            try:
+                begin_index_total = result.index('"total":')
+
+                end_index_total = result.index('"diff"')
+                max_number = result[begin_index_total + 8:end_index_total - 1]
+            except Exception as e:
+                logger.error(f"获取第{pn}页港股列表异常: {e}")
+                return pd.DataFrame()
+
         startIndex = result.index('"diff"')
         endIndex = result.index('}]}')
 

mns_common/api/em/east_money_stock_us_api.py

@@ -46,6 +46,13 @@ def us_real_time_quotes_page_df(cookie, pn):
         }
         r = requests.get(url, params=params, headers=headers, timeout=15)
         data_json = r.json()
+        if pn == 1:
+            try:
+                max_number = data_json['data']['total']
+            except Exception as e:
+                logger.error(f"获取第{pn}页美股列表异常: {e}")
+                return pd.DataFrame()
+
         if not data_json["data"]["diff"]:
             return pd.DataFrame()
         temp_df = pd.DataFrame(data_json["data"]["diff"]).T

mns_common/component/classify/symbol_classify_api.py

@@ -35,26 +35,26 @@ def set_stock_type_by_deal_days(real_time_quotes_now_init):
     real_time_quotes_now.loc[:, "stock_type"] = stock_type_classify_param['normal_stock']
     # 交易天数五个交易日的股票
     real_time_quotes_now.loc[(real_time_quotes_now['name'].str.startswith('C'))
-                             | (real_time_quotes_now['deal_days'] <= stock_type_classify_param[
+                             | (real_time_quotes_now['deal_days'] < stock_type_classify_param[
         'sub_stock_new_min_deal_days']), "stock_type"] = stock_type_classify_param['new_stock']
 
     # 交易上市6-100天的次新股票
     real_time_quotes_now.loc[
         (real_time_quotes_now['stock_type'] != stock_type_classify_param['new_stock'])
-        & (real_time_quotes_now['deal_days'] > stock_type_classify_param['sub_stock_new_min_deal_days'])
-        & (real_time_quotes_now['deal_days'] <= stock_type_classify_param['sub_new_stock_max_deal_days']),
+        & (real_time_quotes_now['deal_days'] >= stock_type_classify_param['sub_stock_new_min_deal_days'])
+        & (real_time_quotes_now['deal_days'] < stock_type_classify_param['sub_new_stock_max_deal_days']),
         "stock_type"] = stock_type_classify_param['sub_stock_new']
 
     # 上市次新股 100-365
     real_time_quotes_now.loc[
-        (real_time_quotes_now['deal_days'] > stock_type_classify_param['sub_new_stock_max_deal_days'])
-        & (real_time_quotes_now['deal_days'] <= stock_type_classify_param['sub_stock_max_deal_days']),
+        (real_time_quotes_now['deal_days'] >= stock_type_classify_param['sub_new_stock_max_deal_days'])
+        & (real_time_quotes_now['deal_days'] < stock_type_classify_param['sub_stock_max_deal_days']),
         "stock_type"] = stock_type_classify_param['sub_stock']
 
     # 交易天数 366-730
     real_time_quotes_now.loc[
-        (real_time_quotes_now['deal_days'] > stock_type_classify_param['sub_stock_max_deal_days'])
-        & (real_time_quotes_now['deal_days'] <= stock_type_classify_param['normal_stock_max_deal_days']),
+        (real_time_quotes_now['deal_days'] >= stock_type_classify_param['sub_stock_max_deal_days'])
+        & (real_time_quotes_now['deal_days'] < stock_type_classify_param['normal_stock_max_deal_days']),
         "stock_type"] = stock_type_classify_param['normal_sub_stock']
 
     return real_time_quotes_now

{mns_common-1.3.5.1.dist-info → mns_common-1.3.5.3.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-common
-Version: 1.3.5.1
+Version: 1.3.5.3
 

{mns_common-1.3.5.1.dist-info → mns_common-1.3.5.3.dist-info}/RECORD

@@ -8,12 +8,12 @@ mns_common/api/akshare/stock_zb_pool.py,sha256=ylcVgZTzsD3qz9WaItLtoqTf4t-Ex49MD
 mns_common/api/akshare/stock_zt_pool_api.py,sha256=_4PG_Wd88S4zweKNwZprwxaMMHBF4OQSB77DGW1l9UQ,1929
 mns_common/api/akshare/yjyg_sync_api.py,sha256=cvk50_XhJWUqduOiC15SYvQTCQqECt6td_L2Hvnl7Jg,4108
 mns_common/api/em/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
-mns_common/api/em/east_money_debt_api.py,sha256=8fNKPpREOGniLnV5VCIGF9Q8Z9vEVfD6Ay33b-Dumc0,14143
-mns_common/api/em/east_money_etf_api.py,sha256=dYng_UpEob-vFk-9BVtj-bPMMIOpKVZRiHjH_NYcQGM,13989
-mns_common/api/em/east_money_stock_api.py,sha256=hTDbc3k_7QU3xp9ZSIcyPP5jpm1FWwd2lPLm0Sb7gG4,9451
+mns_common/api/em/east_money_debt_api.py,sha256=2_iGouYQggVwf0a_DoxXoD2LzZrSpHbZSiRvt_8PP1A,14549
+mns_common/api/em/east_money_etf_api.py,sha256=axovA3gbNrsXCPEn4Yk_Qsf1IePGYeXi93JlB1unz-g,14233
+mns_common/api/em/east_money_stock_api.py,sha256=XKk0DQ2xXMwsLZbTI5yivSki3rD7VutuV-qv1J0ZNWI,9852
 mns_common/api/em/east_money_stock_gdfx_free_top_10_api.py,sha256=jVy3fNdrkLq3ri7yUwXWt0ItB8LCHzt9CPz91Fj8sPA,9198
-mns_common/api/em/east_money_stock_hk_api.py,sha256=tw6APwlQRS-x0b96tCK_D7LKX1UJfuWv5ortoRujacA,14356
-mns_common/api/em/east_money_stock_us_api.py,sha256=_EKzQ0rTTE9JFaOEQkG7e7MgO2IyJZXQxeit_UKcYA4,11013
+mns_common/api/em/east_money_stock_hk_api.py,sha256=WkQJOs_KV1mLWN-v_ZWr_ekNiJoWRFH_iSxfYA78Uao,14748
+mns_common/api/em/east_money_stock_us_api.py,sha256=XwfvM4ZGxWJ_W8PMVAetXtJLltMrGEY1XE6z5xhqe9M,11260
 mns_common/api/em/east_money_stock_v2_api.py,sha256=NsieWF7v-RGGQt7uhTOgH9-bghKWJRDSaqsO9-diKvU,16120
 mns_common/api/em/em_concept_index_api.py,sha256=PP87ES8a_y0o3SKLzBsPrc7DCPI3MBCD-4SmoUUirl0,8285
 mns_common/api/hk/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
@@ -70,7 +70,7 @@ mns_common/component/common_service_fun_api.py,sha256=H7HZ-6uxup5unWe2JazNw_EBML
 mns_common/component/cache/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/component/cache/cache_service.py,sha256=QX7tjR1iGsoCyGt6O41w8aRbZ-3xXQ-53Ps3nmUzAGQ,809
 mns_common/component/classify/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
-mns_common/component/classify/symbol_classify_api.py,sha256=fwT2qM-F-eADOtUeRgyqbHopEpKjg1bhgM9Mjg37Cz0,8139
+mns_common/component/classify/symbol_classify_api.py,sha256=uccN15MNvkZQX0l_oZ47FqjivjQFqidlyw68Xs8uDL8,8138
 mns_common/component/classify/symbol_classify_param.py,sha256=ZOXoZeZ2grVACrpRCQyTF6_NEI9fI-tspYj7jubnkmc,1356
 mns_common/component/company/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/component/company/company_common_service_api.py,sha256=pqb11v5y0uFWJtqA7K-AMf6hzyrFUq_OVpvr7uaWOow,8252
@@ -136,7 +136,7 @@ mns_common/utils/date_handle_util.py,sha256=XS-MyA8_7k35LOCFAYOHgVcVkMft_Kc4Wa9U
 mns_common/utils/db_util.py,sha256=hSmfNAN4vEeEaUva6_cicZEhb2jSnib-Gvk2reke1vc,2590
 mns_common/utils/file_util.py,sha256=egWu6PenGPRp_ixrNTHKarT4dAnOT6FETR82EHUZJnQ,1042
 mns_common/utils/ip_util.py,sha256=UTcYfz_uytB__6nlBf7T-izuI7hi4XdB6ET0sJgEel4,969
-mns_common-1.3.5.1.dist-info/METADATA,sha256=sDEBESkIb-a-0H9N8vXbJkTgEi-u3aR2AdRvDR-4IdU,61
-mns_common-1.3.5.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mns_common-1.3.5.1.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
-mns_common-1.3.5.1.dist-info/RECORD,,
+mns_common-1.3.5.3.dist-info/METADATA,sha256=0ZMsA7xlSdOKayA18Gx8TMBICGbH0feGBT9FbOZ1MyQ,61
+mns_common-1.3.5.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mns_common-1.3.5.3.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
+mns_common-1.3.5.3.dist-info/RECORD,,