akshare 1.16.35__py3-none-any.whl → 1.16.37__py3-none-any.whl

akshare/__init__.py

@@ -3044,9 +3044,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.16.33 fix: fix fund_open_fund_daily_em interface
 1.16.34 fix: fix stock_individual_fund_flow_rank interface
 1.16.35 fix: fix futures_global_spot_em interface
+1.16.36 fix: fix stock_intraday_em interface
+1.16.37 fix: fix stock_board_concept_hist_em interface
 """
 
-__version__ = "1.16.35"
+__version__ = "1.16.37"
 __author__ = "AKFamily"
 
 import sys

akshare/index/index_stock_zh.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2025/2/17 20:30
+Date: 2025/3/10 18:30
 Desc: 股票指数数据-新浪-东财-腾讯
 所有指数-实时行情数据和历史行情数据
 https://finance.sina.com.cn/realstock/company/sz399552/nc.shtml
@@ -11,8 +11,8 @@ import datetime
 import re
 
 import pandas as pd
-import requests
 import py_mini_racer
+import requests
 
 from akshare.index.cons import (
     zh_sina_index_stock_payload,
@@ -22,6 +22,7 @@ from akshare.index.cons import (
 )
 from akshare.stock.cons import hk_js_decode
 from akshare.utils import demjson
+from akshare.utils.func import fetch_paginated_data
 from akshare.utils.tqdm import get_tqdm
 
 
@@ -135,9 +136,9 @@ def __stock_zh_main_spot_em() -> pd.DataFrame:
     url = "https://33.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -151,7 +152,7 @@ def __stock_zh_main_spot_em() -> pd.DataFrame:
     }
     r = requests.get(url, params=params)
     data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    temp_df = pd.DataFrame(data_json["data"]["diff"])
     temp_df.reset_index(inplace=True)
     temp_df["index"] = temp_df["index"].astype(int) + 1
     temp_df.rename(
@@ -205,7 +206,7 @@ def __stock_zh_main_spot_em() -> pd.DataFrame:
     return temp_df
 
 
-def stock_zh_index_spot_em(symbol: str = "沪深重要指数") -> pd.DataFrame:
+def stock_zh_index_spot_em(symbol: str = "上证系列指数") -> pd.DataFrame:
     """
     东方财富网-行情中心-沪深京指数
     https://quote.eastmoney.com/center/gridlist.html#index_sz
