akshare 1.16.32__tar.gz → 1.16.34__tar.gz

{akshare-1.16.32 → akshare-1.16.34}/PKG-INFO

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

@@ -3041,9 +3041,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.16.30 add: add forex_hist_em interface
 1.16.31 add: add index_global_hist_em interface
 1.16.32 fix: fix news_economic_baidu interface
+1.16.33 fix: fix fund_open_fund_daily_em interface
+1.16.34 fix: fix stock_individual_fund_flow_rank interface
 """
 
-__version__ = "1.16.32"
+__version__ = "1.16.34"
 __author__ = "AKFamily"
 
 import sys

{akshare-1.16.32 → akshare-1.16.34}/akshare/fund/fund_em.py

@@ -282,7 +282,7 @@ def fund_open_fund_daily_em() -> pd.DataFrame:
         "gsid": "",
         "text": "",
         "sort": "zdf,desc",
-        "page": "1,20000",
+        "page": "1,50000",
         "dt": "1580914040623",
         "atfc": "",
         "onlySale": "0",

{akshare-1.16.32 → akshare-1.16.34}/akshare/stock/stock_ask_bid_em.py

@@ -9,8 +9,6 @@ https://quote.eastmoney.com/sz000001.html
 import pandas as pd
 import requests
 
-from akshare.stock_feature.stock_hist_em import code_id_map_em
-
 
 def stock_bid_ask_em(symbol: str = "000001") -> pd.DataFrame:
     """
@@ -22,7 +20,7 @@ def stock_bid_ask_em(symbol: str = "000001") -> pd.DataFrame:
     :rtype: pandas.DataFrame
     """
     url = "https://push2.eastmoney.com/api/qt/stock/get"
-    code_id_map_em_dict = code_id_map_em()
+    market_code = 1 if symbol.startswith("6") else 0
     params = {
         "fltt": "2",
         "invt": "2",
@@ -34,7 +32,7 @@ def stock_bid_ask_em(symbol: str = "000001") -> pd.DataFrame:
         "f268,f255,f256,f257,f258,f127,f199,f128,f198,f259,f260,f261,f171,f277,f278,"
         "f279,f288,f152,f250,f251,f252,f253,f254,f269,f270,f271,f272,f273,f274,f275,"
         "f276,f265,f266,f289,f290,f286,f285,f292,f293,f294,f295",
-        "secid": f"{code_id_map_em_dict[symbol]}.{symbol}",
+        "secid": f"{market_code}.{symbol}",
     }
     r = requests.get(url, params=params)
     data_json = r.json()

{akshare-1.16.32 → akshare-1.16.34}/akshare/stock/stock_fund_em.py

@@ -1,17 +1,18 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2025/2/17 14:30
+Date: 2025/3/9 19:00
 Desc: 东方财富网-数据中心-资金流向
 https://data.eastmoney.com/zjlx/detail.html
 """
 
-import json
+import math
 import time
 from functools import lru_cache
 
 import pandas as pd
 import requests
