akshare 1.15.76__py3-none-any.whl → 1.15.78__py3-none-any.whl

akshare/__init__.py

@@ -2986,9 +2986,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.74 fix: fix macro_australia_retail_rate_monthly interface
 1.15.75 feat: add futures_hist_em interface
 1.15.76 fix: fix futures_zh_minute_sina interface
+1.15.77 fix: fix option_czce_daily interface
+1.15.78 fix: fix stock_yzxdr_em interface
 """
 
-__version__ = "1.15.76"
+__version__ = "1.15.78"
 __author__ = "AKFamily"
 
 import sys

akshare/option/option_commodity.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/7/19 14:00
+Date: 2025/1/17 23:00
 Desc: 商品期权数据
 说明：
 (1) 价格：自2019年12月02日起，纤维板报价单位由元/张改为元/立方米
@@ -335,7 +335,7 @@ def option_czce_daily(
                 new_df = __option_czce_daily_convert_numeric_columns(temp_df)
                 return new_df
             elif symbol == "瓶片期权":
-                temp_df = table_df[table_df.iloc[:, 0].str.contains("FG")]
+                temp_df = table_df[table_df.iloc[:, 0].str.contains("PR")]
                 temp_df.reset_index(inplace=True, drop=True)
                 temp_df = temp_df.iloc[:-1, :].copy()
                 new_df = __option_czce_daily_convert_numeric_columns(temp_df)

akshare/stock_feature/stock_yzxdr_em.py

@@ -3,26 +3,30 @@
 """
 Date: 2022/4/27 19:18
 Desc: 东方财富网-数据中心-特色数据-一致行动人
-http://data.eastmoney.com/yzxdr/
+https://data.eastmoney.com/yzxdr/
 """
+
 import pandas as pd
 import requests
-from tqdm import tqdm
+from akshare.utils.tqdm import get_tqdm
 
 from akshare.utils import demjson
 
 
-def stock_yzxdr_em(date: str = "20200930") -> pd.DataFrame:
+def stock_yzxdr_em(date: str = "20240930") -> pd.DataFrame:
     """
     东方财富网-数据中心-特色数据-一致行动人
