akshare 1.14.63__py3-none-any.whl → 1.14.65__py3-none-any.whl

akshare/__init__.py

@@ -2874,9 +2874,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.14.61 fix: fix stock_fund_flow_individual interface
 1.14.62 fix: fix stock_zt_pool_em interface
 1.14.63 add: add spot_quotations_sge interface
+1.14.64 fix: fix stock_board_industry_spot_em interface
+1.14.65 fix: fix option_dce_daily interface
 """
 
-__version__ = "1.14.63"
+__version__ = "1.14.65"
 __author__ = "AKFamily"
 
 import sys

akshare/futures/futures_daily_bar.py

@@ -605,12 +605,7 @@ def get_dce_daily(date: str = "20220308") -> pd.DataFrame:
             "variety",
         ]
     ]
-    # TODO pandas 2.1.0 change
-    try:
-        data_df = data_df.map(lambda x: x.replace(",", ""))
-    except:  # noqa: E722
-        data_df = data_df.applymap(lambda x: x.replace(",", ""))
-
+    data_df = data_df.map(lambda x: x.replace(",", ""))
     data_df = data_df.astype(
         {
             "open": "float",
@@ -690,7 +685,7 @@ if __name__ == "__main__":
     )
     print(get_futures_daily_df)
 
-    get_dce_daily_df = get_dce_daily(date="20230810")
+    get_dce_daily_df = get_dce_daily(date="20140812")
     print(get_dce_daily_df)
 
     get_cffex_daily_df = get_cffex_daily(date="20230810")

akshare/option/option_commodity.py

@@ -40,7 +40,9 @@ def option_dce_daily(
     http://www.dce.com.cn/
     :param trade_date: 交易日
     :type trade_date: str
-    :param symbol: choice of {"玉米期权", "豆粕期权", "铁矿石期权", "液化石油气期权", "聚乙烯期权", "聚氯乙烯期权", "聚丙烯期权", "棕榈油期权", "黄大豆1号期权", "黄大豆2号期权", "豆油期权", "乙二醇期权", "苯乙烯期权"}
+    :param symbol: choice of {"玉米期权", "豆粕期权", "铁矿石期权", "液化石油气期权", "聚乙烯期权", "聚氯乙烯期权",
+    "聚丙烯期权", "棕榈油期权", "黄大豆1号期权", "黄大豆2号期权", "豆油期权", "乙二醇期权", "苯乙烯期权",
+    "鸡蛋期权", "玉米淀粉期权", "生猪期权"}
     :type symbol: str
     :return: 日频行情数据
     :rtype: pandas.DataFrame
@@ -68,6 +70,8 @@ def option_dce_daily(
     another_df.reset_index(inplace=True, drop=True)
     another_df.columns = another_df.iloc[0]
     another_df = another_df.iloc[1:, :]
+    result_one_df = pd.DataFrame()
+    result_two_df = pd.DataFrame()
     if symbol == "豆粕期权":
         result_one_df, result_two_df = (
             table_df[table_df["商品名称"] == "豆粕"],
@@ -133,6 +137,21 @@ def option_dce_daily(
             table_df[table_df["商品名称"] == "苯乙烯"],
             another_df[another_df.iloc[:, 0].str.contains("eb")],
         )
+    elif symbol == "鸡蛋期权":
+        result_one_df, result_two_df = (
+            table_df[table_df["商品名称"] == "鸡蛋"],
+            another_df[another_df.iloc[:, 0].str.contains("eb")],
+        )
+    elif symbol == "玉米淀粉期权":
+        result_one_df, result_two_df = (
+            table_df[table_df["商品名称"] == "玉米淀粉"],
+            another_df[another_df.iloc[:, 0].str.contains("eb")],
+        )
+    elif symbol == "生猪期权":
+        result_one_df, result_two_df = (
+            table_df[table_df["商品名称"] == "生猪"],
+            another_df[another_df.iloc[:, 0].str.contains("eb")],
+        )
     result_one_df.reset_index(inplace=True, drop=True)
     result_two_df.reset_index(inplace=True, drop=True)
     result_two_df.columns.name = None
@@ -148,7 +167,8 @@ def option_czce_daily(
     :param trade_date: 交易日
     :type trade_date: str
     :param symbol: choice of {"白糖期权", "棉花期权", "甲醇期权", "PTA期权",  "菜籽粕期权", "动力煤期权", "短纤期权",
-    "菜籽油期权", "花生期权", "棉花期权", "短纤期权", "纯碱期权", "锰硅期权", "硅铁期权", "尿素期权", "对二甲苯期权", "烧碱期权", "玻璃期权"}
+    "菜籽油期权", "花生期权", "棉花期权", "短纤期权", "纯碱期权", "锰硅期权", "硅铁期权", "尿素期权", "对二甲苯期权",
+    "烧碱期权", "玻璃期权"}
     :type symbol: str
     :return: 日频行情数据
     :rtype: pandas.DataFrame
@@ -506,7 +526,7 @@ if __name__ == "__main__":
     print(option_czce_daily_df)
 
     option_dce_daily_one, option_dce_daily_two = option_dce_daily(
-        symbol="黄大豆2号期权", trade_date="20220808"
+        symbol="鸡蛋期权", trade_date="20240823"
     )
     print(option_dce_daily_one)
     print(option_dce_daily_two)

akshare/stock/stock_board_industry_em.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/3/21 22:27
+Date: 2024/8/23 17:50
 Desc: 东方财富-沪深板块-行业板块
 https://quote.eastmoney.com/center/boardlist.html#industry_board
 """
