akshare 1.15.83__py3-none-any.whl → 1.15.85__py3-none-any.whl

akshare/__init__.py

@@ -2993,9 +2993,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.81 fix: fix bank_fjcf_table_detail interface
 1.15.82 fix: fix stock_individual_spot_xq interface
 1.15.83 fix: fix stock_szse_sector_summary interface
+1.15.84 fix: fix option_dce_daily interface
+1.15.85 fix: fix stock_gddh_em interface
 """
 
-__version__ = "1.15.83"
+__version__ = "1.15.85"
 __author__ = "AKFamily"
 
 import sys

akshare/option/option_commodity.py

@@ -51,7 +51,7 @@ def option_dce_daily(
     day = convert_date(trade_date) if trade_date is not None else datetime.date.today()
     if day.strftime("%Y%m%d") not in calendar:
         warnings.warn("%s非交易日" % day.strftime("%Y%m%d"))
-        return
+        return pd.DataFrame(), pd.DataFrame()
     url = DCE_DAILY_OPTION_URL
     payload = {
         "dayQuotes.variety": "all",
@@ -95,7 +95,7 @@ def option_dce_daily(
     elif symbol == "聚乙烯期权":
         result_one_df, result_two_df = (
             table_df[table_df["商品名称"] == "聚乙烯"],
-            another_df[another_df.iloc[:, 0].str.contains("l")],
+            another_df[another_df.iloc[:, 0].str.contains(r"^l\d")],
         )
     elif symbol == "聚氯乙烯期权":
         result_one_df, result_two_df = (
@@ -120,7 +120,7 @@ def option_dce_daily(
     elif symbol == "黄大豆2号期权":
         result_one_df, result_two_df = (
             table_df[table_df["商品名称"] == "豆二"],
-            another_df[another_df.iloc[:, 0].str.contains("b")],
+            another_df[another_df.iloc[:, 0].str.contains(r"^b\d")],
         )
     elif symbol == "豆油期权":
         result_one_df, result_two_df = (
@@ -623,7 +623,7 @@ if __name__ == "__main__":
     print(option_dce_daily_two)
 
     option_dce_daily_one, option_dce_daily_two = option_dce_daily(
-        symbol="乙二醇期权", trade_date="20230516"
+        symbol="聚乙烯期权", trade_date="20250210"
     )
     print(option_dce_daily_one)
     print(option_dce_daily_two)

akshare/stock_feature/stock_gddh_em.py

@@ -1,13 +1,14 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/8/18 15:32
+Date: 2025/2/11 16:00
 Desc: 东方财富网-数据中心-股东大会
 https://data.eastmoney.com/gddh/
 """
+
 import pandas as pd
 import requests
-from tqdm import tqdm
+from akshare.utils.tqdm import get_tqdm
 
 
 def stock_gddh_em() -> pd.DataFrame:
@@ -24,7 +25,9 @@ def stock_gddh_em() -> pd.DataFrame:
         "pageSize": "500",
         "pageNumber": "1",
         "reportName": "RPT_GENERALMEETING_DETAIL",
-        "columns": "SECURITY_CODE,SECURITY_NAME_ABBR,MEETING_TITLE,START_ADJUST_DATE,EQUITY_RECORD_DATE,ONSITE_RECORD_DATE,DECISION_NOTICE_DATE,NOTICE_DATE,WEB_START_DATE,WEB_END_DATE,SERIAL_NUM,PROPOSAL",
+        "columns": "SECURITY_CODE,SECURITY_NAME_ABBR,MEETING_TITLE,START_ADJUST_DATE,EQUITY_RECORD_DATE,"
+        "ONSITE_RECORD_DATE,DECISION_NOTICE_DATE,NOTICE_DATE,WEB_START_DATE,"
+        "WEB_END_DATE,SERIAL_NUM,PROPOSAL",
         "filter": '(IS_LASTDATE="1")',
         "source": "WEB",
         "client": "WEB",
@@ -33,6 +36,7 @@ def stock_gddh_em() -> pd.DataFrame:
     data_json = r.json()
     total_page = data_json["result"]["pages"]
     big_df = pd.DataFrame()
