akshare 1.14.84__py3-none-any.whl → 1.14.86__py3-none-any.whl

akshare/__init__.py

@@ -2895,9 +2895,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.14.82 fix: fix stock_comment_detail_scrd_desire_daily_em interface
 1.14.83 fix: fix stock_comment_detail_zhpj_lspf_em interface
 1.14.84 fix: fix drewry_wci_index interface
+1.14.85 fix: fix stock_profit_forecast_em interface
+1.14.86 fix: fix stock_comment_detail_scrd_focus_em interface
 """
 
-__version__ = "1.14.84"
+__version__ = "1.14.86"
 __author__ = "AKFamily"
 
 import sys

akshare/stock_feature/stock_comment_em.py

@@ -192,36 +192,32 @@ def stock_comment_detail_scrd_focus_em(symbol: str = "600000") -> pd.DataFrame:
     :return: 市场热度-用户关注指数
     :rtype: pandas.DataFrame
     """
-    url = f"https://data.eastmoney.com/stockcomment/api/{symbol}.json"
-    try_count = 10
-    data_json = None
-    while try_count:
-        try:
-            r = requests.get(url)
-            data_json = r.json()
-            break
-        except requests.exceptions.JSONDecodeError:
-            try_count -= 1
-            time.sleep(1)
-            continue
-
-    current_year = data_json["ApiResults"]["scrd"]["focus"][0][0]["UpdateDate"].split(
-        "/"
-    )[0]
-    temp_df = pd.DataFrame(
-        [
-            data_json["ApiResults"]["scrd"]["focus"][1]["XData"],
-            data_json["ApiResults"]["scrd"]["focus"][1]["Ydata"]["StockFocus"],
-            data_json["ApiResults"]["scrd"]["focus"][1]["Ydata"]["ClosePrice"],
-        ]
-    ).T
-    temp_df.columns = ["日期", "用户关注指数", "收盘价"]
-    temp_df["日期"] = current_year + "-" + temp_df["日期"]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], errors="coerce").dt.date
-    temp_df.sort_values(by=["日期"], inplace=True)
+    url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
+    params = {
+        "filter": f'(SECURITY_CODE="{symbol}")',
+        "columns": "ALL",
+        "source": "WEB",
+        "client": "WEB",
+        "reportName": "RPT_STOCK_MARKETFOCUS",
+        "sortColumns": "TRADE_DATE",
+        "sortTypes": "-1",
+        "pageSize": "30",
+    }
+    r = requests.get(url=url, params=params)
+    data_json = r.json()
+    temp_df = pd.DataFrame(data_json["result"]["data"])
+    temp_df.rename(
+        columns={
+            "MARKET_FOCUS": "用户关注指数",
+            "TRADE_DATE": "交易日",
+        },
+        inplace=True,
+    )
+    temp_df = temp_df[["交易日", "用户关注指数"]]
+    temp_df["交易日"] = pd.to_datetime(temp_df["交易日"], errors="coerce").dt.date
+    temp_df.sort_values(by=["交易日"], inplace=True)
     temp_df.reset_index(inplace=True, drop=True)
     temp_df["用户关注指数"] = pd.to_numeric(temp_df["用户关注指数"], errors="coerce")
-    temp_df["收盘价"] = pd.to_numeric(temp_df["收盘价"], errors="coerce")
     return temp_df
 
 

akshare/stock_fundamental/stock_profit_forecast_em.py

@@ -5,6 +5,7 @@ Date: 2024/1/6 15:00
 Desc: 东方财富网-数据中心-研究报告-盈利预测
 https://data.eastmoney.com/report/profitforecast.jshtml
 """
+
 import pandas as pd
 import requests
 
@@ -15,7 +16,8 @@ def stock_profit_forecast_em(symbol: str = "") -> pd.DataFrame:
     """
     东方财富网-数据中心-研究报告-盈利预测
     https://data.eastmoney.com/report/profitforecast.jshtml
-    :param symbol: "", 默认为获取全部数据; symbol="船舶制造", 则获取具体行业板块的数据; 行业板块可以通过 ak.stock_board_industry_name_em() 接口获取
+    :param symbol: "", 默认为获取全部数据; symbol="船舶制造", 则获取具体行业板块的数据;
+    行业板块可以通过 ak.stock_board_industry_name_em() 接口获取
     :type symbol: str
     :return: 盈利预测
     :rtype: pandas.DataFrame
@@ -34,7 +36,6 @@ def stock_profit_forecast_em(symbol: str = "") -> pd.DataFrame:
     }
     if symbol:
         params.update({"filter": f'(INDUSTRY_BOARD="{symbol}")'})
-
     r = requests.get(url, params=params)
     data_json = r.json()
     page_num = int(data_json["result"]["pages"])
