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

akshare/__init__.py

@@ -3178,9 +3178,10 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.17.69 fix: fix fund_etf_hist_sina interface
 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
 """
 
-__version__ = "1.17.71"
+__version__ = "1.17.72"
 __author__ = "AKFamily"
 
 import sys
@@ -4868,7 +4869,7 @@ futures-warehouse-receipt
 """
 from akshare.futures.futures_warehouse_receipt import (
     futures_czce_warehouse_receipt,
-    futures_dce_warehouse_receipt,
+    futures_warehouse_receipt_dce,
     futures_shfe_warehouse_receipt,
     futures_gfex_warehouse_receipt,
 )

akshare/futures/futures_daily_bar.py

@@ -524,7 +524,7 @@ def get_shfe_daily(date: str = "20220415") -> pd.DataFrame:
     return df
 
 
-def get_dce_daily(date: str = "20220308") -> pd.DataFrame:
+def get_dce_daily(date: str = "20251027") -> pd.DataFrame:
     """
     大连商品交易所日交易数据
     http://www.dce.com.cn/dalianshangpin/xqsj/tjsj26/rtj/rxq/index.html
@@ -537,41 +537,42 @@ def get_dce_daily(date: str = "20220308") -> pd.DataFrame:
     if day.strftime("%Y%m%d") not in calendar:
         # warnings.warn("%s非交易日" % day.strftime("%Y%m%d"))
         return pd.DataFrame()
-    url = "http://portal.dce.com.cn/publicweb/quotesdata/exportDayQuotesChData.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": "86",
-        "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/dayQuotesCh.html",
-        "Upgrade-Insecure-Requests": "1",
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
-        "Chrome/84.0.4147.105 Safari/537.36",
+    url = "http://www.dce.com.cn/dcereport/publicweb/dailystat/dayQuotes"
+    payload = {
+        "contractId": "",
+        "lang": "zh",
+        "optionSeries": "",
+        "statisticsType": "0",
+        "tradeDate": date,
+        "tradeType": "1",
+        "varietyId": "all",
     }
-    params = {
-        "dayQuotes.variety": "all",
-        "dayQuotes.trade_type": "0",
-        "year": date[:4],
-        "month": str(int(date[4:6]) - 1),
-        "day": date[6:],
-        "exportFlag": "excel",
-    }
-    r = requests.post(url, data=params, headers=headers)
-    data_df = pd.read_excel(BytesIO(r.content), header=1)
-    data_df = data_df[~data_df["商品名称"].str.contains("小计")]
-    data_df = data_df[~data_df["商品名称"].str.contains("总计")]
-    data_df["variety"] = data_df["商品名称"].map(lambda x: cons.DCE_MAP[x])
-    data_df["symbol"] = data_df["合约名称"]
-    del data_df["商品名称"]
-    del data_df["合约名称"]
-    data_df.columns = [
+    r = requests.post(url, json=payload)
+    data_json = r.json()
+    temp_df = pd.DataFrame(data_json['data'])
+    temp_df.rename(columns={
+        "variety": "品种名称",
+        "contractId": "合约",
+        "open": "开盘价",
+        "high": "最高价",
+        "low": "最低价",
+        "close": "收盘价",
+        "lastClear": "前结算价",
+        "clearPrice": "结算价",
+        "diff": "涨跌",
+        "diff1": "涨跌1",
+        "volumn": "成交量",
+        "openInterest": "持仓量",
+        "diffI": "持仓量变化",
+        "turnover": "成交额",
+    }, inplace=True)
+    temp_df = temp_df[~temp_df["品种名称"].str.contains("小计")]
+    temp_df = temp_df[~temp_df["品种名称"].str.contains("总计")]
+    temp_df["variety"] = temp_df["品种名称"].map(lambda x: cons.DCE_MAP[x])
+    temp_df["symbol"] = temp_df["合约"]
+    del temp_df["品种名称"]
+    del temp_df["合约"]
+    temp_df.columns = [
         "open",
         "high",
         "low",
@@ -580,15 +581,24 @@ def get_dce_daily(date: str = "20220308") -> pd.DataFrame:
         "settle",
         "_",
         "_",
+        "_",
         "volume",
         "open_interest",
         "_",
         "turnover",
+        "_",
+        "_",
+        "_",
+        "_",
+        "_",
+        "_",
+        "_",
+        "_",
         "variety",
         "symbol",
     ]
-    data_df["date"] = date
-    data_df = data_df[
+    temp_df["date"] = date
+    temp_df = temp_df[
         [
             "symbol",
             "date",
@@ -604,8 +614,7 @@ def get_dce_daily(date: str = "20220308") -> pd.DataFrame:
             "variety",
         ]
     ]
-    data_df = data_df.map(lambda x: x.replace(",", ""))
-    data_df = data_df.astype(
+    temp_df = temp_df.astype(
         {
             "open": "float",
             "high": "float",
@@ -618,8 +627,8 @@ def get_dce_daily(date: str = "20220308") -> pd.DataFrame:
             "pre_settle": "float",
         }
     )
-    data_df.reset_index(inplace=True, drop=True)
-    return data_df
+    temp_df.reset_index(inplace=True, drop=True)
+    return temp_df
 
 
 def get_futures_daily(

akshare/futures/futures_warehouse_receipt.py

@@ -32,7 +32,7 @@ def futures_czce_warehouse_receipt(date: str = "20200702") -> dict:
     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) "
-        "Chrome/83.0.4103.116 Safari/537.36"
+                      "Chrome/83.0.4103.116 Safari/537.36"
     }
     r = requests.get(url, verify=False, headers=headers)
     temp_df = pd.read_excel(BytesIO(r.content))
@@ -40,7 +40,7 @@ def futures_czce_warehouse_receipt(date: str = "20200702") -> dict:
     index_list.append(len(temp_df))
     big_dict = {}
     for inner_index in range(len(index_list) - 1):
-        inner_df = temp_df[index_list[inner_index] : index_list[inner_index + 1]]
+        inner_df = temp_df[index_list[inner_index]: index_list[inner_index + 1]]
         inner_key = re.findall(r"[a-zA-Z]+", inner_df.iloc[0, 0])[0]
         inner_df = inner_df.iloc[1:, :]
         inner_df.dropna(axis=0, how="all", inplace=True)
@@ -52,7 +52,7 @@ def futures_czce_warehouse_receipt(date: str = "20200702") -> dict:
     return big_dict
 
 
-def futures_dce_warehouse_receipt(date: str = "20250929") -> dict:
+def futures_warehouse_receipt_dce(date: str = "20251027") -> pd.DataFrame:
     """
     大连商品交易所-行情数据-统计数据-日统计-仓单日报
     http://www.dce.com.cn/dce/channel/list/187.html
