akshare 1.15.67__py3-none-any.whl → 1.15.69__py3-none-any.whl

akshare/__init__.py

@@ -2977,9 +2977,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.65 fix: fix option_czce_daily interface
 1.15.66 fix: fix fund_etf_dividend_sina interface
 1.15.67 fix: fix stock_hold_change_cninfo interface
+1.15.68 fix: fix stock_research_report_em interface
+1.15.69 fix: fix index_zh_a_hist_min_em interface
 """
 
-__version__ = "1.15.67"
+__version__ = "1.15.69"
 __author__ = "AKFamily"
 
 import sys

akshare/futures/cot.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/11/15 19:30
+Date: 2025/1/10 18:30
 Desc: 期货-中国-交易所-会员持仓数据接口
 大连商品交易所、上海期货交易所、郑州商品交易所、中国金融期货交易所、广州期货交易所
 采集前 20 会员持仓数据;
@@ -1171,7 +1171,7 @@ def __futures_gfex_vars_list() -> list:
     return var_list
 
 
-def __futures_gfex_contract_list(symbol: str = "si", date: str = "20231113") -> list:
+def __futures_gfex_contract_list(symbol: str = "si", date: str = "20240729") -> list:
     """
     广州期货交易所-合约具体名称列表
     http://www.gfex.com.cn/gfex/rcjccpm/hqsj_tjsj.shtml
@@ -1194,6 +1194,8 @@ def __futures_gfex_contract_list(symbol: str = "si", date: str = "20231113") ->
     r = requests.post(url=url, data=payload, headers=headers)
     data_json = r.json()
     temp_df = pd.DataFrame(data_json["data"])
+    if temp_df.empty:
+        return []
     contract_list = temp_df.iloc[:, 0].tolist()
     return contract_list
 
@@ -1317,7 +1319,7 @@ def futures_gfex_position_rank(date: str = "20231113", vars_list: list = None):
                 symbol=item.lower(), date=date
             )
         except:  # noqa: E722
-            return {}
+            return big_dict
         for name in futures_contract_list:
             try:
                 temp_df = __futures_gfex_contract_data(
@@ -1325,7 +1327,7 @@ def futures_gfex_position_rank(date: str = "20231113", vars_list: list = None):
                 )
                 big_dict[name] = temp_df
             except:  # noqa: E722
-                return {}
+                return big_dict
     return big_dict
 
 
@@ -1371,7 +1373,7 @@ if __name__ == "__main__":
     print(futures_dce_position_rank_other_df)
 
     # 广州期货交易所
-    futures_gfex_position_rank_df = futures_gfex_position_rank(date="20240805")
+    futures_gfex_position_rank_df = futures_gfex_position_rank(date="20240729")
     print(futures_gfex_position_rank_df)
 
     # 总接口

akshare/index/index_zh_em.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/12/11 20:20
+Date: 2025/1/10 18:10
 Desc: 东方财富网-指数行情数据
 """
 
@@ -85,6 +85,8 @@ def index_code_id_map_em() -> dict:
         key: value - 1 if value == 1 else value + 1
         for key, value in code_id_dict.items()
     }
+    # 单独增加品种
+    code_id_dict.update({"932000": 2})
     return code_id_dict
 
 
@@ -438,9 +440,9 @@ if __name__ == "__main__":
     print(index_zh_a_hist_df)
 
     index_zh_a_hist_min_em_df = index_zh_a_hist_min_em(
-        symbol="000001",
+        symbol="932000",
         period="1",
-        start_date="2024-03-20 09:30:00",
-        end_date="2024-03-20 19:00:00",
+        start_date="2025-01-10 09:30:00",
+        end_date="2025-01-10 19:00:00",
     )
     print(index_zh_a_hist_min_em_df)

akshare/stock_feature/stock_research_report_em.py

@@ -1,13 +1,15 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/8/20 20:00
+Date: 2025/1/9 21:35
 Desc: 东方财富网-数据中心-研究报告-个股研报
 https://data.eastmoney.com/report/stock.jshtml
 """
