akshare 1.17.71__tar.gz → 1.17.73__tar.gz

{akshare-1.17.71 → akshare-1.17.73}/PKG-INFO

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

@@ -3178,9 +3178,11 @@ 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
+1.17.73 fix: fix get_receipt interface
 """
 
-__version__ = "1.17.71"
+__version__ = "1.17.73"
 __author__ = "AKFamily"
 
 import sys
@@ -4868,7 +4870,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-1.17.71 → akshare-1.17.73}/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-1.17.71 → akshare-1.17.73}/akshare/futures/futures_warehouse_receipt.py

@@ -29,10 +29,12 @@ 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) "
-        "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 +42,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 +54,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 +63,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 +103,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 +124,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 +157,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 +220,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 → akshare-1.17.73}/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-1.17.71 → akshare-1.17.73}/akshare.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare
-Version: 1.17.71
+Version: 1.17.73
 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