-    http://data.eastmoney.com/yzxdr/
+    https://data.eastmoney.com/yzxdr/
     :param date: 每年的季度末时间点
     :type date: str
     :return: 一致行动人
     :rtype: pandas.DataFrame
     """
+    import warnings
+
+    warnings.simplefilter(action="ignore", category=FutureWarning)  # 忽略所有
     date = "-".join([date[:4], date[4:6], date[6:]])
-    url = "http://datacenter.eastmoney.com/api/data/get"
+    url = "https://datacenter.eastmoney.com/api/data/get"
     params = {
         "type": "RPTA_WEB_YZXDRINDEX",
         "sty": "ALL",
@@ -40,24 +44,19 @@ def stock_yzxdr_em(date: str = "20200930") -> pd.DataFrame:
     data_json = demjson.decode(data_text[data_text.find("{") : -1])
     total_pages = data_json["result"]["pages"]
     big_df = pd.DataFrame()
+    tqdm = get_tqdm()
     for page in tqdm(range(1, total_pages + 1), leave=False):
-        params = {
-            "type": "RPTA_WEB_YZXDRINDEX",
-            "sty": "ALL",
-            "source": "WEB",
-            "p": str(page),
-            "ps": "500",
-            "st": "noticedate",
-            "sr": "-1",
-            "var": "mwUyirVm",
-            "filter": f"(enddate='{date}')",
-            "rt": "53575609",
-        }
+        params.update(
+            {
+                "p": str(page),
+                "filter": f"(enddate='{date}')",
+            }
+        )
         r = requests.get(url, params=params)
         data_text = r.text
         data_json = demjson.decode(data_text[data_text.find("{") : -1])
         temp_df = pd.DataFrame(data_json["result"]["data"])
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
+        big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
 
     big_df.reset_index(inplace=True)
     big_df["index"] = range(1, len(big_df) + 1)
@@ -78,8 +77,8 @@ def stock_yzxdr_em(date: str = "20200930") -> pd.DataFrame:
         "数据日期",
         "股票市场",
     ]
-    big_df["数据日期"] = pd.to_datetime(big_df["数据日期"])
-    big_df["公告日期"] = pd.to_datetime(big_df["公告日期"])
+    big_df["数据日期"] = pd.to_datetime(big_df["数据日期"], errors="coerce")
+    big_df["公告日期"] = pd.to_datetime(big_df["公告日期"], errors="coerce")
 
     big_df = big_df[
         [
@@ -95,10 +94,13 @@ def stock_yzxdr_em(date: str = "20200930") -> pd.DataFrame:
             "公告日期",
         ]
     ]
-    big_df['公告日期'] = pd.to_datetime(big_df['公告日期']).dt.date
+    big_df["公告日期"] = pd.to_datetime(big_df["公告日期"], errors="coerce").dt.date
+    big_df["持股数量"] = pd.to_numeric(big_df["持股数量"], errors="coerce")
+    big_df["持股比例"] = pd.to_numeric(big_df["持股比例"], errors="coerce")
+    big_df["持股数量变动"] = pd.to_numeric(big_df["持股数量变动"], errors="coerce")
     return big_df
 
 
 if __name__ == "__main__":
-    stock_yzxdr_em_df = stock_yzxdr_em(date="20220331")
+    stock_yzxdr_em_df = stock_yzxdr_em(date="20240930")
     print(stock_yzxdr_em_df)

{akshare-1.15.76.dist-info → akshare-1.15.78.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=X6nvZhMeiwccKoPYjrVM-qEBwNh7GKmL4554-Fd54iY,186417
+akshare/__init__.py,sha256=-xflBH3XZXXgK0kLNDPW1RBds87h6NkFkgUYNf4aMns,186504
 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=1b5d0pCwuaUtjlM4qyjiTRMx62fKKAq02mc-ira5d5I,25711
+akshare/option/option_commodity.py,sha256=Ovg561J_CSfe7aB1hq47vw3uuWtwMz5HW-2GhaS2z88,25711
 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
@@ -344,7 +344,7 @@ akshare/stock_feature/stock_wencai.py,sha256=KPwt72SOnK4dHh2vpWOHYynkj8Vrbv3AW-E
 akshare/stock_feature/stock_yjbb_em.py,sha256=J-JFnRy4M1DlM46J2ccJTdnkUrI3M2lTYj4CpzqgADo,4275
 akshare/stock_feature/stock_yjyg_cninfo.py,sha256=DveTsc-DhLzRDBJZQ7yv8KogzG-vo3Pmr2oRgCzaH1E,2870
 akshare/stock_feature/stock_yjyg_em.py,sha256=CnpSNyOUYVzoduFTVwsERtdp_uJimlHddw4uWV0iDmc,12184
-akshare/stock_feature/stock_yzxdr_em.py,sha256=2hn2dutiKphyopjlekSfcNCsmf1oy99S60iRjov3Jm4,2951
+akshare/stock_feature/stock_yzxdr_em.py,sha256=-16KDPtBDXkbHRs7aNAyPy35XurDj7LIcbWAtmgvP64,3219
 akshare/stock_feature/stock_zdhtmx_em.py,sha256=2BpJQntGgUlEIOmDlepOiOkw-e-tKLRaY-O7bNSbiIo,4153
 akshare/stock_feature/stock_zf_pg.py,sha256=nYJ1uLOBdzM_PDyq4MNeWoCTripFMAPoAiaPfhDqkcg,6343
 akshare/stock_feature/stock_zh_valuation_baidu.py,sha256=oxYIHP68pFvAYyqjCvZp3a9tpczTFiWhSxZ0w4eyo7I,1904
@@ -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.76.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.15.76.dist-info/METADATA,sha256=H8QEDSFRHcIHPxy73JGr4EhRKKYOpPdGKyBYES_5Cv8,13679
-akshare-1.15.76.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-akshare-1.15.76.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.15.76.dist-info/RECORD,,
+akshare-1.15.78.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.15.78.dist-info/METADATA,sha256=wTcOdPsGAuAdBsVKqUb6MLsnMy-THtLDijeRF4oJXQk,13679
+akshare-1.15.78.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+akshare-1.15.78.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.15.78.dist-info/RECORD,,