akshare 1.16.28__py3-none-any.whl → 1.16.29__py3-none-any.whl

akshare/__init__.py

@@ -3037,9 +3037,10 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.16.26 add: add stock_hsgt_sh_hk_spot_em interface
 1.16.27 fix: fix futures_global_em interface
 1.16.28 fix: fix futures_global_hist_em interface
+1.16.29 fix: fix futures_global_hist_em interface
 """
 
-__version__ = "1.16.28"
+__version__ = "1.16.29"
 __author__ = "AKFamily"
 
 import sys
@@ -3214,7 +3215,7 @@ from akshare.stock_feature.stock_hsgt_min_em import stock_hsgt_fund_min_em
 """
 东方财富网-行情中心-期货市场-国际期货
 """
-from akshare.futures.futures_hf_em import futures_global_em
+from akshare.futures.futures_hf_em import futures_global_spot_em, futures_global_hist_em
 
 """
 雪球行情数据

akshare/futures/futures_hf_em.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/11/28 22:00
+Date: 2025/3/5 19:00
 Desc: 东方财富网-行情中心-期货市场-国际期货
 https://quote.eastmoney.com/center/gridlist.html#futures_global
 """
 
 import math
+from typing import Optional
 
 import pandas as pd
 import requests
@@ -14,7 +15,76 @@ import requests
 from akshare.utils.tqdm import get_tqdm
 
 
-def futures_global_em() -> pd.DataFrame:
+def __futures_global_hist_market_code(symbol: str = "HG00Y") -> Optional[int]:
+    """
+    东方财富网-行情中心-期货市场-国际期货-品种市场对照表
+    https://quote.eastmoney.com/center/gridlist.html#futures_global
+    :param symbol: HG00Y, 品种代码；可以通过 ak.futures_global_spot_em() 来获取所有可获取历史行情数据的品种代码
+    :type symbol: str
+    :return: 品种所属于的市场
+    :rtype: str
+    """
+    # 提取品种代码（去掉年份和月份部分）
+    base_symbol = ""
+    i = 0
+    while i < len(symbol) and not symbol[i].isdigit():
+        base_symbol += symbol[i]
+        i += 1
+    # 如果代码中没有数字（异常情况），则返回整个代码作为基础品种代码
+    if not base_symbol and i == len(symbol):
+        base_symbol = symbol
+    # 金属和贵金属品种 - 101
+    if base_symbol in ["HG", "GC", "SI", "QI", "QO", "MGC", "LTH"]:
+        return 101
+    # 能源品种 - 102
+    if base_symbol in ["CL", "NG", "RB", "HO", "PA", "PL", "QM"]:
+        return 102
+    # 农产品和金融品种 - 103
+    if base_symbol in [
+        "ZW",
+        "ZM",
+        "ZS",
+        "ZC",
+        "XC",
+        "XK",
+        "XW",
+        "YM",
+        "TY",
+        "US",
+        "EH",
+        "ZL",
+        "ZR",
+        "ZO",
+        "FV",
+        "TU",
+        "UL",
+        "NQ",
+        "ES",
+    ]:
+        return 103
+    # 中国市场特有品种 - 104
+    if base_symbol in ["TF", "RT", "CN"]:
+        return 104
+    # 软商品期货 - 108
+    if base_symbol in ["SB", "CT", "SF"]:
+        return 108
+    # 特殊L开头品种 - 109
+    if base_symbol in ["LCPT", "LZNT", "LALT", "LTNT", "LLDT", "LNKT"]:
+        return 109
+    # MPM开头品种 - 110
+    if base_symbol == "MPM":
+        return 110
+    # 日本市场品种 - 111
+    if base_symbol.startswith("J"):
+        return 111
+    # 单字母代码品种 - 112
+    if base_symbol in ["M", "B", "G"]:
+        return 112
+    # 如果没有匹配到任何规则，返回一个默认值或者错误
+    return None
+
+
+def futures_global_spot_em() -> pd.DataFrame:
     """
     东方财富网-行情中心-期货市场-国际期货
     https://quote.eastmoney.com/center/gridlist.html#futures_global
@@ -101,16 +171,19 @@ def futures_global_em() -> pd.DataFrame:
 def futures_global_hist_em(symbol: str = "HG00Y") -> pd.DataFrame:
     """
     东方财富网-行情中心-期货市场-国际期货-历史行情数据
-    https://quote.eastmoney.com/center/gridlist.html#futures_global
+    https://quote.eastmoney.com/globalfuture/HG25J.html
+    :param symbol: 品种代码；可以通过 ak.futures_global_spot_em() 来获取所有可获取历史行情数据的品种代码
+    :type symbol: str
     :return: 历史行情数据
     :rtype: pandas.DataFrame
     """
     url = "https://push2his.eastmoney.com/api/qt/stock/kline/get"
