akshare 1.12.99__py3-none-any.whl → 1.15.73__py3-none-any.whl

akshare/futures/futures_inventory_99.py

@@ -1,297 +1,86 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/1/10 19:00
+Date: 2024/12/23 20:00
 Desc: 99 期货网-大宗商品库存数据
-http://www.99qh.com/d/store.aspx
+https://www.99qh.com/
 """
-from io import StringIO
 
+import json
+from functools import lru_cache
+from datetime import datetime
 import pandas as pd
 import requests
 from bs4 import BeautifulSoup
 
-from akshare.futures.cons import (
-    qh_headers,
-    sample_headers,
-)
+
+@lru_cache(maxsize=32)
+def __get_99_symbol_map() -> pd.DataFrame:
+    """
+    99 期货网-品种代码对照表
+    https://www.99qh.com/data/stockIn?productId=12
+    :return: 品种代码对照表
+    :rtype: pandas.DataFrame
+    """
+    url = "https://www.99qh.com/data/stockIn"
+    r = requests.get(url)
+    soup = BeautifulSoup(r.text, features="lxml")
+    raw_data = soup.find(attrs={"id": "__NEXT_DATA__"}).text
+    data_json = json.loads(raw_data)
+    df_list = []
+    for i, item in enumerate(
+        data_json["props"]["pageProps"]["data"]["varietyListData"]
+    ):
+        temp_df = pd.DataFrame(
+            data_json["props"]["pageProps"]["data"]["varietyListData"][i]["productList"]
+        )
+        df_list.append(temp_df)
+
+    big_df = pd.concat(df_list, ignore_index=True)
+    return big_df
 
 
-def futures_inventory_99(
-        exchange: str = "大连商品交易所", symbol: str = "豆一"
-) -> pd.DataFrame:
+def futures_inventory_99(symbol: str = "豆一") -> pd.DataFrame:
     """
     99 期货网-大宗商品库存数据
