akshare 1.14.49__py3-none-any.whl → 1.17.99__py3-none-any.whl

akshare/index/cons.py

@@ -4,9 +4,11 @@
 Date: 2021/5/27 20:19
 Desc: 指数配置文件
 """
+
 # weibo-user-agent
 index_weibo_headers = {
-    "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1",
+    "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) "
+    "AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1",
     "Referer": "http://data.weibo.com/index/newindex",
     "Accept": "application/json",
     "Origin": "https://data.weibo.com",
@@ -24,7 +26,8 @@ sw_cons_headers = {
     "Host": "www.swsindex.com",
     "Origin": "http://www.swsindex.com",
     "Referer": "http://www.swsindex.com/idx0210.aspx?swindexcode=801010",
-    'User-Agent': "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36",
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+    "Chrome/78.0.3904.108 Safari/537.36",
     "X-AjaxPro-Method": "ReturnContent",
 }
 
@@ -36,7 +39,10 @@ sw_payload = {
     "tablename": "swzs",
     "key": "L1",
     "p": "1",
-    "where": "L1 in('801010','801020','801030','801040','801050','801080','801110','801120','801130','801140','801150','801160','801170','801180','801200','801210','801230','801710','801720','801730','801740','801750','801760','801770','801780','801790','801880','801890','801950','801960','801970','801980')",
+    "where": "L1 in('801010','801020','801030','801040','801050','801080','801110','801120','801130',"
+    "'801140','801150','801160','801170','801180','801200','801210','801230','801710','801720',"
+    "'801730','801740','801750','801760','801770','801780','801790','801880','801890','801950',"
+    "'801960','801970','801980')",
     "orderby": "",
     "fieldlist": "L1,L2,L3,L4,L5,L6,L7,L8,L11",
     "pagecount": "28",
@@ -45,47 +51,145 @@ sw_payload = {
 
 # sw-headers
 sw_headers = {
-    'Accept': 'application/json, text/javascript, */*',
-    'Accept-Encoding': 'gzip, deflate',
-    'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8',
-    'Cache-Control': 'no-cache',
-    'Content-Type': 'application/x-www-form-urlencoded',
-    'DNT': '1',
-    'Host': 'www.swsindex.com',
-    'Origin': 'http://www.swsindex.com',
-    'Pragma': 'no-cache',
-    'Referer': 'http://www.swsindex.com/idx0120.aspx?columnid=8832',
-    'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36',
-    'X-Requested-With': 'XMLHttpRequest'
+    "Accept": "application/json, text/javascript, */*",
+    "Accept-Encoding": "gzip, deflate",
+    "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
+    "Cache-Control": "no-cache",
+    "Content-Type": "application/x-www-form-urlencoded",
+    "DNT": "1",
+    "Host": "www.swsindex.com",
+    "Origin": "http://www.swsindex.com",
+    "Pragma": "no-cache",
+    "Referer": "http://www.swsindex.com/idx0120.aspx?columnid=8832",
+    "User-Agent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+    "Chrome/74.0.3729.169 Safari/537.36",
+    "X-Requested-With": "XMLHttpRequest",
 }
 
 # zh-sina-a
-zh_sina_index_stock_url = "http://vip.stock.finance.sina.com.cn/quotes_service/api/json_v2.php/Market_Center.getHQNodeDataSimple"
+zh_sina_index_stock_url = (
+    "http://vip.stock.finance.sina.com.cn/quotes_service/api/json_v2.php/"
+    "Market_Center.getHQNodeDataSimple"
+)
 zh_sina_index_stock_payload = {
     "page": "1",
     "num": "80",
     "sort": "symbol",
     "asc": "1",
     "node": "hs_s",
-    "_s_r_a": "page"
+    "_s_r_a": "page",
 }
-zh_sina_index_stock_count_url = "http://vip.stock.finance.sina.com.cn/quotes_service/api/json_v2.php/Market_Center.getHQNodeStockCountSimple?node=hs_s"
-zh_sina_index_stock_hist_url = "https://finance.sina.com.cn/realstock/company/{}/hisdata/klc_kl.js"
+zh_sina_index_stock_count_url = (
+    "http://vip.stock.finance.sina.com.cn/quotes_service/api/json_v2.php/"
+    "Market_Center.getHQNodeStockCountSimple?node=hs_s"
+)
+zh_sina_index_stock_hist_url = (
+    "https://finance.sina.com.cn/realstock/company/{}/hisdata/klc_kl.js"
+)
 
 # investing
 short_headers = {
-    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.91 Safari/537.36'
+    "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+    "Chrome/61.0.3163.91 Safari/537.36"
 }
 
 long_headers = {
-    'accept': 'text/plain, */*; q=0.01',
+    "accept": "text/plain, */*; q=0.01",
     # 'accept-encoding': 'gzip, deflate, br',
-    'accept-language': 'zh-CN,zh;q=0.9,en;q=0.8',
+    "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
     # 'cache-control': 'no-cache',
-    'content-length': '267',
-    'content-type': 'application/x-www-form-urlencoded',
-    'origin': 'https://cn.investing.com',
-    'referer': 'https://cn.investing.com/commodities/brent-oil-historical-data',
-    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.91 Safari/537.36',
-    'x-requested-with': 'XMLHttpRequest',
+    "content-length": "267",
+    "content-type": "application/x-www-form-urlencoded",
+    "origin": "https://cn.investing.com",
+    "referer": "https://cn.investing.com/commodities/brent-oil-historical-data",
+    "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+    "Chrome/61.0.3163.91 Safari/537.36",
+    "x-requested-with": "XMLHttpRequest",
+}
+
+index_global_sina_symbol_map = {
+    # 欧洲股市
+    "英国富时100指数": "UKX",
+    "德国DAX 30种股价指数": "DAX",
+    "俄罗斯MICEX指数": "INDEXCF",
+    "法CAC40指数": "CAC",
+    "瑞士股票指数": "SWI20",
+    "富时意大利MIB指数": "FTSEMIB",
+    "荷兰AEX综合指数": "AEX",
+    "西班牙IBEX指数": "IBEX",
+    "欧洲Stoxx50指数": "SX5E",
+    # 美洲股市
+    "加拿大S&P/TSX综合指数": "GSPTSE",
+    "墨西哥BOLSA指数": "MXX",
+    "巴西BOVESPA股票指数": "IBOV",
+    # 亚洲股市
+    "中国台湾加权指数": "TWJQ",
+    "日经225指数": "NKY",
+    "首尔综合指数": "KOSPI",
+    "印度尼西亚雅加达综合指数": "JCI",
+    "印度孟买SENSEX指数": "SENSEX",
+    # 澳洲股市
+    "澳大利亚标准普尔200指数": "AS51",
+    "新西兰NZSE 50指数": "NZ250",
+    # 非洲股市
+    "埃及CASE 30指数": "CASE",
+}
+
+index_global_em_symbol_map = {
+    "波罗的海BDI指数": {"code": "BDI", "market": "100"},
+    "葡萄牙PSI20": {"code": "PSI20", "market": "100"},
+    "菲律宾马尼拉": {"code": "PSI", "market": "100"},
+    "泰国SET": {"code": "SET", "market": "100"},
+    "俄罗斯RTS": {"code": "RTS", "market": "100"},
+    "巴基斯坦卡拉奇": {"code": "KSE100", "market": "100"},
+    "越南胡志明": {"code": "VNINDEX", "market": "100"},
+    "红筹指数": {"code": "HSCCI", "market": "124"},
+    "印尼雅加达综合": {"code": "JKSE", "market": "100"},
+    "希腊雅典ASE": {"code": "ASE", "market": "100"},
+    "墨西哥BOLSA": {"code": "MXX", "market": "100"},
+    "挪威OSEBX": {"code": "OSEBX", "market": "100"},
+    "巴西BOVESPA": {"code": "BVSP", "market": "100"},
+    "波兰WIG": {"code": "WIG", "market": "100"},
+    "印度孟买SENSEX": {"code": "SENSEX", "market": "100"},
+    "布拉格指数": {"code": "PX", "market": "100"},
+    "荷兰AEX": {"code": "AEX", "market": "100"},
+    "冰岛ICEX": {"code": "ICEXI", "market": "100"},
+    "斯里兰卡科伦坡": {"code": "CSEALL", "market": "100"},
+    "富时新加坡海峡时报": {"code": "STI", "market": "100"},
+    "富时意大利MIB": {"code": "MIB", "market": "100"},
+    "路透CRB商品指数": {"code": "CRB", "market": "100"},
+    "比利时BFX": {"code": "BFX", "market": "100"},
+    "富时AIM全股": {"code": "AXX", "market": "100"},
+    "新西兰50": {"code": "NZ50", "market": "100"},
+    "上证指数": {"code": "000001", "market": "1"},
+    "国企指数": {"code": "HSCEI", "market": "100"},
+    "沪深300": {"code": "000300", "market": "1"},
+    "英国富时100": {"code": "FTSE", "market": "100"},
+    "中小100": {"code": "399005", "market": "0"},
+    "瑞士SMI": {"code": "SSMI", "market": "100"},
+    "西班牙IBEX35": {"code": "IBEX", "market": "100"},
+    "瑞典OMXSPI": {"code": "OMXSPI", "market": "100"},
+    "爱尔兰综合": {"code": "ISEQ", "market": "100"},
+    "韩国KOSPI": {"code": "KS11", "market": "100"},
+    "深证成指": {"code": "399001", "market": "0"},
+    "韩国KOSPI200": {"code": "KOSPI200", "market": "100"},
+    "芬兰赫尔辛基": {"code": "HEX", "market": "100"},
+    "恒生指数": {"code": "HSI", "market": "100"},
+    "欧洲斯托克50": {"code": "SX5E", "market": "100"},
+    "美元指数": {"code": "UDI", "market": "100"},
+    "法国CAC40": {"code": "FCHI", "market": "100"},
+    "台湾加权": {"code": "TWII", "market": "100"},
+    "英国富时250": {"code": "MCX", "market": "100"},
+    "富时马来西亚KLCI": {"code": "KLSE", "market": "100"},
+    "OMX哥本哈根20": {"code": "OMXC20", "market": "100"},
+    "道琼斯": {"code": "DJIA", "market": "100"},
+    "奥地利ATX": {"code": "ATX", "market": "100"},
+    "加拿大S&P/TSX": {"code": "TSX", "market": "100"},
+    "德国DAX30": {"code": "GDAXI", "market": "100"},
+    "创业板指": {"code": "399006", "market": "0"},
+    "澳大利亚普通股": {"code": "AORD", "market": "100"},
+    "标普500": {"code": "SPX", "market": "100"},
+    "澳大利亚标普200": {"code": "AS51", "market": "100"},
+    "日经225": {"code": "N225", "market": "100"},
+    "纳斯达克": {"code": "NDX", "market": "100"},
 }

akshare/index/index_cni.py

@@ -143,19 +143,19 @@ def index_hist_cni(
     return temp_df
 
 
-def index_detail_cni(symbol: str = "399001", date: str = "202404") -> pd.DataFrame:
+def index_detail_cni(symbol: str = "399001") -> pd.DataFrame:
     """
     国证指数-样本详情-指定日期的样本成份
