akshare 1.13.46__py3-none-any.whl → 1.17.99__py3-none-any.whl

akshare/stock/stock_allotment_cninfo.py

@@ -1,13 +1,14 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/6/9 18:11
+Date: 2024/10/22 15:00
 Desc: 巨潮资讯-数据浏览器-筹资指标-公司配股实施方案
-http://webapi.cninfo.com.cn/#/dataBrowse
+https://webapi.cninfo.com.cn/#/dataBrowse
 """
+
 import pandas as pd
+import py_mini_racer
 import requests
-from py_mini_racer import py_mini_racer
 
 from akshare.datasets import get_ths_js
 
@@ -21,7 +22,7 @@ def _get_file_content_cninfo(file: str = "cninfo.js") -> str:
     :rtype: str
     """
     setting_file_path = get_ths_js(file)
-    with open(setting_file_path) as f:
+    with open(setting_file_path, encoding="utf-8") as f:
         file_data = f.read()
     return file_data
 
@@ -31,7 +32,7 @@ def stock_allotment_cninfo(
 ) -> pd.DataFrame:
     """
     巨潮资讯-个股-配股实施方案
-    http://webapi.cninfo.com.cn/#/dataBrowse
+    https://webapi.cninfo.com.cn/#/dataBrowse
     :param symbol: 股票代码
     :type symbol: str
     :param start_date: 开始查询的日期
@@ -41,7 +42,7 @@ def stock_allotment_cninfo(
     :return: 配股实施方案
     :rtype: pandas.DataFrame
     """
