akshare 1.15.73__tar.gz → 1.15.75__tar.gz

{akshare-1.15.73 → akshare-1.15.75}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: akshare
-Version: 1.15.73
+Version: 1.15.75
 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.73 → akshare-1.15.75}/akshare/__init__.py

@@ -2983,9 +2983,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.71 fix: fix stock_dzjy_sctj interface
 1.15.72 fix: fix stock_us_spot interface
 1.15.73 fix: fix stock_dzjy_hygtj interface
+1.15.74 fix: fix macro_australia_retail_rate_monthly interface
+1.15.75 feat: add futures_hist_em interface
 """
 
-__version__ = "1.15.73"
+__version__ = "1.15.75"
 __author__ = "AKFamily"
 
 import sys
@@ -3007,6 +3009,11 @@ if sys.version_info < (3, 9):
 
 del sys
 
+"""
+期货行情-内盘-历史行情数据-东财
+"""
+from akshare.futures.futures_hist_em import futures_hist_table_em, futures_hist_em
+
 """
 巨潮资讯-数据中心-专题统计-股东股本-股本变动
 """

{akshare-1.15.73 → akshare-1.15.75}/akshare/economic/macro_australia.py

@@ -1,15 +1,14 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2022/11/27 20:26
+Date: 2025/1/17 15:30
 Desc: 东方财富-经济数据-澳大利亚
 https://data.eastmoney.com/cjsj/foreign_5_0.html
 """
+
 import pandas as pd
 import requests
 
-from akshare.utils import demjson
-
 
 # 零售销售月率
 def macro_australia_retail_rate_monthly() -> pd.DataFrame:
@@ -47,18 +46,19 @@ def macro_australia_retail_rate_monthly() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -98,17 +98,19 @@ def macro_australia_trade() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -148,17 +150,19 @@ def macro_australia_unemployment_rate() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -198,17 +202,19 @@ def macro_australia_ppi_quarterly() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -216,7 +222,7 @@ def macro_australia_ppi_quarterly() -> pd.DataFrame:
 def macro_australia_cpi_quarterly() -> pd.DataFrame:
     """
     东方财富-经济数据-澳大利亚-消费者物价指数季率
-    http://data.eastmoney.com/cjsj/foreign_5_4.html
+    https://data.eastmoney.com/cjsj/foreign_5_4.html
     :return: 消费者物价指数季率
     :rtype: pandas.DataFrame
     """
@@ -248,17 +254,19 @@ def macro_australia_cpi_quarterly() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -298,17 +306,19 @@ def macro_australia_cpi_yearly() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
@@ -348,21 +358,23 @@ def macro_australia_bank_rate() -> pd.DataFrame:
         "发布日期",
         "现值",
         "前值",
-
     ]
-    temp_df = temp_df[[
-        "时间",
-        "前值",
-        "现值",
-        "发布日期",
-    ]]
+    temp_df = temp_df[
+        [
+            "时间",
+            "前值",
+            "现值",
+            "发布日期",
+        ]
+    ]
     temp_df["前值"] = pd.to_numeric(temp_df["前值"], errors="coerce")
     temp_df["现值"] = pd.to_numeric(temp_df["现值"], errors="coerce")
-    temp_df['发布日期'] = pd.to_datetime(temp_df['发布日期']).dt.date
+    temp_df["发布日期"] = pd.to_datetime(temp_df["发布日期"], errors="coerce").dt.date
+    temp_df.sort_values(by="发布日期", ignore_index=True, inplace=True)
     return temp_df
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     macro_australia_retail_rate_monthly_df = macro_australia_retail_rate_monthly()
     print(macro_australia_retail_rate_monthly_df)
 

akshare-1.15.75/akshare/futures/futures_hist_em.py