@@ -52,7 +53,7 @@ def stock_profit_forecast_em(symbol: str = "") -> pd.DataFrame:
         r = requests.get(url, params=params)
         data_json = r.json()
         temp_df = pd.DataFrame(data_json["result"]["data"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
+        big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
 
     big_df.reset_index(inplace=True)
     big_df["index"] = big_df.index + 1
@@ -94,7 +95,6 @@ def stock_profit_forecast_em(symbol: str = "") -> pd.DataFrame:
         "_",
         "_",
     ]
-
     big_df = big_df[
         [
             "序号",
@@ -112,11 +112,12 @@ def stock_profit_forecast_em(symbol: str = "") -> pd.DataFrame:
             f"{year4}预测每股收益",
         ]
     ]
-    big_df["机构投资评级(近六个月)-买入"].fillna(0, inplace=True)
-    big_df["机构投资评级(近六个月)-增持"].fillna(0, inplace=True)
-    big_df["机构投资评级(近六个月)-中性"].fillna(0, inplace=True)
-    big_df["机构投资评级(近六个月)-减持"].fillna(0, inplace=True)
-    big_df["机构投资评级(近六个月)-卖出"].fillna(0, inplace=True)
+    big_df["机构投资评级(近六个月)-买入"] = big_df[
+        "机构投资评级(近六个月)-买入"
+    ].fillna(0)
+    big_df["机构投资评级(近六个月)-增持"] = big_df[
+        "机构投资评级(近六个月)-增持"
+    ].fillna(0)
     big_df["研报数"] = pd.to_numeric(big_df["研报数"], errors="coerce")
     big_df["机构投资评级(近六个月)-买入"] = pd.to_numeric(
         big_df["机构投资评级(近六个月)-买入"], errors="coerce"
@@ -133,10 +134,27 @@ def stock_profit_forecast_em(symbol: str = "") -> pd.DataFrame:
     big_df["机构投资评级(近六个月)-卖出"] = pd.to_numeric(
         big_df["机构投资评级(近六个月)-卖出"], errors="coerce"
     )
-    big_df[f"{year1}预测每股收益"] = pd.to_numeric(big_df[f"{year1}预测每股收益"], errors="coerce")
-    big_df[f"{year2}预测每股收益"] = pd.to_numeric(big_df[f"{year2}预测每股收益"], errors="coerce")
-    big_df[f"{year3}预测每股收益"] = pd.to_numeric(big_df[f"{year3}预测每股收益"], errors="coerce")
-    big_df[f"{year4}预测每股收益"] = pd.to_numeric(big_df[f"{year4}预测每股收益"], errors="coerce")
+    big_df["机构投资评级(近六个月)-中性"] = big_df[
+        "机构投资评级(近六个月)-中性"
+    ].fillna(0)
+    big_df["机构投资评级(近六个月)-减持"] = big_df[
+        "机构投资评级(近六个月)-减持"
+    ].fillna(0)
+    big_df["机构投资评级(近六个月)-卖出"] = big_df[
+        "机构投资评级(近六个月)-卖出"
+    ].fillna(0)
+    big_df[f"{year1}预测每股收益"] = pd.to_numeric(
+        big_df[f"{year1}预测每股收益"], errors="coerce"
+    )
+    big_df[f"{year2}预测每股收益"] = pd.to_numeric(
+        big_df[f"{year2}预测每股收益"], errors="coerce"
+    )
+    big_df[f"{year3}预测每股收益"] = pd.to_numeric(
+        big_df[f"{year3}预测每股收益"], errors="coerce"
+    )
+    big_df[f"{year4}预测每股收益"] = pd.to_numeric(
+        big_df[f"{year4}预测每股收益"], errors="coerce"
+    )
     big_df.sort_values(["研报数"], ascending=False, inplace=True, ignore_index=True)
     big_df["序号"] = range(1, len(big_df) + 1)
     return big_df

{akshare-1.14.84.dist-info → akshare-1.14.86.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.14.84
+Version: 1.14.86
 Summary: AKShare is an elegant and simple financial data interface library for Python, built for human beings!
 Home-page: https://github.com/akfamily/akshare
 Author: AKFamily

{akshare-1.14.84.dist-info → akshare-1.14.86.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=siaAbZ64GnNdzkScy_hOfwhcG3zhBZGLWEgWtD90PLA,182024
+akshare/__init__.py,sha256=EkIzGs9fb7gBOu8Zgd6v4LuUd7lIJNRdCO5wFGaqOz4,182138
 akshare/datasets.py,sha256=-qdwaQjgBlftX84uM74KJqCYJYkQ50PV416_neA4uls,995
 akshare/air/__init__.py,sha256=RMTf1bT5EOE3ttWpn3hGu1LtUmsVxDoa0W7W0gXHOy8,81
 akshare/air/air_hebei.py,sha256=xIXNGLK7IGYqrkteM9fxnHAwWqk6PCQs6D9-ggZ7byY,4442
@@ -296,7 +296,7 @@ akshare/stock_feature/stock_analyst_em.py,sha256=Md3_G-Px0O1lk4dx5dCEKl8Vjgwt79S
 akshare/stock_feature/stock_board_industry_ths.py,sha256=bn4vPXaK_ybU-qUttQshnzFC1L_S9reO2OydmAt7sGI,12488
 akshare/stock_feature/stock_buffett_index_lg.py,sha256=NpNccHmGjtqLz6aUladB6InPzO2pjoImbgCgmNEYUuM,2027
 akshare/stock_feature/stock_classify_sina.py,sha256=Lg7ROG5W9HioFRplJI2rZ6tAAHM09N3g9qF6kReIQYI,3210
-akshare/stock_feature/stock_comment_em.py,sha256=xDq2a5j46VuqWHvB_WPZiv6NUZ4ln6dVxicYMGDNE_0,13947
+akshare/stock_feature/stock_comment_em.py,sha256=uSOS5YmyXB9jSDsZf1fNC0RPGTE6_4RzjwxaewhJQtc,13697
 akshare/stock_feature/stock_concept_futu.py,sha256=jKJ9mfdJXgXwcMb3gVpbDl5ivr-zcMkuGO7jjgyA3os,6228
 akshare/stock_feature/stock_congestion_lg.py,sha256=iTEcmL0HoSqWGfxv_gSM-qA4O23aqUH7qHl9asDtoO0,1299
 akshare/stock_feature/stock_cyq_em.py,sha256=ijHL6BWGDLI8dctYQ4pYWDK2UHOSfn5mRu0c9E5zwp0,11017
@@ -362,7 +362,7 @@ akshare/stock_fundamental/stock_kcb_detail_sse.py,sha256=MBanq3sDvb0OTbUl_gg7avD
 akshare/stock_fundamental/stock_kcb_sse.py,sha256=4_Bu8Qe6lGvlscH-giIPIJaYXpd4bYKZ1rM-hZiLBaE,1534
 akshare/stock_fundamental/stock_mda_ym.py,sha256=P5aaNk3ecS6j-12N2niReiOKD3KM9FhaNgTE07j-1Tw,1106
 akshare/stock_fundamental/stock_notice.py,sha256=tGxGz1Usr3qQzgs1Y71imDPkqJz5ooismz3BiaBwQR0,3928
-akshare/stock_fundamental/stock_profit_forecast_em.py,sha256=QP7jgMwto9o1zc1vDl9BBeta_lgxA13NMbijs9eqjRs,5377
+akshare/stock_fundamental/stock_profit_forecast_em.py,sha256=_ZlWkyz-FswlICbjk_YiHjRwrlLftm_piQIPFkZMrjE,5701
 akshare/stock_fundamental/stock_profit_forecast_hk_etnet.py,sha256=dQaqxi0wXOidIuAxjUzZy_gdy16HEi20I3jEdpNM3qc,5179
 akshare/stock_fundamental/stock_profit_forecast_ths.py,sha256=ZTShEB5w1y5j6TsHzWT8QR8oatbBTdE1H0IIxPLHn9s,2656
 akshare/stock_fundamental/stock_recommend.py,sha256=44l1uLofwO-nsDB4oAYWpHQA7_qhXLOo1BurjUvmXzY,4501
@@ -380,8 +380,8 @@ akshare/utils/token_process.py,sha256=K4rGXjh_tgugbRcyOK2h2x0jP3PT65IIK7nxhUKhOe
 akshare/utils/tqdm.py,sha256=MuPNwcswkOGjwWQOMWXi9ZvQ_RmW4obCWRj2i7HM7FE,847
 tests/__init__.py,sha256=gNzhlO0UPjFq6Ieb38kaVIODXv4cTDByrdohAZnDYt4,82
 tests/test_func.py,sha256=j1MGYbZI2if2j_LY1S4FLsf4qfq4NwVqD5wmRlv5Log,832
-akshare-1.14.84.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.14.84.dist-info/METADATA,sha256=dQ1bPRyg9ju6jfQG2hSJhIVA-I7jQLjs20dPBY1Jm0s,14112
-akshare-1.14.84.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-akshare-1.14.84.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.14.84.dist-info/RECORD,,
+akshare-1.14.86.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.14.86.dist-info/METADATA,sha256=BM6MGxB9MYIQYkigQ7B1nMOGTfofJ3TATnTM3NznCvs,14112
+akshare-1.14.86.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+akshare-1.14.86.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.14.86.dist-info/RECORD,,