akshare 1.15.43__py3-none-any.whl → 1.15.45__py3-none-any.whl

akshare/__init__.py

@@ -2953,9 +2953,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.41 fix: fix macro_china_fdi interface
 1.15.42 fix: fix get_roll_yield_bar interface
 1.15.43 fix: fix macro_china_urban_unemployment interface
+1.15.44 fix: fix index_detail_hist_adjust_cni interface
+1.15.45 fix: fix stock_jgdy_detail_em interface
 """
 
-__version__ = "1.15.43"
+__version__ = "1.15.45"
 __author__ = "AKFamily"
 
 import sys
@@ -5274,14 +5276,6 @@ from akshare.economic.macro_china_nbs import (
     macro_china_nbs_region
 )
 
-"""
-全球期货
-"""
-from akshare.futures.futures_international import (
-    futures_global_commodity_hist,
-    futures_global_commodity_name_url_map,
-)
-
 """
 外汇
 """
@@ -5307,23 +5301,6 @@ from akshare.option.option_commodity import (
     option_gfex_daily,
 )
 
-"""
-英为财情-债券
-"""
-from akshare.bond.bond_investing import (
-    bond_investing_global,
-    bond_investing_global_country_name_url,
-)
-
-"""
-英为财情-指数
-"""
-from akshare.index.index_investing import (
-    index_investing_global,
-    index_investing_global_area_index_name_code,
-    index_investing_global_area_index_name_url,
-)
-
 """
 99期货-期货库存数据
 """

akshare/futures/futures_basis.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/11/28 22:00
+Date: 2024/12/12 17:00
 Desc: 生意社网站采集大宗商品现货价格及相应基差数据, 数据时间段从 20110104-至今
 备注：现期差 = 现货价格 - 期货价格(这里的期货价格为结算价)
 黄金为 元/克, 白银为 元/千克, 玻璃现货为 元/平方米, 鸡蛋现货为 元/公斤, 鸡蛋期货为 元/500千克, 其余为 元/吨.
@@ -124,9 +124,9 @@ def futures_spot_price(
                     return temp_df
                 else:
                     time.sleep(3)
-            except:  # noqa: E722
+            except Exception as e:  # noqa: E722
                 print(
-                    f"{date.strftime('%Y-%m-%d')}日生意社数据连接失败，第{str(i)}次尝试，最多5次"
+                    f"{date.strftime('%Y-%m-%d')}日生意社数据连接失败[错误信息:{e}]，第{str(i)}次尝试，最多5次"
                 )
                 i += 1
                 if i > 5:
@@ -187,6 +187,8 @@ def _check_information(df_data, date):
             "郑州商品交易所",
             "大连商品交易所",
             "广州期货交易所",
+            # 某些天网站没有数据，比如 20180912，此时返回"暂无数据"，但并不是网站被墙了
+            "暂无数据",
         ]:
             symbol = chinese_to_english(news)
             record = pd.DataFrame(df_data[df_data["symbol"] == string])
@@ -206,6 +208,16 @@ def _check_information(df_data, date):
                 record.loc[:, "spot_price"] = float(record["spot_price"].iloc[0]) * 1000
             records = pd.concat([records, record])
 
+    # 20241129:如果某日没有数据，直接返回返回空表
+    if records.empty:
+        records = df_data.iloc[0:0]
+        records["near_basis"] = pd.Series(dtype="float")
+        records["dom_basis"] = pd.Series(dtype="float")
+        records["near_basis_rate"] = pd.Series(dtype="float")
+        records["dom_basis_rate"] = pd.Series(dtype="float")
+        records["date"] = pd.Series(dtype="object")
+        return records
+
     records.loc[:, ["near_contract_price", "dominant_contract_price", "spot_price"]] = (
         records.loc[
             :, ["near_contract_price", "dominant_contract_price", "spot_price"]
@@ -259,6 +271,7 @@ def _check_information(df_data, date):
     records["dom_basis_rate"] = (
         records["dominant_contract_price"] / records["spot_price"] - 1
     )
+    # records.loc[:, "date"] = date.strftime("%Y%m%d")
     records.insert(0, "date", date.strftime("%Y%m%d"))
     return records
 
@@ -300,8 +313,15 @@ def futures_spot_price_previous(date: str = "20240430") -> pd.DataFrame:
     values = main[main[4].str.endswith("%")]
     values.columns = header
     # Basis
-    basis = pd.concat(content[2:-1])
+    # 对于没有数据的天，xml文件中没有数据，所以content[2:-1]可能为空
+    if len(content[2:-1]) > 0:
+        basis = pd.concat(content[2:-1])
+    else:
+        basis = pd.DataFrame(columns=["主力合约基差", "主力合约基差(%)"])
+
     basis.columns = ["主力合约基差", "主力合约基差(%)"]
+    # 20241125(jasonudu)：因为部分日期，存在多个品种的现货价格，比如20151125的白糖、豆粕、豆油等，如果用商品名来merge，会出现重复列名，所以改用index来merge
+    # basis["商品"] = values["商品"].tolist()
     basis.index = values.index
     basis = pd.merge(
         values[["商品", "现货价格", "主力合约代码", "主力合约价格"]],
@@ -338,12 +358,12 @@ def futures_spot_price_previous(date: str = "20240430") -> pd.DataFrame:
 
 if __name__ == "__main__":
     futures_spot_price_daily_df = futures_spot_price_daily(
-        start_day="20241028", end_day="20241128", vars_list=["CU", "RB"]
+        start_day="20240415", end_day="20240418", vars_list=["CU", "RB"]
     )
     print(futures_spot_price_daily_df)
 
-    futures_spot_price_df = futures_spot_price(date="20241128")
+    futures_spot_price_df = futures_spot_price(date="20240430")
     print(futures_spot_price_df)
 
-    futures_spot_price_previous_df = futures_spot_price_previous(date="20241128")
+    futures_spot_price_previous_df = futures_spot_price_previous(date="20240430")
     print(futures_spot_price_previous_df)

akshare/stock_feature/stock_gdfx_em.py

@@ -5,13 +5,14 @@ Date: 2023/11/27 18:00
 Desc: 东方财富网-数据中心-股东分析
 https://data.eastmoney.com/gdfx/
 """