@@ -61,35 +61,33 @@ def futures_dce_warehouse_receipt(date: str = "20250929") -> dict:
     :return: 指定日期的仓单日报数据
     :rtype: dict
     """
-    url = "http://portal.dce.com.cn/publicweb/quotesdata/wbillWeeklyQuotes.html"
-    headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
-        "Chrome/83.0.4103.116 Safari/537.36"
-    }
-    params = {
+    url = "http://www.dce.com.cn/dcereport/publicweb/dailystat/wbillWeeklyQuotes"
+    payload = {
         "tradeDate": date,
         "varietyId": "all",
     }
-    r = requests.post(url, params=params, headers=headers)
-    temp_df = pd.read_html(StringIO(r.text))[0]
-    index_list = temp_df[temp_df.iloc[:, 0].str.contains("小计") == 1].index.to_list()
-    index_list.insert(0, 0)
-    big_dict = {}
-    for inner_index in range(len(index_list) - 1):
-        if inner_index == 0:
-            temp_index = 0
-        else:
-            temp_index = index_list[inner_index] + 1
-        inner_df = temp_df[temp_index : index_list[inner_index + 1] + 1].copy()
-        inner_key = inner_df.iloc[0, 0]
-        inner_df.reset_index(inplace=True, drop=True)
-        inner_df.ffill(inplace=True)
-        # 填补 20240401 中开头没有品种的情况
-        if date == "20240401":
-            inner_df["品种"] = inner_df["品种"].fillna("玉米")
-            inner_key = inner_df.iloc[0, 0]
-        big_dict[inner_key] = inner_df
-    return big_dict
+    r = requests.post(url, json=payload)
+    data_json = r.json()
+    temp_df = pd.DataFrame(data_json['data']['entityList'])
+    temp_df.rename(columns={
+        "variety": "品种名称",
+        "whAbbr": "仓库/分库",
+        "deliveryAbbr": "可选提货地点/分库-数量",
+        "lastWbillQty": "昨日仓单量（手）",
+        "wbillQty": "今日仓单量（手）",
+        "diff": "增减（手）",
+        "varietyOrder": "品种代码",
+    }, inplace=True)
+    temp_df = temp_df[[
+        "品种代码",
+        "品种名称",
+        "仓库/分库",
+        "可选提货地点/分库-数量",
+        "昨日仓单量（手）",
+        "今日仓单量（手）",
+        "增减（手）",
+    ]]
+    return temp_df
 
 
 def futures_shfe_warehouse_receipt(date: str = "20200702") -> dict:
@@ -103,7 +101,7 @@ def futures_shfe_warehouse_receipt(date: str = "20200702") -> dict:
     """
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
-        "Chrome/83.0.4103.116 Safari/537.36"
+                      "Chrome/83.0.4103.116 Safari/537.36"
     }
     url = f"https://www.shfe.com.cn/data/tradedata/future/dailydata/{date}dailystock.dat"
     if date >= "20140519":
