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

akshare/__init__.py

@@ -2995,9 +2995,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 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
+1.15.86 fix: fix stock_zdhtmx_em interface
+1.15.87 fix: fix futures_index_ccidx interface
 """
 
-__version__ = "1.15.85"
+__version__ = "1.15.87"
 __author__ = "AKFamily"
 
 import sys

akshare/futures/futures_index_ccidx.py

@@ -1,12 +1,12 @@
 # -*- coding:utf-8 -*-
 # !/usr/bin/env python
 """
-Date: 2023/11/9 14:00
+Date: 2025/2/12 16:00
 Desc: 中证商品指数
 http://www.ccidx.com/
 """
 
-from io import BytesIO
+import json
 
 import pandas as pd
 import requests
@@ -25,31 +25,28 @@ def futures_index_ccidx(symbol: str = "中证商品期货指数") -> pd.DataFram
         "中证商品期货指数": "100001.CCI",
         "中证商品期货价格指数": "000001.CCI",
     }
-    url = "http://www.ccidx.com/front/ajax_downZSHQ.do"
-    params = {"indexCode": futures_index_map[symbol]}
+    url = "http://www.ccidx.com/CCI-ZZZS/index/getDateLine"
+    params = {"indexId": futures_index_map[symbol]}
     r = requests.get(url, params=params)
-    temp_df = pd.read_excel(BytesIO(r.content), header=1, engine="openpyxl")
-    temp_df.columns = [
-        "日期",
-        "指数代码",
-        "指数中文全称",
-        "指数中文简称",
-        "指数英文全称",
-        "指数英文简称",
-        "开盘",
-        "最高",
-        "最低",
-        "收盘",
-        "结算",
-        "涨跌",
-        "涨跌幅",
-    ]
+    data_json = r.json()
+    temp_df = pd.DataFrame(
+        [json.loads(item) for item in data_json["data"]["dateLineJson"]]
+    )
+    temp_df.rename(
+        columns={
+            "tradeDate": "日期",
+            "indexId": "指数代码",
+            "closingPrice": "收盘点位",
+            "settlePrice": "结算点位",
+            "dailyIncreaseAndDecrease": "涨跌",
+            "dailyIncreaseAndDecreasePercentage": "涨跌幅",
+        },
+        inplace=True,
+    )
+
     temp_df["日期"] = pd.to_datetime(temp_df["日期"], errors="coerce").dt.date
-    temp_df["开盘"] = pd.to_numeric(temp_df["开盘"], errors="coerce")
-    temp_df["最高"] = pd.to_numeric(temp_df["最高"], errors="coerce")
-    temp_df["最低"] = pd.to_numeric(temp_df["最低"], errors="coerce")
-    temp_df["收盘"] = pd.to_numeric(temp_df["收盘"], errors="coerce")
-    temp_df["结算"] = pd.to_numeric(temp_df["结算"], errors="coerce")
+    temp_df["收盘点位"] = pd.to_numeric(temp_df["收盘点位"], errors="coerce")
+    temp_df["结算点位"] = pd.to_numeric(temp_df["结算点位"], errors="coerce")
     temp_df["涨跌"] = pd.to_numeric(temp_df["涨跌"], errors="coerce")
     temp_df["涨跌幅"] = pd.to_numeric(temp_df["涨跌幅"], errors="coerce")
     temp_df.sort_values(by=["日期"], inplace=True)

akshare/stock_feature/stock_zdhtmx_em.py

@@ -1,13 +1,14 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/8/19 20:32
+Date: 2025/2/11 20:32
 Desc: 东方财富网-数据中心-重大合同-重大合同明细
 https://data.eastmoney.com/zdht/mx.html
 """
+
 import pandas as pd
 import requests