-    http://www.99qh.com/d/store.aspx
-    :param exchange: 交易所名称; choice of {"上海期货交易所", "郑州商品交易所", "大连商品交易所", "LME", "NYMEX", "CBOT", "NYBOT", "TOCOM", "上海国际能源交易中心", "OSE"}
-    :type exchange: str
+    https://www.99qh.com/data/stockIn?productId=12
     :param symbol: 交易所对应的具体品种; 如：大连商品交易所的 豆一
     :type symbol: str
     :return: 大宗商品库存数据
     :rtype: pandas.DataFrame
     """
-    data_code = {
-        "1": [
-            "1",
-            "2",
-            "3",
-            "12",
-            "32",
-            "36",
-            "37",
-            "40",
-            "42",
-            "47",
-            "56",
-            "63",
-            "69",
-            "70",
-            "79",
-            "85",
-        ],
-        "2": [
-            "4",
-            "14",
-            "29",
-            "31",
-            "33",
-            "38",
-            "44",
-            "45",
-            "50",
-            "51",
-            "52",
-            "55",
-            "59",
-            "64",
-            "66",
-            "67",
-            "75",
-            "76",
-            "81",
-            "82",
-            "87",
-            "92",
-            "95",
-        ],
-        "3": [
-            "6",
-            "7",
-            "8",
-            "15",
-            "30",
-            "34",
-            "35",
-            "39",
-            "43",
-            "53",
-            "57",
-            "58",
-            "61",
-            "62",
-            "68",
-            "80",
-            "84",
-            "86",
-            "88",
-            "89",
-            "94",
-        ],
-        "4": ["9", "10", "16", "17", "18", "23", "28"],
-        "5": ["11", "20", "21"],
-        "6": ["13", "24", "25", "26", "27"],
-        "7": ["19"],
-        "8": ["22"],
-        "10": ["78", "83", "90", "93"],
-        "11": ["91"],
-    }
-    data_name = {
-        "1": [
-            "铜",
-            "铝",
-            "橡胶",
-            "燃料油",
-            "锌",
-            "黄金",
-            "螺纹钢",
-            "线材",
-            "铅",
-            "白银",
-            "石油沥青",
-            "热轧卷板",
-            "锡",
-            "镍",
-            "纸浆",
-            "不锈钢",
-        ],
-        "2": [
-            "强麦",
-            "一号棉",
-            "白糖",
-            "PTA",
-            "菜籽油",
-            "早籼稻",
-            "甲醇",
-            "普麦",
-            "玻璃",
-            "油菜籽",
-            "菜籽粕",
-            "动力煤",
-            "粳稻",
-            "晚籼稻",
-            "硅铁",
-            "锰硅",
-            "棉纱",
-            "苹果",
-            "红枣",
-            "尿素",
-            "纯碱",
-            "短纤",
-            "花生",
-        ],
-        "3": [
-            "豆一",
-            "豆二",
-            "豆粕",
-            "玉米",
-            "豆油",
-            "聚乙烯",
-            "棕榈油",
-            "聚氯乙烯",
-            "焦炭",
-            "焦煤",
-            "铁矿石",
-            "鸡蛋",
-            "胶合板",
-            "聚丙烯",
-            "玉米淀粉",
-            "乙二醇",
-            "粳米",
-            "苯乙烯",
-            "纤维板",
-            "液化石油气",
-            "生猪",
-        ],
-        "4": ["LME铜", "LME铝", "LME镍", "LME铅", "LME锌", "LME锡", "LME铝合金"],
-        "5": ["COMEX铜", "COMEX金", "COMEX银"],
-        "6": ["CBOT大豆", "CBOT小麦", "CBOT玉米", "CBOT燕麦", "CBOT糙米"],
-        "7": ["NYBOT2号棉"],
-        "8": ["TOCOM橡胶"],
-        "10": ["原油", "20号胶", "低硫燃料油", "国际铜"],
-        "11": ["OSE橡胶"],
-    }
-    temp_out_exchange_name = {
-        "1": "上海期货交易所",
-        "2": "郑州商品交易所",
-        "3": "大连商品交易所",
-        "4": "LME",
-        "5": "NYMEX",
-        "6": "CBOT",
-        "7": "NYBOT",
-        "8": "TOCOM",
-        "10": "上海国际能源交易中心",
-        "11": "OSE",
-    }
-    exchange_map = {
-        value: key for key, value in temp_out_exchange_name.items()
+    temp_df = __get_99_symbol_map()
+    symbol_map = dict(zip(temp_df["name"], temp_df["productId"]))
+
+    url = "https://centerapi.fx168api.com/app/qh/api/stock/trend"
+    headers = {
+        "Content-Type": "application/json;charset=UTF-8",
+        "_pcc": "SGkj5avwu2h8Rs8/41r2LUwDHeEbaMKWe06+hWcEOO/uAQVbckWBHbwAvFbEI1eBBSvmTNqyjHKfFAn/kCpZ"
+        "IU7QNDvTrL2xGkQyuu+EVMU6RnZb/drmVGJRR6VhoHYMmzJvDuR6d43LnY219r44mGeL5x8qSUdh+cHjs0dm0AI=",
+        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/58.0.3029.110 Safari/537.3",
+        "referer": "https://www.99qh.com",
     }
-    exchange = exchange_map[exchange]
-    temp_symbol_code_map = dict(zip(data_name[exchange], data_code[exchange]))
-    symbol = temp_symbol_code_map[symbol]
-    out_exchange_name = {
-        "1": "上海期货交易所",
-        "2": "郑州商品交易所",
-        "3": "大连商品交易所",
-        "4": "LME",
-        "5": "NYMEX",
-        "6": "CBOT",
-        "7": "NYBOT",
-        "8": "TOCOM",
-        "10": "上海国际能源交易中心",
-        "11": "OSE",
+    params = {
+        "productId": symbol_map[symbol],
+        "type": "1",
+        "pageNo": "1",
+        "pageSize": "4000",
+        "startDate": "",
+        "endDate": f"{datetime.now().date().isoformat()}",
+        "appCategory": "web",
     }
-    name_temp_dict = {}
-    code_temp_dict = {}
-    for num in data_code.keys():
-        name_temp_dict[out_exchange_name[num]] = dict(
-            zip(data_code[num], data_name[num])
-        )
-        code_temp_dict[num] = dict(zip(data_code[num], data_name[num]))
-    n = 10
-    while n != 0:
-        try:
-            n -= 1
-            session = requests.Session()
-            url = "http://service.99qh.com/Storage/Storage.aspx"
-            params = {"page": "99qh"}
-            r = session.post(url, params=params, headers=sample_headers)
-            cookie = r.cookies.get_dict()
-            url = "http://service.99qh.com/Storage/Storage.aspx"
-            params = {"page": "99qh"}
-            r = requests.post(
-                url, params=params, headers=sample_headers, cookies=cookie
-            )
-            soup = BeautifulSoup(r.text, "lxml")
-            view_state = soup.find_all(attrs={"id": "__VIEWSTATE"})[0]["value"]
-            even_validation = soup.find_all(attrs={"id": "__EVENTVALIDATION"})[
-                0
-            ]["value"]
-            payload = {
-                "__EVENTTARGET": "ddlExchName",
-                "__EVENTARGUMENT": "",
-                "__LASTFOCUS": "",
-                "__VIEWSTATE": view_state,
-                "__VIEWSTATEGENERATOR": "6EAC22FA",
-                "__EVENTVALIDATION": even_validation,
-                "ddlExchName": int(exchange),
-                "ddlGoodsName": 1,
-            }
-            res = requests.post(
-                url,
-                params={"page": "99qh"},
-                data=payload,
-                headers=qh_headers,
-                cookies=cookie,
-            )
-            soup = BeautifulSoup(res.text, "lxml")
-            view_state = soup.find_all(attrs={"id": "__VIEWSTATE"})[0]["value"]
-            even_validation = soup.find_all(attrs={"id": "__EVENTVALIDATION"})[
-                0
-            ]["value"]
-            payload = {
-                "__EVENTTARGET": "ddlGoodsName",
-                "__EVENTARGUMENT": "",
-                "__LASTFOCUS": "",
-                "__VIEWSTATE": view_state,
-                "__VIEWSTATEGENERATOR": "6EAC22FA",
-                "__EVENTVALIDATION": even_validation,
-                "ddlExchName": int(exchange),
-                "ddlGoodsName": int(symbol),
-            }
-            res = requests.post(
-                url,
-                params=params,
-                data=payload,
-                headers=qh_headers,
-                cookies=cookie,
-            )
-            data_df = pd.read_html(StringIO(res.text))[-1].T
-            data_df.columns = data_df.iloc[0, :]
-            data_df = data_df.iloc[1:, :]
-            data_df.reset_index(inplace=True, drop=True)
-            data_df.columns.name = None
-            data_df["日期"] = pd.to_datetime(data_df["日期"]).dt.date
-            data_df["库存"] = pd.to_numeric(data_df["库存"])
-            data_df["增减"] = pd.to_numeric(data_df["增减"])
-            data_df.sort_values("日期", inplace=True)
-            data_df.reset_index(inplace=True, drop=True)
-            return data_df
-        except:
-            continue
+    r = requests.get(url, params, headers=headers)
+    data_json = r.json()
+    temp_df = pd.DataFrame(data_json["data"]["list"])
+    temp_df.columns = ["日期", "收盘价", "库存"]
+    temp_df.sort_values(by=["日期"], ignore_index=True, 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")
+    return temp_df
 
 
 if __name__ == "__main__":
-    futures_inventory_99_df = futures_inventory_99(
-        exchange="郑州商品交易所", symbol="菜籽油"
-    )
+    futures_inventory_99_df = futures_inventory_99(symbol="豆一")
     print(futures_inventory_99_df)

akshare/futures/futures_news_shmet.py

@@ -1,10 +1,11 @@
 # -*- coding:utf-8 -*-
 # !/usr/bin/env python
 """
