akshare 1.15.45__py3-none-any.whl → 1.15.46__py3-none-any.whl

akshare/__init__.py

@@ -2955,9 +2955,10 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.43 fix: fix macro_china_urban_unemployment interface
 1.15.44 fix: fix index_detail_hist_adjust_cni interface
 1.15.45 fix: fix stock_jgdy_detail_em interface
+1.15.46 fix: fix fund_etf_fund_info_em interface
 """
 
-__version__ = "1.15.45"
+__version__ = "1.15.46"
 __author__ = "AKFamily"
 
 import sys

akshare/fund/fund_em.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/10/1 18:10
+Date: 2024/12/14 15:00
 Desc: 东方财富网站-天天基金网-基金数据-开放式基金净值
 https://fund.eastmoney.com/manager/default.html#dt14;mcreturnjson;ftall;pn20;pi1;scabbname;stasc
 1.基金经理基本数据, 建议包含:基金经理代码,基金经理姓名,从业起始日期,现任基金公司,管理资产总规模,上述数据可在"基金经理列表:
@@ -16,6 +16,7 @@ https://fundf10.eastmoney.com/jjjl_001810.html
 """
 
 import json
+import math
 import time
 from io import StringIO
 
@@ -24,6 +25,7 @@ import requests
 
 from akshare.utils import demjson
 from akshare.utils.cons import headers
+from akshare.utils.tqdm import get_tqdm
 
 
 def fund_purchase_em() -> pd.DataFrame:
@@ -948,15 +950,24 @@ def fund_etf_fund_info_em(
     params = {
         "fundCode": fund,
         "pageIndex": "1",
-        "pageSize": "10000",
+        "pageSize": "20",
         "startDate": "-".join([start_date[:4], start_date[4:6], start_date[6:]]),
         "endDate": "-".join([end_date[:4], end_date[4:6], end_date[6:]]),
         "_": round(time.time() * 1000),
     }
     r = requests.get(url, params=params, headers=headers)
     data_json = r.json()
-    temp_df = pd.DataFrame(data_json["Data"]["LSJZList"])
-    temp_df.columns = [
+    total_page = math.ceil(data_json["TotalCount"] / 20)
+    df_list = []
+    tqdm = get_tqdm()
+    for page in tqdm(range(1, total_page + 1), leave=False):
+        params.update({"pageIndex": page})
+        r = requests.get(url, params=params, headers=headers)
+        data_json = r.json()
+        temp_df = pd.DataFrame(data_json["Data"]["LSJZList"])
+        df_list.append(temp_df)
+    big_df = pd.concat(df_list)
+    big_df.columns = [
         "净值日期",
         "单位净值",
         "累计净值",
@@ -971,15 +982,15 @@ def fund_etf_fund_info_em(
         "_",
         "_",
     ]
-    temp_df = temp_df[
+    big_df = big_df[
         ["净值日期", "单位净值", "累计净值", "日增长率", "申购状态", "赎回状态"]
     ]
-    temp_df["净值日期"] = pd.to_datetime(temp_df["净值日期"]).dt.date
-    temp_df["单位净值"] = pd.to_numeric(temp_df["单位净值"])
-    temp_df["累计净值"] = pd.to_numeric(temp_df["累计净值"])
-    temp_df["日增长率"] = pd.to_numeric(temp_df["日增长率"])
-    temp_df.sort_values(["净值日期"], inplace=True, ignore_index=True)
-    return temp_df
+    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")
+    big_df.sort_values(["净值日期"], inplace=True, ignore_index=True)
+    return big_df
 
 
 def fund_value_estimation_em(symbol: str = "全部") -> pd.DataFrame:

{akshare-1.15.45.dist-info → akshare-1.15.46.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=ACpa0FRN-FBpuz43nJ_CUGfGHwjVNVqqj2wlZZPRxhM,184449
+akshare/__init__.py,sha256=3sRC6Z_f6BmrIUSDf-t363brPzhzqfc3cEYxul6etQ8,184498
 akshare/datasets.py,sha256=-qdwaQjgBlftX84uM74KJqCYJYkQ50PV416_neA4uls,995
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -85,7 +85,7 @@ akshare/fund/__init__.py,sha256=RMTf1bT5EOE3ttWpn3hGu1LtUmsVxDoa0W7W0gXHOy8,81
 akshare/fund/fund_amac.py,sha256=Dml3EgpJhmVgkttb0OdaWN41ynOCIbJ0-1qAPDWF0oo,33800
 akshare/fund/fund_announcement.py,sha256=g5rcIC9vQ4HapZd0b7cDbFYzHu9V6bOKhwxRHVfmv8k,1848
 akshare/fund/fund_aum_em.py,sha256=dy1R1-0X48H8S-LPiuggNA5M-6MvQ08fnp5bytvCGPQ,3518
-akshare/fund/fund_em.py,sha256=MrK_HVcRUvHQCrY-blapivPd0La5cVCBNJIG0gW71fs,40844
+akshare/fund/fund_em.py,sha256=BoqIT2fD7SjleUEYVrPgAWbahGlmL7X6coEuIRgBsB0,41308
 akshare/fund/fund_etf_em.py,sha256=8HrEQbM3wSMHuTAle9g6iT4ULaPjsqCcTBVU7PrpqJA,17377
 akshare/fund/fund_etf_sina.py,sha256=3eYnpug02oSZfR6fuWsT5mZRMRNm39VYCLHKnWdvonM,5218
 akshare/fund/fund_etf_ths.py,sha256=vb_jy0h2-Kz2dNWUrwBYxPB0MAotv0KZgnFhE98ohSM,3432
@@ -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.45.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.15.45.dist-info/METADATA,sha256=i3mygGTuHA_N5-Jvv3KIwajE9NEQ8xqK0oVtuyDyqdA,13423
-akshare-1.15.45.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-akshare-1.15.45.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.15.45.dist-info/RECORD,,
+akshare-1.15.46.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.15.46.dist-info/METADATA,sha256=IAg8UicVROhyCeVGd2axnWgMcIMwj2_2DRaqD2jtaRs,13423
+akshare-1.15.46.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+akshare-1.15.46.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.15.46.dist-info/RECORD,,