akshare 1.17.72__py3-none-any.whl → 1.17.74__py3-none-any.whl

akshare/__init__.py

@@ -3179,9 +3179,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.17.70 fix: fix macro_stock_finance interface
 1.17.71 fix: fix futures_inventory_99 interface
 1.17.72 fix: fix futures_warehouse_receipt_dce interface
+1.17.73 fix: fix get_receipt interface
+1.17.74 fix: fix futures_dce_position_rank interface
 """
 
-__version__ = "1.17.72"
+__version__ = "1.17.74"
 __author__ = "AKFamily"
 
 import sys

akshare/futures/cot.py

@@ -99,7 +99,7 @@ def get_rank_sum_daily(
                     f"{start_day.strftime('%Y-%m-%d')}日交易所数据连接失败，已超过20次，您的地址被网站墙了，请保存好返回数据，稍后从该日期起重试"
                 )
                 return records.reset_index(drop=True)
-            records = pd.concat([records, data], ignore_index=True)
+            records = pd.concat(objs=[records, data], ignore_index=True)
         else:
             warnings.warn(f"{start_day.strftime('%Y%m%d')}非交易日")
         start_day += datetime.timedelta(days=1)
@@ -826,40 +826,21 @@ def futures_dce_position_rank(
     if date.strftime("%Y%m%d") not in calendar:
         warnings.warn("%s非交易日" % date.strftime("%Y%m%d"))
         return {}
-    url = "http://portal.dce.com.cn/publicweb/quotesdata/exportMemberDealPosiQuotesBatchData.html"
-    headers = {
-        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;"
-        "q=0.8,application/signed-exchange;v=b3;q=0.9",
-        "Accept-Encoding": "gzip, deflate",
-        "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
-        "Cache-Control": "no-cache",
-        "Connection": "keep-alive",
-        "Content-Length": "160",
-        "Content-Type": "application/x-www-form-urlencoded",
-        "Host": "www.dce.com.cn",
-        "Origin": "http://portal.dce.com.cn",
-        "Pragma": "no-cache",
-        "Referer": "http://portal.dce.com.cn/publicweb/quotesdata/memberDealPosiQuotes.html",
-        "Upgrade-Insecure-Requests": "1",
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
-        "Chrome/81.0.4044.138 Safari/537.36",
-    }
+    date_str = date.strftime("%Y%m%d")
+    url = "http://www.dce.com.cn/dcereport/publicweb/dailystat/memberDealPosi/batchDownload"
     payload = {
-        "memberDealPosiQuotes.variety": "a",
-        "memberDealPosiQuotes.trade_type": "0",
-        "contract.contract_id": "a2009",
-        "contract.variety_id": "a",
-        "year": date.year,
-        "month": date.month - 1,
-        "day": str(date.day).zfill(2),
-        "batchExportFlag": "batch",
+        "tradeDate": date_str,
+        "varietyId": "a",
+        "contractId": "a2601",
+        "tradeType": "1",
+        "lang": "zh",
     }
-    r = requests.post(url, payload, headers=headers)
+    r = requests.post(url, json=payload)
     big_dict = dict()
     with zipfile.ZipFile(BytesIO(r.content), mode="r") as z:
         for i in z.namelist():
-            file_name = i.encode("cp437").decode("GBK")
-            if not file_name.startswith(date.strftime("%Y%m%d")):
+            file_name = i
+            if not file_name.startswith(date_str):
                 continue
             try:
                 data = pd.read_table(z.open(i), header=None, sep="\t")

akshare/futures/futures_warehouse_receipt.py

@@ -29,6 +29,8 @@ def futures_czce_warehouse_receipt(date: str = "20200702") -> dict:
     :return: 指定日期的仓单日报数据
     :rtype: dict
     """
+    import urllib3
+    urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
     url = f"http://www.czce.com.cn/cn/DFSStaticFiles/Future/{date[:4]}/{date}/FutureDataWhsheet.xls"
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "

akshare/futures/receipt.py