-Date: 2022/7/28 12:50
+Date: 2024/12/26 18:00
 Desc: 上海金属网-快讯
 https://www.shmet.com/newsFlash/newsFlash.html?searchKeyword=
 """
+
 import pandas as pd
 import requests
 
@@ -37,7 +38,7 @@ def futures_news_shmet(symbol: str = "全部") -> pd.DataFrame:
         }
         payload = {
             "currentPage": 1,
-            "pageSize": 1000,
+            "pageSize": 2000,
             "content": "",
             "flashTag": symbol_map[symbol],
         }
@@ -80,6 +81,7 @@ def futures_news_shmet(symbol: str = "全部") -> pd.DataFrame:
 if __name__ == "__main__":
     futures_news_shmet_df = futures_news_shmet(symbol="铜")
     print(futures_news_shmet_df)
+
     for item in [
         "全部",
         "要闻",

akshare/futures/futures_roll_yield.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/1/12 16:58
+Date: 2024/12/6 13:58
 Desc: 中国期货各合约展期收益率
 日线数据从 daily_bar 函数获取, 需要在收盘后运行
 """
+
 import datetime
 import re
 import warnings
@@ -31,9 +32,7 @@ def get_roll_yield(date=None, var="BB", symbol1=None, symbol2=None, df=None):
     df: DataFrame或None 从dailyBar得到合约价格，如果为空就在函数内部抓dailyBar，直接喂给数据可以让计算加快
     """
     # date = "20100104"
-    date = (
-        cons.convert_date(date) if date is not None else datetime.date.today()
-    )
+    date = cons.convert_date(date) if date is not None else datetime.date.today()
     if date.strftime("%Y%m%d") not in calendar:
         warnings.warn("%s非交易日" % date.strftime("%Y%m%d"))
         return None
@@ -46,9 +45,7 @@ def get_roll_yield(date=None, var="BB", symbol1=None, symbol2=None, df=None):
         df = df[
             ~df["symbol"].str.contains("efp")
         ]  # 20200304 由于交易所获取的数据中会有比如 "CUefp"，所以在这里过滤
-        df = df[df["variety"] == var].sort_values(
-            "open_interest", ascending=False
-        )
+        df = df[df["variety"] == var].sort_values("open_interest", ascending=False)
         # df["close"] = df["close"].astype("float")
         df["close"] = pd.to_numeric(df["close"])
         if len(df["close"]) < 2:
@@ -69,7 +66,7 @@ def get_roll_yield(date=None, var="BB", symbol1=None, symbol2=None, df=None):
     if close1 == 0 or close2 == 0:
         return False
     if c > 0:
-        return math.log(close2 / close1) / c * 12, symbol2, symbol1
+        return math.log(close1 / close2) / c * 12, symbol2, symbol1
     else:
         return math.log(close2 / close1) / c * 12, symbol1, symbol2
 
@@ -93,20 +90,14 @@ def get_roll_yield_bar(
     ry      展期收益率
     index   日期或品种
     """