+
 import pandas as pd
 import requests
-from tqdm import tqdm
+
+from akshare.utils.tqdm import get_tqdm
 
 
 def stock_research_report_em(symbol: str = "000001") -> pd.DataFrame:
@@ -40,7 +42,9 @@ def stock_research_report_em(symbol: str = "000001") -> pd.DataFrame:
     r = requests.get(url, params=params)
     data_json = r.json()
     total_page = data_json["TotalPage"]
+    current_year = data_json["currentYear"]
     big_df = pd.DataFrame()
+    tqdm = get_tqdm()
     for page in tqdm(range(1, total_page + 1), leave=False):
         params.update(
             {
@@ -53,9 +57,15 @@ def stock_research_report_em(symbol: str = "000001") -> pd.DataFrame:
         r = requests.get(url, params=params)
         data_json = r.json()
         temp_df = pd.DataFrame(data_json["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.reset_index(inplace=True)
     big_df["index"] = big_df["index"] + 1
+    predict_this_year_eps_title = f"{current_year}-盈利预测-收益"
+    predict_this_year_pe_title = f"{current_year}-盈利预测-市盈率"
+    predict_next_year_eps_title = f"{current_year + 1}-盈利预测-收益"
+    predict_next_year_pe_title = f"{current_year + 1}-盈利预测-市盈率"
+    predict_next_two_year_eps_title = f"{current_year + 2}-盈利预测-收益"
+    predict_next_two_year_pe_title = f"{current_year + 2}-盈利预测-市盈率"
     big_df.rename(
         columns={
             "index": "序号",
@@ -68,12 +78,12 @@ def stock_research_report_em(symbol: str = "000001") -> pd.DataFrame:
             "publishDate": "日期",
             "infoCode": "-",
             "column": "-",
-            "predictNextTwoYearEps": "-",
-            "predictNextTwoYearPe": "-",
-            "predictNextYearEps": "2024-盈利预测-收益",
-            "predictNextYearPe": "2024-盈利预测-市盈率",
-            "predictThisYearEps": "2023-盈利预测-收益",
-            "predictThisYearPe": "2023-盈利预测-市盈率",
+            "predictNextTwoYearEps": predict_next_two_year_eps_title,
+            "predictNextTwoYearPe": predict_next_two_year_pe_title,
+            "predictNextYearEps": predict_next_year_eps_title,
+            "predictNextYearPe": predict_next_year_pe_title,
+            "predictThisYearEps": predict_this_year_eps_title,
+            "predictThisYearPe": predict_this_year_pe_title,
             "predictLastYearEps": "-",
             "predictLastYearPe": "-",
             "actualLastTwoYearEps": "-",
@@ -122,20 +132,38 @@ def stock_research_report_em(symbol: str = "000001") -> pd.DataFrame:
             "东财评级",
             "机构",
             "近一月个股研报数",
-            "2023-盈利预测-收益",
-            "2023-盈利预测-市盈率",
-            "2024-盈利预测-收益",
-            "2024-盈利预测-市盈率",
+            predict_this_year_eps_title,
+            predict_this_year_pe_title,
+            predict_next_year_eps_title,
+            predict_next_year_pe_title,
+            predict_next_two_year_eps_title,
+            predict_next_two_year_pe_title,
             "行业",
             "日期",
         ]
     ]
     big_df["日期"] = pd.to_datetime(big_df["日期"], errors="coerce").dt.date
-    big_df["近一月个股研报数"] = pd.to_numeric(big_df["近一月个股研报数"], errors="coerce")
-    big_df["2023-盈利预测-收益"] = pd.to_numeric(big_df["2023-盈利预测-收益"], errors="coerce")
-    big_df["2023-盈利预测-市盈率"] = pd.to_numeric(big_df["2023-盈利预测-市盈率"], errors="coerce")
-    big_df["2024-盈利预测-收益"] = pd.to_numeric(big_df["2024-盈利预测-收益"], errors="coerce")
-    big_df["2024-盈利预测-市盈率"] = pd.to_numeric(big_df["2024-盈利预测-市盈率"], errors="coerce")
+    big_df["近一月个股研报数"] = pd.to_numeric(
+        big_df["近一月个股研报数"], errors="coerce"
+    )
+    big_df[predict_this_year_eps_title] = pd.to_numeric(
+        big_df[predict_this_year_eps_title], errors="coerce"
+    )
+    big_df[predict_this_year_pe_title] = pd.to_numeric(
+        big_df[predict_this_year_pe_title], errors="coerce"
+    )
+    big_df[predict_next_year_eps_title] = pd.to_numeric(
+        big_df[predict_next_year_eps_title], errors="coerce"
+    )
+    big_df[predict_next_year_pe_title] = pd.to_numeric(
+        big_df[predict_next_year_pe_title], errors="coerce"
+    )
+    big_df[predict_next_two_year_eps_title] = pd.to_numeric(
+        big_df[predict_next_two_year_eps_title], errors="coerce"
+    )
+    big_df[predict_next_two_year_pe_title] = pd.to_numeric(
+        big_df[predict_next_two_year_pe_title], errors="coerce"
+    )
     return big_df
 
 

{akshare-1.15.67.dist-info → akshare-1.15.69.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: akshare
-Version: 1.15.67
+Version: 1.15.69
 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
@@ -37,6 +37,18 @@ Provides-Extra: full
 Requires-Dist: akqmt; extra == "full"
 Provides-Extra: qmt
 Requires-Dist: akqmt; extra == "qmt"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 **欢迎加入专注于财经数据和量化投资的知识社区，请点击[了解更多](https://akshare.akfamily.xyz/learn.html)**
 

{akshare-1.15.67.dist-info → akshare-1.15.69.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=iHal0YVSSEaZA2Utd3s3IAKHnWDM9vY_IJKapTYwNKs,185840
+akshare/__init__.py,sha256=i0Cz2lTw5pRpEQyUD8wrbM2lTy7WInQeiGUDeG89_Ao,185942
 akshare/datasets.py,sha256=rKuRNZrqi6IMsZ9nyvO3Rx02js0tH3zMLjz8HQNAoPQ,963
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -104,7 +104,7 @@ akshare/fund/fund_scale_sina.py,sha256=A0qIzWBQdE3IGS9-cxO9_FNpuH-BAG5HhPk5KzTFT
 akshare/fund/fund_xq.py,sha256=AxMZB-940bNY7-BatVLZiseHNxiWA17hQzTfuxGibPU,11306
 akshare/futures/__init__.py,sha256=RMTf1bT5EOE3ttWpn3hGu1LtUmsVxDoa0W7W0gXHOy8,81
 akshare/futures/cons.py,sha256=swjc7oENcgqtFobdSLozErxyl2xVlWLVwMx8_Q1jFac,14765
-akshare/futures/cot.py,sha256=Kkza2slS7JQpXndKrQEEykzIjZIT3vhvtZHVJ7P1yac,58573
+akshare/futures/cot.py,sha256=GptYlcw4lyHOhW8M5hW55sNMk_fz3swjikhaSJqAmYo,58624
 akshare/futures/futures_basis.py,sha256=pmXNXdWnfvJCRs6xKJ0Ed9R2v92-NK2Sp3AjlwecErc,15691
 akshare/futures/futures_comex_em.py,sha256=V-mkKQkH5N8PyaZWKdyggb2lTnY8DDDxiUPt-1leQu0,3171
 akshare/futures/futures_comm_ctp.py,sha256=V8TEKO0R0i6LfE8DDFqrMA3JGwNlpmaQCvvMugKZ1I8,1004
@@ -171,7 +171,7 @@ akshare/index/index_sugar.py,sha256=B_Nj9Q6JP-Y_d7myZ0C79izTxxrbuZIp1Vv_CilVMOc,
 akshare/index/index_sw.py,sha256=hETMmFszQb7JDY8UHjLK8szfwkr7Ui_6QcseOoEfxaI,10456
 akshare/index/index_yw.py,sha256=6FF38kooLQulnMTqAd1__TNWip4XC1VA72k3T049xYc,4319
 akshare/index/index_zh_a_scope.py,sha256=4Ej2Gnqtd66EBiI67sQZKhblcIJXdD5CoMIJYD_KwYU,1367
-akshare/index/index_zh_em.py,sha256=RrwtUPjzV9DmWZ6J1XY1Ri1AmZFoXpQOdV21PrGrVtg,16356
+akshare/index/index_zh_em.py,sha256=j62koX1r5ifRNWUgRW8tHs_xRYJrn_CgyMitZlQaoIE,16419
 akshare/interest_rate/__init__.py,sha256=O6dl1roEQUWwtXgRpa6wOABUU7MH0YmFDrkfhBpYOX4,81
 akshare/interest_rate/interbank_rate_em.py,sha256=iKvmWxM4bpl9JgHNvavq0yhzMRq69BPEON1cGcWJrf4,4549
 akshare/movie/__init__.py,sha256=YzijIIzvGpcc9hORC6qJSEK6vkjH5c4Docb5tQq2iHs,82
@@ -330,7 +330,7 @@ akshare/stock_feature/stock_market_legu.py,sha256=_LeyGUGyZFeD-1fnJPc4eIQkeoWAmo
 akshare/stock_feature/stock_pankou_em.py,sha256=A3lu1hKddXwMFo9vKPLCQfL3Zh77xr2IbcAtKs8Lc9Y,5599
 akshare/stock_feature/stock_qsjy_em.py,sha256=7EHroLZC3-X_3WNhb7GV9MPQHbxjtkfKI_YEbTvnSb0,3913
 akshare/stock_feature/stock_report_em.py,sha256=jhePrTKGIYzdz8idiPoDs1vEajd73XRIFpZyWQggKa4,18075
-akshare/stock_feature/stock_research_report_em.py,sha256=XFQadpUI2l0-Ik8BQWf-eCC4uFC1xxt9VNiZ9NU2zp0,4888
+akshare/stock_feature/stock_research_report_em.py,sha256=z6nsoai1wUK5EfMoef-7KBd-BqqAGgKdoR01qukWBwk,5900
 akshare/stock_feature/stock_sns_sseinfo.py,sha256=TGGLw5P77Hh-sSHgw_KKoK29d1m_V_2GDQXe9m_XFew,4556
 akshare/stock_feature/stock_sy_em.py,sha256=GysP1WvPpqCLhbCRXH5sxwmXCPYvgtbJYQ_jltDqaA0,17721
 akshare/stock_feature/stock_technology_ths.py,sha256=4u9z7H6MYEutOYAQvYfzgc_FxG6XlhkMLujSotAbraw,30827
@@ -378,8 +378,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.67.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.15.67.dist-info/METADATA,sha256=QP-7VeWE73Os58p3_RxV1KcWzBmnwc9qsSEfDNIZul8,13423
-akshare-1.15.67.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-akshare-1.15.67.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.15.67.dist-info/RECORD,,
+akshare-1.15.69.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.15.69.dist-info/METADATA,sha256=PhHwU8uJGuYZ1qKZEVRe9alcI8GlG61oRJn2NQr363I,13679
+akshare-1.15.69.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+akshare-1.15.69.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.15.69.dist-info/RECORD,,

{akshare-1.15.67.dist-info → akshare-1.15.69.dist-info}/WHEEL

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