akshare 1.14.64__py3-none-any.whl → 1.14.66__py3-none-any.whl

akshare/__init__.py

@@ -2875,9 +2875,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 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
+1.14.66 fix: fix stock_profit_forecast_ths interface
 """
 
-__version__ = "1.14.64"
+__version__ = "1.14.66"
 __author__ = "AKFamily"
 
 import sys

akshare/cost/cost_living.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/1/20 23:30
+Date: 2024/8/28 15:20
 Desc: 世界各大城市生活成本数据
 https://expatistan.com/cost-of-living/index
 """
+
 from io import StringIO
 
 import pandas as pd
@@ -20,14 +21,14 @@ def _get_region() -> dict:
     """
     url = "https://www.expatistan.com/cost-of-living/index"
     r = requests.get(url)
-    soup = BeautifulSoup(r.text, "lxml")
+    soup = BeautifulSoup(r.text, features="lxml")
     half_url_list = [
         item["href"]
-        for item in soup.find("ul", attrs={"class": "regions"}).find_all("a")
+        for item in soup.find(name="ul", attrs={"class": "regions"}).find_all("a")
     ]
     name_list = [
         item["href"].split("/")[-1]
-        for item in soup.find("ul", attrs={"class": "regions"}).find_all("a")
+        for item in soup.find(name="ul", attrs={"class": "regions"}).find_all("a")
     ]
     name_url_dict = dict(zip(name_list, half_url_list))
     name_url_dict["world"] = "/cost-of-living/index"
@@ -38,7 +39,8 @@ def cost_living(symbol: str = "world") -> pd.DataFrame:
     """
     国家或地区生活成本数据
     https://expatistan.com/cost-of-living/index
-    :param symbol: choice of {"europe", "north-america", "latin-america", "asia", "middle-east", "africa", "oceania", "world"}
+    :param symbol: choice of {"europe", "north-america", "latin-america",
+    "asia", "middle-east", "africa", "oceania", "world"}
     :type symbol: str
     :return: 国家或地区生活成本数据
     :rtype: pandas.DataFrame

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_rank_forecast.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/8/18 15:29
+Date: 2024/8/28 15:30
 Desc: 巨潮资讯-数据中心-评级预测-投资评级
-http://webapi.cninfo.com.cn/#/thematicStatistics?name=%E6%8A%95%E8%B5%84%E8%AF%84%E7%BA%A7
+https://webapi.cninfo.com.cn/#/thematicStatistics?name=%E6%8A%95%E8%B5%84%E8%AF%84%E7%BA%A7
 """
 
 import pandas as pd
@@ -22,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
 
@@ -30,7 +30,7 @@ def _get_file_content_cninfo(file: str = "cninfo.js") -> str:
 def stock_rank_forecast_cninfo(date: str = "20230817") -> pd.DataFrame:
     """
     巨潮资讯-数据中心-评级预测-投资评级
-    http://webapi.cninfo.com.cn/#/thematicStatistics?name=%E6%8A%95%E8%B5%84%E8%AF%84%E7%BA%A7
+    https://webapi.cninfo.com.cn/#/thematicStatistics?name=%E6%8A%95%E8%B5%84%E8%AF%84%E7%BA%A7
     :param date: 查询日期
     :type date: str
     :return: 投资评级
@@ -54,7 +54,8 @@ def stock_rank_forecast_cninfo(date: str = "20230817") -> pd.DataFrame:
         "Pragma": "no-cache",
         "Proxy-Connection": "keep-alive",
         "Referer": "http://webapi.cninfo.com.cn/",
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.63 Safari/537.36",
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/93.0.4577.63 Safari/537.36",
         "X-Requested-With": "XMLHttpRequest",
     }
     r = requests.post(url, params=params, headers=headers)

akshare/stock_fundamental/stock_profit_forecast_ths.py

@@ -1,13 +1,18 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/4/9 21:44
+Date: 2024/8/28 15:00
 Desc: 同花顺-盈利预测
 https://basic.10jqka.com.cn/new/600519/worth.html
 """
+
+from io import StringIO
+
 import pandas as pd
 import requests
 
+from akshare.utils.cons import headers
+
 
 def stock_profit_forecast_ths(
     symbol: str = "600519", indicator: str = "预测年报每股收益"
@@ -23,21 +28,18 @@ def stock_profit_forecast_ths(
     :rtype: pandas.DataFrame
     """
     url = f"https://basic.10jqka.com.cn/new/{symbol}/worth.html"
