akshare 1.12.99__py3-none-any.whl → 1.15.73__py3-none-any.whl

akshare/index/index_cx.py

@@ -1,10 +1,11 @@
 # -*- coding:utf-8 -*-
 # !/usr/bin/env python
 """
-Date: 2022/2/7 17:54
+Date: 2024/6/4 18:30
 Desc: 财新数据-指数报告-数字经济指数
-https://s.ccxe.com.cn/indices/dei
+https://yun.ccxe.com.cn/indices/dei
 """
+
 import pandas as pd
 import requests
 
@@ -12,11 +13,11 @@ import requests
 def index_pmi_com_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-财新中国 PMI-综合 PMI
-    https://s.ccxe.com.cn/indices/pmi
+    https://yun.ccxe.com.cn/indices/pmi
     :return: 财新中国 PMI-综合 PMI
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "com"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -29,18 +30,22 @@ def index_pmi_com_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_pmi_man_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-财新中国 PMI-制造业 PMI
-    https://s.ccxe.com.cn/indices/pmi
+    https://yun.ccxe.com.cn/indices/pmi
     :return: 财新中国 PMI-制造业 PMI
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "man"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -53,18 +58,22 @@ def index_pmi_man_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_pmi_ser_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-财新中国 PMI-服务业 PMI
-    https://s.ccxe.com.cn/indices/pmi
+    https://yun.ccxe.com.cn/indices/pmi
     :return: 财新中国 PMI-服务业 PMI
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "ser"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -77,18 +86,22 @@ def index_pmi_ser_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_dei_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-数字经济指数
-    https://s.ccxe.com.cn/indices/dei
+    https://yun.ccxe.com.cn/indices/dei
     :return: 数字经济指数
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "dei"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -101,18 +114,22 @@ def index_dei_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_ii_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-产业指数
-    https://s.ccxe.com.cn/indices/dei
+    https://yun.ccxe.com.cn/indices/dei
     :return: 产业指数
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "ii"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -125,18 +142,22 @@ def index_ii_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_si_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-溢出指数
-    https://s.ccxe.com.cn/indices/dei
+    https://yun.ccxe.com.cn/indices/dei
     :return: 溢出指数
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "si"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -149,18 +170,22 @@ def index_si_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_fi_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-融合指数
-    https://s.ccxe.com.cn/indices/dei
+    https://yun.ccxe.com.cn/indices/dei
     :return: 融合指数
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "fi"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -173,18 +198,22 @@ def index_fi_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_bi_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-基础指数
-    https://s.ccxe.com.cn/indices/dei
+    https://yun.ccxe.com.cn/indices/dei
     :return: 基础指数
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "bi"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -197,18 +226,22 @@ def index_bi_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_nei_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-中国新经济指数
-    https://s.ccxe.com.cn/indices/nei
+    https://yun.ccxe.com.cn/indices/nei
     :return: 中国新经济指数
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "nei"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -221,18 +254,22 @@ def index_nei_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_li_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-劳动力投入指数
-    https://s.ccxe.com.cn/indices/nei
+    https://yun.ccxe.com.cn/indices/nei
     :return: 劳动力投入指数
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "li"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -245,18 +282,22 @@ def index_li_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_ci_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-资本投入指数
-    https://s.ccxe.com.cn/indices/nei
+    https://yun.ccxe.com.cn/indices/nei
     :return: 资本投入指数
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "ci"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -269,18 +310,22 @@ def index_ci_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_ti_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-科技投入指数
-    https://s.ccxe.com.cn/indices/nei
+    https://yun.ccxe.com.cn/indices/nei
     :return: 科技投入指数
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "ti"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -293,18 +338,22 @@ def index_ti_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_neaw_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-新经济行业入职平均工资水平
-    https://s.ccxe.com.cn/indices/nei
+    https://yun.ccxe.com.cn/indices/nei
     :return: 新经济行业入职平均工资水平
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "neaw"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -317,18 +366,22 @@ def index_neaw_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_awpr_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-新经济入职工资溢价水平
-    https://s.ccxe.com.cn/indices/nei
+    https://yun.ccxe.com.cn/indices/nei
     :return: 新经济入职工资溢价水平
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {"type": "awpr"}
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -341,18 +394,22 @@ def index_awpr_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
 def index_cci_cx() -> pd.DataFrame():
     """
     财新数据-指数报告-大宗商品指数
-    https://s.ccxe.com.cn/indices/cci
+    https://yun.ccxe.com.cn/indices/nei
     :return: 大宗商品指数
     :rtype: pandas.DataFrame
     """
