PyPI - akshare - Versions diffs - 1.15.13__py3-none-any.whl → 1.15.14__py3-none-any.whl - Mend

akshare 1.15.13py3-none-any.whl → 1.15.14py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of akshare might be problematic. Click here for more details.

Files changed (8) hide show

akshare/__init__.py CHANGED Viewed

@@ -2923,9 +2923,10 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.11 fix: fix stock_individual_spot_xq indicator
 1.15.12 fix: fix stock_shareholder_change_ths indicator
 1.15.13 fix: fix stock_inner_trade_xq indicator
+1.15.14 fix: fix macro_bank_usa_interest_rate indicator
 """
-__version__ = "1.15.13"
+__version__ = "1.15.14"
 __author__ = "AKFamily"
 import sys

akshare/economic/macro_bank.py CHANGED Viewed

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2022/5/25 21:11
+Date: 2024/11/5 17:11
 Desc: 金十数据中心-经济指标-央行利率-主要央行利率
 https://datacenter.jin10.com/economic
 输出数据格式为 float64
@@ -17,6 +17,7 @@ https://datacenter.jin10.com/economic
 印度央行决议报告
 巴西央行决议报告
 """
 import datetime
 import time
@@ -24,80 +25,87 @@ import pandas as pd
 import requests
-# 金十数据中心-经济指标-央行利率-主要央行利率-美联储利率决议报告
-def macro_bank_usa_interest_rate() -> pd.DataFrame:
+def __get_interest_rate_data(attr_id: str, name: str = "利率") -> pd.DataFrame:
     """
-    美联储利率决议报告, 数据区间从 19820927-至今
+    利率决议报告公共函数
     https://datacenter.jin10.com/reportType/dc_usa_interest_rate_decision
-    https://cdn.jin10.com/dc/reports/dc_usa_interest_rate_decision_all.js?v=1578581921
-    :return: 美联储利率决议报告-今值(%)
+    :param attr_id: 内置属性
+    :type attr_id: str
+    :param name: 利率报告名称
+    :type name: str
+    :return: 利率决议报告数据
     :rtype: pandas.Series
     """
     t = time.time()
     headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-site",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36",
+        "Accept": "*/*",
+        "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/120.0.0.0 Safari/537.36",
+        "Origin": "https://datacenter.jin10.com",
+        "Referer": "https://datacenter.jin10.com/",
         "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
         "x-version": "1.0.0",
     }
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
+    base_url = "https://datacenter-api.jin10.com/reports/list_v2"
     params = {
         "max_date": "",
         "category": "ec",
-        "attr_id": "24",
+        "attr_id": attr_id,
         "_": str(int(round(t * 1000))),
     }