+    market_code = __futures_global_hist_market_code(symbol)
     params = {
-        "secid": f"101.{symbol}",
+        "secid": f"{market_code}.{symbol}",
         "klt": "101",
         "fqt": "1",
-        "lmt": "66",
+        "lmt": "6600",
         "end": "20500000",
         "iscca": "1",
         "fields1": "f1,f2,f3,f4,f5,f6,f7,f8",
@@ -123,12 +196,53 @@ def futures_global_hist_em(symbol: str = "HG00Y") -> pd.DataFrame:
     temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]["klines"]])
     temp_df["code"] = data_json["data"]["code"]
     temp_df["name"] = data_json["data"]["name"]
+    temp_df.columns = [
+        "日期",
+        "开盘",
+        "最新价",
+        "最高",
+        "最低",
+        "总量",
+        "-",
+        "-",
+        "涨幅",
+        "-",
+        "-",
+        "-",
+        "持仓",
+        "日增",
+        "代码",
+        "名称",
+    ]
+    temp_df = temp_df[
+        [
+            "日期",
+            "代码",
+            "名称",
+            "开盘",
+            "最新价",
+            "最高",
+            "最低",
+            "总量",
+            "涨幅",
+            "持仓",
+            "日增",
+        ]
+    ]
+    temp_df["日期"] = pd.to_datetime(temp_df["日期"], errors="coerce").dt.date
+    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")
     return temp_df
 
 
 if __name__ == "__main__":
-    futures_global_em_df = futures_global_em()
-    print(futures_global_em_df)
+    futures_global_spot_em_df = futures_global_spot_em()
+    print(futures_global_spot_em_df)
 
-    futures_global_hist_em_df = futures_global_hist_em(symbol="HG25M")
+    futures_global_hist_em_df = futures_global_hist_em(symbol="HG00Y")
     print(futures_global_hist_em_df)

{akshare-1.16.28.dist-info → akshare-1.16.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: akshare
-Version: 1.16.28
+Version: 1.16.29
 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.16.28.dist-info → akshare-1.16.29.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=fqCk5IyCVc85uNjmJj3ZTExFv_FxrGdLP_YRGqCNShQ,189563
+akshare/__init__.py,sha256=0nKkoBzlF340MgMYFgSBYV8fmLvgWMDXYhA6G_cKozY,189642
 akshare/datasets.py,sha256=rKuRNZrqi6IMsZ9nyvO3Rx02js0tH3zMLjz8HQNAoPQ,963
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -112,7 +112,7 @@ akshare/futures/futures_comm_qihuo.py,sha256=uQfabZ63qME8sTaxUbIUVQBVi8yTaPPDhD7
 akshare/futures/futures_contract_detail.py,sha256=auwzNdaoFi5hoJY6rNkO54v5FD2gmEkQu7B90yEDtkc,1175
 akshare/futures/futures_daily_bar.py,sha256=pultXs8digLfWT0dzyWs0AtFk3Fi2uZDT-zxbg_PcOM,25299
 akshare/futures/futures_foreign.py,sha256=2cbMA-eug_jriDFwKZWmA_TbPW2GQAjscpZHBrs287E,2131
-akshare/futures/futures_hf_em.py,sha256=xcCzyH0sU-il8RTTLLrnLOt3jybylb1FLMXOEuIUXkM,4437
+akshare/futures/futures_hf_em.py,sha256=vEgJav-g_PNO_Jh4Xup27PIt-ARGqVk9TjNXK_3eC-E,7966
 akshare/futures/futures_hist_em.py,sha256=Q8I20qRjp2ujiJMCCNBvTHXmrIth22p2k6KpvbkC3dk,6472
 akshare/futures/futures_hq_sina.py,sha256=HZBAve1yxp1fnwgEy_2CqVoniTXRkt8KI3REt0N0TiY,9575
 akshare/futures/futures_index_ccidx.py,sha256=_kgWioCOpFNn8WUcL5qKHGb3rUHzrbrx2AszprKpBh4,4460
@@ -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.16.28.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.16.28.dist-info/METADATA,sha256=3tFeYcw8G7HeGaDHnCBIYJirPqcxfhAmBCwLzroXbIE,13847
-akshare-1.16.28.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-akshare-1.16.28.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.16.28.dist-info/RECORD,,
+akshare-1.16.29.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.16.29.dist-info/METADATA,sha256=RWyZ6eGQqJw6yAxLc7GyPWNLJYW6pjHFfbwRxsfjupE,13847
+akshare-1.16.29.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+akshare-1.16.29.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.16.29.dist-info/RECORD,,