@@ -0,0 +1,189 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+"""
+Date: 2024/1/17 19:30
+Desc: 东方财富网-期货行情
+https://qhweb.eastmoney.com/quote
+"""
+
+import re
+from functools import lru_cache
+
+import pandas as pd
+import requests
+
+
+def __futures_hist_separate_char_and_numbers_em(symbol: str = "焦煤2506") -> tuple:
+    """
+    东方财富网-期货行情-交易所品种对照表原始数据
+    https://quote.eastmoney.com/qihuo/al2505.html
+    :param symbol: 股票代码
+    :type symbol: str
+    :return: 交易所品种对照表原始数据
+    :rtype: pandas.DataFrame
+    """
+    char = re.findall(pattern="[\u4e00-\u9fa5a-zA-Z]+", string=symbol)
+    numbers = re.findall(pattern=r"\d+", string=symbol)
+    return char[0], numbers[0]
+
+
+@lru_cache()
+def __fetch_exchange_symbol_raw_em() -> list:
+    """
+    东方财富网-期货行情-交易所品种对照表原始数据
+    https://quote.eastmoney.com/qihuo/al2505.html
+    :return: 交易所品种对照表原始数据
+    :rtype: pandas.DataFrame
+    """
+    url = "https://futsse-static.eastmoney.com/redis"
+    params = {"msgid": "gnweb"}
+    r = requests.get(url, params=params)
+    data_json = r.json()
+    all_exchange_symbol_list = []
+    for item in data_json:
+        params = {"msgid": str(item["mktid"])}
+        r = requests.get(url, params=params)
+        inner_data_json = r.json()
+        for num in range(1, len(inner_data_json) + 1):
+            params = {"msgid": str(item["mktid"]) + f"_{num}"}
+            r = requests.get(url, params=params)
+            inner_data_json = r.json()
+            all_exchange_symbol_list.extend(inner_data_json)
+    return all_exchange_symbol_list
+
+
+@lru_cache()
+def __get_exchange_symbol_map() -> tuple[dict, dict, dict, dict]:
+    """
+    东方财富网-期货行情-交易所品种映射
+    https://quote.eastmoney.com/qihuo/al2505.html
+    :return: 交易所品种映射
+    :rtype: pandas.DataFrame
+    """
+    all_exchange_symbol_list = __fetch_exchange_symbol_raw_em()
+    c_contract_mkt = {}
+    c_contract_to_e_contract = {}
+    e_symbol_mkt = {}
+    c_symbol_mkt = {}
+    for item in all_exchange_symbol_list:
+        c_contract_mkt[item["name"]] = item["mktid"]
+        c_contract_to_e_contract[item["name"]] = item["code"]
+        e_symbol_mkt[item["vcode"]] = item["mktid"]
+        c_symbol_mkt[item["vname"]] = item["mktid"]
+    return c_contract_mkt, c_contract_to_e_contract, e_symbol_mkt, c_symbol_mkt
+
+
+def futures_hist_table_em() -> pd.DataFrame:
+    """
+    东方财富网-期货行情-交易所品种对照表
+    https://quote.eastmoney.com/qihuo/al2505.html
+    :return: 交易所品种对照表
+    :rtype: pandas.DataFrame
+    """
+    all_exchange_symbol_list = __fetch_exchange_symbol_raw_em()
+    temp_df = pd.DataFrame(all_exchange_symbol_list)
+    temp_df = temp_df[["mktname", "name", "code"]]
+    temp_df.columns = ["市场简称", "合约中文代码", "合约代码"]
+    return temp_df
+
+
+def futures_hist_em(
+    symbol: str = "热卷主连",
+    period: str = "daily",
+    start_date: str = "19900101",
+    end_date: str = "20500101",
+) -> pd.DataFrame:
+    """
+    东方财富网-期货行情-行情数据
+    https://qhweb.eastmoney.com/quote
+    :param symbol: 期货代码
+    :type symbol: str
+    :param period: choice of {'daily', 'weekly', 'monthly'}
+    :type period: str
+    :param start_date: 开始日期
+    :type start_date: str
+    :param end_date: 结束日期
+    :type end_date: str
+    :return: 行情数据
+    :rtype: pandas.DataFrame
+    """
+    url = "https://push2his.eastmoney.com/api/qt/stock/kline/get"
+    period_dict = {"daily": "101", "weekly": "102", "monthly": "103"}
+    c_contract_mkt, c_contract_to_e_contract, e_symbol_mkt, c_symbol_mkt = (
+        __get_exchange_symbol_map()
+    )
+    try:
+        sec_id = f"{c_contract_mkt[symbol]}.{c_contract_to_e_contract[symbol]}"
+    except KeyError:
+        symbol_char, numbers = __futures_hist_separate_char_and_numbers_em(symbol)
+        if re.match(pattern="^[\u4e00-\u9fa5]+$", string=symbol_char):
+            sec_id = str(c_symbol_mkt[symbol_char]) + "." + symbol
+        else:
+            sec_id = str(e_symbol_mkt[symbol_char]) + "." + symbol
+    params = {
+        "secid": sec_id,
+        "klt": period_dict[period],
+        "fqt": "1",
+        "lmt": "10000",
+        "end": "20500000",
+        "iscca": "1",
+        "fields1": "f1,f2,f3,f4,f5,f6,f7,f8",
+        "fields2": "f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61,f62,f63,f64",
+        "ut": "7eea3edcaed734bea9cbfc24409ed989",
+        "forcect": "1",
+    }
+    r = requests.get(url, timeout=15, params=params)
+    data_json = r.json()
+    temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]["klines"]])
+    temp_df.columns = [
+        "时间",
+        "开盘",
+        "收盘",
+        "最高",
+        "最低",
+        "成交量",
+        "成交额",
+        "-",
+        "涨跌幅",
+        "涨跌",
+        "_",
+        "_",
+        "持仓量",
+        "_",
+    ]
+    temp_df = temp_df[
+        [
+            "时间",
+            "开盘",
+            "最高",
+            "最低",
+            "收盘",
+            "涨跌",
+            "涨跌幅",
+            "成交量",
+            "成交额",
+            "持仓量",
+        ]
+    ]
+    temp_df.index = pd.to_datetime(temp_df["时间"])
+    temp_df = temp_df[start_date:end_date]
+    temp_df.reset_index(drop=True, inplace=True)
+    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")
+    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")
+    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")
+    temp_df["时间"] = pd.to_datetime(temp_df["时间"], errors="coerce").dt.date
+    return temp_df
+
+
+if __name__ == "__main__":
+    futures_hist_table_em_df = futures_hist_table_em()
+    print(futures_hist_table_em_df)
+
+    futures_hist_em_df = futures_hist_em(symbol="热卷主连", period="daily")
+    print(futures_hist_em_df)

akshare-1.15.75/akshare/futures/futures_rule_em.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+"""
+Date: 2024/1/17 19:30
+Desc: 东方财富网-期货行情-品种及交易规则
+https://portal.eastmoneyfutures.com/pages/service/jyts.html#jyrl
+"""
+
+import pandas as pd
+import requests
+from akshare.utils.cons import headers
+
+
+def futures_rule_em() -> pd.DataFrame:
+    """
+    东方财富网-期货行情-品种及交易规则
+    https://portal.eastmoneyfutures.com/pages/service/jyts.html#jyrl
+    :return: 品种及交易规则
+    :rtype: pandas.DataFrame
+    """
+    url = "https://eastmoneyfutures.com/api/ComManage/GetPZJYInfo"
+    r = requests.get(url, headers=headers)
+    data_json = r.json()
+    temp_df = pd.DataFrame(data_json["Data"])
+    return temp_df
+
+
+def futures_trading_hours_em():
+    """
+    东方财富网-期货交易时间
+    https://qhweb.eastmoney.com/tradinghours
+    """
+    pass
+
+
+if __name__ == "__main__":
+    futures_rule_em_df = futures_rule_em()
+    print(futures_rule_em_df)