-    url = "http://webapi.cninfo.com.cn/api/stock/p_stock2232"
+    url = "https://webapi.cninfo.com.cn/api/stock/p_stock2232"
     params = {
         "scode": symbol,
         "sdate": start_date
@@ -63,10 +64,10 @@ def stock_allotment_cninfo(
         "Cache-Control": "no-cache",
         "Content-Length": "0",
         "Host": "webapi.cninfo.com.cn",
-        "Origin": "http://webapi.cninfo.com.cn",
+        "Origin": "https://webapi.cninfo.com.cn",
         "Pragma": "no-cache",
         "Proxy-Connection": "keep-alive",
-        "Referer": "http://webapi.cninfo.com.cn/",
+        "Referer": "https://webapi.cninfo.com.cn/",
         "X-Requested-With": "XMLHttpRequest",
     }
     r = requests.post(url, params=params, headers=headers)
@@ -191,6 +192,6 @@ def stock_allotment_cninfo(
 
 if __name__ == "__main__":
     stock_allotment_cninfo_df = stock_allotment_cninfo(
-        symbol="600030", start_date="19900101", end_date="20221008"
+        symbol="600030", start_date="19900101", end_date="20241022"
     )
     print(stock_allotment_cninfo_df)

akshare/stock/stock_ask_bid_em.py

@@ -1,90 +1,15 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/3/20 15:00
+Date: 2025/2/16 18:30
 Desc: 东方财富-行情报价
 https://quote.eastmoney.com/sz000001.html
 """
 
-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": "1",
-        "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"])
-    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": "1",
-        "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"])
-    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": "1",
-        "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"])
-    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_bid_ask_em(symbol: str = "000001") -> pd.DataFrame:
     """
     东方财富-行情报价
@@ -95,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",
@@ -107,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/stock/stock_board_concept_em.py

@@ -1,13 +1,98 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/6/29 17:13
+Date: 2025/3/12 17:00
 Desc: 东方财富-沪深板块-概念板块
 https://quote.eastmoney.com/center/boardlist.html#concept_board
 """
 
-import requests
+import re
+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:
+    """
+    东方财富网-行情中心-沪深京板块-概念板块-名称
+    https://quote.eastmoney.com/center/boardlist.html#concept_board
+    :return: 概念板块-名称
+    :rtype: pandas.DataFrame
+    """
+    url = "https://79.push2.eastmoney.com/api/qt/clist/get"
+    params = {
+        "pn": "1",
+        "pz": "100",
+        "po": "1",
+        "np": "1",
+        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
+        "fltt": "2",
+        "invt": "2",
+        "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",
+    }
+    temp_df = fetch_paginated_data(url, params)
+    temp_df.columns = [
+        "排名",
+        "最新价",
+        "涨跌幅",
+        "涨跌额",
+        "换手率",
+        "_",
+        "板块代码",
+        "板块名称",
+        "_",
+        "_",
+        "_",
+        "_",
+        "总市值",
+        "_",
+        "_",
+        "_",
+        "_",
+        "_",
+        "_",
+        "上涨家数",
+        "下跌家数",
+        "_",
+        "_",
+        "领涨股票",
+        "_",
+        "_",
+        "领涨股票-涨跌幅",
+    ]
+    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_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
 
 
 def stock_board_concept_name_em() -> pd.DataFrame:
@@ -20,22 +105,17 @@ def stock_board_concept_name_em() -> pd.DataFrame:
     url = "https://79.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "2000",
+        "pz": "100",
         "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"])
-    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 = [
         "排名",
         "最新价",
@@ -94,8 +174,58 @@ def stock_board_concept_name_em() -> pd.DataFrame:
     return temp_df
 
 
+def stock_board_concept_spot_em(symbol: str = "可燃冰") -> pd.DataFrame:
+    """
+    东方财富网-行情中心-沪深京板块-概念板块-实时行情
+    https://quote.eastmoney.com/bk/90.BK0818.html
+    :param symbol: 概念板块代码
+    :type symbol: str
+    :return: 概念板块-实时行情
+    :rtype: pandas.DataFrame
+    """
+    url = "https://91.push2.eastmoney.com/api/qt/stock/get"
+    field_map = {
+        "f43": "最新",
+        "f44": "最高",
+        "f45": "最低",
+        "f46": "开盘",
+        "f47": "成交量",
+        "f48": "成交额",
+        "f170": "涨跌幅",
+        "f171": "振幅",
+        "f168": "换手率",
+        "f169": "涨跌额",
+    }
+
+    if re.match(pattern=r"^BK\d+", string=symbol):
+        em_code = symbol
+    else:
+        industry_listing = __stock_board_concept_name_em()
+        em_code = industry_listing.query("板块名称 == @symbol")["板块代码"].values[0]
+    params = dict(
+        fields=",".join(field_map.keys()),
+        mpi="1000",
+        invt="2",
+        fltt="1",
+        secid=f"90.{em_code}",
+    )
+    r = requests.get(url, params=params)
+    data_dict = r.json()
+    result = pd.DataFrame.from_dict(data_dict["data"], orient="index")
+    result.rename(field_map, inplace=True)
+    result.reset_index(inplace=True)
+    result.columns = ["item", "value"]
+    result["value"] = pd.to_numeric(result["value"], errors="coerce")
+
+    # 各项转换成正常单位. 除了成交量与成交额, 原始数据中已是正常单位(元)
+    result["value"] = result["value"] * 1e-2
+    result.iloc[4, 1] = result.iloc[4, 1] * 1e2
+    result.iloc[5, 1] = result.iloc[5, 1] * 1e2
+    return result
+
+
 def stock_board_concept_hist_em(
-    symbol: str = "数字货币",
+    symbol: str = "绿色电力",
     period: str = "daily",
     start_date: str = "20220101",
     end_date: str = "20221128",
@@ -122,7 +252,7 @@ def stock_board_concept_hist_em(
         "weekly": "102",
         "monthly": "103",
     }
-    stock_board_concept_em_map = stock_board_concept_name_em()
+    stock_board_concept_em_map = __stock_board_concept_name_em()
     stock_board_code = stock_board_concept_em_map[
         stock_board_concept_em_map["板块名称"] == symbol
     ]["板块代码"].values[0]
@@ -130,7 +260,6 @@ def stock_board_concept_hist_em(
     url = "https://91.push2his.eastmoney.com/api/qt/stock/kline/get"
     params = {
         "secid": f"90.{stock_board_code}",
-        "ut": "fa5fd1943c7b386f172d6893dbfba10b",
         "fields1": "f1,f2,f3,f4,f5,f6",
         "fields2": "f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61",
         "klt": period_map[period],
@@ -139,7 +268,6 @@ def stock_board_concept_hist_em(
         "end": end_date,
         "smplmt": "10000",
         "lmt": "1000000",
-        "_": "1626079488673",
     }
     r = requests.get(url, params=params)
     data_json = r.json()
@@ -198,7 +326,7 @@ def stock_board_concept_hist_min_em(
     :return: 分时历史行情
     :rtype: pandas.DataFrame
     """
-    stock_board_concept_em_map = stock_board_concept_name_em()
+    stock_board_concept_em_map = __stock_board_concept_name_em()
     stock_board_code = stock_board_concept_em_map[
         stock_board_concept_em_map["板块名称"] == symbol
     ]["板块代码"].values[0]
@@ -207,11 +335,9 @@ def stock_board_concept_hist_min_em(
         params = {
             "fields1": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13",
             "fields2": "f51,f52,f53,f54,f55,f56,f57,f58",
-            "ut": "fa5fd1943c7b386f172d6893dbfba10b",
             "iscr": "0",
             "ndays": "1",
             "secid": f"90.{stock_board_code}",
-            "_": "1687852931312",
         }
         r = requests.get(url, params=params)
         data_json = r.json()
@@ -240,14 +366,12 @@ def stock_board_concept_hist_min_em(
         url = "https://91.push2his.eastmoney.com/api/qt/stock/kline/get"
         params = {
             "secid": f"90.{stock_board_code}",
-            "ut": "fa5fd1943c7b386f172d6893dbfba10b",
             "fields1": "f1,f2,f3,f4,f5,f6",
             "fields2": "f51,f52,f53,f54,f55,f56,f57,f58,f59,f60,f61",
             "klt": period,
             "fqt": "1",
             "end": "20500101",
             "lmt": "1000000",
-            "_": "1647760607065",
         }
         r = requests.get(url, params=params)
         data_json = r.json()
@@ -295,39 +419,37 @@ def stock_board_concept_hist_min_em(
         return temp_df
 
 
-def stock_board_concept_cons_em(symbol: str = "车联网") -> pd.DataFrame:
+def stock_board_concept_cons_em(symbol: str = "融资融券") -> pd.DataFrame:
     """
     东方财富-沪深板块-概念板块-板块成份
     https://quote.eastmoney.com/center/boardlist.html#boards-BK06551
-    :param symbol: 板块名称
+    :param symbol: 板块名称或者板块代码
     :type symbol: str
     :return: 板块成份
     :rtype: pandas.DataFrame
     """
-    stock_board_concept_em_map = stock_board_concept_name_em()
-    stock_board_code = stock_board_concept_em_map[
-        stock_board_concept_em_map["板块名称"] == symbol
-    ]["板块代码"].values[0]
+    if re.match(pattern=r"^BK\d+", string=symbol):
+        stock_board_code = symbol
+    else:
+        stock_board_concept_em_map = __stock_board_concept_name_em()
+        stock_board_code = stock_board_concept_em_map[
+            stock_board_concept_em_map["板块名称"] == symbol
+        ]["板块代码"].values[0]
     url = "https://29.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "5000",
+        "pz": "100",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
-        "fid": "f3",
+        "fid": "f12",
         "fs": f"b:{stock_board_code} f:!50",
         "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,f45",
-        "_": "1626081702127",
     }
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
-    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 = [
         "序号",
         "_",
@@ -403,11 +525,14 @@ if __name__ == "__main__":
     stock_board_concept_em_df = stock_board_concept_name_em()
     print(stock_board_concept_em_df)
 
+    stock_board_concept_spot_em_df = stock_board_concept_spot_em(symbol="可燃冰")
+    print(stock_board_concept_spot_em_df)
+
     stock_board_concept_hist_em_df = stock_board_concept_hist_em(
         symbol="绿色电力",
         period="daily",
         start_date="20220101",
-        end_date="20230806",
+        end_date="20250227",
         adjust="",
     )
     print(stock_board_concept_hist_em_df)
@@ -417,5 +542,5 @@ if __name__ == "__main__":
     )
     print(stock_board_concept_hist_min_em_df)
 
-    stock_board_concept_cons_em_df = stock_board_concept_cons_em(symbol="融资融券")
+    stock_board_concept_cons_em_df = stock_board_concept_cons_em(symbol="BK0655")
     print(stock_board_concept_cons_em_df)