akshare 1.14.49__py3-none-any.whl → 1.17.99__py3-none-any.whl

akshare/futures/futures_stock_js.py

@@ -32,7 +32,6 @@ def futures_stock_shfe_js(date: str = "20240419") -> pd.DataFrame:
         "category": "stock",
         "date": "-".join([date[:4], date[4:6], date[6:]]),
         "attr_id": "1",
-        "_": "1708761356458",
     }
     r = requests.get(url, params=params, headers=headers)
     data_json = r.json()

akshare/futures/futures_to_spot.py

@@ -259,11 +259,10 @@ def futures_delivery_czce(date: str = "20210112") -> pd.DataFrame:
         "交割数量",
         "交割额",
     ]
-    temp_df["交割数量"] = temp_df["交割数量"].str.replace(",", "")
-    temp_df["交割额"] = temp_df["交割额"].str.replace(",", "")
-
-    temp_df["交割数量"] = pd.to_numeric(temp_df["交割数量"])
-    temp_df["交割额"] = pd.to_numeric(temp_df["交割额"])
+    temp_df["交割数量"] = temp_df["交割数量"].astype(str).str.replace(",", "")
+    temp_df["交割额"] = temp_df["交割额"].astype(str).str.replace(",", "")
+    temp_df["交割数量"] = pd.to_numeric(temp_df["交割数量"], errors="coerce")
+    temp_df["交割额"] = pd.to_numeric(temp_df["交割额"], errors="coerce")
     return temp_df
 
 
@@ -328,7 +327,7 @@ if __name__ == "__main__":
     futures_delivery_dce_df = futures_delivery_dce(date="202101")
     print(futures_delivery_dce_df)
 
-    futures_delivery_monthly_czce_df = futures_delivery_czce(date="20210112")
+    futures_delivery_monthly_czce_df = futures_delivery_czce(date="20251014")
     print(futures_delivery_monthly_czce_df)
 
     futures_delivery_shfe_df = futures_delivery_shfe(date="202312")

akshare/futures/futures_warehouse_receipt.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/4/2 22:30
+Date: 2025/7/1 16:30
 Desc: 期货-仓单日报
 上海期货交易所-仓单日报
 https://tsite.shfe.com.cn/statements/dataview.html?paramid=dailystock
@@ -20,7 +20,7 @@ import pandas as pd
 import requests
 
 
-def futures_czce_warehouse_receipt(date: str = "20200702") -> dict:
+def futures_warehouse_receipt_czce(date: str = "20251103") -> dict:
     """
     郑州商品交易所-交易数据-仓单日报
     http://www.czce.com.cn/cn/jysj/cdrb/H770310index_1.htm
@@ -29,10 +29,15 @@ def futures_czce_warehouse_receipt(date: str = "20200702") -> dict:
     :return: 指定日期的仓单日报数据
     :rtype: dict
     """
-    url = f"http://www.czce.com.cn/cn/DFSStaticFiles/Future/{date[:4]}/{date}/FutureDataWhsheet.xls"
+    import urllib3
+    urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+    if int(date) > 20251101:
+        url = f"http://www.czce.com.cn/cn/DFSStaticFiles/Future/{date[:4]}/{date}/FutureDataWhsheet.xlsx"
+    else:
+        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,8 +45,8 @@ 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_key = re.findall(r"[a-zA-Z]+", inner_df.iloc[0, 0])[0]
+        inner_df = temp_df[index_list[inner_index]: index_list[inner_index + 1]]
+        inner_key = re.findall(pattern=r"[a-zA-Z]+", string=inner_df.iloc[0, 0])[0]
         inner_df = inner_df.iloc[1:, :]
         inner_df.dropna(axis=0, how="all", inplace=True)
         inner_df.dropna(axis=1, how="all", inplace=True)
@@ -52,46 +57,42 @@ def futures_czce_warehouse_receipt(date: str = "20200702") -> dict:
     return big_dict
 
 