@@ -124,7 +122,7 @@ def futures_shfe_warehouse_receipt(date: str = "20200702") -> dict:
         temp_df = pd.read_html(StringIO(r.text))[0]
         index_list = temp_df[
             temp_df.iloc[:, 3].str.contains("单位：") == 1
-        ].index.to_list()
+            ].index.to_list()
         big_dict = {}
         for inner_index in range(len(index_list)):
             temp_index_start = index_list[inner_index]
@@ -157,7 +155,7 @@ def futures_gfex_warehouse_receipt(date: str = "20240122") -> dict:
     url = "http://www.gfex.com.cn/u/interfacesWebTdWbillWeeklyQuotes/loadList"
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
-        "Chrome/83.0.4103.116 Safari/537.36"
+                      "Chrome/83.0.4103.116 Safari/537.36"
     }
     payload = {"gen_date": date}
     r = requests.post(url=url, data=payload, headers=headers)
@@ -220,8 +218,8 @@ if __name__ == "__main__":
     czce_warehouse_receipt_df = futures_czce_warehouse_receipt(date="20151019")
     print(czce_warehouse_receipt_df)
 
-    futures_dce_warehouse_receipt_df = futures_dce_warehouse_receipt(date="20251014")
-    print(futures_dce_warehouse_receipt_df)
+    futures_warehouse_receipt_dce_df = futures_warehouse_receipt_dce(date="20251014")
+    print(futures_warehouse_receipt_dce_df)
 
     futures_shfe_warehouse_receipt_df = futures_shfe_warehouse_receipt(date="20200702")
     print(futures_shfe_warehouse_receipt_df)

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

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

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=TVaTAi74ngc9bFz8f9sshS2fvHdLnrMI2VduS6TtC78,199531
+akshare/__init__.py,sha256=n4zAYkZ4DTiFpgb4lSOMkJVSClS_xkeNi9Wbvh6vKNc,199588
 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_comex_em.py,sha256=NPwOCD6lZUDL4wlGxvbmmJIFkQlW427ERO0vT
 akshare/futures/futures_comm_ctp.py,sha256=IyVRCUvhLTFzmcUVvlIaYZ1e38ll7AF8ExhgtXKuzrI,1003
 akshare/futures/futures_comm_qihuo.py,sha256=uQfabZ63qME8sTaxUbIUVQBVi8yTaPPDhD7voR9PEx0,10504
 akshare/futures/futures_contract_detail.py,sha256=Glm1x72WBwF4G-f_ZYzHsbNhlQ6Ti1HeF0Rzhx-pfFg,1190
-akshare/futures/futures_daily_bar.py,sha256=QWeHNxFMtwY2IGEK6ZlPJ9wax4Jl8pcGinqtkIVj0KQ,25366
+akshare/futures/futures_daily_bar.py,sha256=gbBW9SphkOrDMzrnetiXA-224ahqOrgc0jVmk8Ay4aA,25057
 akshare/futures/futures_foreign.py,sha256=2cbMA-eug_jriDFwKZWmA_TbPW2GQAjscpZHBrs287E,2131
 akshare/futures/futures_hf_em.py,sha256=juiJauO7T6YTHXIS--ZDW-Idk73KMOrXgRBi1xEiBqA,8195
 akshare/futures/futures_hist_em.py,sha256=TuHdpcfVxdqoHzg5-JwppLUQgwuaz_LG2UZBlgf73i4,6509
@@ -131,7 +131,7 @@ 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=koiyOO6HmpgwPapyVyFHHK_yJeU7oAzfJArVmo19_hk,9047
+akshare/futures/futures_warehouse_receipt.py,sha256=XuCPGumcQIBOJf5XzDsU5NbViXqf0Erqv9u-3c36VFc,8789
 akshare/futures/futures_zh_sina.py,sha256=wFFiPdud7a6HUHxohlQmN0FsnrvsadTYhbq0cZT4dpo,26191
 akshare/futures/receipt.py,sha256=6KFgO6BJcQ0S5ZlRIQfPwXOuMLuncn7pcFCPOp1QJGI,23588
 akshare/futures/requests_fun.py,sha256=w4inzqYjrAiRx_E3oszbcJwrRJR3MKpm5Rkropdusoo,2893
@@ -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.71.dist-info/licenses/LICENSE,sha256=s18q7gS2g1F9-Cnk5eqrJG4OGWSwSxVEMzIuT6HyYNY,1073
+akshare-1.17.72.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.71.dist-info/METADATA,sha256=gvVGTjrecSSbxLsshOClDTWEyA-K3I07RIdwADEVH0U,12593
-akshare-1.17.71.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-akshare-1.17.71.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.17.71.dist-info/RECORD,,
+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,,