-    headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36",
-    }
     r = requests.get(url, headers=headers)
     r.encoding = "gbk"
     if indicator == "预测年报每股收益":
-        temp_df = pd.read_html(r.text)[0]
+        temp_df = pd.read_html(StringIO(r.text))[0]
         temp_df["年度"] = temp_df["年度"].astype(str)
         return temp_df
     if indicator == "预测年报净利润":
-        temp_df = pd.read_html(r.text)[1]
+        temp_df = pd.read_html(StringIO(r.text))[1]
         temp_df["年度"] = temp_df["年度"].astype(str)
         return temp_df
     if indicator == "业绩预测详表-机构":
-        temp_df = pd.read_html(r.text)[2]
+        temp_df = pd.read_html(StringIO(r.text))[2]
         columns_list = []
         for item in temp_df.columns:
             columns_list.append(item[1])
@@ -51,7 +53,7 @@ def stock_profit_forecast_ths(
         temp_df["报告日期"] = pd.to_datetime(temp_df["报告日期"]).dt.date
         return temp_df
     if indicator == "业绩预测详表-详细指标预测":
-        temp_df = pd.read_html(r.text)[3]
+        temp_df = pd.read_html(StringIO(r.text))[3]
         temp_df.columns = [
             item.replace("（", "-").replace("）", "") for item in temp_df.columns
         ]
@@ -59,6 +61,13 @@ def stock_profit_forecast_ths(
 
 
 if __name__ == "__main__":
-    for item in ["预测年报每股收益", "预测年报净利润", "业绩预测详表-机构", "业绩预测详表-详细指标预测"]:
-        stock_profit_forecast_ths_df = stock_profit_forecast_ths(symbol="600519", indicator=item)
+    for _item in [
+        "预测年报每股收益",
+        "预测年报净利润",
+        "业绩预测详表-机构",
+        "业绩预测详表-详细指标预测",
+    ]:
+        stock_profit_forecast_ths_df = stock_profit_forecast_ths(
+            symbol="600519", indicator=_item
+        )
         print(stock_profit_forecast_ths_df)

{akshare-1.14.64.dist-info → akshare-1.14.66.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=zXYZnokPlRdH1ld70wQoCc3o6BGNDeMl4xYNDxEc66c,181054
+akshare/__init__.py,sha256=dEuaO6dYs2XIQvfEjUWWLIaIXrIC8aiPuJMWFnrF3ak,181151
 akshare/datasets.py,sha256=oIu1zC7o_LMHY22lQmdM7vCnryHibKrJLBqJwQiitlI,1167
 akshare/air/__init__.py,sha256=RMTf1bT5EOE3ttWpn3hGu1LtUmsVxDoa0W7W0gXHOy8,81
 akshare/air/air_hebei.py,sha256=xIXNGLK7IGYqrkteM9fxnHAwWqk6PCQs6D9-ggZ7byY,4442
@@ -33,7 +33,7 @@ akshare/bond/bond_zh_cov.py,sha256=yL77itRK0rFCeQP_M524lW1740D5Q1IZW6eLvjXf2H4,2
 akshare/bond/bond_zh_sina.py,sha256=msj7upgqaCTzC_MxzhUm7hVKtzHeWRUjlcjvZn2zlbw,4654
 akshare/bond/cons.py,sha256=SGqjMqRYwJlEb8UczxdcrtcD7I2SAVULXARGEedEQfE,1792
 akshare/cost/__init__.py,sha256=x1R9hH6E0M7C86XhHFzbPiipUWz9IknuhVZrk4gZus4,82
-akshare/cost/cost_living.py,sha256=LRJKKthUOfg-pAGwJpp9R8Ad3ve_yb9vSnjABxfJbQc,2054
+akshare/cost/cost_living.py,sha256=_yoGEW4jBfpjhgMxCXvMtBbrCx2PEuOngV3laEoEOvk,2078
 akshare/crypto/__init__.py,sha256=lbmNMPPLGkW9AgGL4ZnCwoQvPjOFPDNUz6P3arSkNI0,83
 akshare/crypto/crypto_bitcoin_cme.py,sha256=IO4dxPj-kwtJXo9F_h5tH64__yeDQXs2cavCkgxxp1I,2436
 akshare/crypto/crypto_hist_investing.py,sha256=tIeEkFur-u-E2_-R4I_Zy0s_VFnR03CCl4GpgJkLYJw,9748
@@ -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
@@ -265,7 +265,7 @@ akshare/stock/stock_ipo_summary_cninfo.py,sha256=Ma-54GsOOhRWxilLH-Qmm0VVbpJQGf2
 akshare/stock/stock_new_cninfo.py,sha256=EOuZowDLQSSHyPAwXcuPXbQkqhbz2nRBZsM7o2ZWILE,5725
 akshare/stock/stock_news_cx.py,sha256=IuNo67ToW6SNT9aZVTDqQMnlLFw4QV-_FWSw-9vgfB4,1055
 akshare/stock/stock_profile_cninfo.py,sha256=tiEPnoH7IGp9DV1kMQNGIXuVOWpQFl_BS_RX_ijM4BI,3163
-akshare/stock/stock_rank_forecast.py,sha256=Qh7bwfQ_Dq8bEMuMLOzFOc_da_0n2GKr8tRFeFqTo5g,3168
+akshare/stock/stock_rank_forecast.py,sha256=5U0fa4tzhqKrw5kDRahUCFSrbrEx_aRtlqZq2mpeJaU,3199
 akshare/stock/stock_repurchase_em.py,sha256=XVAUD_yd48wqxbMbfU0Ne2SNFOSG9NBklUhf3pl6cKc,5000
 akshare/stock/stock_share_changes_cninfo.py,sha256=zg-1KHPbxdMRMr4wYY8LA30D-u47YesbEDt_MgCMk_k,4846
 akshare/stock/stock_share_hold.py,sha256=uToDxxnaD9nVtsidq0kVK-LzWU4XZdZBdzJnJvywAfI,10959
@@ -364,7 +364,7 @@ akshare/stock_fundamental/stock_mda_ym.py,sha256=OdWTiZc0HhTOgGtDiIN1A-u2K51eMZa
 akshare/stock_fundamental/stock_notice.py,sha256=tGxGz1Usr3qQzgs1Y71imDPkqJz5ooismz3BiaBwQR0,3928
 akshare/stock_fundamental/stock_profit_forecast_em.py,sha256=QP7jgMwto9o1zc1vDl9BBeta_lgxA13NMbijs9eqjRs,5377
 akshare/stock_fundamental/stock_profit_forecast_hk_etnet.py,sha256=dQaqxi0wXOidIuAxjUzZy_gdy16HEi20I3jEdpNM3qc,5179
-akshare/stock_fundamental/stock_profit_forecast_ths.py,sha256=LP3tBRMZEYKA7VE5-wQ7Pj-H5R57oo0sqTmxbMMobq0,2648
+akshare/stock_fundamental/stock_profit_forecast_ths.py,sha256=ZTShEB5w1y5j6TsHzWT8QR8oatbBTdE1H0IIxPLHn9s,2656
 akshare/stock_fundamental/stock_recommend.py,sha256=44l1uLofwO-nsDB4oAYWpHQA7_qhXLOo1BurjUvmXzY,4501
 akshare/stock_fundamental/stock_register_em.py,sha256=QxQh7kddjXLainVVugvOCYG8nDyOv31I8npQmXw3Ccs,15643
 akshare/stock_fundamental/stock_restricted_em.py,sha256=e5G3oiZBf9d_a8quX5nLzn3RggeF4yX3j-h3nAZBRmA,13378
@@ -379,9 +379,9 @@ akshare/utils/func.py,sha256=PDkwpyCjZCbCLSAG9wBQt-sYNtb1XlpUBvhAfuSLf3s,586
 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=tfvy_YnYmDra2dkKZ5JvprU1gNW5X9T634PszdSdH1A,944
-akshare-1.14.64.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.14.64.dist-info/METADATA,sha256=iIkiuYRQOUYJ_lxPDy1DMlpZ58i1nvkDoNUP--pLw-U,13961
-akshare-1.14.64.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-akshare-1.14.64.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.14.64.dist-info/RECORD,,
+tests/test_func.py,sha256=OK--59gYndzZ-t4iAbfoMrERE6MPUV24u1Ja1wlv0BM,946
+akshare-1.14.66.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.14.66.dist-info/METADATA,sha256=bvoryNxW6M_xnsyuCCash2eA2yelVNrdcztN1GsS2Ko,13961
+akshare-1.14.66.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+akshare-1.14.66.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.14.66.dist-info/RECORD,,

{akshare-1.14.64.dist-info → akshare-1.14.66.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/test_func.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/3/14 18:00
+Date: 2024/8/28 15:00
 Desc: To test intention, just write test code here!
 """
 
@@ -42,6 +42,6 @@ def test_zipfile_func():
 
 
 if __name__ == "__main__":
-    test_cost_living()
+    # test_cost_living()
     test_path_func()
     test_zipfile_func()