akshare 1.14.83__tar.gz → 1.14.85__tar.gz

{akshare-1.14.83 → akshare-1.14.85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.14.83
+Version: 1.14.85
 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.83 → akshare-1.14.85}/akshare/__init__.py

@@ -2894,9 +2894,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.14.81 fix: fix stock_hsgt_hist_em interface
 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
 """
 
-__version__ = "1.14.83"
+__version__ = "1.14.85"
 __author__ = "AKFamily"
 
 import sys

{akshare-1.14.83 → akshare-1.14.85}/akshare/index/index_drewry.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/9/30 15:30
+Date: 2024/9/26 18:00
 Desc: Drewry 集装箱指数
 https://www.drewry.co.uk/supply-chain-advisors/supply-chain-expertise/world-container-index-assessed-by-drewry
 https://infogram.com/world-container-index-1h17493095xl4zj
 """
+
 import pandas as pd
 import requests
 from bs4 import BeautifulSoup
@@ -17,7 +18,8 @@ def drewry_wci_index(symbol: str = "composite") -> pd.DataFrame:
     """
     Drewry 集装箱指数
     https://infogram.com/world-container-index-1h17493095xl4zj
-    :param symbol: choice of {"composite", "shanghai-rotterdam", "rotterdam-shanghai", "shanghai-los angeles", "los angeles-shanghai", "shanghai-genoa", "new york-rotterdam", "rotterdam-new york"}
+    :param symbol: choice of {"composite", "shanghai-rotterdam", "rotterdam-shanghai", "shanghai-los angeles",
+    "los angeles-shanghai", "shanghai-genoa", "new york-rotterdam", "rotterdam-new york"}
     :type symbol: str
     :return: Drewry 集装箱指数
     :rtype: pandas.DataFrame
@@ -34,24 +36,23 @@ def drewry_wci_index(symbol: str = "composite") -> pd.DataFrame:
     }
     url = "https://infogram.com/world-container-index-1h17493095xl4zj"
     r = requests.get(url)
-    soup = BeautifulSoup(r.text, "lxml")
+    soup = BeautifulSoup(r.text, features="lxml")
     data_text = soup.find_all("script")[-4].string.strip("window.infographicData=")[:-1]
     data_json = demjson.decode(data_text)
-    temp_df = pd.DataFrame(data_json["elements"][2]["data"][symbol_map[symbol]])
-    temp_df = temp_df.iloc[1:, :]
+    data_json_need = data_json["elements"]["content"]["content"]["entities"][
+        "7a55585f-3fb3-44e6-9b54-beea1cd20b4d"
+    ]["data"][symbol_map[symbol]]
+    date_list = [item[0]["value"] for item in data_json_need[1:]]
+    try:
+        value_list = [item[1]["value"] for item in data_json_need[1:]]
+    except TypeError:
+        value_list = [item[1]["value"] for item in data_json_need[1:-1]]
+    temp_df = pd.DataFrame([date_list, value_list]).T
     temp_df.columns = ["date", "wci"]
-    temp_df["date"] = [item["value"] for item in temp_df["date"]]
-    temp_df["wci"] = [item["value"] for item in temp_df["wci"]]
-    day = temp_df["date"].str.split("-", expand=True).iloc[:, 0].str.strip()
-    month = temp_df["date"].str.split("-", expand=True).iloc[:, 1].str.strip()
-    month = month.str.replace("July", "Jul")
-    year = temp_df["date"].str.split("-", expand=True).iloc[:, 2].str.strip()
-    temp_df["date"] = day + "-" + month + "-" + year
-    # 修正数据源中日期格式的错误
-    temp_df["date"] = temp_df["date"].str.replace("Sept", "Sep")
-    temp_df["date"] = pd.to_datetime(temp_df["date"], format="%d-%b-%y").dt.date
+    temp_df["date"] = pd.to_datetime(
+        temp_df["date"], format="%d-%b-%y", errors="coerce"
+    ).dt.date
     temp_df["wci"] = pd.to_numeric(temp_df["wci"], errors="coerce")
-    temp_df.reset_index(inplace=True, drop=True)
     return temp_df
 
 

{akshare-1.14.83 → akshare-1.14.85}/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.83 → akshare-1.14.85}/akshare.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.14.83
+Version: 1.14.85
 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