-from tqdm import tqdm
+from akshare.utils.tqdm import get_tqdm
 
 
 def stock_zdhtmx_em(
@@ -19,6 +20,9 @@ def stock_zdhtmx_em(
     :return: 股东大会
     :rtype: pandas.DataFrame
     """
+    import warnings
+
+    warnings.filterwarnings(action="ignore", category=FutureWarning)
     url = "https://datacenter-web.eastmoney.com/api/data/v1/get"
     params = {
         "sortColumns": "DIM_RDATE",
@@ -28,12 +32,14 @@ def stock_zdhtmx_em(
         "columns": "ALL",
         "token": "894050c76af8597a853f5b408b759f5d",
         "reportName": "RPTA_WEB_ZDHT_LIST",
-        "filter": f"""(DIM_RDATE>='{"-".join([start_date[:4], start_date[4:6], start_date[6:]])}')(DIM_RDATE<='{"-".join([end_date[:4], end_date[4:6], end_date[6:]])}')""",
+        "filter": f"""(DIM_RDATE>='{"-".join([start_date[:4], start_date[4:6], start_date[6:]])}')
+        (DIM_RDATE<='{"-".join([end_date[:4], end_date[4:6], end_date[6:]])}')""",
     }
     r = requests.get(url, params=params)
     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(
             {
@@ -43,7 +49,7 @@ def stock_zdhtmx_em(
         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.reset_index(inplace=True)
     big_df["index"] = big_df["index"] + 1
     big_df.rename(
@@ -101,8 +107,12 @@ def stock_zdhtmx_em(
     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["最新财务报表的营业收入"] = 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
 
 

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

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

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=GjfQo3PkBi5hufDAfY92Cm7-6uHIk2cQBpJOSMa5jv4,186840
+akshare/__init__.py,sha256=IYBCt-ujchTg4VREWnkTnX-buYA9aQmbWH849eD0ZeQ,186930
 akshare/datasets.py,sha256=rKuRNZrqi6IMsZ9nyvO3Rx02js0tH3zMLjz8HQNAoPQ,963
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -115,7 +115,7 @@ akshare/futures/futures_foreign.py,sha256=oSIoAg5oy-CIlPWHkQffcvZGu02Y2GWOrt-6aP
 akshare/futures/futures_hf_em.py,sha256=jne-wUYr2QTUkDq3qAxYKE0Hm90L3H8qUDu3JavKiUg,3338
 akshare/futures/futures_hist_em.py,sha256=23poFID_GE2mWf9NnkJBE3N7FgxNYiqrbTKO0VciS_A,6441
 akshare/futures/futures_hq_sina.py,sha256=eK1gEan4DPvpYmln8-tNnzh_J_733s95DBr--NqNYVA,9576
-akshare/futures/futures_index_ccidx.py,sha256=Ni5GICleqcHrmLatOE_Bs4i1DS3bn0lEm_RyrjlucB0,4581
+akshare/futures/futures_index_ccidx.py,sha256=_kgWioCOpFNn8WUcL5qKHGb3rUHzrbrx2AszprKpBh4,4460
 akshare/futures/futures_inventory_99.py,sha256=xdX8GSCEcRWYnbw0XS22rcblXOvlzUvfUltv7oyRh3Y,2990
 akshare/futures/futures_inventory_em.py,sha256=C5nt4F51WB-oc8o3GrMvEGo0SO2mIq_H1vHVl42vzT0,2340
 akshare/futures/futures_news_shmet.py,sha256=1epZ3MwDc-T2n1ie4SSDfvUaBiMpSL0Q_xb2VoZ_llU,2465
@@ -345,7 +345,7 @@ akshare/stock_feature/stock_yjbb_em.py,sha256=J-JFnRy4M1DlM46J2ccJTdnkUrI3M2lTYj
 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=-16KDPtBDXkbHRs7aNAyPy35XurDj7LIcbWAtmgvP64,3219
-akshare/stock_feature/stock_zdhtmx_em.py,sha256=2BpJQntGgUlEIOmDlepOiOkw-e-tKLRaY-O7bNSbiIo,4153
+akshare/stock_feature/stock_zdhtmx_em.py,sha256=AwJajapk-Y59usiw6p0fBYVkqTDAXBQsxFEmo4sfkE4,4326
 akshare/stock_feature/stock_zf_pg.py,sha256=nYJ1uLOBdzM_PDyq4MNeWoCTripFMAPoAiaPfhDqkcg,6343
 akshare/stock_feature/stock_zh_valuation_baidu.py,sha256=oxYIHP68pFvAYyqjCvZp3a9tpczTFiWhSxZ0w4eyo7I,1904
 akshare/stock_feature/stock_zh_vote_baidu.py,sha256=SsSNnCq7PDFMzWFcPFcC_MSc9rua412P14vHc923gmo,1761
@@ -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.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,,
+akshare-1.15.87.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.15.87.dist-info/METADATA,sha256=0TbL6iLOFFIXCWenS6eBnCFZnVlY4F-1mx2W6GEXpQA,13679
+akshare-1.15.87.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+akshare-1.15.87.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.15.87.dist-info/RECORD,,