-    http://www.cnindex.com.cn/module/index-detail.html?act_menu=1&indexCode=399001
+    https://www.cnindex.com.cn/module/index-detail.html?act_menu=1&indexCode=399001
     :param symbol: 指数代码
     :type symbol: str
-    :param date: 指定月份
-    :type date: str
     :return: 指定日期的样本成份
     :rtype: pandas.DataFrame
     """
-    url = "http://www.cnindex.com.cn/sample-detail/download"
-    params = {"indexcode": symbol, "dateStr": "-".join([date[:4], date[4:]])}
+    import warnings
+    warnings.simplefilter(action="ignore", category=UserWarning)
+    url = "https://www.cnindex.com.cn/sample-detail/download-history"
+    params = {"indexcode": symbol}
     r = requests.get(url, params=params)
     temp_df = pd.read_excel(BytesIO(r.content))
     temp_df["样本代码"] = temp_df["样本代码"].astype(str).str.zfill(6)
@@ -268,7 +268,7 @@ if __name__ == "__main__":
     )
     print(index_hist_cni_df)
 
-    index_detail_cni_df = index_detail_cni(symbol="399001", date="202404")
+    index_detail_cni_df = index_detail_cni(symbol="399001")
     print(index_detail_cni_df)
 
     index_detail_hist_cni_df = index_detail_hist_cni(symbol="399101", date="202404")

akshare/index/index_cons.py

@@ -133,7 +133,7 @@ def index_stock_cons_csindex(symbol: str = "000300") -> pd.DataFrame:
     :rtype: pandas.DataFrame
     """
     url = (
-        f"https://csi-web-dev.oss-cn-shanghai-finance-1-pub.aliyuncs.com/static/"
+        f"https://oss-ch.csindex.com.cn/static/"
         f"html/csindex/public/uploads/file/autofile/cons/{symbol}cons.xls"
     )
     r = requests.get(url)