-    date = (
-        cons.convert_date(date) if date is not None else datetime.date.today()
-    )
+    date = cons.convert_date(date) if date is not None else datetime.date.today()
     start_day = (
-        cons.convert_date(start_day)
-        if start_day is not None
-        else datetime.date.today()
+        cons.convert_date(start_day) if start_day is not None else datetime.date.today()
     )
     end_day = (
         cons.convert_date(end_day)
         if end_day is not None
-        else cons.convert_date(
-            cons.get_latest_data_date(datetime.datetime.now())
-        )
+        else cons.convert_date(cons.get_latest_data_date(datetime.datetime.now()))
     )
 
     if type_method == "symbol":
@@ -122,13 +113,11 @@ def get_roll_yield_bar(
             df = pd.concat(
                 [
                     df,
-                    get_futures_daily(
-                        start_date=date, end_date=date, market=market
-                    ),
+                    get_futures_daily(start_date=date, end_date=date, market=market),
                 ]
             )
         var_list = list(set(df["variety"]))
-        for i_remove in ['IO', 'MO', 'HO']:
+        for i_remove in ["IO", "MO", "HO"]:
             if i_remove in var_list:
                 var_list.remove(i_remove)
         df_l = pd.DataFrame()
@@ -165,7 +154,7 @@ def get_roll_yield_bar(
                             ),
                         ]
                     )
-            except:
+            except:  # noqa: E722
                 pass
             start_day += datetime.timedelta(days=1)
         return df_l
@@ -186,7 +175,5 @@ if __name__ == "__main__":
     )
     print(get_roll_yield_bar_range_df)
 
-    get_roll_yield_bar_symbol = get_roll_yield_bar(
-        type_method="var", date="20210201"
-    )
+    get_roll_yield_bar_symbol = get_roll_yield_bar(type_method="var", date="20210201")
     print(get_roll_yield_bar_symbol)

akshare/futures/futures_spot_stock_em.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2022/10/14 17:15
+Date: 2024/3/21 12:00
 Desc: 东方财富网-数据中心-现货与股票
-http://data.eastmoney.com/ifdata/xhgp.html
+https://data.eastmoney.com/ifdata/xhgp.html
 """
+
 import pandas as pd
 import requests
 
@@ -14,7 +15,7 @@ from akshare.utils import demjson
 def futures_spot_stock(symbol: str = "能源") -> pd.DataFrame:
     """
     东方财富网-数据中心-现货与股票
-    http://data.eastmoney.com/ifdata/xhgp.html
+    https://data.eastmoney.com/ifdata/xhgp.html
     :param symbol: choice of {'能源', '化工', '塑料', '纺织', '有色', '钢铁', '建材', '农副'}
     :type symbol: str
     :return: 现货与股票上下游对应数据
@@ -30,9 +31,10 @@ def futures_spot_stock(symbol: str = "能源") -> pd.DataFrame:
         "建材": 6,
         "农副": 7,
     }