-def futures_dce_warehouse_receipt(date: str = "20200702") -> dict:
+def futures_warehouse_receipt_dce(date: str = "20251027") -> pd.DataFrame:
     """
     大连商品交易所-行情数据-统计数据-日统计-仓单日报
-    http://www.dce.com.cn/dalianshangpin/xqsj/tjsj26/rtj/cdrb/index.html
+    http://www.dce.com.cn/dce/channel/list/187.html
     :param date: 交易日, e.g., "20200702"
     :type date: str
     :return: 指定日期的仓单日报数据
     :rtype: dict
     """
-    url = "http://www.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"
+    url = "http://www.dce.com.cn/dcereport/publicweb/dailystat/wbillWeeklyQuotes"
+    payload = {
+        "tradeDate": date,
+        "varietyId": "all",
     }
-    params = {
-        "wbillWeeklyQuotes.variety": "all",
-        "year": date[:4],
-        "month": str(int(date[4:6]) - 1),
-        "day": date[6:],
-    }
-    r = requests.get(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:
@@ -105,9 +106,9 @@ 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://tsite.shfe.com.cn/data/dailydata/{date}dailystock.dat"
+    url = f"https://www.shfe.com.cn/data/tradedata/future/dailydata/{date}dailystock.dat"
     if date >= "20140519":
         r = requests.get(url, headers=headers)
         data_json = r.json()
@@ -121,12 +122,12 @@ def futures_shfe_warehouse_receipt(date: str = "20200702") -> dict:
         for item in set(temp_df["VARNAME"]):
             big_dict[item] = temp_df[temp_df["VARNAME"] == item]
     else:
-        url = f"https://tsite.shfe.com.cn/data/dailydata/{date}dailystock.html"
+        url = f"https://www.shfe.com.cn/data/tradedata/future/dailydata/{date}dailystock.html"
         r = requests.get(url, headers=headers)
         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]
@@ -159,7 +160,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)
@@ -219,11 +220,11 @@ def futures_gfex_warehouse_receipt(date: str = "20240122") -> dict:
 
 
 if __name__ == "__main__":
-    czce_warehouse_receipt_df = futures_czce_warehouse_receipt(date="20151019")
-    print(czce_warehouse_receipt_df)
+    futures_warehouse_receipt_czce_df = futures_warehouse_receipt_czce(date="20251014")
+    print(futures_warehouse_receipt_czce_df)
 
-    futures_dce_warehouse_receipt_df = futures_dce_warehouse_receipt(date="20240401")
-    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/futures/futures_zh_sina.py

@@ -88,7 +88,7 @@ def futures_symbol_mark() -> pd.DataFrame:
     return temp_df
 
 
-def futures_zh_realtime(symbol: str = "白糖") -> pd.DataFrame:
+def futures_zh_realtime(symbol: str = "PTA") -> pd.DataFrame:
     """
     期货品种当前时刻所有可交易的合约实时数据
     https://vip.stock.finance.sina.com.cn/quotes_service/view/qihuohangqing.html#titlePos_1
@@ -612,7 +612,7 @@ def futures_zh_spot(
             return data_df
 
 
-def futures_zh_minute_sina(symbol: str = "IF2008", period: str = "5") -> pd.DataFrame:
+def futures_zh_minute_sina(symbol: str = "IF2008", period: str = "1") -> pd.DataFrame:
     """
     中国各品种期货分钟频率数据
     https://vip.stock.finance.sina.com.cn/quotes_service/view/qihuohangqing.html#titlePos_3
@@ -704,7 +704,7 @@ if __name__ == "__main__":
     futures_zh_realtime_df = futures_zh_realtime(symbol="工业硅")
     print(futures_zh_realtime_df)
 
-    futures_zh_minute_sina_df = futures_zh_minute_sina(symbol="SI2406", period="1")
+    futures_zh_minute_sina_df = futures_zh_minute_sina(symbol="RB0", period="1")
     print(futures_zh_minute_sina_df)
 
     futures_zh_daily_sina_df = futures_zh_daily_sina(symbol="RB0")