+from akshare.utils.tqdm import get_tqdm
 
 
 def stock_individual_fund_flow(
@@ -43,8 +44,8 @@ def stock_individual_fund_flow(
         "_": int(time.time() * 1000),
     }
     r = requests.get(url, params=params, headers=headers)
-    json_data = r.json()
-    content_list = json_data["data"]["klines"]
+    data_json = r.json()
+    content_list = data_json["data"]["klines"]
     temp_df = pd.DataFrame([item.split(",") for item in content_list])
     temp_df.columns = [
         "日期",
@@ -147,9 +148,9 @@ def stock_individual_fund_flow_rank(indicator: str = "5日") -> pd.DataFrame:
     params = {
         "fid": indicator_map[indicator][0],
         "po": "1",
-        "pz": "50000",
+        "pz": "200",
         "pn": "1",
-        "np": "2",
+        "np": "1",
         "fltt": "2",
         "invt": "2",
         "ut": "b2884a393a59ad64002292a3e90d46a5",
@@ -158,7 +159,20 @@ def stock_individual_fund_flow_rank(indicator: str = "5日") -> pd.DataFrame:
     }
     r = requests.get(url, params=params)
     data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    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.reset_index(inplace=True)
     temp_df["index"] = range(1, len(temp_df) + 1)
     if indicator == "今日":
@@ -348,13 +362,11 @@ def stock_market_fund_flow() -> pd.DataFrame:
         "fields1": "f1,f2,f3,f7",
         "fields2": "f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61,f62,f63,f64,f65",
         "ut": "b2884a393a59ad64002292a3e90d46a5",
-        "cb": "jQuery183003743205523325188_1589197499471",
         "_": int(time.time() * 1000),
     }
     r = requests.get(url, params=params, headers=headers)
-    text_data = r.text
-    json_data = json.loads(text_data[text_data.find("{") : -2])
-    content_list = json_data["data"]["klines"]
+    data_json = r.json()
+    content_list = data_json["data"]["klines"]
     temp_df = pd.DataFrame([item.split(",") for item in content_list])
     temp_df.columns = [
         "日期",
@@ -468,9 +480,9 @@ def stock_sector_fund_flow_rank(
     }
     params = {
         "pn": "1",
-        "pz": "5000",
+        "pz": "200",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "b2884a393a59ad64002292a3e90d46a5",
         "fltt": "2",
         "invt": "2",
@@ -479,13 +491,25 @@ def stock_sector_fund_flow_rank(
         "stat": indicator_map[indicator][1],
         "fields": indicator_map[indicator][2],
         "rt": "52975239",
-        "cb": "jQuery18308357908311220152_1589256588824",
         "_": int(time.time() * 1000),
     }
     r = requests.get(url, params=params, headers=headers)
-    data_text = r.text
-    data_json = json.loads(data_text[data_text.find("{") : -2])
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    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)
+
     if indicator == "今日":
         temp_df.columns = [
             "-",

{akshare-1.16.32 → akshare-1.16.34}/akshare/stock/stock_info_em.py

@@ -9,8 +9,6 @@ https://quote.eastmoney.com/concept/sh603777.html?from=classic
 import pandas as pd
 import requests
 
-from akshare.stock_feature.stock_hist_em import code_id_map_em
-
 
 def stock_individual_info_em(
     symbol: str = "603777", timeout: float = None
@@ -25,8 +23,8 @@ def stock_individual_info_em(
     :return: 股票信息
     :rtype: pandas.DataFrame
     """
-    code_id_dict = code_id_map_em()
     url = "https://push2.eastmoney.com/api/qt/stock/get"
+    market_code = 1 if symbol.startswith("6") else 0
     params = {
         "ut": "fa5fd1943c7b386f172d6893dbfba10b",
         "fltt": "2",
@@ -38,7 +36,7 @@ def stock_individual_info_em(
         "f110,f262,f263,f264,f267,f268,f255,f256,f257,f258,f127,f199,f128,f198,f259,f260,f261,"
         "f171,f277,f278,f279,f288,f152,f250,f251,f252,f253,f254,f269,f270,f271,f272,f273,f274,"
         "f275,f276,f265,f266,f289,f290,f286,f285,f292,f293,f294,f295",
-        "secid": f"{code_id_dict[symbol]}.{symbol}",
+        "secid": f"{market_code}.{symbol}",
         "_": "1640157544804",
     }
     r = requests.get(url, params=params, timeout=timeout)

{akshare-1.16.32 → akshare-1.16.34}/akshare/stock_feature/stock_cyq_em.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/4/4 19:00
+Date: 2025/3/9 18:30
 Desc: 东方财富网-概念板-行情中心-日K-筹码分布
 https://quote.eastmoney.com/concept/sz000001.html
 """
@@ -13,8 +13,6 @@ import pandas as pd
 import requests
 import py_mini_racer
 
-from akshare.stock_feature.stock_hist_em import code_id_map_em
-
 
 def stock_cyq_em(symbol: str = "000001", adjust: str = "") -> pd.DataFrame:
     """
@@ -222,10 +220,10 @@ def stock_cyq_em(symbol: str = "000001", adjust: str = "") -> pd.DataFrame:
     js_code = py_mini_racer.MiniRacer()
     js_code.eval(html_str)
     adjust_dict = {"qfq": "1", "hfq": "2", "": "0"}
-    code_id_dict = code_id_map_em()
+    market_code = 1 if symbol.startswith("6") else 0
     url = "https://push2his.eastmoney.com/api/qt/stock/kline/get"
     params = {
-        "secid": f"{code_id_dict[symbol]}.{symbol}",
+        "secid": f"{market_code}.{symbol}",
         "ut": "fa5fd1943c7b386f172d6893dbfba10b",
         "fields1": "f1,f2,f3,f4,f5,f6",
         "fields2": "f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61",

{akshare-1.16.32 → akshare-1.16.34}/akshare/stock_feature/stock_hist_em.py

@@ -1,15 +1,16 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2025/2/17 14:00
+Date: 2025/3/9 18:00
 Desc: 东方财富网-行情首页-沪深京 A 股
 https://quote.eastmoney.com/
 """
 
-from functools import lru_cache
+import math
 
 import pandas as pd
 import requests
+from akshare.utils.tqdm import get_tqdm
 
 
 def stock_zh_a_spot_em() -> pd.DataFrame:
@@ -22,13 +23,13 @@ def stock_zh_a_spot_em() -> pd.DataFrame:
     url = "https://82.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "20000",
+        "pz": "200",
         "po": "1",
-        "np": "2",
+        "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:0 t:6,m:0 t:80,m:1 t:2,m:1 t:23,m:0 t:81 s:2048",
         "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",
@@ -36,7 +37,20 @@ def stock_zh_a_spot_em() -> pd.DataFrame:
     }
     r = requests.get(url, params=params, timeout=15)
     data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
+    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.columns = [
         "_",
         "最新价",
@@ -937,79 +951,6 @@ def stock_zh_b_spot_em() -> pd.DataFrame:
     return temp_df
 
 
-@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, timeout=15)
-    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, timeout=15)
-    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, timeout=15)
-    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 stock_zh_a_hist(
     symbol: str = "000001",
     period: str = "daily",
@@ -1036,7 +977,7 @@ def stock_zh_a_hist(
     :return: 每日行情
     :rtype: pandas.DataFrame
     """
-    code_id_dict = code_id_map_em()
+    market_code = 1 if symbol.startswith("6") else 0
     adjust_dict = {"qfq": "1", "hfq": "2", "": "0"}
     period_dict = {"daily": "101", "weekly": "102", "monthly": "103"}
     url = "https://push2his.eastmoney.com/api/qt/stock/kline/get"
@@ -1046,7 +987,7 @@ def stock_zh_a_hist(
         "ut": "7eea3edcaed734bea9cbfc24409ed989",
         "klt": period_dict[period],
         "fqt": adjust_dict[adjust],
-        "secid": f"{code_id_dict[symbol]}.{symbol}",
+        "secid": f"{market_code}.{symbol}",
         "beg": start_date,
         "end": end_date,
         "_": "1623766962675",
@@ -1124,7 +1065,7 @@ def stock_zh_a_hist_min_em(
     :return: 每日分时行情
     :rtype: pandas.DataFrame
     """
-    code_id_dict = code_id_map_em()
+    market_code = 1 if symbol.startswith("6") else 0
     adjust_map = {
         "": "0",
         "qfq": "1",
@@ -1138,7 +1079,7 @@ def stock_zh_a_hist_min_em(
             "ut": "7eea3edcaed734bea9cbfc24409ed989",
             "ndays": "5",
             "iscr": "0",
-            "secid": f"{code_id_dict[symbol]}.{symbol}",
+            "secid": f"{market_code}.{symbol}",
             "_": "1623766962675",
         }
         r = requests.get(url, timeout=15, params=params)
@@ -1176,7 +1117,7 @@ def stock_zh_a_hist_min_em(
             "ut": "7eea3edcaed734bea9cbfc24409ed989",
             "klt": period,
             "fqt": adjust_map[adjust],
-            "secid": f"{code_id_dict[symbol]}.{symbol}",
+            "secid": f"{market_code}.{symbol}",
             "beg": "0",
             "end": "20500000",
             "_": "1630930917857",
@@ -1248,7 +1189,7 @@ def stock_zh_a_hist_pre_min_em(
     :return: 每日分时行情包含盘前数据
     :rtype: pandas.DataFrame
     """
-    code_id_dict = code_id_map_em()
+    market_code = 1 if symbol.startswith("6") else 0
     url = "https://push2.eastmoney.com/api/qt/stock/trends2/get"
     params = {
         "fields1": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13",
@@ -1257,7 +1198,7 @@ def stock_zh_a_hist_pre_min_em(
         "ndays": "1",
         "iscr": "1",
         "iscca": "0",
-        "secid": f"{code_id_dict[symbol]}.{symbol}",
+        "secid": f"{market_code}.{symbol}",
         "_": "1623766962675",
     }
     r = requests.get(url, timeout=15, params=params)
@@ -1928,9 +1869,6 @@ if __name__ == "__main__":
     stock_zh_b_spot_em_df = stock_zh_b_spot_em()
     print(stock_zh_b_spot_em_df)
 
-    code_id_map_em_df = code_id_map_em()
-    print(code_id_map_em_df)
-
     stock_hk_spot_em_df = stock_hk_spot_em()
     print(stock_hk_spot_em_df)
 
@@ -2008,8 +1946,8 @@ if __name__ == "__main__":
 
     stock_zh_a_hist_min_em_df = stock_zh_a_hist_min_em(
         symbol="300364",
-        start_date="2025-02-14 09:30:00",
-        end_date="2025-02-14 15:00:00",
+        start_date="2025-03-07 09:30:00",
+        end_date="2025-03-07 15:00:00",
         period="5",
         adjust="hfq",
     )
@@ -2028,8 +1966,8 @@ if __name__ == "__main__":
         symbol="01611",
         period="1",
         adjust="",
-        start_date="2024-04-12 09:30:00",
-        end_date="2024-04-12 18:32:00",
+        start_date="2025-03-07 09:30:00",
+        end_date="2025-03-07 18:32:00",
     )
     print(stock_hk_hist_min_em_df)
 

{akshare-1.16.32 → akshare-1.16.34}/akshare.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: akshare
-Version: 1.16.32
+Version: 1.16.34
 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