akshare 1.15.96__tar.gz → 1.15.98__tar.gz

{akshare-1.15.96 → akshare-1.15.98}/PKG-INFO

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

@@ -3006,9 +3006,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.94 fix: fix stock_zh_index_spot_em interface
 1.15.95 fix: fix stock_us_spot_em interface
 1.15.96 fix: fix bond_cov_comparison interface
+1.15.97 fix: fix stock_intraday_em interface
+1.15.98 fix: fix stock_board_concept_name_em interface
 """
 
-__version__ = "1.15.96"
+__version__ = "1.15.98"
 __author__ = "AKFamily"
 
 import sys

{akshare-1.15.96 → akshare-1.15.98}/akshare/fund/fund_etf_em.py

@@ -73,7 +73,7 @@ def fund_etf_spot_em() -> pd.DataFrame:
         "fltt": "2",
         "invt": "2",
         "wbp2u": "|0|0|0|web",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "b:MK0021,b:MK0022,b:MK0023,b:MK0024,b:MK0827",
         "fields": (
             "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,"

{akshare-1.15.96 → akshare-1.15.98}/akshare/index/index_stock_zh.py

@@ -247,7 +247,7 @@ def stock_zh_index_spot_em(symbol: str = "沪深重要指数") -> pd.DataFrame:
         "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",

{akshare-1.15.96 → akshare-1.15.98}/akshare/index/index_zh_em.py

@@ -31,7 +31,7 @@ def index_code_id_map_em() -> dict:
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:1 t:2,m:1 t:23",
         "fields": "f12",
         "_": "1623833739532",
@@ -63,7 +63,7 @@ def index_code_id_map_em() -> dict:
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:0 t:6,m:0 t:80",
         "fields": "f12",
         "_": "1623833739532",
@@ -95,7 +95,7 @@ def index_code_id_map_em() -> dict:
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:0 t:81 s:2048",
         "fields": "f12",
         "_": "1623833739532",
@@ -478,7 +478,7 @@ if __name__ == "__main__":
 
     index_zh_a_hist_min_em_df = index_zh_a_hist_min_em(
         symbol="000001",
-        period="15",
+        period="5",
         start_date="2025-02-14 09:30:00",
         end_date="2025-02-14 19:00:00",
     )

{akshare-1.15.96 → akshare-1.15.98}/akshare/stock/stock_board_concept_em.py

@@ -1,15 +1,21 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/6/29 17:13
+Date: 2025/2/17 14:10
 Desc: 东方财富-沪深板块-概念板块
 https://quote.eastmoney.com/center/boardlist.html#concept_board
 """
 
-import requests
+import math
+from functools import lru_cache
+
 import pandas as pd
+import requests
 
+from akshare.utils.tqdm import get_tqdm
 
+
+@lru_cache()
 def stock_board_concept_name_em() -> pd.DataFrame:
     """
     东方财富网-行情中心-沪深京板块-概念板块-名称
@@ -20,20 +26,33 @@ def stock_board_concept_name_em() -> pd.DataFrame:
     url = "https://79.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "2000",
+        "pz": "200",
         "po": "1",
         "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"])
+    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)
     temp_df.columns = [
@@ -311,7 +330,7 @@ def stock_board_concept_cons_em(symbol: str = "融资融券") -> pd.DataFrame:
     url = "https://29.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "5000",
+        "pz": "200",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
@@ -325,7 +344,20 @@ def stock_board_concept_cons_em(symbol: str = "融资融券") -> pd.DataFrame:
     }
     r = requests.get(url, params=params)
     data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    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)
     temp_df.columns = [

{akshare-1.15.96 → akshare-1.15.98}/akshare/stock/stock_fund_em.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/3/25 12:30
+Date: 2025/2/17 14:30
 Desc: 东方财富网-数据中心-资金流向
 https://data.eastmoney.com/zjlx/detail.html
 """
@@ -654,7 +654,7 @@ def _get_stock_sector_fund_flow_summary_code() -> dict:
         "pn": "1",
         "pz": "5000",
         "po": "1",
