akshare 1.15.45__tar.gz → 1.15.47__tar.gz

{akshare-1.15.45 → akshare-1.15.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.15.45
+Version: 1.15.47
 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 → akshare-1.15.47}/akshare/__init__.py

@@ -2955,9 +2955,11 @@ 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
+1.15.47 fix: fix stock_individual_spot_xq interface
 """
 
-__version__ = "1.15.45"
+__version__ = "1.15.47"
 __author__ = "AKFamily"
 
 import sys

{akshare-1.15.45 → akshare-1.15.47}/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,14 +16,17 @@ https://fundf10.eastmoney.com/jjjl_001810.html
 """
 
 import json
+import math
 import time
 from io import StringIO
 
 import pandas as pd
+import py_mini_racer
 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:
@@ -351,19 +354,12 @@ def fund_open_fund_info_em(
     r = requests.get(url, headers=headers)
     data_text = r.text
 
+    js_code = py_mini_racer.MiniRacer()
+    js_code.eval(data_text)
+
     # 单位净值走势
     if indicator == "单位净值走势":
-        try:
-            data_json = demjson.decode(
-                data_text[
-                    data_text.find("Data_netWorthTrend") + 21 : data_text.find(
-                        "Data_ACWorthTrend"
-                    )
-                    - 15
-                ]
-            )
-        except:  # noqa: E722
-            return pd.DataFrame()
+        data_json = js_code.execute("Data_netWorthTrend")
         temp_df = pd.DataFrame(data_json)
         if temp_df.empty:
             return pd.DataFrame()
@@ -393,17 +389,7 @@ def fund_open_fund_info_em(
 
     # 累计净值走势
     if indicator == "累计净值走势":
-        try:
-            data_json = demjson.decode(
-                data_text[
-                    data_text.find("Data_ACWorthTrend") + 20 : data_text.find(
-                        "Data_grandTotal"
-                    )
-                    - 16
-                ]
-            )
-        except:  # noqa: E722
-            return pd.DataFrame()
+        data_json = js_code.execute("Data_ACWorthTrend")
         temp_df = pd.DataFrame(data_json)
         if temp_df.empty:
             return pd.DataFrame()
@@ -461,14 +447,7 @@ def fund_open_fund_info_em(
 
     # 同类排名走势
     if indicator == "同类排名走势":
-        data_json = demjson.decode(
-            data_text[
-                data_text.find("Data_rateInSimilarType") + 25 : data_text.find(
-                    "Data_rateInSimilarPersent"
-                )
-                - 16
-            ]
-        )
+        data_json = js_code.execute("Data_rateInSimilarType")
         temp_df = pd.DataFrame(data_json)
         temp_df["x"] = pd.to_datetime(temp_df["x"], unit="ms", utc=True).dt.tz_convert(
             "Asia/Shanghai"
@@ -499,14 +478,7 @@ def fund_open_fund_info_em(
 
     # 同类排名百分比
     if indicator == "同类排名百分比":
-        data_json = demjson.decode(
-            data_text[
-                data_text.find("Data_rateInSimilarPersent") + 26 : data_text.find(
-                    "Data_fluctuationScale"
-                )
-                - 23
-            ]
-        )
+        data_json = js_code.execute("Data_rateInSimilarPersent")
         temp_df = pd.DataFrame(data_json)
         temp_df.columns = ["x", "y"]
         temp_df["x"] = pd.to_datetime(temp_df["x"], unit="ms", utc=True).dt.tz_convert(
@@ -948,15 +920,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 +952,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 → akshare-1.15.47}/akshare/futures/futures_daily_bar.py

@@ -682,7 +682,7 @@ def get_futures_daily(
 
 if __name__ == "__main__":
     get_futures_daily_df = get_futures_daily(
-        start_date="20241118", end_date="20241118", market="DCE"
+        start_date="20180326", end_date="20180331", market="INE"
     )
     print(get_futures_daily_df)
 

{akshare-1.15.45 → akshare-1.15.47}/akshare/stock/stock_xq.py

@@ -42,7 +42,7 @@ def stock_individual_spot_xq(
     """
     session = requests.Session()
     headers = {
-        "cookie": "xq_a_token=691d6f0a678b98a172affb89759b9c46fd23b4e2;",
+        "cookie": "xq_a_token=220b0abef0fac476d076c9f7a3938b7edac35f48;",
         "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 "
         "(KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1",
     }

{akshare-1.15.45 → akshare-1.15.47}/akshare.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.15.45
+Version: 1.15.47
 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