@@ -167,7 +167,7 @@ def index_stock_cons_weight_csindex(symbol: str = "000300") -> pd.DataFrame:
     :rtype: pandas.DataFrame
     """
     url = (
-        f"https://csi-web-dev.oss-cn-shanghai-finance-1-pub.aliyuncs.com/static/html/csindex/"
+        f"https://oss-ch.csindex.com.cn/static/html/csindex/"
         f"public/uploads/file/autofile/closeweight/{symbol}closeweight.xls"
     )
     r = requests.get(url)

akshare/index/index_csindex.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+"""
+Date: 2025/8/4 14:00
+Desc: 中证指数网站-指数列表
+网站：https://www.csindex.com.cn/#/indices/family/list?index_series=1
+"""
+import warnings
+from io import BytesIO
+
+import pandas as pd
+import requests
+
+
+def index_csindex_all() -> pd.DataFrame:
+    """
+    中证指数网站-指数列表
+    https://www.csindex.com.cn/#/indices/family/list?index_series=1
+    Note: 但是不知道数据更新时间
+    :return: 最新指数的列表,
+    :rtype: pandas.DataFrame
+    """
+    warnings.filterwarnings("ignore", category=UserWarning, message="Workbook contains no default style")
+    url = (
+        f"https://www.csindex.com.cn/csindex-home/exportExcel/indexAll/CH"
+    )
+
+    headers = {
+        "Content-Type": "application/json;charset=UTF-8",
+    }
+    playloads = {
+        "sorter": {
+            "sortField": "null",
+            "sortOrder": None
+        },
+        "pager": {
+            "pageNum": 1,
+            "pageSize": 10
+        },
+        "indexFilter": {
+            "ifCustomized": None,
+            "ifTracked": None,
+            "ifWeightCapped": None,
+            "indexCompliance": None,
+            "hotSpot": None,
+            "indexClassify": None,
+            "currency": None,
+            "region": None,
+            "indexSeries": ["1"],
+            "undefined": None
+        }
+    }
+    r = requests.post(url, json=playloads, headers=headers)
+
+    temp_df = pd.read_excel(BytesIO(r.content))
+    temp_df["基日"] = pd.to_datetime(
+        temp_df["基日"], format="%Y-%m-%d", errors="coerce"
+    ).dt.date
+    temp_df["发布时间"] = pd.to_datetime(
+        temp_df["发布时间"], format="%Y-%m-%d", errors="coerce"
+    ).dt.date
+    temp_df["指数代码"] = temp_df["指数代码"].astype(str).str.zfill(6)
+    return temp_df
+
+
+if __name__ == "__main__":
+    index_csindex_all_df = index_csindex_all()
+    print(index_csindex_all_df)

akshare/index/index_cx.py

@@ -1,7 +1,7 @@
 # -*- coding:utf-8 -*-
 # !/usr/bin/env python
 """