-        "np": "1",
+        "np": "2",
         "ut": "b2884a393a59ad64002292a3e90d46a5",
         "fltt": "2",
         "invt": "2",
@@ -667,7 +667,7 @@ def _get_stock_sector_fund_flow_summary_code() -> dict:
     }
     r = requests.get(url, params=params, headers=headers)
     data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
     name_code_map = dict(zip(temp_df["f14"], temp_df["f12"]))
     return name_code_map
 
@@ -1061,7 +1061,7 @@ def _get_stock_concept_fund_flow_summary_code() -> dict:
         "pn": "1",
         "pz": "5000",
         "po": "1",
-        "np": "1",
+        "np": "2",
         "fields": "f12,f13,f14,f62",
         "fid": "f62",
         "fs": "m:90+t:3",
@@ -1070,7 +1070,7 @@ def _get_stock_concept_fund_flow_summary_code() -> dict:
     }
     r = requests.get(url, params=params, headers=headers)
     data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
     name_code_map = dict(zip(temp_df["f14"], temp_df["f12"]))
     return name_code_map
 
@@ -1332,7 +1332,7 @@ if __name__ == "__main__":
     stock_sector_fund_flow_hist_df = stock_sector_fund_flow_hist(symbol="电源设备")
     print(stock_sector_fund_flow_hist_df)
 
-    stock_concept_fund_flow_hist_df = stock_concept_fund_flow_hist(symbol="锂电池")
+    stock_concept_fund_flow_hist_df = stock_concept_fund_flow_hist(symbol="电源设备")
     print(stock_concept_fund_flow_hist_df)
 
     stock_main_fund_flow_df = stock_main_fund_flow(symbol="全部股票")

{akshare-1.15.96 → akshare-1.15.98}/akshare/stock/stock_intraday_em.py

@@ -1,17 +1,20 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/10/14 22:00
+Date: 2025/2/17 14:00
 Desc: 东财财富-日内分时数据
 https://quote.eastmoney.com/f1.html?newcode=0.000001
 """
 
 import json
+import math
 from functools import lru_cache
 
 import pandas as pd
 import requests
 
+from akshare.utils.tqdm import get_tqdm
+
 
 @lru_cache()
 def __code_id_map_em() -> dict:
@@ -24,13 +27,13 @@ def __code_id_map_em() -> dict:
     url = "http://80.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "200",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:1 t:2,m:1 t:23",
         "fields": "f12",
         "_": "1623833739532",
@@ -39,19 +42,32 @@ def __code_id_map_em() -> dict:
     data_json = r.json()
     if not data_json["data"]["diff"]:
         return dict()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    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["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",
+        "pz": "200",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:0 t:6,m:0 t:80",
         "fields": "f12",
         "_": "1623833739532",
@@ -60,18 +76,31 @@ def __code_id_map_em() -> dict:
     data_json = r.json()
     if not data_json["data"]["diff"]:
         return dict()
-    temp_df_sz = pd.DataFrame(data_json["data"]["diff"])
+    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_sz = pd.concat(temp_list, ignore_index=True)
     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",
+        "pz": "200",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": "m:0 t:81 s:2048",
         "fields": "f12",
         "_": "1623833739532",
@@ -80,7 +109,20 @@ def __code_id_map_em() -> dict:
     data_json = r.json()
     if not data_json["data"]["diff"]:
         return dict()
-    temp_df_sz = pd.DataFrame(data_json["data"]["diff"])
+    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_sz = pd.concat(temp_list, ignore_index=True)
     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
@@ -121,9 +163,7 @@ def stock_intraday_em(symbol: str = "000001") -> pd.DataFrame:
         "secid": f"{code_id_map_em_dict[symbol]}.{symbol}",
         "wbp2u": "|0|0|0|web",
     }
-
     big_df = pd.DataFrame()  # 创建一个空的 DataFrame
-
     for event in __event_stream(url, params):
         # 从每个事件的数据行中删除 "data: "，然后解析 JSON
         event_json = json.loads(event.replace("data: ", ""))