@@ -37,7 +37,7 @@ shfe_20101029 = pd.DataFrame(
 def get_dce_receipt(date: str = None, vars_list: List = cons.contract_symbols):
     """
     大连商品交易所-注册仓单数据
-
+    http://www.dce.com.cn/dce/channel/list/187.html
     :param date: 开始日期: YYYY-MM-DD 或 YYYYMMDD 或 datetime.date对象, 为空时为当天
     :type date: str
     :param vars_list: 合约品种如 RB, AL等列表, 为空时为所有商品数据从 20060106开始，每周五更新仓单数据。直到20090407起，每交易日都更新仓单数据
@@ -51,24 +51,23 @@ def get_dce_receipt(date: str = None, vars_list: List = cons.contract_symbols):
     if date.strftime("%Y%m%d") not in calendar:
         warnings.warn(f"{date.strftime('%Y%m%d')}非交易日")
         return None
+    url = "http://www.dce.com.cn/dcereport/publicweb/dailystat/wbillWeeklyQuotes"
     payload = {
-        "weekQuotes.variety": "all",
-        "year": date.year,
-        "month": date.month - 1,  # 网站月份描述少 1 个月, 属于网站问题
-        "day": date.day,
+        "tradeDate": date.strftime("%Y%m%d"),
+        "varietyId": "all",
     }
-    data = pandas_read_html_link(
-        cons.DCE_RECEIPT_URL, method="post", data=payload, headers=cons.dce_headers
-    )[0]
+    r = requests.post(url, json=payload)
+    data_json = r.json()
+    temp_df = pd.DataFrame(data_json['data']['entityList'])
     records = pd.DataFrame()
-    for x in data.to_dict(orient="records"):
-        if isinstance(x["品种"], str):
-            if x["品种"][-2:] == "小计":
-                var = x["品种"][:-2]
+    for x in temp_df.to_dict(orient="records"):
+        if isinstance(x["variety"], str):
+            if x["variety"][-2:] == "小计":
+                var = x["variety"][:-2]
                 temp_data = {
                     "var": chinese_to_english(var),
-                    "receipt": int(x["今日仓单量"]),
-                    "receipt_chg": int(x["增减"]),
+                    "receipt": int(x["wbillQty"]),
+                    "receipt_chg": int(x["diff"]),
                     "date": date.strftime("%Y%m%d"),
                 }
                 records = pd.concat([records, pd.DataFrame(temp_data, index=[0])])
@@ -110,7 +109,8 @@ def get_shfe_receipt_1(
         shfe_20101029["date"] = date
         return shfe_20101029
     elif date in ["20100416", "20130821"]:
-        return warnings.warn("20100416、20130821交易所数据丢失")
+        print("20100416、20130821交易所数据丢失")
+        return pd.DataFrame()
     else:
         var_list = [
             "天然橡胶",
@@ -245,10 +245,10 @@ def get_czce_receipt_1(date: str = None, vars_list: List = cons.contract_symbols
     ends = [x for x in data.index if "总计" in str(data[0].tolist()[x])]
     for i in list(range(len(indexes))):
         if i != len(indexes) - 1:
-            data_cut = data.loc[indexes[i] : ends[i], :]
+            data_cut = data.loc[indexes[i]: ends[i], :]
             data_cut = data_cut.fillna(method="pad")
         else:
-            data_cut = data.loc[indexes[i] :, :]
+            data_cut = data.loc[indexes[i]:, :]
             data_cut = data_cut.fillna(method="pad")
         if "PTA" in data_cut[0].tolist()[0]:
             var = "TA"
@@ -347,7 +347,8 @@ def get_czce_receipt_3(
     :rtype: pandas.DataFrame
     """
     if not isinstance(vars_list, list):
-        return warnings.warn("vars_list: 必须是列表")
+        print("vars_list: 必须是列表")
+        return pd.DataFrame()
     date = (
         cons.convert_date(date).strftime("%Y%m%d")
         if date is not None
@@ -355,7 +356,7 @@ def get_czce_receipt_3(
     )
     if date not in calendar:
         warnings.warn("%s非交易日" % date.strftime("%Y%m%d"))
-        return None
+        return pd.DataFrame()
     url = f"http://www.czce.com.cn/cn/DFSStaticFiles/Future/{date[:4]}/{date}/FutureDataWhsheet.xls"
     r = requests_link(url, encoding="utf-8", headers=cons.shfe_headers)
     temp_df = pd.read_excel(BytesIO(r.content))
@@ -389,6 +390,7 @@ def get_czce_receipt_3(
     symbol_list = []
     receipt_list = []
     receipt_chg_list = []
+    records = pd.DataFrame()
     for page in range(len(range_list_one)):
         inner_df = temp_df[range_list_one[page] : range_list_two[page]]
         reg = re.compile(r"[A-Z]+")
@@ -600,5 +602,5 @@ def get_receipt(
 
 
 if __name__ == "__main__":
-    get_receipt_df = get_receipt(start_date="20250805", end_date="20250806")
+    get_receipt_df = get_receipt(start_date="20251027", end_date="20251027")
     print(get_receipt_df)

akshare/stock/cons.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2025/10/13 16:00
+Date: 2025/10/28 15:00
 Desc: 股票配置文件
 """
 
-xq_a_token = "60b153239a4812ba6463e1c5005fad4a7b4a2174"
+xq_a_token = "144a75f00fac53d1ebae9a21261446d57d4443d1"
 
 # zh-sina-kcb
 zh_sina_kcb_stock_url = ("http://vip.stock.finance.sina.com.cn/quotes_service/api/json_v2.php/"

{akshare-1.17.72.dist-info → akshare-1.17.74.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare
-Version: 1.17.72
+Version: 1.17.74
 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.17.72.dist-info → akshare-1.17.74.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=n4zAYkZ4DTiFpgb4lSOMkJVSClS_xkeNi9Wbvh6vKNc,199588
+akshare/__init__.py,sha256=E3jj9C33zHR4bfOq31f7rh6kQhAgoAX2avtdtqzi7N8,199680
 akshare/datasets.py,sha256=rKuRNZrqi6IMsZ9nyvO3Rx02js0tH3zMLjz8HQNAoPQ,963
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -109,7 +109,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=2cqWdaPbuGHtkhbrDWnhHnIBxUzelRJjJ5oCmMKodFo,17976
-akshare/futures/cot.py,sha256=e3gkSGTJqh-M6thdqLBj7RdqsNyzoW_6QGoDtfEgSUk,58878
+akshare/futures/cot.py,sha256=hY27LMsSmRvme4ITJdcWAc8N4a7vwNo6M2Gh8jcxz74,57848
 akshare/futures/futures_basis.py,sha256=YB-fOUTCanNZqHNcJXJdFqpCBi9_NYbrTlzx2st5AS0,15710
 akshare/futures/futures_comex_em.py,sha256=NPwOCD6lZUDL4wlGxvbmmJIFkQlW427ERO0vTux13WU,3172
 akshare/futures/futures_comm_ctp.py,sha256=IyVRCUvhLTFzmcUVvlIaYZ1e38ll7AF8ExhgtXKuzrI,1003
@@ -131,9 +131,9 @@ akshare/futures/futures_settlement_price_sgx.py,sha256=SJxAGNuNxNEGDk7EF2odRPrWK
 akshare/futures/futures_spot_stock_em.py,sha256=43CPkAouDu691M6aCMdO1SGKglTak2aba2Np7ftkAdg,3523
 akshare/futures/futures_stock_js.py,sha256=sAao7ZcqBovdEo4wrVt2K6kXK2rf1_kT_StQdzhm9og,1635
 akshare/futures/futures_to_spot.py,sha256=fDsnmwUDUWQSF11MBvGEKn_c69fJmaGnRigWzvQMaZc,12898
-akshare/futures/futures_warehouse_receipt.py,sha256=XuCPGumcQIBOJf5XzDsU5NbViXqf0Erqv9u-3c36VFc,8789
+akshare/futures/futures_warehouse_receipt.py,sha256=yY_6feZN3V3kAa-3b_G-Twmxc1BnHGukJ4MvpHhH8Nc,8880
 akshare/futures/futures_zh_sina.py,sha256=wFFiPdud7a6HUHxohlQmN0FsnrvsadTYhbq0cZT4dpo,26191
-akshare/futures/receipt.py,sha256=6KFgO6BJcQ0S5ZlRIQfPwXOuMLuncn7pcFCPOp1QJGI,23588
+akshare/futures/receipt.py,sha256=Yi8zpEQUcrgbOLcz5S3uT5hnOMwwcdyf8c-iUjJ4064,23682
 akshare/futures/requests_fun.py,sha256=w4inzqYjrAiRx_E3oszbcJwrRJR3MKpm5Rkropdusoo,2893
 akshare/futures/symbol_var.py,sha256=dlDxz6K6_sn1B1xalCGR9Inc_apbQP-F3tJ_ZuKH1rQ,5857
 akshare/futures_derivative/__init__.py,sha256=COFyP01gIUhWs4EBr6hwL73B7IWePIzg7vP7oEY3G3I,82
@@ -238,7 +238,7 @@ akshare/spot/spot_hog_soozhu.py,sha256=IEt7zrDs0ptAKgMA7QRIk45jcMLcA_LGq6Y3lKLFT
 akshare/spot/spot_price_qh.py,sha256=rRv09vR8K0U_x6x8AiLgGluxytIXkLatFNVkFbIh8eQ,3756
 akshare/spot/spot_sge.py,sha256=fXy6I9GchX2rfdPDD2wSN8K-hcDdS3ABzLDLdH-9t4Y,8696
 akshare/stock/__init__.py,sha256=jSa9260d6aNZajaW68chI2mpPkDSXLOgi3eXrqo4MQ8,82
-akshare/stock/cons.py,sha256=kgmTTFQIcOC7fjYLoAMpCBhAw0XUBGhjrrJ-a3tRqfM,43668
+akshare/stock/cons.py,sha256=UfWofeh75Jo8lifeoONVtNuyjwCxngtsJ9Az3nNuXHA,43668
 akshare/stock/stock_allotment_cninfo.py,sha256=OVjVdWp2XVRNbJvVgtgVVoBmPBJgBB4RyIIgA_9QHM8,6066
 akshare/stock/stock_ask_bid_em.py,sha256=bo7VNkp1PmK4Z-GPZuVn_I-IAdzeW8cs3W_75KodxCg,3368
 akshare/stock/stock_board_concept_em.py,sha256=C13AHQueLFDDqL39MEkIKWFJVgMql5T79N1Hruppn9o,17785
@@ -399,10 +399,10 @@ akshare/utils/func.py,sha256=4cwmXFztU86yJNONJ40KJLvsIEQHBbct4iMm3zT2v30,2315
 akshare/utils/multi_decrypt.py,sha256=aWoL2iEPeuXHJg8-n7OtMKixLnIhfzepACgxfrfmQB4,1657
 akshare/utils/token_process.py,sha256=nGtgnZGRprXJkhLXH8mcUH4TgIFwzsTOb0EaEPa0Euo,667
 akshare/utils/tqdm.py,sha256=MuPNwcswkOGjwWQOMWXi9ZvQ_RmW4obCWRj2i7HM7FE,847
-akshare-1.17.72.dist-info/licenses/LICENSE,sha256=s18q7gS2g1F9-Cnk5eqrJG4OGWSwSxVEMzIuT6HyYNY,1073
+akshare-1.17.74.dist-info/licenses/LICENSE,sha256=s18q7gS2g1F9-Cnk5eqrJG4OGWSwSxVEMzIuT6HyYNY,1073
 tests/__init__.py,sha256=gNzhlO0UPjFq6Ieb38kaVIODXv4cTDByrdohAZnDYt4,82
 tests/test_func.py,sha256=j1MGYbZI2if2j_LY1S4FLsf4qfq4NwVqD5wmRlv5Log,832
-akshare-1.17.72.dist-info/METADATA,sha256=zIoezhJiwM7AzUc4l4qHU7CCkgx4obt4XvGKWetehCg,12593
-akshare-1.17.72.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-akshare-1.17.72.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.17.72.dist-info/RECORD,,
+akshare-1.17.74.dist-info/METADATA,sha256=7KUnp0TMPeVBk1QyGfUHkqbNIZVo742waTW5SROVtck,12593
+akshare-1.17.74.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+akshare-1.17.74.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.17.74.dist-info/RECORD,,