+
 import re
 
 import pandas as pd
@@ -18,7 +19,7 @@ def stock_board_industry_name_em() -> pd.DataFrame:
     :return: 行业板块-名称
     :rtype: pandas.DataFrame
     """
-    url = "http://17.push2.eastmoney.com/api/qt/clist/get"
+    url = "https://17.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
         "pz": "2000",
@@ -29,7 +30,9 @@ def stock_board_industry_name_em() -> pd.DataFrame:
         "invt": "2",
         "fid": "f3",
         "fs": "m:90 t:2 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,f26,f22,f33,f11,f62,f128,f136,f115,f152,f124,f107,f104,f105,f140,f141,f207,f208,f209,f222",
+        "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,f124,f107,f104,f105,"
+        "f140,f141,f207,f208,f209,f222",
         "_": "1626075887768",
     }
     r = requests.get(url, params=params)
@@ -104,7 +107,9 @@ def stock_board_industry_name_em() -> pd.DataFrame:
     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
 
 
@@ -117,7 +122,7 @@ def stock_board_industry_spot_em(symbol: str = "小金属") -> pd.DataFrame:
     :return: 实时行情
     :rtype: pandas.DataFrame
     """
-    url = "http://91.push2.eastmoney.com/api/qt/stock/get"
+    url = "https://91.push2.eastmoney.com/api/qt/stock/get"
     field_map = {
         "f43": "最新",
         "f44": "最高",
@@ -131,14 +136,14 @@ def stock_board_industry_spot_em(symbol: str = "小金属") -> pd.DataFrame:
         "f169": "涨跌额",
     }
 
-    if re.match(r'^BK\d+', symbol):
+    if re.match(pattern=r"^BK\d+", string=symbol):
         em_code = symbol
     else:
         industry_listing = stock_board_industry_name_em()