-Date: 2024/6/4 18:30
+Date: 2025/8/7 18:30
 Desc: 财新数据-指数报告-数字经济指数
 https://yun.ccxe.com.cn/indices/dei
 """
@@ -10,7 +10,7 @@ import pandas as pd
 import requests
 
 
-def index_pmi_com_cx() -> pd.DataFrame():
+def index_pmi_com_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-财新中国 PMI-综合 PMI
     https://yun.ccxe.com.cn/indices/pmi
@@ -38,7 +38,7 @@ def index_pmi_com_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_pmi_man_cx() -> pd.DataFrame():
+def index_pmi_man_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-财新中国 PMI-制造业 PMI
     https://yun.ccxe.com.cn/indices/pmi
@@ -66,7 +66,7 @@ def index_pmi_man_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_pmi_ser_cx() -> pd.DataFrame():
+def index_pmi_ser_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-财新中国 PMI-服务业 PMI
     https://yun.ccxe.com.cn/indices/pmi
@@ -94,7 +94,7 @@ def index_pmi_ser_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_dei_cx() -> pd.DataFrame():
+def index_dei_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-数字经济指数
     https://yun.ccxe.com.cn/indices/dei
@@ -122,7 +122,7 @@ def index_dei_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_ii_cx() -> pd.DataFrame():
+def index_ii_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-产业指数
     https://yun.ccxe.com.cn/indices/dei
@@ -150,7 +150,7 @@ def index_ii_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_si_cx() -> pd.DataFrame():
+def index_si_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-溢出指数
     https://yun.ccxe.com.cn/indices/dei
@@ -178,7 +178,7 @@ def index_si_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_fi_cx() -> pd.DataFrame():
+def index_fi_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-融合指数
     https://yun.ccxe.com.cn/indices/dei
@@ -206,7 +206,7 @@ def index_fi_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_bi_cx() -> pd.DataFrame():
+def index_bi_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-基础指数
     https://yun.ccxe.com.cn/indices/dei
@@ -234,7 +234,7 @@ def index_bi_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_nei_cx() -> pd.DataFrame():
+def index_nei_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-中国新经济指数
     https://yun.ccxe.com.cn/indices/nei
@@ -262,7 +262,7 @@ def index_nei_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_li_cx() -> pd.DataFrame():
+def index_li_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-劳动力投入指数
     https://yun.ccxe.com.cn/indices/nei
@@ -290,7 +290,7 @@ def index_li_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_ci_cx() -> pd.DataFrame():
+def index_ci_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-资本投入指数
     https://yun.ccxe.com.cn/indices/nei
@@ -318,7 +318,7 @@ def index_ci_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_ti_cx() -> pd.DataFrame():
+def index_ti_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-科技投入指数
     https://yun.ccxe.com.cn/indices/nei
@@ -346,7 +346,7 @@ def index_ti_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_neaw_cx() -> pd.DataFrame():
+def index_neaw_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-新经济行业入职平均工资水平
     https://yun.ccxe.com.cn/indices/nei
@@ -374,7 +374,7 @@ def index_neaw_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_awpr_cx() -> pd.DataFrame():
+def index_awpr_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-新经济入职工资溢价水平
     https://yun.ccxe.com.cn/indices/nei
@@ -402,7 +402,7 @@ def index_awpr_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_cci_cx() -> pd.DataFrame():
+def index_cci_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-大宗商品指数
     https://yun.ccxe.com.cn/indices/nei
@@ -434,7 +434,7 @@ def index_cci_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_qli_cx() -> pd.DataFrame():
+def index_qli_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-高质量因子
     https://yun.ccxe.com.cn/indices/qli
@@ -466,7 +466,7 @@ def index_qli_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_ai_cx() -> pd.DataFrame():
+def index_ai_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-AI策略指数
     https://yun.ccxe.com.cn/indices/ai
@@ -498,7 +498,7 @@ def index_ai_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_bei_cx() -> pd.DataFrame():
+def index_bei_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-基石经济指数
     https://yun.ccxe.com.cn/indices/bei
@@ -530,7 +530,7 @@ def index_bei_cx() -> pd.DataFrame():
     return temp_df
 
 
-def index_neei_cx() -> pd.DataFrame():
+def index_neei_cx() -> pd.DataFrame:
     """
     财新数据-指数报告-新动能指数
     https://yun.ccxe.com.cn/indices/neei

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/index/index_eri.py

@@ -5,6 +5,7 @@ Date: 2023/6/19 18:16
 Desc: 浙江省排污权交易指数
 https://zs.zjpwq.net/
 """
+
 import pandas as pd
 import requests