@@ -219,31 +220,27 @@ def stock_zh_index_spot_em(symbol: str = "沪深重要指数") -> pd.DataFrame:
 
     url = "https://48.push2.eastmoney.com/api/qt/clist/get"
     symbol_map = {
-        "上证系列指数": "m:1 s:2",
+        "上证系列指数": "m:1+t:1",
         "深证系列指数": "m:0 t:5",
-        "指数成份": "m:1 s:3,m:0 t:5",
+        "指数成份": "m:1+s:3,m:0+t:5",
         "中证系列指数": "m:2",
     }
     params = {
         "pn": "1",
-        "pz": "20000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
         "wbp2u": "|0|0|0|web",
-        "fid": "f3",
+        "fid": "f12",
         "fs": symbol_map[symbol],
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,f23,f24,f25,"
         "f26,f22,f33,f11,f62,f128,f136,f115,f152",
         "_": "1704327268532",
     }
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df["index"].astype(int) + 1
+    temp_df = fetch_paginated_data(url, params)
     temp_df.rename(
         columns={
             "index": "序号",

akshare/stock/stock_board_concept_em.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2025/2/28 16:30
+Date: 2025/3/10 18:30
 Desc: 东方财富-沪深板块-概念板块
 https://quote.eastmoney.com/center/boardlist.html#concept_board
 """
@@ -12,6 +12,8 @@ from functools import lru_cache
 import pandas as pd
 import requests
 
+from akshare.utils.func import fetch_paginated_data
+
 
 @lru_cache()
 def __stock_board_concept_name_em() -> pd.DataFrame:
@@ -24,22 +26,18 @@ def __stock_board_concept_name_em() -> pd.DataFrame:
     url = "https://79.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:90 t:3 f:!50",
         "fields": "f2,f3,f4,f8,f12,f14,f15,f16,f17,f18,f20,f21,f24,f25,f22,f33,f11,f62,f128,f124,f107,f104,f105,f136",
         "_": "1626075887768",
     }
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = range(1, len(temp_df) + 1)
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
         "排名",
         "最新价",
@@ -108,9 +106,9 @@ def stock_board_concept_name_em() -> pd.DataFrame:
     url = "https://79.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -119,11 +117,7 @@ def stock_board_concept_name_em() -> pd.DataFrame:
         "fields": "f2,f3,f4,f8,f12,f14,f15,f16,f17,f18,f20,f21,f24,f25,f22,f33,f11,f62,f128,f124,f107,f104,f105,f136",
         "_": "1626075887768",
     }
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = range(1, len(temp_df) + 1)
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
         "排名",
         "最新价",
@@ -451,9 +445,9 @@ def stock_board_concept_cons_em(symbol: str = "融资融券") -> pd.DataFrame:
     url = "https://29.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -463,11 +457,7 @@ def stock_board_concept_cons_em(symbol: str = "融资融券") -> pd.DataFrame:
         "f24,f25,f22,f11,f62,f128,f136,f115,f152,f45",
         "_": "1626081702127",
     }
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = range(1, len(temp_df) + 1)
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
         "序号",
         "_",

akshare/stock/stock_intraday_em.py

@@ -1,91 +1,17 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2025/2/24 18:00
+Date: 2025/3/10 18:00
 Desc: 东财财富-日内分时数据
 https://quote.eastmoney.com/f1.html?newcode=0.000001
 """
 
 import json
-from functools import lru_cache
 
 import pandas as pd
 import requests
 
 
-@lru_cache()
-def __code_id_map_em() -> dict:
-    """
-    东方财富-股票和市场代码
-    https://quote.eastmoney.com/center/gridlist.html#hs_a_board
-    :return: 股票和市场代码
-    :rtype: dict
-    """
-    url = "https://80.push2.eastmoney.com/api/qt/clist/get"
-    params = {
-        "pn": "1",
-        "pz": "50000",
-        "po": "1",
-        "np": "2",
-        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
-        "fltt": "2",
-        "invt": "2",
-        "fid": "f3",
-        "fs": "m:1 t:2,m:1 t:23",
-        "fields": "f12",
-        "_": "1623833739532",
-    }
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return dict()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
-    temp_df["market_id"] = 1
-    temp_df.columns = ["sh_code", "sh_id"]
-    code_id_dict = dict(zip(temp_df["sh_code"], temp_df["sh_id"]))
-    params = {
-        "pn": "1",
-        "pz": "50000",
-        "po": "1",
-        "np": "2",
-        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
-        "fltt": "2",
-        "invt": "2",
-        "fid": "f3",
-        "fs": "m:0 t:6,m:0 t:80",
-        "fields": "f12",
-        "_": "1623833739532",
-    }
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return dict()
-    temp_df_sz = pd.DataFrame(data_json["data"]["diff"]).T
-    temp_df_sz["sz_id"] = 0
-    code_id_dict.update(dict(zip(temp_df_sz["f12"], temp_df_sz["sz_id"])))
-    params = {
-        "pn": "1",
-        "pz": "50000",
-        "po": "1",
-        "np": "2",
-        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
-        "fltt": "2",
-        "invt": "2",
-        "fid": "f3",
-        "fs": "m:0 t:81 s:2048",
-        "fields": "f12",
-        "_": "1623833739532",
-    }
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return dict()
-    temp_df_sz = pd.DataFrame(data_json["data"]["diff"]).T
-    temp_df_sz["bj_id"] = 0
-    code_id_dict.update(dict(zip(temp_df_sz["f12"], temp_df_sz["bj_id"])))
-    return code_id_dict
-
-
 def __event_stream(url, params):
     # 使用 stream=True 参数来启用流式请求
     response = requests.get(url, params=params, stream=True)
@@ -102,14 +28,14 @@ def __event_stream(url, params):
 
 def stock_intraday_em(symbol: str = "000001") -> pd.DataFrame:
     """
-    东财财富-分时数据
+    东方财富-分时数据
     https://quote.eastmoney.com/f1.html?newcode=0.000001
     :param symbol: 股票代码
     :type symbol: str
     :return: 分时数据
     :rtype: pandas.DataFrame
     """
-    code_id_map_em_dict = __code_id_map_em()
+    market_code = 1 if symbol.startswith("6") else 0
     url = "https://70.push2.eastmoney.com/api/qt/stock/details/sse"
     params = {
         "fields1": "f1,f2,f3,f4",
@@ -118,7 +44,7 @@ def stock_intraday_em(symbol: str = "000001") -> pd.DataFrame:
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "pos": "-0",
-        "secid": f"{code_id_map_em_dict[symbol]}.{symbol}",
+        "secid": f"{market_code}.{symbol}",
         "wbp2u": "|0|0|0|web",
     }
 

akshare/stock_feature/stock_hist_em.py

@@ -1,16 +1,15 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2025/3/9 18:00
+Date: 2025/3/10 18:00
 Desc: 东方财富网-行情首页-沪深京 A 股
 https://quote.eastmoney.com/
 """
 
-import math
-
 import pandas as pd
 import requests
-from akshare.utils.tqdm import get_tqdm
+
+from akshare.utils.func import fetch_paginated_data
 
 
 def stock_zh_a_spot_em() -> pd.DataFrame:
@@ -23,7 +22,7 @@ def stock_zh_a_spot_em() -> pd.DataFrame:
     url = "https://82.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "200",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
@@ -35,23 +34,9 @@ def stock_zh_a_spot_em() -> pd.DataFrame:
         "f20,f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
         "_": "1623833739532",
     }
-    r = requests.get(url, params=params, timeout=15)
-    data_json = r.json()
-    total_page = math.ceil(data_json["data"]["total"] / 200)
-    temp_list = []
-    tqdm = get_tqdm()
-    for page in tqdm(range(1, total_page + 1), leave=False):
-        params.update(
-            {
-                "pn": page,
-            }
-        )
-        r = requests.get(url, params=params, timeout=15)
-        data_json = r.json()
-        inner_temp_df = pd.DataFrame(data_json["data"]["diff"])
-        temp_list.append(inner_temp_df)
-    temp_df = pd.concat(temp_list, ignore_index=True)
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "index",
         "_",
         "最新价",
         "涨跌幅",
@@ -84,8 +69,6 @@ def stock_zh_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
     temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
@@ -149,24 +132,21 @@ def stock_sh_a_spot_em() -> pd.DataFrame:
     url = "https://82.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:1 t:2,m:1 t:23",
         "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,f23,"
         "f24,f25,f22,f11,f62,f128,f136,f115,f152",
         "_": "1623833739532",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -199,9 +179,6 @@ def stock_sh_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -264,9 +241,9 @@ def stock_sz_a_spot_em() -> pd.DataFrame:
     url = "https://82.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -276,12 +253,9 @@ def stock_sz_a_spot_em() -> pd.DataFrame:
         "f25,f22,f11,f62,f128,f136,f115,f152",
         "_": "1623833739532",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -314,9 +288,6 @@ def stock_sz_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -379,9 +350,9 @@ def stock_bj_a_spot_em() -> pd.DataFrame:
     url = "https://82.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -391,12 +362,9 @@ def stock_bj_a_spot_em() -> pd.DataFrame:
         ",f25,f22,f11,f62,f128,f136,f115,f152",
         "_": "1623833739532",
     }
-    r = requests.get(url, params=params, timeout=15)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -429,9 +397,6 @@ def stock_bj_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -494,9 +459,9 @@ def stock_new_a_spot_em() -> pd.DataFrame:
     url = "https://82.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -507,12 +472,9 @@ def stock_new_a_spot_em() -> pd.DataFrame:
         "f25,f26,f22,f11,f62,f128,f136,f115,f152",
         "_": "1623833739532",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -546,9 +508,6 @@ def stock_new_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -614,9 +573,9 @@ def stock_cy_a_spot_em() -> pd.DataFrame:
     url = "https://7.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -627,12 +586,9 @@ def stock_cy_a_spot_em() -> pd.DataFrame:
         "f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
         "_": "1623833739532",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -665,9 +621,6 @@ def stock_cy_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -730,9 +683,9 @@ def stock_kc_a_spot_em() -> pd.DataFrame:
     url = "https://7.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -743,12 +696,9 @@ def stock_kc_a_spot_em() -> pd.DataFrame:
         "f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
         "_": "1623833739532",
     }
-    r = requests.get(url, params=params, timeout=15)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -781,9 +731,6 @@ def stock_kc_a_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -846,9 +793,9 @@ def stock_zh_b_spot_em() -> pd.DataFrame:
     url = "https://28.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -858,12 +805,9 @@ def stock_zh_b_spot_em() -> pd.DataFrame:
         ",f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
         "_": "1623833739532",
     }
-    r = requests.get(url, params=params, timeout=15)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -896,9 +840,6 @@ def stock_zh_b_spot_em() -> pd.DataFrame:
         "-",
         "-",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -1239,9 +1180,9 @@ def stock_hk_spot_em() -> pd.DataFrame:
     url = "https://72.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -1251,12 +1192,9 @@ def stock_hk_spot_em() -> pd.DataFrame:
         "f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
         "_": "1624010056945",
     }
-    r = requests.get(url, timeout=15, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -1289,9 +1227,6 @@ def stock_hk_spot_em() -> pd.DataFrame:
         "_",
         "_",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -1331,9 +1266,9 @@ def stock_hk_main_board_spot_em() -> pd.DataFrame:
     url = "https://81.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -1343,10 +1278,9 @@ def stock_hk_main_board_spot_em() -> pd.DataFrame:
         "f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152",
         "_": "1624010056945",
     }
-    r = requests.get(url, params=params, timeout=15)
-    data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -1379,9 +1313,6 @@ def stock_hk_main_board_spot_em() -> pd.DataFrame:
         "_",
         "_",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = temp_df.index + 1
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df = temp_df[
         [
             "序号",
@@ -1624,9 +1555,9 @@ def stock_us_spot_em() -> pd.DataFrame:
     url = "https://72.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "100",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -1636,12 +1567,9 @@ def stock_us_spot_em() -> pd.DataFrame:
         "f21,f23,f24,f25,f26,f22,f33,f11,f62,f128,f136,f115,f152",
         "_": "1624010056945",
     }
-    r = requests.get(url, params=params, timeout=15)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    temp_df = fetch_paginated_data(url, params)
     temp_df.columns = [
+        "序号",
         "_",
         "最新价",
         "涨跌幅",
@@ -1676,9 +1604,6 @@ def stock_us_spot_em() -> pd.DataFrame:
         "_",
         "_",
     ]
-    temp_df.reset_index(inplace=True)
-    temp_df["index"] = range(1, len(temp_df) + 1)
-    temp_df.rename(columns={"index": "序号"}, inplace=True)
     temp_df["代码"] = temp_df["编码"].astype(str) + "." + temp_df["简称"]
     temp_df = temp_df[
         [

akshare/utils/func.py

@@ -1,12 +1,59 @@
 # !/usr/bin/env python
 """
-Date: 2024/4/7 15:30
+Date: 2025/3/10 18:00
 Desc: 通用帮助函数
 """
 
-from typing import List
+import math
+from typing import List, Dict
 
 import pandas as pd
+import requests
+
+from akshare.utils.tqdm import get_tqdm
+
+
+def fetch_paginated_data(url: str, base_params: Dict, timeout: int = 15):
+    """
+    东方财富-分页获取数据并合并结果
+    https://quote.eastmoney.com/f1.html?newcode=0.000001
+    :param url: 股票代码
+    :type url: str
+    :param base_params: 基础请求参数
+    :type base_params: dict
+    :param timeout: 请求超时时间
+    :type timeout: str
+    :return: 合并后的数据
+    :rtype: pandas.DataFrame
+    """
+    # 复制参数以避免修改原始参数
+    params = base_params.copy()
+    # 获取第一页数据，用于确定分页信息
+    r = requests.get(url, params=params, timeout=timeout)
+    data_json = r.json()
+    # 计算分页信息
+    per_page_num = len(data_json["data"]["diff"])
+    total_page = math.ceil(data_json["data"]["total"] / per_page_num)
+    # 存储所有页面数据
+    temp_list = []
+    # 添加第一页数据
+    temp_list.append(pd.DataFrame(data_json["data"]["diff"]))
+    # 获取进度条
+    tqdm = get_tqdm()
+    # 获取剩余页面数据
+    for page in tqdm(range(2, total_page + 1), leave=False):
+        params.update({"pn": page})
+        r = requests.get(url, params=params, timeout=timeout)
+        data_json = r.json()
+        inner_temp_df = pd.DataFrame(data_json["data"]["diff"])
+        temp_list.append(inner_temp_df)
+    # 合并所有数据
+    temp_df = pd.concat(temp_list, ignore_index=True)
+    temp_df["f3"] = pd.to_numeric(temp_df["f3"], errors="coerce")
+    temp_df.sort_values(by=["f3"], ascending=False, inplace=True, ignore_index=True)
+    temp_df.reset_index(inplace=True)
+    temp_df["index"] = temp_df["index"].astype(int) + 1
+    return temp_df
 
 
 def set_df_columns(df: pd.DataFrame, cols: List[str]) -> pd.DataFrame:

{akshare-1.16.35.dist-info → akshare-1.16.37.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=vAG55v1T8N_eCiPJG-o7jIrXQtUZpcwbcqVeE4tEZ9M,190342
+akshare/__init__.py,sha256=diiFL-n_yvjQPu7e9YeRy0_N1BP1cQwp8RLJ86xIojc,190442
 akshare/datasets.py,sha256=rKuRNZrqi6IMsZ9nyvO3Rx02js0tH3zMLjz8HQNAoPQ,963
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -172,7 +172,7 @@ akshare/index/index_research_sw.py,sha256=Mm1YtiP-PXhDysJwmFidX3RZSZZ92AyXpjl_tV
 akshare/index/index_spot.py,sha256=meTBTCp2DPVTX_N3qpCLtkI-0q3XhrJ3gndNugRBGKg,1767
 akshare/index/index_stock_hk.py,sha256=eCtL477XlLpbOvBRWG_ooDlFV4kFRk8na0k2r_rr_GU,9795
 akshare/index/index_stock_us_sina.py,sha256=IxOk4G49oasv7EfEQenL9-GLuelyUus6c4JPyRlaOzY,1551
-akshare/index/index_stock_zh.py,sha256=T79qIxZbRub4yprZ5ukEllWqfj-WV2Zkx4i7KyEwGjE,17860
+akshare/index/index_stock_zh.py,sha256=P0kO15gezzmvSrZrhZRzUlh40Vb7NnE0ePTNuqhUAPQ,17739
 akshare/index/index_stock_zh_csindex.py,sha256=sRVoDD-fitqAMuDs0XPm1oCz2nZ2QTkvNswL1WvXpwo,4164
 akshare/index/index_sugar.py,sha256=B_Nj9Q6JP-Y_d7myZ0C79izTxxrbuZIp1Vv_CilVMOc,5006
 akshare/index/index_sw.py,sha256=hETMmFszQb7JDY8UHjLK8szfwkr7Ui_6QcseOoEfxaI,10456
@@ -236,7 +236,7 @@ akshare/stock/__init__.py,sha256=jSa9260d6aNZajaW68chI2mpPkDSXLOgi3eXrqo4MQ8,82
 akshare/stock/cons.py,sha256=0oyUW5Pu-iQ3qgh-TFemM_O5f1fAwVe-PsI4Qa8EYpQ,42956
 akshare/stock/stock_allotment_cninfo.py,sha256=OVjVdWp2XVRNbJvVgtgVVoBmPBJgBB4RyIIgA_9QHM8,6066
 akshare/stock/stock_ask_bid_em.py,sha256=bo7VNkp1PmK4Z-GPZuVn_I-IAdzeW8cs3W_75KodxCg,3368
-akshare/stock/stock_board_concept_em.py,sha256=-ZzrpRCpoiTdOy_yeLtkGEHP_wjKBmKiR5l_EfDhLzg,18554
+akshare/stock/stock_board_concept_em.py,sha256=9gf-hhb9-s-iOnPD7mlBSAf8_XYbyB-ly1Z8eg5CBGc,18116
 akshare/stock/stock_board_industry_em.py,sha256=Whqgve1JrghcKuaC2F80Vt-z-9oSxQW66GIZwMM0QG8,19170
 akshare/stock/stock_cg_equity_mortgage.py,sha256=Pui5aWKKPwGuKjF_GNpejDzsMGNPrxiaJviLz3x2e9I,3426
 akshare/stock/stock_cg_guarantee.py,sha256=ts7qcQhhyN1PHB7Q4XlMn38HhfVvubOvky9RZfmUP94,3844
@@ -263,7 +263,7 @@ akshare/stock/stock_industry_pe_cninfo.py,sha256=0OjjsFGG90zJRZEBqaCsjKSpSAgrp3P
 akshare/stock/stock_industry_sw.py,sha256=C0FjDg976EA0EksRS3sChbmJOZmOPEOzKCrHVs2YqTg,1441
 akshare/stock/stock_info.py,sha256=AqzLzsTlYTSExBtyrZZBjI-D-VROj9e7Sq37WKHJ7XQ,16314
 akshare/stock/stock_info_em.py,sha256=9dxvIeRmvfN-1blwivCT5gGWBsOyLQljHEW5TAG0qsU,2559
-akshare/stock/stock_intraday_em.py,sha256=s3gAzG0-6gYj407WePpoNXVyKUZB-siOOw1xZbBYIF4,4538
+akshare/stock/stock_intraday_em.py,sha256=lKa33VVH9OPisYvUnfib-lmaGzl_iM12uyKUwRERDZE,2391
 akshare/stock/stock_intraday_sina.py,sha256=7LzXRwjdPo-BHwvs8244-MFiGriPUCFBJqRW-r9iVB4,2359
 akshare/stock/stock_ipo_summary_cninfo.py,sha256=Ma-54GsOOhRWxilLH-Qmm0VVbpJQGf2XWKaJ8NBSgAY,3847
 akshare/stock/stock_new_cninfo.py,sha256=EOuZowDLQSSHyPAwXcuPXbQkqhbz2nRBZsM7o2ZWILE,5725
@@ -318,7 +318,7 @@ akshare/stock_feature/stock_gdhs.py,sha256=Z6ZMy1A03BqMu9TghcIu2Sd_wwEtpIH7qawHu
 akshare/stock_feature/stock_gdzjc_em.py,sha256=SHJH5iS3_NhvjTqRXF0vPooZl0s_ASeyZmNCC50ZYqs,4426
 akshare/stock_feature/stock_gpzy_em.py,sha256=FgyjVgdoxrtMM7WwxdQJxK0mYGJklIHaT9KmMCFmEPM,17869
 akshare/stock_feature/stock_gxl_lg.py,sha256=I8TpDEpFzadZSSyZisyIk6163mJlRxup91dmlBH4t4U,2641
-akshare/stock_feature/stock_hist_em.py,sha256=8tR__dts03shNuxBGmEYmotOuVfAQpvUnzT2-m6shA4,67558
+akshare/stock_feature/stock_hist_em.py,sha256=vC3gWA1hTgWdwk4VFfk6HOwfWuzlYO2xa5vZg5hi088,64241
 akshare/stock_feature/stock_hist_tx.py,sha256=WpLsbkG2didSx7lYNkSbTWNTrLhUKbcopfD18WO2Rlc,3397
 akshare/stock_feature/stock_hk_valuation_baidu.py,sha256=_sErx4UhNsSXJgXyPfrL0aPxkW53Mg1zH9gEKoziaCA,1968
 akshare/stock_feature/stock_hot_xq.py,sha256=NmoH4x-0hiDztj-YwzMFVIyOICQ2wUUBbhjt91q-tq4,9112
@@ -383,13 +383,13 @@ akshare/utils/__init__.py,sha256=HbKUP2vZApbeK2PTZVO_m-6kAUymfDwm2yv3Kr4R_1A,81
 akshare/utils/cons.py,sha256=PFZndkG3lMW1Qhg-wqcZmSowFXwQUsYYCLZT4s1Xkwc,225
 akshare/utils/context.py,sha256=Hl4kPUzQ1CecRzu5JvTKpTpiMLfzAzYzG7F5hktlsCQ,934
 akshare/utils/demjson.py,sha256=xW2z0UGS2zzyH_dzhd765ZveuXRbfjkM7KBiI8H5fJA,241609
-akshare/utils/func.py,sha256=PDkwpyCjZCbCLSAG9wBQt-sYNtb1XlpUBvhAfuSLf3s,586
+akshare/utils/func.py,sha256=4cwmXFztU86yJNONJ40KJLvsIEQHBbct4iMm3zT2v30,2315
 akshare/utils/token_process.py,sha256=K4rGXjh_tgugbRcyOK2h2x0jP3PT65IIK7nxhUKhOeQ,666
 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.35.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.16.35.dist-info/METADATA,sha256=9e0Iq61KfT8dieIOQTPKWjvnebu4fnngqBOcEK__FDQ,13653
-akshare-1.16.35.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-akshare-1.16.35.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.16.35.dist-info/RECORD,,
+akshare-1.16.37.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.16.37.dist-info/METADATA,sha256=_VOPPo7anGG8O2U16g8i4mcT9gly7TNG_TY5z9D9h2E,13653
+akshare-1.16.37.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+akshare-1.16.37.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.16.37.dist-info/RECORD,,