-        em_code = industry_listing.query('板块名称 == @symbol')["板块代码"].values[0]
+        em_code = industry_listing.query("板块名称 == @symbol")["板块代码"].values[0]
 
     params = dict(
-        fields=','.join(field_map.keys()),
+        fields=",".join(field_map.keys()),
         mpi="1000",
         invt="2",
         fltt="1",
@@ -150,22 +155,22 @@ def stock_board_industry_spot_em(symbol: str = "小金属") -> pd.DataFrame:
     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.columns = ["item", "value"]
+    result["value"] = pd.to_numeric(result["value"], errors="coerce")
 
     # 各项转换成正常单位. 除了成交量与成交额, 原始数据中已是正常单位(元)
-    result['value'] = result['value'] * 1e-2
+    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_industry_hist_em(
-        symbol: str = "小金属",
-        start_date: str = "20211201",
-        end_date: str = "20220401",
-        period: str = "日k",
-        adjust: str = "",
+    symbol: str = "小金属",
+    start_date: str = "20211201",
+    end_date: str = "20220401",
+    period: str = "日k",
+    adjust: str = "",
 ) -> pd.DataFrame:
     """
     东方财富网-沪深板块-行业板块-历史行情
@@ -184,14 +189,14 @@ def stock_board_industry_hist_em(
     :rtype: pandas.DataFrame
     """
     period_map = {
-        "日k": '101',
-        "周k": '102',
-        "月k": '103',
+        "日k": "101",
+        "周k": "102",
+        "月k": "103",
     }
     stock_board_concept_em_map = stock_board_industry_name_em()
     stock_board_code = stock_board_concept_em_map[
         stock_board_concept_em_map["板块名称"] == symbol
-        ]["板块代码"].values[0]
+    ]["板块代码"].values[0]
     adjust_map = {"": "0", "qfq": "1", "hfq": "2"}
     url = "http://7.push2his.eastmoney.com/api/qt/stock/kline/get"
     params = {
@@ -209,9 +214,7 @@ def stock_board_industry_hist_em(
     }
     r = requests.get(url, params=params)
     data_json = r.json()
-    temp_df = pd.DataFrame(
-        [item.split(",") for item in data_json["data"]["klines"]]
-    )
+    temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]["klines"]])
     temp_df.columns = [
         "日期",
         "开盘",
@@ -254,7 +257,7 @@ def stock_board_industry_hist_em(
 
 
 def stock_board_industry_hist_min_em(
-        symbol: str = "小金属", period: str = "5"
+    symbol: str = "小金属", period: str = "5"
 ) -> pd.DataFrame:
     """
     东方财富网-沪深板块-行业板块-分时历史行情
@@ -269,15 +272,15 @@ def stock_board_industry_hist_min_em(
     stock_board_concept_em_map = stock_board_industry_name_em()
     stock_board_code = stock_board_concept_em_map[
         stock_board_concept_em_map["板块名称"] == symbol
-        ]["板块代码"].values[0]
+    ]["板块代码"].values[0]
     if period == "1":
         url = "https://push2his.eastmoney.com/api/qt/stock/trends2/get"
         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',
+            "ut": "fa5fd1943c7b386f172d6893dbfba10b",
+            "iscr": "0",
+            "ndays": "1",
             "secid": f"90.{stock_board_code}",
             "_": "1687852931312",
         }
@@ -378,7 +381,7 @@ def stock_board_industry_cons_em(symbol: str = "小金属") -> pd.DataFrame:
     stock_board_concept_em_map = stock_board_industry_name_em()
     stock_board_code = stock_board_concept_em_map[
         stock_board_concept_em_map["板块名称"] == symbol
-        ]["板块代码"].values[0]
+    ]["板块代码"].values[0]
     url = "http://29.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
@@ -390,7 +393,8 @@ def stock_board_industry_cons_em(symbol: str = "小金属") -> pd.DataFrame:
         "invt": "2",
         "fid": "f3",
         "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",
+        "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)
@@ -477,7 +481,11 @@ if __name__ == "__main__":
     print(stock_board_industry_spot_em_df)
 
     stock_board_industry_hist_em_df = stock_board_industry_hist_em(
-        symbol="小金属", start_date="20211201", end_date="20240222", period="日k", adjust=""
+        symbol="小金属",
+        start_date="20211201",
+        end_date="20240222",
+        period="日k",
+        adjust="",
     )
     print(stock_board_industry_hist_em_df)
 
@@ -486,7 +494,5 @@ if __name__ == "__main__":
     )
     print(stock_board_industry_hist_min_em_df)
 
-    stock_board_industry_cons_em_df = stock_board_industry_cons_em(
-        symbol="小金属"
-    )
+    stock_board_industry_cons_em_df = stock_board_industry_cons_em(symbol="小金属")
     print(stock_board_industry_cons_em_df)

{akshare-1.14.63.dist-info → akshare-1.14.65.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.14.63
+Version: 1.14.65
 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.14.63.dist-info → akshare-1.14.65.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=CJdmywJ8pTFJlDkUKAiTGYYgjR827XXdayzoNxdKy94,180998
+akshare/__init__.py,sha256=-hJ6YdUISPANmHfIPC0x-w1aQoTWDB7BciYS34h0B0M,181098
 akshare/datasets.py,sha256=oIu1zC7o_LMHY22lQmdM7vCnryHibKrJLBqJwQiitlI,1167
 akshare/air/__init__.py,sha256=RMTf1bT5EOE3ttWpn3hGu1LtUmsVxDoa0W7W0gXHOy8,81
 akshare/air/air_hebei.py,sha256=xIXNGLK7IGYqrkteM9fxnHAwWqk6PCQs6D9-ggZ7byY,4442
@@ -107,7 +107,7 @@ akshare/futures/futures_comex_em.py,sha256=V-mkKQkH5N8PyaZWKdyggb2lTnY8DDDxiUPt-
 akshare/futures/futures_comm_ctp.py,sha256=V8TEKO0R0i6LfE8DDFqrMA3JGwNlpmaQCvvMugKZ1I8,1004
 akshare/futures/futures_comm_qihuo.py,sha256=uQfabZ63qME8sTaxUbIUVQBVi8yTaPPDhD7voR9PEx0,10504
 akshare/futures/futures_contract_detail.py,sha256=auwzNdaoFi5hoJY6rNkO54v5FD2gmEkQu7B90yEDtkc,1175
-akshare/futures/futures_daily_bar.py,sha256=Zmabe58qHxF0gJ8CKAw9uuuUtxfYMhLNWSJioMGYK04,25363
+akshare/futures/futures_daily_bar.py,sha256=mD7n1K0FSIwA6CREkIjkcPvLaGb1Q7uGc-qrb1hI5j4,25227
 akshare/futures/futures_foreign.py,sha256=oSIoAg5oy-CIlPWHkQffcvZGu02Y2GWOrt-6aPA53Xg,2059
 akshare/futures/futures_hf_em.py,sha256=OEUltaq1LKabl9eTQoNxswnl1BLKpB27eiIHwbu_Rh4,3178
 akshare/futures/futures_hq_sina.py,sha256=4qDv8U99Ic82QbFNvwsuaHZX2VPl8Ei-yNsEnRpaPZA,9582
@@ -194,7 +194,7 @@ akshare/nlp/nlp_interface.py,sha256=PyZjT3PkuTbloop-JwLwZ2kNi22zdO-r_pRUWQ5SmgM,
 akshare/option/__init__.py,sha256=RMTf1bT5EOE3ttWpn3hGu1LtUmsVxDoa0W7W0gXHOy8,81
 akshare/option/cons.py,sha256=zTRZ62RFwOcAKfmso-7nZJtT3a8Dt1nQbNnEjSqgjpI,4811
 akshare/option/option_comm_qihuo.py,sha256=kjbdp-94KJJJi1ex5U03abtlgviqwP0Aahb6FwddPkk,3128
-akshare/option/option_commodity.py,sha256=_SWFCP0EoKtwwF72WecK6YL-ogKnY7Yjnd2IwjA95Og,21261
+akshare/option/option_commodity.py,sha256=D5n-tdNohA7OtgzwG09UI7LtWUkHSHHOOZujCi8BwOg,22038
 akshare/option/option_commodity_sina.py,sha256=r6qK_K7w3A6Uqp5ZtBb4pW7vH04oMyeCEZLLGqi0jpA,7776
 akshare/option/option_czce.py,sha256=L4i7TVKcOns5ZKoqq-mrSykdx3SGwu6OL4eI77-A_lc,1812
 akshare/option/option_daily_stats_sse_szse.py,sha256=Ip_vE81qbEGt4ocbtWfUT7XGu0HWU0zKkzauZeq9RJA,4962
@@ -234,7 +234,7 @@ akshare/stock/cons.py,sha256=0oyUW5Pu-iQ3qgh-TFemM_O5f1fAwVe-PsI4Qa8EYpQ,42956
 akshare/stock/stock_allotment_cninfo.py,sha256=qk--nWhskZWnUUOwBvfgiFJEOd1GqmQijzzVlORCG2I,6059
 akshare/stock/stock_ask_bid_em.py,sha256=ioVkmRMVs7A7Lj_PboxwIoZINNk73nAko80wIJX4RKU,5510
 akshare/stock/stock_board_concept_em.py,sha256=iajw06K04I-F9VGXbuJf5Vz_digDCgMi4J1vgzkmbFA,14039
-akshare/stock/stock_board_industry_em.py,sha256=ZyDnlwAFBEtQI2KEThqs7QG6Akl1DBbKFy7qB3tzqN0,16161
+akshare/stock/stock_board_industry_em.py,sha256=AfRVUVZrgSJXaoKAK81Ga-_m3hfv8YZzczBnnBdFq-I,16195
 akshare/stock/stock_cg_equity_mortgage.py,sha256=Pui5aWKKPwGuKjF_GNpejDzsMGNPrxiaJviLz3x2e9I,3426
 akshare/stock/stock_cg_guarantee.py,sha256=ts7qcQhhyN1PHB7Q4XlMn38HhfVvubOvky9RZfmUP94,3844
 akshare/stock/stock_cg_lawsuit.py,sha256=6Y92pPw0JgyrInteqHuU07G1jwmdX2wjaDtrJN8y6Hg,4129
@@ -380,8 +380,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=tfvy_YnYmDra2dkKZ5JvprU1gNW5X9T634PszdSdH1A,944
-akshare-1.14.63.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.14.63.dist-info/METADATA,sha256=3xjOwl22QmMxtxdLNnS3R23J9zXmEy5qFzkGpDupjNw,13961
-akshare-1.14.63.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-akshare-1.14.63.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.14.63.dist-info/RECORD,,
+akshare-1.14.65.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.14.65.dist-info/METADATA,sha256=K48tcTg49VogE_x7iNQLPrPf9WO-FK4FAZyWb8XrNrE,13961
+akshare-1.14.65.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+akshare-1.14.65.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.14.65.dist-info/RECORD,,