+
 import pandas as pd
 import requests
 from tqdm import tqdm
 
 
 def stock_gdfx_free_holding_statistics_em(
-        date: str = "20210630",
+    date: str = "20210630",
 ) -> pd.DataFrame:
     """
     东方财富网-数据中心-股东分析-股东持股统计-十大流通股东
@@ -83,15 +84,33 @@ def stock_gdfx_free_holding_statistics_em(
         ]
     ]
     big_df["统计次数"] = pd.to_numeric(big_df["统计次数"])
-    big_df["公告日后涨幅统计-10个交易日-平均涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-10个交易日-平均涨幅"])
-    big_df["公告日后涨幅统计-10个交易日-最大涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-10个交易日-最大涨幅"])
-    big_df["公告日后涨幅统计-10个交易日-最小涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-10个交易日-最小涨幅"])
-    big_df["公告日后涨幅统计-30个交易日-平均涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-30个交易日-平均涨幅"])
-    big_df["公告日后涨幅统计-30个交易日-最大涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-30个交易日-最大涨幅"])
-    big_df["公告日后涨幅统计-30个交易日-最小涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-30个交易日-最小涨幅"])
-    big_df["公告日后涨幅统计-60个交易日-平均涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-60个交易日-平均涨幅"])
-    big_df["公告日后涨幅统计-60个交易日-最大涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-60个交易日-最大涨幅"])
-    big_df["公告日后涨幅统计-60个交易日-最小涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-60个交易日-最小涨幅"])
+    big_df["公告日后涨幅统计-10个交易日-平均涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-10个交易日-平均涨幅"]
+    )
+    big_df["公告日后涨幅统计-10个交易日-最大涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-10个交易日-最大涨幅"]
+    )
+    big_df["公告日后涨幅统计-10个交易日-最小涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-10个交易日-最小涨幅"]
+    )
+    big_df["公告日后涨幅统计-30个交易日-平均涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-30个交易日-平均涨幅"]
+    )
+    big_df["公告日后涨幅统计-30个交易日-最大涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-30个交易日-最大涨幅"]
+    )
+    big_df["公告日后涨幅统计-30个交易日-最小涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-30个交易日-最小涨幅"]
+    )
+    big_df["公告日后涨幅统计-60个交易日-平均涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-60个交易日-平均涨幅"]
+    )
+    big_df["公告日后涨幅统计-60个交易日-最大涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-60个交易日-最大涨幅"]
+    )
+    big_df["公告日后涨幅统计-60个交易日-最小涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-60个交易日-最小涨幅"]
+    )
     return big_df
 
 
@@ -167,15 +186,33 @@ def stock_gdfx_holding_statistics_em(date: str = "20210930") -> pd.DataFrame:
         ]
     ]
     big_df["统计次数"] = pd.to_numeric(big_df["统计次数"])
-    big_df["公告日后涨幅统计-10个交易日-平均涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-10个交易日-平均涨幅"])
-    big_df["公告日后涨幅统计-10个交易日-最大涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-10个交易日-最大涨幅"])
-    big_df["公告日后涨幅统计-10个交易日-最小涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-10个交易日-最小涨幅"])
-    big_df["公告日后涨幅统计-30个交易日-平均涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-30个交易日-平均涨幅"])
-    big_df["公告日后涨幅统计-30个交易日-最大涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-30个交易日-最大涨幅"])
-    big_df["公告日后涨幅统计-30个交易日-最小涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-30个交易日-最小涨幅"])
-    big_df["公告日后涨幅统计-60个交易日-平均涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-60个交易日-平均涨幅"])
-    big_df["公告日后涨幅统计-60个交易日-最大涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-60个交易日-最大涨幅"])
-    big_df["公告日后涨幅统计-60个交易日-最小涨幅"] = pd.to_numeric(big_df["公告日后涨幅统计-60个交易日-最小涨幅"])
+    big_df["公告日后涨幅统计-10个交易日-平均涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-10个交易日-平均涨幅"]
+    )
+    big_df["公告日后涨幅统计-10个交易日-最大涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-10个交易日-最大涨幅"]
+    )
+    big_df["公告日后涨幅统计-10个交易日-最小涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-10个交易日-最小涨幅"]
+    )
+    big_df["公告日后涨幅统计-30个交易日-平均涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-30个交易日-平均涨幅"]
+    )
+    big_df["公告日后涨幅统计-30个交易日-最大涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-30个交易日-最大涨幅"]
+    )
+    big_df["公告日后涨幅统计-30个交易日-最小涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-30个交易日-最小涨幅"]
+    )
+    big_df["公告日后涨幅统计-60个交易日-平均涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-60个交易日-平均涨幅"]
+    )
+    big_df["公告日后涨幅统计-60个交易日-最大涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-60个交易日-最大涨幅"]
+    )
+    big_df["公告日后涨幅统计-60个交易日-最小涨幅"] = pd.to_numeric(
+        big_df["公告日后涨幅统计-60个交易日-最小涨幅"]
+    )
     return big_df
 
 
@@ -334,7 +371,7 @@ def stock_gdfx_holding_change_em(date: str = "20210930") -> pd.DataFrame:
 
 
 def stock_gdfx_free_top_10_em(
-        symbol: str = "sh688686", date: str = "20210630"
+    symbol: str = "sh688686", date: str = "20240930"
 ) -> pd.DataFrame:
     """
     东方财富网-个股-十大流通股东
@@ -384,14 +421,16 @@ def stock_gdfx_free_top_10_em(
             "变动比率",
         ]
     ]
-    temp_df["持股数"] = pd.to_numeric(temp_df["持股数"])
-    temp_df["占总流通股本持股比例"] = pd.to_numeric(temp_df["占总流通股本持股比例"])
-    temp_df["变动比率"] = pd.to_numeric(temp_df["变动比率"])
+    temp_df["持股数"] = pd.to_numeric(temp_df["持股数"], errors="coerce")
+    temp_df["占总流通股本持股比例"] = pd.to_numeric(
+        temp_df["占总流通股本持股比例"], errors="coerce"
+    )
+    temp_df["变动比率"] = pd.to_numeric(temp_df["变动比率"], errors="coerce")
     return temp_df
 
 
 def stock_gdfx_top_10_em(
-        symbol: str = "sh688686", date: str = "20210630"
+    symbol: str = "sh688686", date: str = "20210630"
 ) -> pd.DataFrame:
     """
     东方财富网-个股-十大股东
@@ -477,24 +516,27 @@ def stock_gdfx_free_holding_detail_em(date: str = "20210930") -> pd.DataFrame:
 
     big_df.reset_index(inplace=True)
     big_df["index"] = big_df.index + 1
-    big_df.rename(columns={
-        "index": "序号",
-        "HOLDER_NAME": "股东名称",
-        "HOLDER_TYPE": "股东类型",
-        "SHARES_TYPE": "股份类型",
-        "HOLDER_RANK": "股东排名",
-        "SECURITY_CODE": "股票代码",
-        "SECURITY_NAME_ABBR": "股票简称",
-        "HOLD_NUM": "期末持股-数量",
-        "FREE_HOLDNUM_RATIO": "期末持股-持股占流通股比",
-        "XZCHANGE": "期末持股-数量变化",
-        "CHANGE_RATIO": "期末持股-数量变化比例",
-        "HOLDNUM_CHANGE_NAME": "期末持股-持股变动",
-        "HOLDER_MARKET_CAP": "期末持股-流通市值",
-        "END_DATE": "报告期",
-        "UPDATE_DATE": "公告日",
-        "REPORT_DATE_NAME": "报告名称",
-    }, inplace=True)
+    big_df.rename(
+        columns={
+            "index": "序号",
+            "HOLDER_NAME": "股东名称",
+            "HOLDER_TYPE": "股东类型",
+            "SHARES_TYPE": "股份类型",
+            "HOLDER_RANK": "股东排名",
+            "SECURITY_CODE": "股票代码",
+            "SECURITY_NAME_ABBR": "股票简称",
+            "HOLD_NUM": "期末持股-数量",
+            "FREE_HOLDNUM_RATIO": "期末持股-持股占流通股比",
+            "XZCHANGE": "期末持股-数量变化",
+            "CHANGE_RATIO": "期末持股-数量变化比例",
+            "HOLDNUM_CHANGE_NAME": "期末持股-持股变动",
+            "HOLDER_MARKET_CAP": "期末持股-流通市值",
+            "END_DATE": "报告期",
+            "UPDATE_DATE": "公告日",
+            "REPORT_DATE_NAME": "报告名称",
+        },
+        inplace=True,
+    )
 
     big_df = big_df[
         [
@@ -515,13 +557,21 @@ def stock_gdfx_free_holding_detail_em(date: str = "20210930") -> pd.DataFrame:
     big_df["报告期"] = pd.to_datetime(big_df["报告期"], errors="coerce").dt.date
     big_df["公告日"] = pd.to_datetime(big_df["公告日"], errors="coerce").dt.date
     big_df["期末持股-数量"] = pd.to_numeric(big_df["期末持股-数量"], errors="coerce")
-    big_df["期末持股-数量变化"] = pd.to_numeric(big_df["期末持股-数量变化"], errors="coerce")
-    big_df["期末持股-数量变化比例"] = pd.to_numeric(big_df["期末持股-数量变化比例"], errors="coerce")
-    big_df["期末持股-流通市值"] = pd.to_numeric(big_df["期末持股-流通市值"], errors="coerce")
+    big_df["期末持股-数量变化"] = pd.to_numeric(
+        big_df["期末持股-数量变化"], errors="coerce"
+    )
+    big_df["期末持股-数量变化比例"] = pd.to_numeric(
+        big_df["期末持股-数量变化比例"], errors="coerce"
+    )
+    big_df["期末持股-流通市值"] = pd.to_numeric(
+        big_df["期末持股-流通市值"], errors="coerce"
+    )
     return big_df
 
 
-def stock_gdfx_holding_detail_em(date: str = "20230331", indicator: str = "个人", symbol: str = "新进") -> pd.DataFrame:
+def stock_gdfx_holding_detail_em(
+    date: str = "20230331", indicator: str = "个人", symbol: str = "新进"
+) -> pd.DataFrame:
     """
     东方财富网-数据中心-股东分析-股东持股明细-十大股东
     https://data.eastmoney.com/gdfx/HoldingAnalyse.html