-    big_df = pd.DataFrame()
-    while True:
-        r = requests.get(url, params=params, headers=headers)
-        data_json = r.json()
-        if not data_json["data"]["values"]:
-            break
-        temp_df = pd.DataFrame(data_json["data"]["values"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
-        last_date_str = temp_df.iat[-1, 0]
-        last_date_str = (
-            (
-                datetime.datetime.strptime(last_date_str, "%Y-%m-%d")
-                - datetime.timedelta(days=1)
+    interest_rate_data = []
+    try:
+        while True:
+            response = requests.get(
+                url=base_url, params=params, headers=headers, timeout=10
             )
-            .date()
-            .isoformat()
-        )
-        params.update({"max_date": f"{last_date_str}"})
-    big_df["商品"] = "美联储利率决议"
-    big_df.columns = [
-        "日期",
-        "今值",
-        "预测值",
-        "前值",
-        "商品",
-    ]
-    big_df = big_df[
-        [
-            "商品",
-            "日期",
-            "今值",
-            "预测值",
-            "前值",
-        ]
-    ]
+            data = response.json()
+            if not data.get("data", {}).get("values"):
+                break
+            interest_rate_data.extend(data["data"]["values"])
+            # Update max_date for pagination
+            last_date = data["data"]["values"][-1][0]
+            next_date = (
+                datetime.datetime.strptime(last_date, "%Y-%m-%d").date()
+                - datetime.timedelta(days=1)
+            ).isoformat()
+            params["max_date"] = next_date
+    except requests.exceptions.RequestException as e:
+        print(f"Error fetching data: {e}")
+        return pd.DataFrame()
+    # Convert to DataFrame
+    big_df = pd.DataFrame(interest_rate_data)
+    if big_df.empty:
+        return pd.DataFrame()
+    # Process DataFrame
+    big_df["商品"] = name
+    big_df.columns = ["日期", "今值", "预测值", "前值", "商品"]
+    big_df = big_df[["商品", "日期", "今值", "预测值", "前值"]]
+    # Convert data types
     big_df["日期"] = pd.to_datetime(big_df["日期"]).dt.date
-    big_df["今值"] = pd.to_numeric(big_df["今值"])
-    big_df["预测值"] = pd.to_numeric(big_df["预测值"])
-    big_df["前值"] = pd.to_numeric(big_df["前值"])
-    big_df.sort_values(["日期"], inplace=True)
-    big_df.reset_index(inplace=True, drop=True)
-    return big_df
+    numeric_columns = ["今值", "预测值", "前值"]
+    for col in numeric_columns:
+        big_df[col] = pd.to_numeric(big_df[col], errors="coerce")
+    return big_df.sort_values("日期").reset_index(drop=True)
+# 金十数据中心-经济指标-央行利率-主要央行利率-美联储利率决议报告
+def macro_bank_usa_interest_rate() -> pd.DataFrame:
+    """
+    美联储利率决议报告, 数据区间从 19820927-至今
+    https://datacenter.jin10.com/reportType/dc_usa_interest_rate_decision
+    :return: 美联储利率决议报告-今值(%)
+    :rtype: pandas.Series
+    """
+    return __get_interest_rate_data(attr_id="24", name="美联储利率决议报告")
 # 金十数据中心-经济指标-央行利率-主要央行利率-欧洲央行决议报告
@@ -109,71 +117,7 @@ def macro_bank_euro_interest_rate() -> pd.DataFrame:
     :return: 欧洲央行决议报告-今值(%)
     :rtype: pandas.Series
     """
-    t = time.time()
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-site",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
-    params = {
-        "max_date": "",
-        "category": "ec",
-        "attr_id": "21",
-        "_": str(int(round(t * 1000))),
-    }
-    big_df = pd.DataFrame()
-    while True:
-        r = requests.get(url, params=params, headers=headers)
-        data_json = r.json()
-        if not data_json["data"]["values"]:
-            break
-        temp_df = pd.DataFrame(data_json["data"]["values"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
-        last_date_str = temp_df.iat[-1, 0]
-        last_date_str = (
-            (
-                datetime.datetime.strptime(last_date_str, "%Y-%m-%d")
-                - datetime.timedelta(days=1)
-            )
-            .date()
-            .isoformat()
-        )
-        params.update({"max_date": f"{last_date_str}"})
-    big_df["商品"] = "欧元区利率决议"
-    big_df.columns = [
-        "日期",
-        "今值",
-        "预测值",
-        "前值",
-        "商品",
-    ]
-    big_df = big_df[
-        [
-            "商品",
-            "日期",
-            "今值",
-            "预测值",
-            "前值",
-        ]
-    ]
-    big_df["日期"] = pd.to_datetime(big_df["日期"]).dt.date
-    big_df["今值"] = pd.to_numeric(big_df["今值"])
-    big_df["预测值"] = pd.to_numeric(big_df["预测值"])
-    big_df["前值"] = pd.to_numeric(big_df["前值"])
-    big_df.sort_values(["日期"], inplace=True)
-    big_df.reset_index(inplace=True, drop=True)
-    return big_df
+    return __get_interest_rate_data(attr_id="21", name="欧洲央行决议报告")
 # 金十数据中心-经济指标-央行利率-主要央行利率-新西兰联储决议报告
@@ -185,71 +129,7 @@ def macro_bank_newzealand_interest_rate() -> pd.DataFrame:
     :return: 新西兰联储决议报告-今值(%)
     :rtype: pandas.Series
     """
-    t = time.time()
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-site",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
-    params = {
-        "max_date": "",
-        "category": "ec",
-        "attr_id": "23",
-        "_": str(int(round(t * 1000))),
-    }
-    big_df = pd.DataFrame()
-    while True:
-        r = requests.get(url, params=params, headers=headers)
-        data_json = r.json()
-        if not data_json["data"]["values"]:
-            break
-        temp_df = pd.DataFrame(data_json["data"]["values"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
-        last_date_str = temp_df.iat[-1, 0]
-        last_date_str = (
-            (
-                datetime.datetime.strptime(last_date_str, "%Y-%m-%d")
-                - datetime.timedelta(days=1)
-            )
-            .date()
-            .isoformat()
-        )
-        params.update({"max_date": f"{last_date_str}"})
-    big_df["商品"] = "新西兰利率决议报告"
-    big_df.columns = [
-        "日期",
-        "今值",
-        "预测值",
-        "前值",
-        "商品",
-    ]
-    big_df = big_df[
-        [
-            "商品",
-            "日期",
-            "今值",
-            "预测值",
-            "前值",
-        ]
-    ]
-    big_df["日期"] = pd.to_datetime(big_df["日期"]).dt.date
-    big_df["今值"] = pd.to_numeric(big_df["今值"])
-    big_df["预测值"] = pd.to_numeric(big_df["预测值"])
-    big_df["前值"] = pd.to_numeric(big_df["前值"])
-    big_df.sort_values(["日期"], inplace=True)
-    big_df.reset_index(inplace=True, drop=True)
-    return big_df
+    return __get_interest_rate_data(attr_id="23", name="新西兰利率决议报告")
 # 金十数据中心-经济指标-央行利率-主要央行利率-瑞士央行决议报告
@@ -261,71 +141,7 @@ def macro_bank_switzerland_interest_rate() -> pd.DataFrame:
     :return: 瑞士央行利率决议报告-今值(%)
     :rtype: pandas.Series
     """
-    t = time.time()
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-site",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
-    params = {
-        "max_date": "",
-        "category": "ec",
-        "attr_id": "25",
-        "_": str(int(round(t * 1000))),
-    }
-    big_df = pd.DataFrame()
-    while True:
-        r = requests.get(url, params=params, headers=headers)
-        data_json = r.json()
-        if not data_json["data"]["values"]:
-            break
-        temp_df = pd.DataFrame(data_json["data"]["values"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
-        last_date_str = temp_df.iat[-1, 0]
-        last_date_str = (
-            (
-                datetime.datetime.strptime(last_date_str, "%Y-%m-%d")
-                - datetime.timedelta(days=1)
-            )
-            .date()
-            .isoformat()
-        )
-        params.update({"max_date": f"{last_date_str}"})
-    big_df["商品"] = "瑞士央行利率决议报告"
-    big_df.columns = [
-        "日期",
-        "今值",
-        "预测值",
-        "前值",
-        "商品",
-    ]
-    big_df = big_df[
-        [
-            "商品",
-            "日期",
-            "今值",
-            "预测值",
-            "前值",
-        ]
-    ]
-    big_df["日期"] = pd.to_datetime(big_df["日期"]).dt.date
-    big_df["今值"] = pd.to_numeric(big_df["今值"])
-    big_df["预测值"] = pd.to_numeric(big_df["预测值"])
-    big_df["前值"] = pd.to_numeric(big_df["前值"])
-    big_df.sort_values(["日期"], inplace=True)
-    big_df.reset_index(inplace=True, drop=True)
-    return big_df
+    return __get_interest_rate_data(attr_id="25", name="瑞士央行决议报告")
 # 金十数据中心-经济指标-央行利率-主要央行利率-英国央行决议报告
@@ -337,71 +153,7 @@ def macro_bank_english_interest_rate() -> pd.DataFrame:
     :return: 英国央行决议报告-今值(%)
     :rtype: pandas.Series
     """
-    t = time.time()
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-site",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
-    params = {
-        "max_date": "",
-        "category": "ec",
-        "attr_id": "26",
-        "_": str(int(round(t * 1000))),
-    }
-    big_df = pd.DataFrame()
-    while True:
-        r = requests.get(url, params=params, headers=headers)
-        data_json = r.json()
-        if not data_json["data"]["values"]:
-            break
-        temp_df = pd.DataFrame(data_json["data"]["values"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
-        last_date_str = temp_df.iat[-1, 0]
-        last_date_str = (
-            (
-                datetime.datetime.strptime(last_date_str, "%Y-%m-%d")
-                - datetime.timedelta(days=1)
-            )
-            .date()
-            .isoformat()
-        )
-        params.update({"max_date": f"{last_date_str}"})
-    big_df["商品"] = "英国利率决议报告"
-    big_df.columns = [
-        "日期",
-        "今值",
-        "预测值",
-        "前值",
-        "商品",
-    ]
-    big_df = big_df[
-        [
-            "商品",
-            "日期",
-            "今值",
-            "预测值",
-            "前值",
-        ]
-    ]
-    big_df["日期"] = pd.to_datetime(big_df["日期"]).dt.date
-    big_df["今值"] = pd.to_numeric(big_df["今值"])
-    big_df["预测值"] = pd.to_numeric(big_df["预测值"])
-    big_df["前值"] = pd.to_numeric(big_df["前值"])
-    big_df.sort_values(["日期"], inplace=True)
-    big_df.reset_index(inplace=True, drop=True)
-    return big_df
+    return __get_interest_rate_data(attr_id="26", name="英国央行决议报告")
 # 金十数据中心-经济指标-央行利率-主要央行利率-澳洲联储决议报告
@@ -413,71 +165,7 @@ def macro_bank_australia_interest_rate() -> pd.DataFrame:
     :return: 澳洲联储决议报告-今值(%)
     :rtype: pandas.Series
     """
-    t = time.time()
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-site",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
-    params = {
-        "max_date": "",
-        "category": "ec",
-        "attr_id": "27",
-        "_": str(int(round(t * 1000))),
-    }
-    big_df = pd.DataFrame()
-    while True:
-        r = requests.get(url, params=params, headers=headers)
-        data_json = r.json()
-        if not data_json["data"]["values"]:
-            break
-        temp_df = pd.DataFrame(data_json["data"]["values"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
-        last_date_str = temp_df.iat[-1, 0]
-        last_date_str = (
-            (
-                datetime.datetime.strptime(last_date_str, "%Y-%m-%d")
-                - datetime.timedelta(days=1)
-            )
-            .date()
-            .isoformat()
-        )
-        params.update({"max_date": f"{last_date_str}"})
-    big_df["商品"] = "澳大利亚利率决议报告"
-    big_df.columns = [
-        "日期",
-        "今值",
-        "预测值",
-        "前值",
-        "商品",
-    ]
-    big_df = big_df[
-        [
-            "商品",
-            "日期",
-            "今值",
-            "预测值",
-            "前值",
-        ]
-    ]
-    big_df["日期"] = pd.to_datetime(big_df["日期"]).dt.date
-    big_df["今值"] = pd.to_numeric(big_df["今值"])
-    big_df["预测值"] = pd.to_numeric(big_df["预测值"])
-    big_df["前值"] = pd.to_numeric(big_df["前值"])
-    big_df.sort_values(["日期"], inplace=True)
-    big_df.reset_index(inplace=True, drop=True)
-    return big_df
+    return __get_interest_rate_data(attr_id="27", name="澳洲联储决议报告")
 # 金十数据中心-经济指标-央行利率-主要央行利率-日本央行决议报告
@@ -489,71 +177,7 @@ def macro_bank_japan_interest_rate() -> pd.DataFrame:
     :return: 日本利率决议报告-今值(%)
     :rtype: pandas.Series
     """
-    t = time.time()
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-site",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
-    params = {
-        "max_date": "",
-        "category": "ec",
-        "attr_id": "22",
-        "_": str(int(round(t * 1000))),
-    }
-    big_df = pd.DataFrame()
-    while True:
-        r = requests.get(url, params=params, headers=headers)
-        data_json = r.json()
-        if not data_json["data"]["values"]:
-            break
-        temp_df = pd.DataFrame(data_json["data"]["values"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
-        last_date_str = temp_df.iat[-1, 0]
-        last_date_str = (
-            (
-                datetime.datetime.strptime(last_date_str, "%Y-%m-%d")
-                - datetime.timedelta(days=1)
-            )
-            .date()
-            .isoformat()
-        )
-        params.update({"max_date": f"{last_date_str}"})
-    big_df["商品"] = "日本利率决议报告"
-    big_df.columns = [
-        "日期",
-        "今值",
-        "预测值",
-        "前值",
-        "商品",
-    ]
-    big_df = big_df[
-        [
-            "商品",
-            "日期",
-            "今值",
-            "预测值",
-            "前值",
-        ]
-    ]
-    big_df["日期"] = pd.to_datetime(big_df["日期"]).dt.date
-    big_df["今值"] = pd.to_numeric(big_df["今值"])
-    big_df["预测值"] = pd.to_numeric(big_df["预测值"])
-    big_df["前值"] = pd.to_numeric(big_df["前值"])
-    big_df.sort_values(["日期"], inplace=True)
-    big_df.reset_index(inplace=True, drop=True)
-    return big_df
+    return __get_interest_rate_data(attr_id="22", name="日本央行决议报告")
 # 金十数据中心-经济指标-央行利率-主要央行利率-俄罗斯央行决议报告
@@ -565,71 +189,7 @@ def macro_bank_russia_interest_rate() -> pd.DataFrame:
     :return: 俄罗斯利率决议报告-今值(%)
     :rtype: pandas.Series
     """
-    t = time.time()
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-site",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
-    params = {
-        "max_date": "",
-        "category": "ec",
-        "attr_id": "64",
-        "_": str(int(round(t * 1000))),
-    }
-    big_df = pd.DataFrame()
-    while True:
-        r = requests.get(url, params=params, headers=headers)
-        data_json = r.json()
-        if not data_json["data"]["values"]:
-            break
-        temp_df = pd.DataFrame(data_json["data"]["values"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
-        last_date_str = temp_df.iat[-1, 0]
-        last_date_str = (
-            (
-                datetime.datetime.strptime(last_date_str, "%Y-%m-%d")
-                - datetime.timedelta(days=1)
-            )
-            .date()
-            .isoformat()
-        )
-        params.update({"max_date": f"{last_date_str}"})
-    big_df["商品"] = "俄罗斯利率决议报告"
-    big_df.columns = [
-        "日期",
-        "今值",
-        "预测值",
-        "前值",
-        "商品",
-    ]
-    big_df = big_df[
-        [
-            "商品",
-            "日期",
-            "今值",
-            "预测值",
-            "前值",
-        ]
-    ]
-    big_df["日期"] = pd.to_datetime(big_df["日期"]).dt.date
-    big_df["今值"] = pd.to_numeric(big_df["今值"])
-    big_df["预测值"] = pd.to_numeric(big_df["预测值"])
-    big_df["前值"] = pd.to_numeric(big_df["前值"])
-    big_df.sort_values(["日期"], inplace=True)
-    big_df.reset_index(inplace=True, drop=True)
-    return big_df
+    return __get_interest_rate_data(attr_id="64", name="俄罗斯央行决议报告")
 # 金十数据中心-经济指标-央行利率-主要央行利率-印度央行决议报告
@@ -641,71 +201,7 @@ def macro_bank_india_interest_rate() -> pd.DataFrame:
     :return: 印度利率决议报告-今值(%)
     :rtype: pandas.Series
     """
-    t = time.time()
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-site",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
-    params = {
-        "max_date": "",
-        "category": "ec",
-        "attr_id": "68",
-        "_": str(int(round(t * 1000))),
-    }
-    big_df = pd.DataFrame()
-    while True:
-        r = requests.get(url, params=params, headers=headers)
-        data_json = r.json()
-        if not data_json["data"]["values"]:
-            break
-        temp_df = pd.DataFrame(data_json["data"]["values"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
-        last_date_str = temp_df.iat[-1, 0]
-        last_date_str = (
-            (
-                datetime.datetime.strptime(last_date_str, "%Y-%m-%d")
-                - datetime.timedelta(days=1)
-            )
-            .date()
-            .isoformat()
-        )
-        params.update({"max_date": f"{last_date_str}"})
-    big_df["商品"] = "印度利率决议报告"
-    big_df.columns = [
-        "日期",
-        "今值",
-        "预测值",
-        "前值",
-        "商品",
-    ]
-    big_df = big_df[
-        [
-            "商品",
-            "日期",
-            "今值",
-            "预测值",
-            "前值",
-        ]
-    ]
-    big_df["日期"] = pd.to_datetime(big_df["日期"]).dt.date
-    big_df["今值"] = pd.to_numeric(big_df["今值"])
-    big_df["预测值"] = pd.to_numeric(big_df["预测值"])
-    big_df["前值"] = pd.to_numeric(big_df["前值"])
-    big_df.sort_values(["日期"], inplace=True)
-    big_df.reset_index(inplace=True, drop=True)
-    return big_df
+    return __get_interest_rate_data(attr_id="68", name="印度央行决议报告")
 # 金十数据中心-经济指标-央行利率-主要央行利率-巴西央行决议报告
@@ -717,71 +213,7 @@ def macro_bank_brazil_interest_rate() -> pd.DataFrame:
     :return: 巴西利率决议报告-今值(%)
     :rtype: pandas.Series
     """
-    t = time.time()
-    headers = {
-        "accept": "*/*",
-        "accept-encoding": "gzip, deflate, br",
-        "accept-language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "cache-control": "no-cache",
-        "origin": "https://datacenter.jin10.com",
-        "pragma": "no-cache",
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-site",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36",
-        "x-app-id": "rU6QIu7JHe2gOUeR",
-        "x-csrf-token": "",
-        "x-version": "1.0.0",
-    }
-    url = "https://datacenter-api.jin10.com/reports/list_v2"
-    params = {
-        "max_date": "",
-        "category": "ec",
-        "attr_id": "55",
-        "_": str(int(round(t * 1000))),
-    }
-    big_df = pd.DataFrame()
-    while True:
-        r = requests.get(url, params=params, headers=headers)
-        data_json = r.json()
-        if not data_json["data"]["values"]:
-            break
-        temp_df = pd.DataFrame(data_json["data"]["values"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
-        last_date_str = temp_df.iat[-1, 0]
-        last_date_str = (
-            (
-                datetime.datetime.strptime(last_date_str, "%Y-%m-%d")
-                - datetime.timedelta(days=1)
-            )
-            .date()
-            .isoformat()
-        )
-        params.update({"max_date": f"{last_date_str}"})
-    big_df["商品"] = "巴西利率决议报告"
-    big_df.columns = [
-        "日期",
-        "今值",
-        "预测值",
-        "前值",
-        "商品",
-    ]
-    big_df = big_df[
-        [
-            "商品",
-            "日期",
-            "今值",
-            "预测值",
-            "前值",
-        ]
-    ]
-    big_df["日期"] = pd.to_datetime(big_df["日期"]).dt.date
-    big_df["今值"] = pd.to_numeric(big_df["今值"])
-    big_df["预测值"] = pd.to_numeric(big_df["预测值"])
-    big_df["前值"] = pd.to_numeric(big_df["前值"])
-    big_df.sort_values(["日期"], inplace=True)
-    big_df.reset_index(inplace=True, drop=True)
-    return big_df
+    return __get_interest_rate_data(attr_id="55", name="巴西央行决议报告")
 if __name__ == "__main__":
@@ -794,15 +226,11 @@ if __name__ == "__main__":
     print(macro_bank_euro_interest_rate_df)
     # 金十数据中心-经济指标-央行利率-主要央行利率-新西兰联储决议报告
-    macro_bank_newzealand_interest_rate_df = (
-        macro_bank_newzealand_interest_rate()
-    )
+    macro_bank_newzealand_interest_rate_df = macro_bank_newzealand_interest_rate()
     print(macro_bank_newzealand_interest_rate_df)
     # 金十数据中心-经济指标-央行利率-主要央行利率-瑞士央行决议报告
-    macro_bank_switzerland_interest_rate_df = (
-        macro_bank_switzerland_interest_rate()
-    )
+    macro_bank_switzerland_interest_rate_df = macro_bank_switzerland_interest_rate()
     print(macro_bank_switzerland_interest_rate_df)
     # 金十数据中心-经济指标-央行利率-主要央行利率-英国央行决议报告
@@ -810,9 +238,7 @@ if __name__ == "__main__":
     print(macro_bank_english_interest_rate_df)
     # 金十数据中心-经济指标-央行利率-主要央行利率-澳洲联储决议报告
-    macro_bank_australia_interest_rate_df = (
-        macro_bank_australia_interest_rate()
-    )
+    macro_bank_australia_interest_rate_df = macro_bank_australia_interest_rate()
     print(macro_bank_australia_interest_rate_df)
     # 金十数据中心-经济指标-央行利率-主要央行利率-日本央行决议报告

akshare/index/index_stock_zh_csindex.py CHANGED Viewed

@@ -382,7 +382,7 @@ def index_value_name_funddb() -> pd.DataFrame:
 def index_value_hist_funddb(
-    symbol: str = "大盘成长", indicator: str = "市盈率"
+    symbol: str = "大盘成长", indicator: str = "市盈率", year: str = "-1"
 ) -> pd.DataFrame:
     """
     funddb-指数估值-估值信息
@@ -391,6 +391,8 @@ def index_value_hist_funddb(
     :type symbol: str
     :param indicator: choice of {'市盈率', '市净率', '股息率', '风险溢价'}
     :type indicator: str
+    :param year: choice of {'-1': "所有", '3': "近3年", '5': "近5年", '10': "近10年"}
+    :type year: str
     :return: 估值信息
     :rtype: pandas.DataFrame
     """
@@ -417,12 +419,12 @@ def index_value_hist_funddb(
         type="pc",
         ver="new",
         version="2.2.7",
-        year=-1,
+        year=int(year),
     )
     payload = {
         "gu_code": name_code_map[symbol],
         "pe_category": indicator_map[indicator],
-        "year": -1,
+        "year": int(year),
         "ver": "new",
         "type": "pc",
         "version": "2.2.7",
@@ -474,6 +476,6 @@ if __name__ == "__main__":
     print(index_value_name_funddb_df)
     index_value_hist_funddb_df = index_value_hist_funddb(
-        symbol="大盘成长", indicator="市盈率"
+        symbol="大盘成长", indicator="市盈率", year="-1"
     )
     print(index_value_hist_funddb_df)

{akshare-1.15.13.dist-info → akshare-1.15.14.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.15.13
+Version: 1.15.14
 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.13.dist-info → akshare-1.15.14.dist-info}/RECORD RENAMED Viewed

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=FKX7WMccB5Id23VL4nmeqolblK3dC_INyGCwkOsSrwE,183272
+akshare/__init__.py,sha256=opho0M5bD5jNYkgVSoGIbIp5VbprD6Nt7BgKEFQow7A,183328
 akshare/datasets.py,sha256=-qdwaQjgBlftX84uM74KJqCYJYkQ50PV416_neA4uls,995
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -53,7 +53,7 @@ akshare/data/ths.js,sha256=AWPkHf3L2Il1UUL0F5qDqNn1dfU0OlZBNUbMf8AmI3Y,39664
 akshare/economic/__init__.py,sha256=7dWJSrPs7KTj9_Ffs-ZS3aYDrf3v4nOnZYqwUZ3DJms,82
 akshare/economic/cons.py,sha256=0JM61Eiro0xqXGnCaDSoLsw5iQWKAtqhRHcXmDfJgyw,16594
 akshare/economic/macro_australia.py,sha256=JKNaedN19Rw15dn8bPur1yrsQA5j6hfX4tjgh7OCBHY,10801
-akshare/economic/macro_bank.py,sha256=vElFSGa0O4LqFgGHNyzxjlaYQPWa0EER-ET5yn_uv3M,29134
+akshare/economic/macro_bank.py,sha256=Hx250J4r8wBsYFdDyJJixXHEe4ReA1ZO4lBJQDdATYw,10721
 akshare/economic/macro_canada.py,sha256=nNaZ3yZIvgTtRiQhwoEybMX6UpqszPKeixzYITv9ox0,15195
 akshare/economic/macro_china.py,sha256=rQFlQqXKnORhG3ISSW_nlUgNNdTewZGIrUBA2xu0lV0,148646
 akshare/economic/macro_china_hk.py,sha256=dIBc9gAYiHZUjXLF4c3yBK-2s3iLx46GcgJGlVJpv4c,5974
@@ -172,7 +172,7 @@ akshare/index/index_spot.py,sha256=HrXt2QC9i1pYEh7wyJPKjtexctzSIUyMjEzk5BQq_K8,1
 akshare/index/index_stock_hk.py,sha256=nPFzRrjyiUpRK-OSDsdi5AFCKHNKqOVji6WJcQxOvNo,9781
 akshare/index/index_stock_us_sina.py,sha256=IxOk4G49oasv7EfEQenL9-GLuelyUus6c4JPyRlaOzY,1551
 akshare/index/index_stock_zh.py,sha256=WkXd3A8gc1hgPJPR4znRbLfrqMeTivLS7L449TlOBdE,14873
-akshare/index/index_stock_zh_csindex.py,sha256=kRWl1c30OOhLj_mLCBoxOJdgE9KxEUqJf7Hjmu-tLfo,13110
+akshare/index/index_stock_zh_csindex.py,sha256=jVF29Byn2guaZ4QsXwwL1C5qtqk_m1ja-dgDnKnfz8s,13267
 akshare/index/index_sugar.py,sha256=B_Nj9Q6JP-Y_d7myZ0C79izTxxrbuZIp1Vv_CilVMOc,5006
 akshare/index/index_sw.py,sha256=n757dUfNEsaZGk_eCxeetZi3pktBBYLVEMM7f9U_XjM,10174
 akshare/index/index_yw.py,sha256=6FF38kooLQulnMTqAd1__TNWip4XC1VA72k3T049xYc,4319
@@ -383,8 +383,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.13.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.15.13.dist-info/METADATA,sha256=-MOPXh9wvdFnbIDVUNBNOobh_VUCEUXn5dX0w4ZjlKA,14244
-akshare-1.15.13.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-akshare-1.15.13.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.15.13.dist-info/RECORD,,
+akshare-1.15.14.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.15.14.dist-info/METADATA,sha256=TPX6vATWb5loTldlJ_0g-WXp9YkZqnAqEFdMRHWzZhI,14244
+akshare-1.15.14.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+akshare-1.15.14.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.15.14.dist-info/RECORD,,

{akshare-1.15.13.dist-info → akshare-1.15.14.dist-info}/LICENSE RENAMED Viewed

File without changes

{akshare-1.15.13.dist-info → akshare-1.15.14.dist-info}/WHEEL RENAMED Viewed

File without changes

{akshare-1.15.13.dist-info → akshare-1.15.14.dist-info}/top_level.txt RENAMED Viewed

File without changes

akshare 1.15.13__py3-none-any.whl → 1.15.14__py3-none-any.whl

Potentially problematic release.

akshare 1.15.13py3-none-any.whl → 1.15.14py3-none-any.whl