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

akshare/fund/fund_xq.py

@@ -1,16 +1,17 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/01/16 23:40
+Date: 2024/10/27 22:30
 Desc: 雪球基金-基金详情
 https://danjuanfunds.com/funding/003545
 """
+
 import pandas as pd
 import requests
 
 
 def fund_individual_basic_info_xq(
-        symbol: str = "000001", timeout: float = None
+    symbol: str = "000001", timeout: float = None
 ) -> pd.DataFrame:
     """
     雪球基金-基金详情
@@ -24,52 +25,58 @@ def fund_individual_basic_info_xq(
     """
     url = f"https://danjuanfunds.com/djapi/fund/{symbol}"
     headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36"
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/80.0.3987.149 Safari/537.36"
     }
     r = requests.get(url, headers=headers, timeout=timeout)
     json_data = r.json()["data"]
     temp_df = pd.json_normalize(json_data)
-    temp_df.rename(columns={
-        "fd_code": "基金代码",
-        "fd_name": "基金名称",
-        "fd_full_name": "基金全称",
-        "found_date": "成立时间",
-        "totshare": "最新规模",
-        "keeper_name": "基金公司",
-        "manager_name": "基金经理",
-        "trup_name": "托管银行",
-        "type_desc": "基金类型",
-        "rating_source": "评级机构",
-        "rating_desc": "基金评级",
-        "invest_orientation": "投资策略",
-        "invest_target": "投资目标",
-        "performance_bench_mark": "业绩比较基准",
-    }, inplace=True)
+    temp_df.rename(
+        columns={
+            "fd_code": "基金代码",
+            "fd_name": "基金名称",
+            "fd_full_name": "基金全称",
+            "found_date": "成立时间",
+            "totshare": "最新规模",
+            "keeper_name": "基金公司",
+            "manager_name": "基金经理",
+            "trup_name": "托管银行",
+            "type_desc": "基金类型",
+            "rating_source": "评级机构",
+            "rating_desc": "基金评级",
+            "invest_orientation": "投资策略",
+            "invest_target": "投资目标",
+            "performance_bench_mark": "业绩比较基准",
+        },
+        inplace=True,
+    )
     if "评级机构" not in temp_df.columns:
-        temp_df['评级机构'] = pd.NA
-    temp_df = temp_df[[
-        "基金代码",
-        "基金名称",
-        "基金全称",
-        "成立时间",
-        "最新规模",
-        "基金公司",
-        "基金经理",
-        "托管银行",
-        "基金类型",
-        "评级机构",
-        "基金评级",
-        "投资策略",
-        "投资目标",
-        "业绩比较基准",
-    ]]
+        temp_df["评级机构"] = pd.NA
+    temp_df = temp_df[
+        [
+            "基金代码",
+            "基金名称",
+            "基金全称",
+            "成立时间",
+            "最新规模",
+            "基金公司",
+            "基金经理",
+            "托管银行",
+            "基金类型",
+            "评级机构",
+            "基金评级",
+            "投资策略",
+            "投资目标",
+            "业绩比较基准",
+        ]
+    ]
     temp_df = temp_df.T.reset_index()
     temp_df.columns = ["item", "value"]
     return temp_df
 
 
 def fund_individual_achievement_xq(
-        symbol: str = "000001", timeout: float = None
+    symbol: str = "000001", timeout: float = None
 ) -> pd.DataFrame:
     """
     雪球基金-基金业绩
@@ -81,11 +88,10 @@ def fund_individual_achievement_xq(
     :return: 基金业绩
     :rtype: pandas.DataFrame
     """
-    url = (
-        f"https://danjuanfunds.com/djapi/fundx/base/fund/achievement/{symbol}"
-    )
+    url = f"https://danjuanfunds.com/djapi/fundx/base/fund/achievement/{symbol}"
     headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36"
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/80.0.3987.149 Safari/537.36"
     }
     r = requests.get(url, headers=headers, timeout=timeout)
     json_data = r.json()["data"]
@@ -124,7 +130,7 @@ def fund_individual_achievement_xq(
 
 
 def fund_individual_analysis_xq(
-        symbol: str = "000001", timeout: float = None
+    symbol: str = "000001", timeout: float = None
 ) -> pd.DataFrame:
     """
     雪球基金-基金数据分析
@@ -138,7 +144,8 @@ def fund_individual_analysis_xq(
     """
     url = f"https://danjuanfunds.com/djapi/fund/base/quote/data/index/analysis/{symbol}"
     headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36"
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/80.0.3987.149 Safari/537.36"
     }
     r = requests.get(url, headers=headers, timeout=timeout)
     json_data = r.json()["data"]["index_data_list"]
@@ -161,20 +168,22 @@ def fund_individual_analysis_xq(
         "年化夏普比率",
         "最大回撤",
     ]
-    temp_df = temp_df.map(
-        lambda x: x if "%" not in str(x) else x.replace("%", "")
-    )
+    temp_df = temp_df.map(lambda x: x if "%" not in str(x) else x.replace("%", ""))
     temp_df[["年化波动率", "最大回撤"]] *= 100
-    temp_df['较同类风险收益比'] = pd.to_numeric(temp_df['较同类风险收益比'], errors="coerce")
-    temp_df['较同类抗风险波动'] = pd.to_numeric(temp_df['较同类抗风险波动'], errors="coerce")
-    temp_df['年化波动率'] = pd.to_numeric(temp_df['年化波动率'], errors="coerce")
-    temp_df['年化夏普比率'] = pd.to_numeric(temp_df['年化夏普比率'], errors="coerce")
-    temp_df['最大回撤'] = pd.to_numeric(temp_df['最大回撤'], errors="coerce")
+    temp_df["较同类风险收益比"] = pd.to_numeric(
+        temp_df["较同类风险收益比"], errors="coerce"
+    )
+    temp_df["较同类抗风险波动"] = pd.to_numeric(
+        temp_df["较同类抗风险波动"], errors="coerce"
+    )
+    temp_df["年化波动率"] = pd.to_numeric(temp_df["年化波动率"], errors="coerce")
+    temp_df["年化夏普比率"] = pd.to_numeric(temp_df["年化夏普比率"], errors="coerce")
+    temp_df["最大回撤"] = pd.to_numeric(temp_df["最大回撤"], errors="coerce")
     return temp_df
 
 
 def fund_individual_profit_probability_xq(
-        symbol: str = "000001", timeout: float = None
+    symbol: str = "000001", timeout: float = None
 ) -> pd.DataFrame:
     """
     雪球基金-盈利概率-历史任意时点买入，持有满 X 年，盈利概率 Y%
@@ -186,11 +195,10 @@ def fund_individual_profit_probability_xq(
     :return: 盈利概率
     :rtype: pandas.DataFrame
     """
-    url = (
-        f"https://danjuanfunds.com/djapi/fundx/base/fund/profit/ratio/{symbol}"
-    )
+    url = f"https://danjuanfunds.com/djapi/fundx/base/fund/profit/ratio/{symbol}"
     headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36"
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/80.0.3987.149 Safari/537.36"
     }
     r = requests.get(url, headers=headers, timeout=timeout)
     json_data = r.json()["data"]["data_list"]
@@ -207,79 +215,97 @@ def fund_individual_profit_probability_xq(
         "盈利概率",
         "平均收益",
     ]
-    temp_df = temp_df.map(
-        lambda x: x if "%" not in str(x) else x.replace("%", "")
-    )
-    temp_df['盈利概率'] = pd.to_numeric(temp_df['盈利概率'], errors="coerce")
-    temp_df['平均收益'] = pd.to_numeric(temp_df['平均收益'], errors="coerce")
+    temp_df = temp_df.map(lambda x: x if "%" not in str(x) else x.replace("%", ""))
+    temp_df["盈利概率"] = pd.to_numeric(temp_df["盈利概率"], errors="coerce")
+    temp_df["平均收益"] = pd.to_numeric(temp_df["平均收益"], errors="coerce")
     return temp_df
 
 
 def fund_individual_detail_info_xq(
-        symbol: str = "000001", indicator: str = "交易规则", timeout: float = None
+    symbol: str = "000001", timeout: float = None
 ) -> pd.DataFrame:
     """
-    雪球基金-详细信息
+    雪球基金-交易规则
     https://danjuanfunds.com/djapi/fund/detail/675091
     :param symbol: 基金代码
     :type symbol: str
-    :param indicator: 信息类型; choice of {"交易规则", "持仓资产比例"}
-    :type symbol: str
     :param timeout: choice of None or a positive float number
     :type timeout: float
-    :return: 盈利概率
+    :return: 交易规则
     :rtype: pandas.DataFrame
     """
     url = f"https://danjuanfunds.com/djapi/fund/detail/{symbol}"
     headers = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36"
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/80.0.3987.149 Safari/537.36"
     }
     r = requests.get(url, headers=headers, timeout=timeout)
     json_data = r.json()["data"]
-
-    if indicator == "持仓资产比例":
-        temp_df = pd.DataFrame.from_dict(
-            json_data["fund_position"]["chart_list"], orient="columns"
-        )
+    combined_df = None
+    rate_type_dict = {
+        "declare_rate_table": "买入规则",
+        "withdraw_rate_table": "卖出规则",
+        "other_rate_table": "其他费用",
+    }
+    for k, v in rate_type_dict.items():
+        temp_df = pd.DataFrame.from_dict(json_data["fund_rates"][k], orient="columns")
+        temp_df["rate_type"] = v
         temp_df = temp_df[
             [
-                "type_desc",
-                "percent",
+                "rate_type",
+                "name",
+                "value",
             ]
         ]
         temp_df.columns = [
-            "资产类型",
-            "仓位占比",
+            "费用类型",
+            "条件或名称",
+            "费用",
         ]
-        temp_df['仓位占比'] = pd.to_numeric(temp_df['仓位占比'], errors="coerce")
-        return temp_df
-    elif indicator == "交易规则":
-        combined_df = None
-        rate_type_dict = {
-            "declare_rate_table": "买入规则",
-            "withdraw_rate_table": "卖出规则",
-            "other_rate_table": "其他费用",
-        }
-        for k, v in rate_type_dict.items():
-            temp_df = pd.DataFrame.from_dict(
-                json_data["fund_rates"][k], orient="columns"
-            )
-            temp_df["rate_type"] = v
-            temp_df = temp_df[
-                [
-                    "rate_type",
-                    "name",
-                    "value",
-                ]
-            ]
-            temp_df.columns = [
-                "费用类型",
-                "条件或名称",
-                "费用",
-            ]
-            combined_df = pd.concat([combined_df, temp_df], ignore_index=True)
-            combined_df['费用'] = pd.to_numeric(combined_df['费用'], errors="coerce")
-        return combined_df
+        combined_df = pd.concat(objs=[combined_df, temp_df], ignore_index=True)
+        combined_df["费用"] = pd.to_numeric(combined_df["费用"], errors="coerce")
+    return combined_df
+
+
+def fund_individual_detail_hold_xq(
+    symbol: str = "002804", date: str = "20231231", timeout: float = None
+) -> pd.DataFrame:
+    """
+    雪球基金-持仓
+    https://danjuanfunds.com/rn/fund-detail/archive?id=103&code=002804
+    :param symbol: 基金代码
+    :type symbol: str
+    :param date: 财报日期
+    :type date: str
+    :param timeout: choice of None or a positive float number
+    :type timeout: float
+    :return: 雪球基金-持仓
+    :rtype: pandas.DataFrame
+    """
+    url = "https://danjuanfunds.com/djapi/fundx/base/fund/record/asset/percent"
+    headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/80.0.3987.149 Safari/537.36"
+    }
+    params = {
+        "fund_code": f"{symbol}",
+        "report_date": f"{'-'.join([date[:4], date[4:6], date[6:]])}",
+    }
+    r = requests.get(url, headers=headers, params=params, timeout=timeout)
+    data_json = r.json()
+    temp_df = pd.DataFrame.from_dict(data_json["data"]["chart_list"], orient="columns")
+    temp_df = temp_df[
+        [
+            "type_desc",
+            "percent",
+        ]
+    ]
+    temp_df.columns = [
+        "资产类型",
+        "仓位占比",
+    ]
+    temp_df["仓位占比"] = pd.to_numeric(temp_df["仓位占比"], errors="coerce")
+    return temp_df
 
 
 if __name__ == "__main__":
@@ -292,11 +318,15 @@ if __name__ == "__main__":
     fund_individual_analysis_xq_df = fund_individual_analysis_xq(symbol="000001")
     print(fund_individual_analysis_xq_df)
 
-    fund_individual_profit_probability_xq_df = fund_individual_profit_probability_xq(symbol="000001")
+    fund_individual_profit_probability_xq_df = fund_individual_profit_probability_xq(
+        symbol="000001"
+    )
     print(fund_individual_profit_probability_xq_df)
 
-    fund_individual_detail_info_xq_df = fund_individual_detail_info_xq(indicator="交易规则")
+    fund_individual_detail_info_xq_df = fund_individual_detail_info_xq(symbol="000001")
     print(fund_individual_detail_info_xq_df)
 
-    fund_individual_detail_info_xq_df = fund_individual_detail_info_xq(indicator="持仓资产比例")
-    print(fund_individual_detail_info_xq_df)
+    fund_individual_detail_hold_xq_df = fund_individual_detail_hold_xq(
+        symbol="002804", date="20231231"
+    )
+    print(fund_individual_detail_hold_xq_df)

akshare/futures/cons.py

@@ -64,30 +64,6 @@ inventory_temp_headers = {
     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36",
 }
 
-sample_headers = {
-    "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3",
-    "Host": "service.99qh.com",
-    "Origin": "http://service.99qh.com",
-    "Referer": "http://www.99qh.com/d/store.aspx",
-    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36",
-}
-
-qh_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-Encoding": "gzip, deflate",
-    "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
-    "Cache-Control": "no-cache",
-    "Connection": "keep-alive",
-    "Content-Length": "8429",
-    "Content-Type": "application/x-www-form-urlencoded",
-    "Host": "service.99qh.com",
-    "Origin": "http://service.99qh.com",
-    "Pragma": "no-cache",
-    "Cookie": "__utma=181566328.985082941.1656754961.1656754961.1656754961.1; __utmc=181566328; __utmz=181566328.1656754961.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none); ASP.NET_SessionId=42k0mpzfu3fv5cxqmtrwc20y; tgw_l7_route=b26adbec28f4b4e1f7290033d59c43a7; __utmt=1; __utmb=181566328.2.10.1656754961",
-    "Referer": "http://service.99qh.com/Storage/Storage.aspx?page=99qh",
-    "Upgrade-Insecure-Requests": "1",
-    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36",
-}
 # 奇货可查
 QHKC_INDEX_URL = "https://www.qhkch.com/ajax/index_show.php"
 QHKC_INDEX_TREND_URL = "https://qhkch.com/ajax/indexes_trend.php"
@@ -100,7 +76,6 @@ QHKC_FUND_BIG_CHANGE_URL = "https://qhkch.com/ajax/fund_big_chge.php"
 QHKC_TOOL_FOREIGN_URL = "https://qhkch.com/ajax/toolbox_foreign.php"
 QHKC_TOOL_GDP_URL = "https://qhkch.com/dist/views/toolbox/gdp.html?v=1.10.7.1"
 
-
 # 键值对: 键为交易所代码, 值为具体合约代码
 market_exchange_symbols = {
     "cffex": ["IF", "IC", "IM", "IH", "T", "TF", "TS", "TL"],
@@ -126,6 +101,7 @@ market_exchange_symbols = {
         "EB",  # 20191009
         "PG",
         "LH",  # 20210108 生猪期货
+        "LG",  # 20241118 原木期货
     ],
     "czce": [
         "WH",
@@ -228,7 +204,7 @@ dce_headers = {
 SYS_SPOT_PRICE_URL = "http://www.100ppi.com/sf/day-{}.html"
 SYS_SPOT_PRICE_LATEST_URL = "http://www.100ppi.com/sf/"
 
-SHFE_VOL_RANK_URL = "http://www.shfe.com.cn/data/dailydata/kx/pm%s.dat"
+SHFE_VOL_RANK_URL = "https://tsite.shfe.com.cn/data/dailydata/kx/pm%s.dat"
 CFFEX_VOL_RANK_URL = "http://www.cffex.com.cn/sj/ccpm/%s/%s/%s_1.csv"
 DCE_VOL_RANK_URL_1 = "http://www.dce.com.cn/publicweb/quotesdata/exportMemberDealPosiQuotesData.html?memberDealPosiQuotes.variety=%s&memberDealPosiQuotes.trade_type=0&contract.contract_id=%s&contract.variety_id=%s&year=%s&month=%s&day=%s&exportFlag=txt"
 DCE_VOL_RANK_URL_2 = "http://www.dce.com.cn/publicweb/quotesdata/memberDealPosiQuotes.html?memberDealPosiQuotes.variety=%s&memberDealPosiQuotes.trade_type=0&contract.contract_id=all&contract.variety_id=%s&year=%s&month=%s&day=%s"
@@ -240,8 +216,8 @@ CZCE_VOL_RANK_URL_3 = (
 
 DCE_RECEIPT_URL = "http://www.dce.com.cn/publicweb/quotesdata/wbillWeeklyQuotes.html"
 
-SHFE_RECEIPT_URL_1 = "http://www.shfe.com.cn/data/dailydata/%sdailystock.html"
-SHFE_RECEIPT_URL_2 = "http://www.shfe.com.cn/data/dailydata/%sdailystock.dat"
+SHFE_RECEIPT_URL_1 = "http://tsite.shfe.com.cn/data/dailydata/%sdailystock.html"
+SHFE_RECEIPT_URL_2 = "http://tsite.shfe.com.cn/data/dailydata/%sdailystock.dat"
 CZCE_RECEIPT_URL_1 = "http://www.czce.com.cn/cn/exchange/jyxx/sheet/sheet%s.html"
 CZCE_RECEIPT_URL_2 = "http://www.czce.com.cn/cn/exchange/%s/datawhsheet/%s.htm"
 CZCE_RECEIPT_URL_3 = (
@@ -249,8 +225,8 @@ CZCE_RECEIPT_URL_3 = (
 )
 
 CFFEX_DAILY_URL = "http://www.cffex.com.cn/fzjy/mrhq/{}/{}/{}_1.csv"
-SHFE_DAILY_URL = "http://www.shfe.com.cn/data/dailydata/kx/kx%s.dat"
-SHFE_V_WAP_URL = "http://www.shfe.com.cn/data/dailydata/ck/%sdailyTimePrice.dat"
+SHFE_DAILY_URL = "http://tsite.shfe.com.cn/data/dailydata/kx/kx%s.dat"
+SHFE_V_WAP_URL = "http://tsite.shfe.com.cn/data/dailydata/ck/%sdailyTimePrice.dat"
 DCE_DAILY_URL = "http://www.dce.com.cn//publicweb/quotesdata/dayQuotesCh.html"
 CZCE_DAILY_URL_1 = "http://www.czce.com.cn/cn/exchange/jyxx/hq/hq%s.html"
 CZCE_DAILY_URL_2 = "http://www.czce.com.cn/cn/exchange/%s/datadaily/%s.txt"
@@ -412,6 +388,7 @@ DCE_MAP = {
     "苯乙烯": "EB",
     "液化石油气": "PG",
     "生猪": "LH",
+    "原木": "LG",
 }
 
 
@@ -478,7 +455,7 @@ def get_calendar():
     """
     setting_file_name = "calendar.json"
     setting_file_path = get_json_path(setting_file_name, __file__)
-    with open(setting_file_path, "r") as f:
+    with open(setting_file_path, "r", encoding="utf-8") as f:
         data_json = json.load(f)
     return data_json