-    url = "http://data.eastmoney.com/ifdata/xhgp.html"
+    url = "https://data.eastmoney.com/ifdata/xhgp.html"
     headers = {
-        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
+        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,"
+        "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",
@@ -40,13 +42,14 @@ def futures_spot_stock(symbol: str = "能源") -> pd.DataFrame:
         "Host": "data.eastmoney.com",
         "Pragma": "no-cache",
         "Upgrade-Insecure-Requests": "1",
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36",
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
+        "(KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36",
     }
     r = requests.get(url, headers=headers)
     data_text = r.text
     temp_json = demjson.decode(
         data_text[
-            data_text.find("pagedata"): data_text.find(
+            data_text.find("pagedata") : data_text.find(
                 "/newstatic/js/common/emdataview.js"
             )
         ]
@@ -79,16 +82,19 @@ def futures_spot_stock(symbol: str = "能源") -> pd.DataFrame:
         "生产商",
         "下游用户",
     ]
-    temp_df[date_list[0]] = pd.to_numeric(temp_df[date_list[0]])
-    temp_df[date_list[1]] = pd.to_numeric(temp_df[date_list[1]])
-    temp_df[date_list[2]] = pd.to_numeric(temp_df[date_list[2]])
-    temp_df[date_list[3]] = pd.to_numeric(temp_df[date_list[3]])
-    temp_df['最新价格'] = pd.to_numeric(temp_df['最新价格'])
-    temp_df['近半年涨跌幅'] = pd.to_numeric(temp_df['近半年涨跌幅'])
+    temp_df[date_list[0]] = pd.to_numeric(temp_df[date_list[0]], errors="coerce")
+    temp_df[date_list[1]] = pd.to_numeric(temp_df[date_list[1]], errors="coerce")
+    temp_df[date_list[2]] = pd.to_numeric(temp_df[date_list[2]], errors="coerce")
+    temp_df[date_list[3]] = pd.to_numeric(temp_df[date_list[3]], errors="coerce")
+    temp_df["最新价格"] = pd.to_numeric(temp_df["最新价格"], errors="coerce")
+    temp_df["近半年涨跌幅"] = pd.to_numeric(temp_df["近半年涨跌幅"], errors="coerce")
     return temp_df
 
 
 if __name__ == "__main__":
+    futures_spot_stock_df = futures_spot_stock(symbol="能源")
+    print(futures_spot_stock_df)
+
     for sector in ["能源", "化工", "塑料", "纺织", "有色", "钢铁", "建材", "农副"]:
         futures_spot_stock_df = futures_spot_stock(symbol=sector)
         print(futures_spot_stock_df)

akshare/futures/futures_stock_js.py

@@ -1,16 +1,17 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/2/24 15:30
+Date: 2024/4/24 18:10
 Desc: 上海期货交易所指定交割仓库库存周报
 https://datacenter.jin10.com/reportType/dc_shfe_weekly_stock
-https://www.shfe.com.cn/statements/dataview.html?paramid=kx
+https://tsite.shfe.com.cn/statements/dataview.html?paramid=kx
 """
+
 import pandas as pd
 import requests
 
 
-def futures_stock_shfe_js(date: str = "20240223") -> pd.DataFrame:
+def futures_stock_shfe_js(date: str = "20240419") -> pd.DataFrame:
     """
     金十财经-上海期货交易所指定交割仓库库存周报
     https://datacenter.jin10.com/reportType/dc_shfe_weekly_stock
@@ -20,27 +21,28 @@ def futures_stock_shfe_js(date: str = "20240223") -> pd.DataFrame:
     :rtype: pandas.Series
     """
     headers = {
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36",
+        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/107.0.0.0 Safari/537.36",
         "x-app-id": "rU6QIu7JHe2gOUeR",
         "x-csrf-token": "x-csrf-token",
         "x-version": "1.0.0",
     }
     url = "https://datacenter-api.jin10.com/reports/list"
     params = {
-        'category': 'stock',
-        'date': '-'.join([date[:4], date[4:6], date[6:]]),
-        'attr_id': '1',
-        '_': '1708761356458',
+        "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()
-    columns_list = [item['name'] for item in data_json['data']['keys']]
-    temp_df = pd.DataFrame(data_json['data']['values'], columns=columns_list)
+    columns_list = [item["name"] for item in data_json["data"]["keys"]]
+    temp_df = pd.DataFrame(data_json["data"]["values"], columns=columns_list)
     for item in columns_list[1:]:
         temp_df[item] = pd.to_numeric(temp_df[item], errors="coerce")
     return temp_df
 
 
-if __name__ == '__main__':
-    futures_stock_shfe_js_df = futures_stock_shfe_js(date="20240223")
+if __name__ == "__main__":
+    futures_stock_shfe_js_df = futures_stock_shfe_js(date="20240419")
     print(futures_stock_shfe_js_df)