@@ -559,22 +609,24 @@ def stock_gdfx_holding_detail_em(date: str = "20230331", indicator: str = "个
 
     big_df.reset_index(inplace=True)
     big_df["index"] = big_df.index + 1
-    big_df.rename(columns={
-        "index": "序号",
-        "HOLDER_NAME": "股东名称",
-        "HOLDER_NEWTYPE": "股东类型",
-        "RANK": "股东排名",
-        "SECURITY_CODE": "股票代码",
-        "SECURITY_NAME_ABBR": "股票简称",
-        "END_DATE": "报告期",
-        "HOLD_NUM": "期末持股-数量",
-        "HOLD_NUM_CHANGE": "期末持股-数量变化",
-        "HOLD_RATIO_CHANGE": "期末持股-数量变化比例",
-        "HOLDNUM_CHANGE_NAME": "期末持股-持股变动",
-        "HOLDER_MARKET_CAP": "期末持股-流通市值",
-        "NOTICE_DATE": "公告日",
-
-    }, inplace=True)
+    big_df.rename(
+        columns={
+            "index": "序号",
+            "HOLDER_NAME": "股东名称",
+            "HOLDER_NEWTYPE": "股东类型",
+            "RANK": "股东排名",
+            "SECURITY_CODE": "股票代码",
+            "SECURITY_NAME_ABBR": "股票简称",
+            "END_DATE": "报告期",
+            "HOLD_NUM": "期末持股-数量",
+            "HOLD_NUM_CHANGE": "期末持股-数量变化",
+            "HOLD_RATIO_CHANGE": "期末持股-数量变化比例",
+            "HOLDNUM_CHANGE_NAME": "期末持股-持股变动",
+            "HOLDER_MARKET_CAP": "期末持股-流通市值",
+            "NOTICE_DATE": "公告日",
+        },
+        inplace=True,
+    )
 
     big_df = big_df[
         [
@@ -596,9 +648,15 @@ def stock_gdfx_holding_detail_em(date: str = "20230331", indicator: str = "个
     big_df["报告期"] = pd.to_datetime(big_df["报告期"], errors="coerce").dt.date
     big_df["公告日"] = pd.to_datetime(big_df["公告日"], errors="coerce").dt.date
     big_df["期末持股-数量"] = pd.to_numeric(big_df["期末持股-数量"], errors="coerce")
-    big_df["期末持股-数量变化"] = pd.to_numeric(big_df["期末持股-数量变化"], errors="coerce")
-    big_df["期末持股-数量变化比例"] = pd.to_numeric(big_df["期末持股-数量变化比例"], errors="coerce")
-    big_df["期末持股-流通市值"] = pd.to_numeric(big_df["期末持股-流通市值"], errors="coerce")
+    big_df["期末持股-数量变化"] = pd.to_numeric(
+        big_df["期末持股-数量变化"], errors="coerce"
+    )
+    big_df["期末持股-数量变化比例"] = pd.to_numeric(
+        big_df["期末持股-数量变化比例"], errors="coerce"
+    )
+    big_df["期末持股-流通市值"] = pd.to_numeric(
+        big_df["期末持股-流通市值"], errors="coerce"
+    )
     big_df["股东排名"] = pd.to_numeric(big_df["股东排名"], errors="coerce")
     return big_df
 
@@ -637,23 +695,26 @@ def stock_gdfx_free_holding_analyse_em(date: str = "20230930") -> pd.DataFrame:
 
     big_df.reset_index(inplace=True)
     big_df["index"] = big_df.index + 1
-    big_df.rename(columns={
-        "index": "序号",
-        "HOLDER_NAME": "股东名称",
-        "HOLDER_TYPE": "股东类型",
-        "SECURITY_CODE": "股票代码",
-        "SECURITY_NAME_ABBR": "股票简称",
-        "END_DATE": "报告期",
-        "HOLD_NUM": "期末持股-数量",
-        "XZCHANGE": "期末持股-数量变化",
-        "HOLD_RATIO_CHANGE": "期末持股-数量变化比例",
-        "HOLDNUM_CHANGE_NAME": "期末持股-持股变动",
-        "HOLDER_MARKET_CAP": "期末持股-流通市值",
-        "UPDATE_DATE": "公告日",
-        "D10_ADJCHRATE": "公告日后涨跌幅-10个交易日",
-        "D30_ADJCHRATE": "公告日后涨跌幅-30个交易日",
-        "D60_ADJCHRATE": "公告日后涨跌幅-60个交易日",
-    }, inplace=True)
+    big_df.rename(
+        columns={
+            "index": "序号",
+            "HOLDER_NAME": "股东名称",
+            "HOLDER_TYPE": "股东类型",
+            "SECURITY_CODE": "股票代码",
+            "SECURITY_NAME_ABBR": "股票简称",
+            "END_DATE": "报告期",
+            "HOLD_NUM": "期末持股-数量",
+            "XZCHANGE": "期末持股-数量变化",
+            "HOLD_RATIO_CHANGE": "期末持股-数量变化比例",
+            "HOLDNUM_CHANGE_NAME": "期末持股-持股变动",
+            "HOLDER_MARKET_CAP": "期末持股-流通市值",
+            "UPDATE_DATE": "公告日",
+            "D10_ADJCHRATE": "公告日后涨跌幅-10个交易日",
+            "D30_ADJCHRATE": "公告日后涨跌幅-30个交易日",
+            "D60_ADJCHRATE": "公告日后涨跌幅-60个交易日",
+        },
+        inplace=True,
+    )
     big_df = big_df[
         [
             "序号",
@@ -676,12 +737,24 @@ def stock_gdfx_free_holding_analyse_em(date: str = "20230930") -> pd.DataFrame:
     big_df["报告期"] = pd.to_datetime(big_df["报告期"], errors="coerce").dt.date
     big_df["公告日"] = pd.to_datetime(big_df["公告日"], errors="coerce").dt.date
     big_df["期末持股-数量"] = pd.to_numeric(big_df["期末持股-数量"], errors="coerce")
-    big_df["期末持股-数量变化"] = pd.to_numeric(big_df["期末持股-数量变化"], errors="coerce")
-    big_df["期末持股-数量变化比例"] = pd.to_numeric(big_df["期末持股-数量变化比例"], errors="coerce")
-    big_df["期末持股-流通市值"] = pd.to_numeric(big_df["期末持股-流通市值"], errors="coerce")
-    big_df["公告日后涨跌幅-10个交易日"] = pd.to_numeric(big_df["公告日后涨跌幅-10个交易日"], errors="coerce")
-    big_df["公告日后涨跌幅-30个交易日"] = pd.to_numeric(big_df["公告日后涨跌幅-30个交易日"], errors="coerce")
-    big_df["公告日后涨跌幅-60个交易日"] = pd.to_numeric(big_df["公告日后涨跌幅-60个交易日"], errors="coerce")
+    big_df["期末持股-数量变化"] = pd.to_numeric(
+        big_df["期末持股-数量变化"], errors="coerce"
+    )
+    big_df["期末持股-数量变化比例"] = pd.to_numeric(
+        big_df["期末持股-数量变化比例"], errors="coerce"
+    )
+    big_df["期末持股-流通市值"] = pd.to_numeric(
+        big_df["期末持股-流通市值"], errors="coerce"
+    )
+    big_df["公告日后涨跌幅-10个交易日"] = pd.to_numeric(
+        big_df["公告日后涨跌幅-10个交易日"], errors="coerce"
+    )
+    big_df["公告日后涨跌幅-30个交易日"] = pd.to_numeric(
+        big_df["公告日后涨跌幅-30个交易日"], errors="coerce"
+    )
+    big_df["公告日后涨跌幅-60个交易日"] = pd.to_numeric(
+        big_df["公告日后涨跌幅-60个交易日"], errors="coerce"
+    )
     return big_df
 
 
@@ -718,7 +791,7 @@ def stock_gdfx_holding_analyse_em(date: str = "20230331") -> pd.DataFrame:
         big_df = pd.concat([big_df, temp_df], ignore_index=True)
 
     big_df.reset_index(inplace=True)
-    big_df['index'] = big_df['index'] + 1
+    big_df["index"] = big_df["index"] + 1
     big_df.rename(
         columns={
             "index": "序号",
@@ -766,12 +839,24 @@ def stock_gdfx_holding_analyse_em(date: str = "20230331") -> pd.DataFrame:
     big_df["公告日"] = pd.to_datetime(big_df["公告日"]).dt.date
     big_df["报告期"] = pd.to_datetime(big_df["报告期"]).dt.date
     big_df["期末持股-数量"] = pd.to_numeric(big_df["期末持股-数量"], errors="coerce")
-    big_df["期末持股-数量变化"] = pd.to_numeric(big_df["期末持股-数量变化"], errors="coerce")
-    big_df["期末持股-数量变化比例"] = pd.to_numeric(big_df["期末持股-数量变化比例"], errors="coerce")
-    big_df["期末持股-流通市值"] = pd.to_numeric(big_df["期末持股-流通市值"], errors="coerce")
-    big_df["公告日后涨跌幅-10个交易日"] = pd.to_numeric(big_df["公告日后涨跌幅-10个交易日"], errors="coerce")
-    big_df["公告日后涨跌幅-30个交易日"] = pd.to_numeric(big_df["公告日后涨跌幅-30个交易日"], errors="coerce")
-    big_df["公告日后涨跌幅-60个交易日"] = pd.to_numeric(big_df["公告日后涨跌幅-60个交易日"], errors="coerce")
+    big_df["期末持股-数量变化"] = pd.to_numeric(
+        big_df["期末持股-数量变化"], errors="coerce"
+    )
+    big_df["期末持股-数量变化比例"] = pd.to_numeric(
+        big_df["期末持股-数量变化比例"], errors="coerce"
+    )
+    big_df["期末持股-流通市值"] = pd.to_numeric(
+        big_df["期末持股-流通市值"], errors="coerce"
+    )
+    big_df["公告日后涨跌幅-10个交易日"] = pd.to_numeric(
+        big_df["公告日后涨跌幅-10个交易日"], errors="coerce"
+    )
+    big_df["公告日后涨跌幅-30个交易日"] = pd.to_numeric(
+        big_df["公告日后涨跌幅-30个交易日"], errors="coerce"
+    )
+    big_df["公告日后涨跌幅-60个交易日"] = pd.to_numeric(
+        big_df["公告日后涨跌幅-60个交易日"], errors="coerce"
+    )
     return big_df
 
 

akshare/stock_feature/stock_jgdy_em.py

@@ -7,6 +7,7 @@ http://data.eastmoney.com/jgdy/
 东方财富网-数据中心-特色数据-机构调研-机构调研统计: http://data.eastmoney.com/jgdy/tj.html
 东方财富网-数据中心-特色数据-机构调研-机构调研详细: http://data.eastmoney.com/jgdy/xx.html
 """
+
 import pandas as pd
 import requests
 from tqdm import tqdm
@@ -23,26 +24,26 @@ def stock_jgdy_tj_em(date: str = "20220101") -> pd.DataFrame:
     """
     url = "http://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
-        'sortColumns': 'NOTICE_DATE,SUM,RECEIVE_START_DATE,SECURITY_CODE',
-        'sortTypes': '-1,-1,-1,1',
-        'pageSize': '500',
-        'pageNumber': '1',
-        'reportName': 'RPT_ORG_SURVEYNEW',
-        'columns': 'ALL',
-        'quoteColumns': 'f2~01~SECURITY_CODE~CLOSE_PRICE,f3~01~SECURITY_CODE~CHANGE_RATE',
-        'source': 'WEB',
-        'client': 'WEB',
-        'filter': f"""(NUMBERNEW="1")(IS_SOURCE="1")(RECEIVE_START_DATE>'{'-'.join([date[:4], date[4:6], date[6:]])}')"""
+        "sortColumns": "NOTICE_DATE,SUM,RECEIVE_START_DATE,SECURITY_CODE",
+        "sortTypes": "-1,-1,-1,1",
+        "pageSize": "500",
+        "pageNumber": "1",
+        "reportName": "RPT_ORG_SURVEYNEW",
+        "columns": "ALL",
+        "quoteColumns": "f2~01~SECURITY_CODE~CLOSE_PRICE,f3~01~SECURITY_CODE~CHANGE_RATE",
+        "source": "WEB",
+        "client": "WEB",
+        "filter": f"""(NUMBERNEW="1")(IS_SOURCE="1")(RECEIVE_START_DATE>'{'-'.join([date[:4], date[4:6], date[6:]])}')""",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
-    total_page = data_json['result']['pages']
+    total_page = data_json["result"]["pages"]
     big_df = pd.DataFrame()
-    for page in tqdm(range(1, total_page+1), leave=False):
+    for page in tqdm(range(1, total_page + 1), leave=False):
         params.update({"pageNumber": page})
         r = requests.get(url, params=params)
         data_json = r.json()
-        temp_df = pd.DataFrame(data_json['result']['data'])
+        temp_df = pd.DataFrame(data_json["result"]["data"])
         big_df = pd.concat([big_df, temp_df])
     big_df.reset_index(inplace=True)
     big_df["index"] = list(range(1, len(big_df) + 1))
@@ -96,45 +97,47 @@ def stock_jgdy_tj_em(date: str = "20220101") -> pd.DataFrame:
             "公告日期",
         ]
     ]
-    big_df['最新价'] = pd.to_numeric(big_df['最新价'], errors="coerce")
-    big_df['涨跌幅'] = pd.to_numeric(big_df['涨跌幅'], errors="coerce")
-    big_df['接待机构数量'] = pd.to_numeric(big_df['接待机构数量'], errors="coerce")
-    big_df['接待日期'] = pd.to_datetime(big_df['接待日期']).dt.date
-    big_df['公告日期'] = pd.to_datetime(big_df['公告日期']).dt.date
+    big_df["最新价"] = pd.to_numeric(big_df["最新价"], errors="coerce")
+    big_df["涨跌幅"] = pd.to_numeric(big_df["涨跌幅"], errors="coerce")
+    big_df["接待机构数量"] = pd.to_numeric(big_df["接待机构数量"], errors="coerce")
+    big_df["接待日期"] = pd.to_datetime(big_df["接待日期"]).dt.date
+    big_df["公告日期"] = pd.to_datetime(big_df["公告日期"]).dt.date
     return big_df
 
 
-def stock_jgdy_detail_em(date: str = "20220101") -> pd.DataFrame:
+def stock_jgdy_detail_em(date: str = "20241211") -> pd.DataFrame:
     """
     东方财富网-数据中心-特色数据-机构调研-机构调研详细
-    http://data.eastmoney.com/jgdy/xx.html
+    https://data.eastmoney.com/jgdy/xx.html
     :param date: 开始时间
     :type date: str
     :return: 机构调研详细
     :rtype: pandas.DataFrame
     """
-    url = "http://datacenter-web.eastmoney.com/api/data/v1/get"
+    url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
-        'sortColumns': 'NOTICE_DATE,RECEIVE_START_DATE,SECURITY_CODE,NUMBERNEW',
-        'sortTypes': '-1,-1,1,-1',
-        'pageSize': '50000',
-        'pageNumber': '1',
-        'reportName': 'RPT_ORG_SURVEY',
-        'columns': 'SECUCODE,SECURITY_CODE,SECURITY_NAME_ABBR,NOTICE_DATE,RECEIVE_START_DATE,RECEIVE_OBJECT,RECEIVE_PLACE,RECEIVE_WAY_EXPLAIN,INVESTIGATORS,RECEPTIONIST,ORG_TYPE',
-        'quoteColumns': 'f2~01~SECURITY_CODE~CLOSE_PRICE,f3~01~SECURITY_CODE~CHANGE_RATE',
-        'source': 'WEB',
-        'client': 'WEB',
-        'filter': f"""(IS_SOURCE="1")(RECEIVE_START_DATE>'{'-'.join([date[:4], date[4:6], date[6:]])}')"""
+        "sortColumns": "NOTICE_DATE,RECEIVE_START_DATE,SECURITY_CODE,NUMBERNEW",
+        "sortTypes": "-1,-1,1,-1",
+        "pageSize": "50",
+        "pageNumber": "1",
+        "reportName": "RPT_ORG_SURVEY",
+        "columns": "SECUCODE,SECURITY_CODE,SECURITY_NAME_ABBR,NOTICE_DATE,RECEIVE_START_DATE,"
+        "RECEIVE_OBJECT,RECEIVE_PLACE,RECEIVE_WAY_EXPLAIN,INVESTIGATORS,RECEPTIONIST,ORG_TYPE",
+        "quoteColumns": "f2~01~SECURITY_CODE~CLOSE_PRICE,f3~01~SECURITY_CODE~CHANGE_RATE",
+        "quoteType": "0",
+        "source": "WEB",
+        "client": "WEB",
+        "filter": f"""(IS_SOURCE="1")(RECEIVE_START_DATE>'{'-'.join([date[:4], date[4:6], date[6:]])}')""",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
-    total_page = data_json['result']['pages']
+    total_page = data_json["result"]["pages"]
     big_df = pd.DataFrame()
-    for page in tqdm(range(1, total_page+1), leave=False):
+    for page in tqdm(range(1, total_page + 1), leave=False):
         params.update({"pageNumber": page})
         r = requests.get(url, params=params)
         data_json = r.json()
-        temp_df = pd.DataFrame(data_json['result']['data'])
+        temp_df = pd.DataFrame(data_json["result"]["data"])
         big_df = pd.concat([big_df, temp_df])
     big_df.reset_index(inplace=True)
     big_df["index"] = list(range(1, len(big_df) + 1))
@@ -171,10 +174,10 @@ def stock_jgdy_detail_em(date: str = "20220101") -> pd.DataFrame:
             "公告日期",
         ]
     ]
-    big_df['最新价'] = pd.to_numeric(big_df['最新价'], errors="coerce")
-    big_df['涨跌幅'] = pd.to_numeric(big_df['涨跌幅'], errors="coerce")
-    big_df['调研日期'] = pd.to_datetime(big_df['调研日期']).dt.date
-    big_df['公告日期'] = pd.to_datetime(big_df['公告日期']).dt.date
+    big_df["最新价"] = pd.to_numeric(big_df["最新价"], errors="coerce")
+    big_df["涨跌幅"] = pd.to_numeric(big_df["涨跌幅"], errors="coerce")
+    big_df["调研日期"] = pd.to_datetime(big_df["调研日期"], errors="coerce").dt.date
+    big_df["公告日期"] = pd.to_datetime(big_df["公告日期"], errors="coerce").dt.date
     return big_df
 
 

{akshare-1.15.43.dist-info → akshare-1.15.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.15.43
+Version: 1.15.45
 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.15.43.dist-info → akshare-1.15.45.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=uxia6EqdSE8ySJmzG-tkP6xbZEwVKYQXA_jzhb13j84,184843
+akshare/__init__.py,sha256=ACpa0FRN-FBpuz43nJ_CUGfGHwjVNVqqj2wlZZPRxhM,184449
 akshare/datasets.py,sha256=-qdwaQjgBlftX84uM74KJqCYJYkQ50PV416_neA4uls,995
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -27,7 +27,6 @@ akshare/bond/bond_china_money.py,sha256=IInePsQJDby5w0AYd84ipiJL_nbyVAaRC7SaHLWD
 akshare/bond/bond_convert.py,sha256=9w94nIdSN4BUL27sPbVEUouBaAm30WMBiokYr4yM0sI,12649
 akshare/bond/bond_em.py,sha256=Ck5hCloZ25I8updarLPzqHYYZPeOsjIFy4g2oaZvFMs,5318
 akshare/bond/bond_info_cm.py,sha256=VBu9UM9tUcGDRV07pndU9yttLDF_Nk3b0vU0n65qpHs,7890
-akshare/bond/bond_investing.py,sha256=nWONMggn-KV8XwUSs5CqIXKHX9F7W1tb4w8umH5rWho,4992
 akshare/bond/bond_issue_cninfo.py,sha256=tPoZhF-_sIX9ztCKB0K0-Z4Kd9b-389bP3_CdFK7Wb0,21672
 akshare/bond/bond_nafmii.py,sha256=cekcobyXKMG1zDuM8wHWOn__SuWELxYmUwfGVmLRP40,2155
 akshare/bond/bond_summary.py,sha256=ECwCRcs5YMIro4I1Yayf6SZ8nz1Hr97RhmKT6aGaQDg,3581
@@ -105,7 +104,7 @@ akshare/fund/fund_xq.py,sha256=AxMZB-940bNY7-BatVLZiseHNxiWA17hQzTfuxGibPU,11306
 akshare/futures/__init__.py,sha256=RMTf1bT5EOE3ttWpn3hGu1LtUmsVxDoa0W7W0gXHOy8,81
 akshare/futures/cons.py,sha256=zD2uRQK3v-mywcDZfL28sDdRl6WIeWthHTfu8nrcQAo,16252
 akshare/futures/cot.py,sha256=Kkza2slS7JQpXndKrQEEykzIjZIT3vhvtZHVJ7P1yac,58573
-akshare/futures/futures_basis.py,sha256=WYkGO2nN42figx8dVwendETve21tW3oy8FQyfAbVhGU,14535
+akshare/futures/futures_basis.py,sha256=pmXNXdWnfvJCRs6xKJ0Ed9R2v92-NK2Sp3AjlwecErc,15691
 akshare/futures/futures_comex_em.py,sha256=V-mkKQkH5N8PyaZWKdyggb2lTnY8DDDxiUPt-1leQu0,3171
 akshare/futures/futures_comm_ctp.py,sha256=V8TEKO0R0i6LfE8DDFqrMA3JGwNlpmaQCvvMugKZ1I8,1004
 akshare/futures/futures_comm_qihuo.py,sha256=uQfabZ63qME8sTaxUbIUVQBVi8yTaPPDhD7voR9PEx0,10504
@@ -115,7 +114,6 @@ akshare/futures/futures_foreign.py,sha256=oSIoAg5oy-CIlPWHkQffcvZGu02Y2GWOrt-6aP
 akshare/futures/futures_hf_em.py,sha256=jne-wUYr2QTUkDq3qAxYKE0Hm90L3H8qUDu3JavKiUg,3338
 akshare/futures/futures_hq_sina.py,sha256=eK1gEan4DPvpYmln8-tNnzh_J_733s95DBr--NqNYVA,9576
 akshare/futures/futures_index_ccidx.py,sha256=9Rhk3ps-H69tU-NIV0W2NdLFUDTSUx0bwtePA6gLMZA,4566
-akshare/futures/futures_international.py,sha256=EE_JTjQKekx8_FU8M12wHSd1DSlfMXYFiBJ6_wmThfc,6946
 akshare/futures/futures_inventory_99.py,sha256=Nvw39obGGhgOkk_C4jOrV4gdq78dtHPOnits_B0Ljxk,8450
 akshare/futures/futures_inventory_em.py,sha256=C5nt4F51WB-oc8o3GrMvEGo0SO2mIq_H1vHVl42vzT0,2340
 akshare/futures/futures_news_baidu.py,sha256=uqXUgQa7_aNjj1g4IBt6Ic4DhlsuBvjEEYC3OTPeqmA,1544
@@ -161,7 +159,6 @@ akshare/index/index_drewry.py,sha256=BM7V6P8K4QUFQArsdaWRu5qJUZaCoyNz97_b8dmLeCw
 akshare/index/index_eri.py,sha256=7X0KNDBntEkE_qSb2jb6IBv-S8PsevLFdxGT8nKT3W0,2111
 akshare/index/index_fear_greed_funddb.py,sha256=7Z6GqYkKPJHNHMEN-uZNu2KnNNLTWvJcVlYpfAShJJc,2378
 akshare/index/index_hog.py,sha256=kb867BVagt70_ycZMn22ks5Z9jlVbMiuTsvq5ygjeig,1657
-akshare/index/index_investing.py,sha256=BPGIAD-_QNhpMivQi7bSGvBF2KWd8gfHsNf0hqHKrR0,8897
 akshare/index/index_kq_fz.py,sha256=Y-cbxWLpRyGcFcMSDxZZQXdAuD85IuQH5xC2rhtGbRc,3395
 akshare/index/index_kq_ss.py,sha256=m4hAMNnzHk8JNAnKjkYYVeyG4zUC5zR5i0-u-OxmaGU,3333
 akshare/index/index_option_qvix.py,sha256=sCx0iiIetkp5ELE9sDwesVFgJNfa_1tAEWVCJI-I2u4,3270
@@ -309,7 +306,7 @@ akshare/stock_feature/stock_fhps_em.py,sha256=85gfdMP3OtA3wsEGlB2RkdHiOEZjFff1ls
 akshare/stock_feature/stock_fhps_ths.py,sha256=NosH1xyT1Pif4T9tchdtJTBEpe6g1Wq2kjvxJDsZD_Y,1805
 akshare/stock_feature/stock_fund_flow.py,sha256=cqBqsFrzwmuLP3k3wYQzvW085QUUfHZ4nBW8Zx7egkQ,18669
 akshare/stock_feature/stock_gddh_em.py,sha256=I_MUJhyy0mwjNG46ZsQINEQvHR42EmS7gJBQujXr5Bw,3467
-akshare/stock_feature/stock_gdfx_em.py,sha256=vrzyMdcNw8wZabXYH89wjzIAokAVfHDVcpNfC0MHsl4,37825
+akshare/stock_feature/stock_gdfx_em.py,sha256=rnGnHYmPH7b2mk4R9LJ3xl5XTMUaQqsFyQejje0qhyQ,38645
 akshare/stock_feature/stock_gdhs.py,sha256=Z6ZMy1A03BqMu9TghcIu2Sd_wwEtpIH7qawHun9G7ns,9036
 akshare/stock_feature/stock_gdzjc_em.py,sha256=SHJH5iS3_NhvjTqRXF0vPooZl0s_ASeyZmNCC50ZYqs,4426
 akshare/stock_feature/stock_gpzy_em.py,sha256=8NvLfWbLLQyjTlg6iSpg1LxlIAKLv534JZAiUAVxF1M,17443
@@ -324,7 +321,7 @@ akshare/stock_feature/stock_hsgt_min_em.py,sha256=KLeez7MQwBAcO-RT7n41LOikUfvXDG
 akshare/stock_feature/stock_info.py,sha256=AQ4ZMXAks3qCxk3lbH_YpsqC-qQHpZ49UGk0Mm08d2E,9192
 akshare/stock_feature/stock_inner_trade_xq.py,sha256=jsARS5It6_UNn3WL8vnTK4F90Rx1dMvarxtiVbzOLrM,2682
 akshare/stock_feature/stock_irm_cninfo.py,sha256=xD028gllzaHYj6xU9pRKvSLI_gIkVhCTnFH0dSPv1gY,6112
-akshare/stock_feature/stock_jgdy_em.py,sha256=jmXRvmIwk7IY3SKAGaxi5M7WM7V8yY51UOPg94YQR9Q,6003
+akshare/stock_feature/stock_jgdy_em.py,sha256=B39Il7p1a_hx0FXL4zo_Xsxi10Z8W7_EZv8f9nNnwXg,6080
 akshare/stock_feature/stock_lh_yybpm.py,sha256=7VlqA-UGbfiQ4ez7Ah9znIfUcVI-7Fxxz_V03JO8LTY,3614
 akshare/stock_feature/stock_lhb_em.py,sha256=vDUeuJp9mRHmgrtjLPLXG-IFb4VVzXkr2-Q4UBzEtzc,34334
 akshare/stock_feature/stock_lhb_sina.py,sha256=W5F5aPlxAmHzzxcf1AAiJuMVtTK9PlYMo_XamCZ5N1o,9232
@@ -383,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.15.43.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.15.43.dist-info/METADATA,sha256=5B4yFcajS1Zn5CFYJDXvjfhWWYlYIkd_N2qI51xOex8,13423
-akshare-1.15.43.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-akshare-1.15.43.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.15.43.dist-info/RECORD,,
+akshare-1.15.45.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.15.45.dist-info/METADATA,sha256=i3mygGTuHA_N5-Jvv3KIwajE9NEQ8xqK0oVtuyDyqdA,13423
+akshare-1.15.45.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+akshare-1.15.45.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.15.45.dist-info/RECORD,,

akshare/bond/bond_investing.py

@@ -1,139 +0,0 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-"""
-Date: 2021/5/7 13:50
-Desc: 英为财情-利率国债-全球政府债券行情与收益率
-https://cn.investing.com/rates-bonds/
-"""
-import re
-
-import pandas as pd
-import requests
-from bs4 import BeautifulSoup
-
-from akshare.index.cons import short_headers, long_headers
-
-
-def _get_global_country_name_url() -> dict:
-    """
-    指数数据国家对应的 URL
-    https://cn.investing.com/rates-bonds/
-    :return: 指数数据国家对应的 URL
-    :rtype: dict
-    """
-    url = "https://cn.investing.com/rates-bonds/"
-    res = requests.get(url, headers=short_headers, timeout=30)
-    soup = BeautifulSoup(res.text, "lxml")
-    name_url_option_list = soup.find("select", attrs={"name": "country"}).find_all(
-        "option"
-    )[1:]
-    url_list = [item["value"] for item in name_url_option_list]
-    name_list = [item.get_text() for item in name_url_option_list]
-    name_code_map_dict = {}
-    name_code_map_dict.update(zip(name_list, url_list))
-    return name_code_map_dict
-
-
-def bond_investing_global_country_name_url(country: str = "中国") -> dict:
-    """
-    参考网页: https://cn.investing.com/rates-bonds/
-    获取选择国家对应的: 主要指数, 主要行业, 附加指数, 其他指数
-    :param country: str 中文国家名称, 对应 get_global_country_name_url 函数返回的国家名称
-    :return: dict
-    """
-    name_url_dict = _get_global_country_name_url()
-    url = f"https://cn.investing.com{name_url_dict[country]}"
-    res = requests.get(url, headers=short_headers, timeout=30)
-    soup = BeautifulSoup(res.text, "lxml")
-    url_list = [
-        item.find("a")["href"] for item in soup.find_all(attrs={"class": "plusIconTd"})
-    ]
-    name_list = [
-        item.find("a").get_text()
-        for item in soup.find_all(attrs={"class": "plusIconTd"})
-    ]
-    name_code_map_dict = {}
-    name_code_map_dict.update(zip(name_list, url_list))
-    return name_code_map_dict
-
-
-def bond_investing_global(
-    country: str = "中国",
-    index_name: str = "中国1年期国债",
-    period: str = "每日",
-    start_date: str = "20000101",
-    end_date: str = "20191017",
-) -> pd.DataFrame:
-    """
-    具体国家的具体指数的从 start_date 到 end_date 期间的数据
-    https://cn.investing.com/rates-bonds/
-    :param country: 对应函数中的国家名称
-    :type country: str
-    :param index_name: 对应函数中的指数名称
-    :type index_name: str
-    :param period: choice of {"每日", "每周", "每月"}
-    :type period: str
-    :param start_date: '2000-01-01', 注意格式
-    :type start_date: str
-    :param end_date: '2019-10-17', 注意格式
-    :type end_date: str
-    :return: 指定参数的数据
-    :rtype: pandas.DataFrame
-    """
-    start_date = "/".join([start_date[:4], start_date[4:6], start_date[6:]])
-    end_date = "/".join([end_date[:4], end_date[4:6], end_date[6:]])
-    period_map = {"每日": "Daily", "每周": "Weekly", "每月": "Monthly"}
-    name_code_dict = bond_investing_global_country_name_url(country)
-    temp_url = f"https://cn.investing.com/{name_code_dict[index_name]}-historical-data"
-    res = requests.get(temp_url, headers=short_headers, timeout=30)
-    soup = BeautifulSoup(res.text, "lxml")
-    title = soup.find("h2", attrs={"class": "float_lang_base_1"}).get_text()
-    data = soup.find_all(text=re.compile("window.histDataExcessInfo"))[0].strip()
-    para_data = re.findall(r"\d+", data)
-    payload = {
-        "curr_id": para_data[0],
-        "smlID": para_data[1],
-        "header": title,
-        "st_date": start_date,
-        "end_date": end_date,
-        "interval_sec": period_map[period],
-        "sort_col": "date",
-        "sort_ord": "DESC",
-        "action": "historical_data",
-    }
-    url = "https://cn.investing.com/instruments/HistoricalDataAjax"
-    res = requests.post(url, data=payload, headers=long_headers, timeout=60)
-    df_data = pd.read_html(res.text)[0]
-    df_data.columns = [
-        "日期",
-        "收盘",
-        "开盘",
-        "高",
-        "低",
-        "涨跌幅",
-    ]
-    if period == "每月":
-        df_data.index = pd.to_datetime(df_data["日期"], format="%Y年%m月")
-    else:
-        df_data.index = pd.to_datetime(df_data["日期"], format="%Y年%m月%d日")
-    df_data = df_data[["收盘", "开盘", "高", "低", "涨跌幅"]]
-    df_data["涨跌幅"] = df_data["涨跌幅"].str.replace("%", "")
-    df_data["涨跌幅"] = df_data["涨跌幅"].str.replace(",", "")
-    df_data = df_data.astype(float)
-    return df_data
-
-
-if __name__ == "__main__":
-    bond_investing_global_country_name_url_df = bond_investing_global_country_name_url(
-        "中国"
-    )
-    print(bond_investing_global_country_name_url_df)
-
-    bond_investing_global_df = bond_investing_global(
-        country="中国",
-        index_name="中国10年期国债",
-        period="每日",
-        start_date="20100101",
-        end_date="20210318",
-    )
-    print(bond_investing_global_df)

akshare/futures/futures_international.py

@@ -1,170 +0,0 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-"""
-Date: 2021/5/10 17:06
-Desc: 提供英为财情-国际大宗商品期货
-https://cn.investing.com/commodities/brent-oil-historical-data
-"""
-import re
-
-import pandas as pd
-import requests
-from bs4 import BeautifulSoup
-
-from akshare.index.cons import short_headers, long_headers
-
-
-def get_sector_symbol_name_url() -> dict:
-    """
-    期货所对应板块的 URL
-    :return: dict
-    {'能源': '/commodities/energy',
-    '金属': '/commodities/metals',
-    '农业': '/commodities/softs',
-    '商品指数': '/indices/commodities-indices'}
-    """
-    url = "https://cn.investing.com/commodities/"
-    res = requests.get(url, headers=short_headers)
-    soup = BeautifulSoup(res.text, "lxml")
-    name_url_option_list = soup.find_all(attrs={"class": "linkTitle"})  # 去掉-所有国家及地区
-    url_list = [item.find("a")["href"] for item in name_url_option_list]
-    name_list = [item.get_text() for item in name_url_option_list]
-    name_code_map_dict = {}
-    name_code_map_dict.update(zip(name_list, url_list))
-    return name_code_map_dict
-
-
-def futures_global_commodity_name_url_map(sector: str = "能源") -> dict:
-    """
-    参考网页: https://cn.investing.com/commodities/
-    获取选择板块对应的: 具体期货品种的 url 地址
-    :param sector: 板块, 对应 get_global_country_name_url 品种名称
-    :type sector: str
-    :return: dict of name-url
-    :rtype: dict
-    {'伦敦布伦特原油': '/commodities/brent-oil',
-    'WTI原油': '/commodities/crude-oil',
-    '伦敦汽油': '/commodities/london-gas-oil',
-    '天然气': '/commodities/natural-gas?cid=49787',
-    '燃料油': '/commodities/heating-oil',
-    '碳排放': '/commodities/carbon-emissions',
-    'RBOB汽油': '/commodities/gasoline-rbob',
-    '布伦特原油': '/commodities/brent-oil?cid=49769',
-    '原油': '/commodities/crude-oil?cid=49774'}
-    """
-    name_url_dict = get_sector_symbol_name_url()
-    url = f"https://cn.investing.com{name_url_dict[sector]}"
-    res = requests.post(url, headers=short_headers)
-    soup = BeautifulSoup(res.text, "lxml")
-    url_list = [
-        item.find("a")["href"].split("?")[0]
-        for item in soup.find_all(attrs={"class": "plusIconTd"})
-    ]
-    name_list = [
-        item.find("a").get_text()
-        for item in soup.find_all(attrs={"class": "plusIconTd"})
-    ]
-    name_code_map_dict = {}
-    name_code_map_dict.update(zip(name_list, url_list))
-    return name_code_map_dict
-
-
-def futures_global_commodity_hist(
-    sector: str = "能源",
-    symbol: str = "伦敦布伦特原油",
-    start_date: str = "20000101",
-    end_date: str = "20191017",
-) -> pd.DataFrame:
-    """
-    国际大宗商品的历史量价数据
-    https://cn.investing.com/commodities
-    :param sector: 板块名称; 调用 futures_global_commodity_name_url_map 函数获取
-    :type sector: str
-    :param symbol: 品种名称; 通过访问网站查询
-    :type symbol: str
-    :param start_date: 开始日期
-    :type start_date: str
-    :param end_date: 结束日期
-    :type end_date: str
-    :return: 国际大宗商品的历史量价数据
-    :rtype: pandas.DataFrame
-    """
-    start_date = "/".join([start_date[:4], start_date[4:6], start_date[6:]])
-    end_date = "/".join([end_date[:4], end_date[4:6], end_date[6:]])
-    name_code_dict = futures_global_commodity_name_url_map(sector)
-    temp_url = f"https://cn.investing.com/{name_code_dict[symbol]}-historical-data"
-    res = requests.post(temp_url, headers=short_headers)
-    soup = BeautifulSoup(res.text, "lxml")
-    title = soup.find("h2", attrs={"class": "float_lang_base_1"}).get_text()
-    res = requests.post(temp_url, headers=short_headers)
-    soup = BeautifulSoup(res.text, "lxml")
-    data = soup.find_all(text=re.compile("window.histDataExcessInfo"))[0].strip()
-    para_data = re.findall(r"\d+", data)
-    payload = {
-        "curr_id": para_data[0],
-        "smlID": para_data[1],
-        "header": title,
-        "st_date": start_date,
-        "end_date": end_date,
-        "interval_sec": "Daily",
-        "sort_col": "date",
-        "sort_ord": "DESC",
-        "action": "historical_data",
-    }
-    url = "https://cn.investing.com/instruments/HistoricalDataAjax"
-    r = requests.post(url, data=payload, headers=long_headers)
-    temp_df = pd.read_html(r.text)[0]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], format="%Y年%m月%d日")
-    if any(temp_df["交易量"].astype(str).str.contains("-")):
-        temp_df["交易量"][temp_df["交易量"].str.contains("-")] = temp_df["交易量"][
-            temp_df["交易量"].str.contains("-")
-        ].replace("-", 0)
-    if any(temp_df["交易量"].astype(str).str.contains("B")):
-        temp_df["交易量"][temp_df["交易量"].str.contains("B").fillna(False)] = (
-            temp_df["交易量"][temp_df["交易量"].str.contains("B").fillna(False)]
-            .str.replace("B", "")
-            .astype(float)
-            * 1000000000
-        )
-    if any(temp_df["交易量"].astype(str).str.contains("M")):
-        temp_df["交易量"][temp_df["交易量"].str.contains("M").fillna(False)] = (
-            temp_df["交易量"][temp_df["交易量"].str.contains("M").fillna(False)]
-            .str.replace("M", "")
-            .astype(float)
-            * 1000000
-        )
-    if any(temp_df["交易量"].astype(str).str.contains("K")):
-        temp_df["交易量"][temp_df["交易量"].str.contains("K").fillna(False)] = (
-            temp_df["交易量"][temp_df["交易量"].str.contains("K").fillna(False)]
-            .str.replace("K", "")
-            .astype(float)
-            * 1000
-        )
-    temp_df["交易量"] = temp_df["交易量"].astype(float)
-    temp_df["涨跌幅"] = pd.DataFrame(
-        round(temp_df["涨跌幅"].str.replace("%", "").astype(float) / 100, 6)
-    )
-    temp_df.name = title
-    temp_df.columns.name = None
-    temp_df.sort_values(["日期"], ascending=False, inplace=True)
-    return temp_df
-
-
-if __name__ == "__main__":
-    temp_dict = futures_global_commodity_name_url_map(sector="能源")
-    print(temp_dict)
-
-    futures_global_commodity_hist_df = futures_global_commodity_hist(
-        sector="能源", symbol="伦敦布伦特原油", start_date="19700101", end_date="20210510"
-    )
-    print(futures_global_commodity_hist_df)
-
-    # futures_global_commodity_hist_df = futures_global_commodity_hist(
-    #     sector="能源", symbol="伦敦布伦特原油", start_date="1970/01/01", end_date="2021/05/10"
-    # )
-    # print(futures_global_commodity_hist_df.to_csv("伦敦布伦特原油_19880627_20080319.csv", encoding="gb2312"))
-    #
-    # futures_global_commodity_hist_df = futures_global_commodity_hist(
-    #     sector="能源", symbol="伦敦布伦特原油", start_date="2008/03/19", end_date="2021/05/10"
-    # )
-    # print(futures_global_commodity_hist_df.to_csv("伦敦布伦特原油_20080319_20210510.csv", encoding="gb2312"))

akshare/index/index_investing.py

@@ -1,232 +0,0 @@
-#!/usr/bin/env python
-# -*- coding:utf-8 -*-
-"""
-Date: 2022/8/8 19:53
-Desc: 英为财情-股票指数-全球股指与期货指数数据接口
-https://cn.investing.com/indices/volatility-s-p-500-historical-data
-"""
-import json
-
-import pandas as pd
-import requests
-from bs4 import BeautifulSoup
-
-from akshare.index.cons import short_headers
-
-
-def _get_global_index_area_name_code() -> dict:
-    """
-    全球指数-各国的全球指数数据
-    https://cn.investing.com/indices/global-indices?majorIndices=on&primarySectors=on&bonds=on&additionalIndices=on&otherIndices=on&c_id=37
-    :return: 国家和代码
-    :rtype: dict
-    """
-    url = "https://cn.investing.com/indices/global-indices"
-    params = {
-        "majorIndices": "on",
-        "primarySectors": "on",
-        "bonds": "on",
-        "additionalIndices": "on",
-        "otherIndices": "on",
-    }
-    r = requests.get(url, params=params, headers=short_headers)
-    data_text = r.text
-    soup = BeautifulSoup(data_text, "lxml")
-    name_url_option_list = soup.find_all("option")[1:]
-    url_list = [
-        item["value"]
-        for item in name_url_option_list
-        if "c_id" in item["value"]
-    ]
-    url_list_code = [
-        item["value"].split("?")[1].split("=")[1]
-        for item in name_url_option_list
-        if "c_id" in item["value"]
-    ]
-    name_list = [item.get_text() for item in name_url_option_list][
-        : len(url_list)
-    ]
-    _temp_df = pd.DataFrame([name_list, url_list_code]).T
-    name_code_list = dict(zip(_temp_df.iloc[:, 0], _temp_df.iloc[:, 1]))
-    return name_code_list
-
-
-def _get_global_country_name_url() -> dict:
-    """
-    可获得指数数据国家对应的 URL
-    https://cn.investing.com/indices/
-    :return: 国家和 URL
-    :rtype: dict
-    """
-    url = "https://cn.investing.com/indices/"
-    res = requests.post(url, headers=short_headers)
-    soup = BeautifulSoup(res.text, "lxml")
-    name_url_option_list = soup.find(
-        "select", attrs={"name": "country"}
-    ).find_all("option")[
-        1:
-    ]  # 去掉-所有国家及地区
-    url_list = [item["value"] for item in name_url_option_list]
-    name_list = [item.get_text() for item in name_url_option_list]
-    name_code_map_dict = {}
-    name_code_map_dict.update(zip(name_list, url_list))
-    return name_code_map_dict
-
-
-def index_investing_global_area_index_name_code(area: str = "中国") -> dict:
-    """
-    指定 area 的所有指数和代码
-    https://cn.investing.com/indices/
-    :param area: 指定的国家或地区；ak._get_global_country_name_url() 函数返回的国家或地区的名称
-    :type area: str
-    :return: 指定 area 的所有指数和代码
-    :rtype: dict
-    """
-    pd.set_option("mode.chained_assignment", None)
-    name_url_dict = _get_global_country_name_url()
-    url = f"https://cn.investing.com{name_url_dict[area]}?&majorIndices=on&primarySectors=on&additionalIndices=on&otherIndices=on"
-    r = requests.get(url)
-    soup = BeautifulSoup(r.text, "lxml")
-    code_list = [
-        item["data-id"]
-        for item in soup.find_all("table")[1].find_all(
-            "span", attrs={"class": "alertBellGrayPlus"}
-        )
-    ]
-    name_list = [
-        item.find("a").text
-        for item in soup.find_all("td", attrs={"class": "plusIconTd"})
-    ]
-    name_code_map_dict = {}
-    name_code_map_dict.update(zip(name_list, code_list))
-    return name_code_map_dict
-
-
-def index_investing_global_area_index_name_url(area: str = "中国") -> dict:
-    """
-    指定 area 的所有指数和 URL 地址
-    https://cn.investing.com/indices/
-    :param area: 指定的国家或地区；ak._get_global_country_name_url() 函数返回的国家或地区的名称
-    :type area: str
-    :return: 指定 area 的所有指数和 URL 地址
-    :rtype: dict
-    """
-    pd.set_option("mode.chained_assignment", None)
-    name_url_dict = _get_global_country_name_url()
-    url = f"https://cn.investing.com{name_url_dict[area]}?&majorIndices=on&primarySectors=on&additionalIndices=on&otherIndices=on"
-    r = requests.get(url)
-    soup = BeautifulSoup(r.text, "lxml")
-    code_list = [
-        item.find("a")["href"]
-        for item in soup.find_all("td", attrs={"class": "plusIconTd"})
-    ]
-    name_list = [
-        item.find("a").text
-        for item in soup.find_all("td", attrs={"class": "plusIconTd"})
-    ]
-    name_code_map_dict = {}
-    name_code_map_dict.update(zip(name_list, code_list))
-    return name_code_map_dict
-
-
-def index_investing_global(
-    area: str = "中国",
-    symbol: str = "上证指数",
-    period: str = "每日",
-    start_date: str = "20100101",
-    end_date: str = "20211031",
-) -> pd.DataFrame:
-    """
-    具体国家或地区的从 start_date 到 end_date 期间的数据
-    https://cn.investing.com/indices/ftse-epra-nareit-hong-kong-historical-data
-    :param area: 对应函数中的国家或地区名称
-    :type area: str
-    :param symbol: 对应函数中的指数名称
-    :type symbol: str
-    :param period: choice of {"每日", "每周", "每月"}
-    :type period: str
-    :param start_date: '20000101', 注意格式
-    :type start_date: str
-    :param end_date: '20191017', 注意格式
-    :type end_date: str
-    :return: 指定参数的数据
-    :rtype: pandas.DataFrame
-    """
-    start_date = "-".join([start_date[:4], start_date[4:6], start_date[6:]])
-    end_date = "-".join([end_date[:4], end_date[4:6], end_date[6:]])
-    period_map = {"每日": "Daily", "每周": "Weekly", "每月": "Monthly"}
-    name_code_dict = index_investing_global_area_index_name_code(area)
-    url = f"https://api.investing.com/api/financialdata/historical/{name_code_dict[symbol]}"
-    params = {
-        "start-date": start_date,
-        "end-date": end_date,
-        "time-frame": period_map[period],
-        "add-missing-rows": "false",
-    }
-    headers = {
-        "accept": "application/json, text/plain, */*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "domain-id": "cn",
-        "origin": "https://cn.investing.com",
-        "pragma": "no-cache",
-        "referer": "https://cn.investing.com/",
-        "sec-ch-ua": '"Google Chrome";v="105", "Not)A;Brand";v="8", "Chromium";v="105"',
-        "sec-ch-ua-mobile": "?0",
-        "sec-ch-ua-platform": '"Windows"',
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-site",
-        "authorization": "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NjM2NjQ1NzUsImp0aSI6IjIyODA4MDM5MSIsImlhdCI6MTY2MzY2MDk3NSwiaXNzIjoiaW52ZXN0aW5nLmNvbSIsInVzZXJfaWQiOjIyODA4MDM5MSwicHJpbWFyeV9kb21haW5faWQiOiIxIiwiQXV0aG5TeXN0ZW1Ub2tlbiI6IiIsIkF1dGhuU2Vzc2lvblRva2VuIjoiIiwiRGV2aWNlVG9rZW4iOiIiLCJVYXBpVG9rZW4iOiJObmclMkJmMlJyUHpjeWRtdHRaell5TW1JN1pUNWliV1prTURJMVB6czlNeVUySWpVN1lEYzNjV1ZxYWlSZ1kyVjVNamRsWWpRMFptWTFQMkk4TnpCdlBEWXlQbVJrWXo4M01tQnJaMmN3TW1aaU1HVm9ZbWRtWmpBNU5UWTdhRE0lMkJOalUxTW1Cdk56VmxPbW93WUR4bGJUSWdaWGswY0daM05XZGlNamQyYnlnMk9UNSUyRlpEUSUyRllESm1hMjluTURJeFlqRmxQV0l3Wmpjd1pUVXhPenN6S3paOSIsIkF1dGhuSWQiOiIiLCJJc0RvdWJsZUVuY3J5cHRlZCI6ZmFsc2UsIkRldmljZUlkIjoiIiwiUmVmcmVzaEV4cGlyZWRBdCI6MTY2NjE4MDk3NX0.uRLTP1IG3696uxHm3Qq0D8z4o3nfsD3CaIS9cZGjsV0",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36",
-    }
-    r = requests.get(url, params=params, headers=headers)
-    r.encoding = "utf-8"
-    r = requests.get(url, params=params, headers=headers)
-    data_json = r.json()
-    df_data = pd.DataFrame(data_json["data"])
-    df_data.columns = [
-        "-",
-        "-",
-        "-",
-        "日期",
-        "-",
-        "-",
-        "-",
-        "-",
-        "-",
-        "交易量",
-        "-",
-        "收盘",
-        "开盘",
-        "高",
-        "低",
-        "涨跌幅",
-    ]
-    df_data = df_data[["日期", "收盘", "开盘", "高", "低", "交易量", "涨跌幅"]]
-    df_data["日期"] = pd.to_datetime(df_data["日期"]).dt.date
-    df_data["收盘"] = pd.to_numeric(df_data["收盘"])
-    df_data["开盘"] = pd.to_numeric(df_data["开盘"])
-    df_data["高"] = pd.to_numeric(df_data["高"])
-    df_data["低"] = pd.to_numeric(df_data["低"])
-    df_data["交易量"] = pd.to_numeric(df_data["交易量"])
-    df_data["涨跌幅"] = pd.to_numeric(df_data["涨跌幅"])
-    df_data.sort_values("日期", inplace=True)
-    df_data.reset_index(inplace=True, drop=True)
-    return df_data
-
-
-if __name__ == "__main__":
-    print(index_investing_global_area_index_name_url("香港"))
-
-    print(index_investing_global_area_index_name_code("香港"))
-
-    index_investing_global_df = index_investing_global(
-        area="中国",
-        symbol="富时中国A50指数",
-        period="每日",
-        start_date="20100101",
-        end_date="20220808",
-    )
-    print(index_investing_global_df)