+    tqdm = get_tqdm()
     for page in tqdm(range(1, total_page + 1), leave=False):
         params.update(
             {
@@ -42,7 +46,7 @@ def stock_gddh_em() -> pd.DataFrame:
         r = requests.get(url, params=params)
         data_json = r.json()
         temp_df = pd.DataFrame(data_json["result"]["data"])
-        big_df = pd.concat([big_df, temp_df], axis=0, ignore_index=True)
+        big_df = pd.concat(objs=[big_df, temp_df], axis=0, ignore_index=True)
     big_df.rename(
         columns={
             "SECURITY_CODE": "代码",
@@ -76,13 +80,17 @@ def stock_gddh_em() -> pd.DataFrame:
             "提案",
         ]
     ]
-    big_df['召开开始日'] = pd.to_datetime(big_df['召开开始日'], errors="coerce").dt.date
-    big_df['股权登记日'] = pd.to_datetime(big_df['股权登记日'], errors="coerce").dt.date
-    big_df['现场登记日'] = pd.to_datetime(big_df['现场登记日'], errors="coerce").dt.date
-    big_df['网络投票时间-开始日'] = pd.to_datetime(big_df['网络投票时间-开始日'], errors="coerce").dt.date
-    big_df['网络投票时间-结束日'] = pd.to_datetime(big_df['网络投票时间-结束日'], errors="coerce").dt.date
-    big_df['决议公告日'] = pd.to_datetime(big_df['决议公告日'], errors="coerce").dt.date
-    big_df['公告日'] = pd.to_datetime(big_df['公告日'], errors="coerce").dt.date
+    big_df["召开开始日"] = pd.to_datetime(big_df["召开开始日"], errors="coerce").dt.date
+    big_df["股权登记日"] = pd.to_datetime(big_df["股权登记日"], errors="coerce").dt.date
+    big_df["现场登记日"] = pd.to_datetime(big_df["现场登记日"], errors="coerce").dt.date
+    big_df["网络投票时间-开始日"] = pd.to_datetime(
+        big_df["网络投票时间-开始日"], errors="coerce"
+    ).dt.date
+    big_df["网络投票时间-结束日"] = pd.to_datetime(
+        big_df["网络投票时间-结束日"], errors="coerce"
+    ).dt.date
+    big_df["决议公告日"] = pd.to_datetime(big_df["决议公告日"], errors="coerce").dt.date
+    big_df["公告日"] = pd.to_datetime(big_df["公告日"], errors="coerce").dt.date
     big_df["提案"] = big_df["提案"].str.replace("\r\n2", "").str.replace("\r\n3", "")
     return big_df
 

{akshare-1.15.83.dist-info → akshare-1.15.85.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: akshare
-Version: 1.15.83
+Version: 1.15.85
 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.83.dist-info → akshare-1.15.85.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=lmCddktWjPQd-jRCkri7SL2go_N5AGXhd8WxL5dRBOw,186755
+akshare/__init__.py,sha256=GjfQo3PkBi5hufDAfY92Cm7-6uHIk2cQBpJOSMa5jv4,186840
 akshare/datasets.py,sha256=rKuRNZrqi6IMsZ9nyvO3Rx02js0tH3zMLjz8HQNAoPQ,963
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -190,7 +190,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=bdvtr0uedPZGZeJGf2sbAIP54wk8MQcqZcLsNTSCbJI,25754
+akshare/option/option_commodity.py,sha256=gJ22bfXMEz9vWXuVjgNU9mvvRlXcNWjW8hUxG7-Mi8U,25793
 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
@@ -305,7 +305,7 @@ akshare/stock_feature/stock_esg_sina.py,sha256=RJmeYi2YDns3Do-vydtKgJEQsLVgmmV1G
 akshare/stock_feature/stock_fhps_em.py,sha256=85gfdMP3OtA3wsEGlB2RkdHiOEZjFff1ls5x1oWSQPQ,9469
 akshare/stock_feature/stock_fhps_ths.py,sha256=NosH1xyT1Pif4T9tchdtJTBEpe6g1Wq2kjvxJDsZD_Y,1805
 akshare/stock_feature/stock_fund_flow.py,sha256=cqBqsFrzwmuLP3k3wYQzvW085QUUfHZ4nBW8Zx7egkQ,18669
-akshare/stock_feature/stock_gddh_em.py,sha256=I_MUJhyy0mwjNG46ZsQINEQvHR42EmS7gJBQujXr5Bw,3467
+akshare/stock_feature/stock_gddh_em.py,sha256=N4sH_qF7LZvMs46t7eGtbnahNrEBQPDk6tRSP_1ModM,3563
 akshare/stock_feature/stock_gdfx_em.py,sha256=rnGnHYmPH7b2mk4R9LJ3xl5XTMUaQqsFyQejje0qhyQ,38645
 akshare/stock_feature/stock_gdhs.py,sha256=Z6ZMy1A03BqMu9TghcIu2Sd_wwEtpIH7qawHun9G7ns,9036
 akshare/stock_feature/stock_gdzjc_em.py,sha256=SHJH5iS3_NhvjTqRXF0vPooZl0s_ASeyZmNCC50ZYqs,4426
@@ -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=j1MGYbZI2if2j_LY1S4FLsf4qfq4NwVqD5wmRlv5Log,832
-akshare-1.15.83.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.15.83.dist-info/METADATA,sha256=4FMu1VzEhreX8Edl_JnArQ6-uZ7lKpF37Uc93A5ty2M,13679
-akshare-1.15.83.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-akshare-1.15.83.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.15.83.dist-info/RECORD,,
+akshare-1.15.85.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.15.85.dist-info/METADATA,sha256=N2wlQIM5XSQ-Xqf031_xEhc-XipHV5BFGyuK1tf3s6I,13679
+akshare-1.15.85.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+akshare-1.15.85.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.15.85.dist-info/RECORD,,