-    url = "https://s.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
     params = {
         "type": "cci",
         "code": "1000050",
@@ -369,7 +426,139 @@ def index_cci_cx() -> pd.DataFrame():
             "变化值",
         ]
     ]
-    temp_df["日期"] = pd.to_datetime(temp_df["日期"], unit="ms").dt.date
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
+    return temp_df
+
+
+def index_qli_cx() -> pd.DataFrame():
+    """
+    财新数据-指数报告-高质量因子
+    https://yun.ccxe.com.cn/indices/qli
+    :return: 高质量因子
+    :rtype: pandas.DataFrame
+    """
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    params = {
+        "type": "qli",
+        "code": "1000050",
+        "month": "-1",
+    }
+    r = requests.get(url, params=params)
+    data_json = r.json()
+    temp_df = pd.DataFrame(data_json["data"])
+    temp_df.columns = ["变化幅度", "高质量因子指数", "日期"]
+    temp_df = temp_df[
+        [
+            "日期",
+            "高质量因子指数",
+            "变化幅度",
+        ]
+    ]
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
+    return temp_df
+
+
+def index_ai_cx() -> pd.DataFrame():
+    """
+    财新数据-指数报告-AI策略指数
+    https://yun.ccxe.com.cn/indices/ai
+    :return: AI策略指数
+    :rtype: pandas.DataFrame
+    """
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    params = {
+        "type": "ai",
+        "code": "1000050",
+        "month": "-1",
+    }
+    r = requests.get(url, params=params)
+    data_json = r.json()
+    temp_df = pd.DataFrame(data_json["data"])
+    temp_df.columns = ["变化幅度", "AI策略指数", "日期"]
+    temp_df = temp_df[
+        [
+            "日期",
+            "AI策略指数",
+            "变化幅度",
+        ]
+    ]
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
+    return temp_df
+
+
+def index_bei_cx() -> pd.DataFrame():
+    """
+    财新数据-指数报告-基石经济指数
+    https://yun.ccxe.com.cn/indices/bei
+    :return: 基石经济指数
+    :rtype: pandas.DataFrame
+    """
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    params = {
+        "type": "ind",
+        "code": "930927",
+        "month": "-1",
+    }
+    r = requests.get(url, params=params)
+    data_json = r.json()
+    temp_df = pd.DataFrame(data_json["data"])
+    temp_df.columns = ["变化幅度", "基石经济指数", "日期"]
+    temp_df = temp_df[
+        [
+            "日期",
+            "基石经济指数",
+            "变化幅度",
+        ]
+    ]
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
+    return temp_df
+
+
+def index_neei_cx() -> pd.DataFrame():
+    """
+    财新数据-指数报告-新动能指数
+    https://yun.ccxe.com.cn/indices/neei
+    :return: 新动能指数
+    :rtype: pandas.DataFrame
+    """
+    url = "https://yun.ccxe.com.cn/api/index/pro/cxIndexTrendInfo"
+    params = {
+        "type": "ind",
+        "code": "930928",
+        "month": "1",
+    }
+    r = requests.get(url, params=params)
+    data_json = r.json()
+    temp_df = pd.DataFrame(data_json["data"])
+    temp_df.columns = ["变化幅度", "新动能指数", "日期"]
+    temp_df = temp_df[
+        [
+            "日期",
+            "新动能指数",
+            "变化幅度",
+        ]
+    ]
+    temp_df["日期"] = (
+        pd.to_datetime(temp_df["日期"], unit="ms", utc=True)
+        .dt.tz_convert("Asia/Shanghai")
+        .dt.date
+    )
     return temp_df
 
 
@@ -418,3 +607,15 @@ if __name__ == "__main__":
 
     index_cci_cx_df = index_cci_cx()
     print(index_cci_cx_df)
+
+    index_qli_cx_df = index_qli_cx()
+    print(index_qli_cx_df)
+
+    index_ai_cx_df = index_ai_cx()
+    print(index_ai_cx_df)
+
+    index_bei_cx_df = index_bei_cx()
+    print(index_bei_cx_df)
+
+    index_neei_cx_df = index_neei_cx()
+    print(index_neei_cx_df)

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