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

akshare/fund/fund_portfolio_em.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/1/25 18:00
+Date: 2024/6/7 20:00
 Desc: 天天基金网-基金档案-投资组合
 https://fundf10.eastmoney.com/ccmx_000001.html
 """
+
 from io import StringIO
 
 import pandas as pd
@@ -14,9 +15,7 @@ from bs4 import BeautifulSoup
 from akshare.utils import demjson
 
 
-def fund_portfolio_hold_em(
-        symbol: str = "000001", date: str = "2023"
-) -> pd.DataFrame:
+def fund_portfolio_hold_em(symbol: str = "000001", date: str = "2024") -> pd.DataFrame:
     """
     天天基金网-基金档案-投资组合-基金持仓
     https://fundf10.eastmoney.com/ccmx_000001.html
@@ -27,7 +26,7 @@ def fund_portfolio_hold_em(
     :return: 基金持仓
     :rtype: pandas.DataFrame
     """
-    url = "http://fundf10.eastmoney.com/FundArchivesDatas.aspx"
+    url = "https://fundf10.eastmoney.com/FundArchivesDatas.aspx"
     params = {
         "type": "jjcc",
         "code": symbol,
@@ -38,59 +37,70 @@ def fund_portfolio_hold_em(
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{"): -1])
-    soup = BeautifulSoup(data_json["content"], "lxml")
+    data_json = demjson.decode(data_text[data_text.find("{") : -1])
+    soup = BeautifulSoup(data_json["content"], features="lxml")
     item_label = [
         item.text.split("\xa0\xa0")[1]
-        for item in soup.find_all("h4", attrs={"class": "t"})
+        for item in soup.find_all(name="h4", attrs={"class": "t"})
     ]
-    big_df = pd.DataFrame()
+
+    column_name = [
+        "序号",
+        "股票代码",
+        "股票名称",
+        "占净值比例",
+        "持股数",
+        "持仓市值",
+        "季度",
+    ]
+    big_df = pd.DataFrame(columns=column_name)
+
     for item in range(len(item_label)):
-        temp_df = pd.read_html(StringIO(data_json["content"]), converters={"股票代码": str})[
-            item
-        ]
+        temp_df = pd.read_html(
+            StringIO(data_json["content"]), converters={"股票代码": str}
+        )[item]
         del temp_df["相关资讯"]
-        temp_df.rename(
-            columns={"占净值 比例": "占净值比例"}, inplace=True
-        )
+        temp_df.rename(columns={"占净值 比例": "占净值比例"}, inplace=True)
         temp_df["占净值比例"] = (
             temp_df["占净值比例"].str.split("%", expand=True).iloc[:, 0]
         )
         temp_df.rename(
-            columns={"持股数（万股）": "持股数", "持仓市值（万元）": "持仓市值"}, inplace=True
+            columns={"持股数（万股）": "持股数", "持仓市值（万元）": "持仓市值"},
+            inplace=True,
         )
         temp_df.rename(
-            columns={"持股数 （万股）": "持股数", "持仓市值 （万元）": "持仓市值"}, inplace=True
+            columns={"持股数 （万股）": "持股数", "持仓市值 （万元）": "持仓市值"},
+            inplace=True,
         )
         temp_df.rename(
-            columns={"持股数（万股）": "持股数", "持仓市值（万元人民币）": "持仓市值"}, inplace=True
+            columns={"持股数（万股）": "持股数", "持仓市值（万元人民币）": "持仓市值"},
+            inplace=True,
         )
         temp_df.rename(
-            columns={"持股数 （万股）": "持股数", "持仓市值 （万元人民币）": "持仓市值"}, inplace=True
+            columns={
+                "持股数 （万股）": "持股数",
+                "持仓市值 （万元人民币）": "持仓市值",
+            },
+            inplace=True,
         )
 
         temp_df["季度"] = item_label[item]
-        temp_df = temp_df[
-            [
-                "序号",
-                "股票代码",
-                "股票名称",
-                "占净值比例",
-                "持股数",
-                "持仓市值",
-                "季度",
-            ]
-        ]
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
-    big_df["占净值比例"] = pd.to_numeric(big_df["占净值比例"], errors="coerce")
-    big_df["持股数"] = pd.to_numeric(big_df["持股数"], errors="coerce")
-    big_df["持仓市值"] = pd.to_numeric(big_df["持仓市值"], errors="coerce")
-    big_df["序号"] = range(1, len(big_df) + 1)
+        temp_df = temp_df[column_name]
+        big_df = pd.concat(objs=[temp_df, big_df], ignore_index=True) if not big_df.empty else temp_df
+
+    if not big_df.empty:
+        big_df["占净值比例"] = pd.to_numeric(big_df["占净值比例"], errors="coerce")
+        big_df["持股数"] = pd.to_numeric(big_df["持股数"], errors="coerce")
+        big_df["持仓市值"] = pd.to_numeric(big_df["持仓市值"], errors="coerce")
+        del big_df["序号"]
+        big_df.reset_index(inplace=True, drop=False)
+        big_df["index"] = big_df["index"] + 1
+        big_df.rename(columns={"index": "序号"}, inplace=True)
     return big_df
 
 
 def fund_portfolio_bond_hold_em(
-        symbol: str = "000001", date: str = "2023"
+    symbol: str = "000001", date: str = "2023"
 ) -> pd.DataFrame:
     """
     天天基金网-基金档案-投资组合-债券持仓
@@ -102,7 +112,7 @@ def fund_portfolio_bond_hold_em(
     :return: 债券持仓
     :rtype: pandas.DataFrame
     """
-    url = "http://fundf10.eastmoney.com/FundArchivesDatas.aspx"
+    url = "https://fundf10.eastmoney.com/FundArchivesDatas.aspx"
     params = {
         "type": "zqcc",
         "code": symbol,
@@ -111,17 +121,17 @@ def fund_portfolio_bond_hold_em(
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{"): -1])
-    soup = BeautifulSoup(data_json["content"], "lxml")
+    data_json = demjson.decode(data_text[data_text.find("{") : -1])
+    soup = BeautifulSoup(data_json["content"], features="lxml")
     item_label = [
         item.text.split("\xa0\xa0")[1]
-        for item in soup.find_all("h4", attrs={"class": "t"})
+        for item in soup.find_all(name="h4", attrs={"class": "t"})
     ]
     big_df = pd.DataFrame()
     for item in range(len(item_label)):
-        temp_df = pd.read_html(StringIO(data_json["content"]), converters={"债券代码": str})[
-            item
-        ]
+        temp_df = pd.read_html(
+            StringIO(data_json["content"]), converters={"债券代码": str}
+        )[item]
         temp_df["占净值比例"] = (
             temp_df["占净值比例"].str.split("%", expand=True).iloc[:, 0]
         )
@@ -137,7 +147,7 @@ def fund_portfolio_bond_hold_em(
                 "季度",
             ]
         ]
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
+        big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
     big_df["占净值比例"] = pd.to_numeric(big_df["占净值比例"], errors="coerce")
     big_df["持仓市值"] = pd.to_numeric(big_df["持仓市值"], errors="coerce")
     big_df["序号"] = range(1, len(big_df) + 1)
@@ -145,7 +155,7 @@ def fund_portfolio_bond_hold_em(
 
 
 def fund_portfolio_industry_allocation_em(
-        symbol: str = "000001", date: str = "2023"
+    symbol: str = "000001", date: str = "2023"
 ) -> pd.DataFrame:
     """
     天天基金网-基金档案-投资组合-行业配置
@@ -157,7 +167,7 @@ def fund_portfolio_industry_allocation_em(
     :return: 行业配置
     :rtype: pandas.DataFrame
     """
-    url = "http://api.fund.eastmoney.com/f10/HYPZ/"
+    url = "https://api.fund.eastmoney.com/f10/HYPZ/"
     headers = {
         "Accept": "*/*",
         "Accept-Encoding": "gzip, deflate",
@@ -166,18 +176,18 @@ def fund_portfolio_industry_allocation_em(
         "Connection": "keep-alive",
         "Host": "api.fund.eastmoney.com",
         "Pragma": "no-cache",
-        "Referer": "http://fundf10.eastmoney.com/",
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.82 Safari/537.36",
+        "Referer": "https://fundf10.eastmoney.com/",
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/99.0.4844.82 Safari/537.36",
     }
     params = {
         "fundCode": symbol,
         "year": date,
         "callback": "jQuery183006997159478989867_1648016188499",
-        "_": "1648016377955",
     }
     r = requests.get(url, params=params, headers=headers)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{"): -1])
+    data_json = demjson.decode(data_text[data_text.find("{") : -1])
     temp_list = []
     for item in data_json["Data"]["QuarterInfos"]:
         temp_list.extend(item["HYPZInfo"])
@@ -218,7 +228,7 @@ def fund_portfolio_industry_allocation_em(
 
 
 def fund_portfolio_change_em(
-        symbol: str = "003567", indicator: str = "累计买入", date: str = "2023"
+    symbol: str = "003567", indicator: str = "累计买入", date: str = "2023"
 ) -> pd.DataFrame:
     """
     天天基金网-基金档案-投资组合-重大变动
@@ -236,7 +246,7 @@ def fund_portfolio_change_em(
         "累计买入": "1",
         "累计卖出": "2",
     }
-    url = "http://fundf10.eastmoney.com/FundArchivesDatas.aspx"
+    url = "https://fundf10.eastmoney.com/FundArchivesDatas.aspx"
     params = {
         "type": "zdbd",
         "code": symbol,
@@ -246,20 +256,22 @@ def fund_portfolio_change_em(
     }
     r = requests.get(url, params=params)
     data_text = r.text
-    data_json = demjson.decode(data_text[data_text.find("{"): -1])
-    soup = BeautifulSoup(data_json["content"], "lxml")
+    data_json = demjson.decode(data_text[data_text.find("{") : -1])
+    soup = BeautifulSoup(data_json["content"], features="lxml")
     item_label = [
         item.text.split("\xa0\xa0")[1]
-        for item in soup.find_all("h4", attrs={"class": "t"})
+        for item in soup.find_all(name="h4", attrs={"class": "t"})
     ]
     big_df = pd.DataFrame()
     for item in range(len(item_label)):
-        temp_df = pd.read_html(StringIO(data_json["content"]), converters={"股票代码": str})[
-            item
-        ]
+        temp_df = pd.read_html(
+            StringIO(data_json["content"]), converters={"股票代码": str}
+        )[item]
         del temp_df["相关资讯"]
         temp_df["占期初基金资产净值比例（%）"] = (
-            temp_df["占期初基金资产净值比例（%）"].str.split("%", expand=True).iloc[:, 0]
+            temp_df["占期初基金资产净值比例（%）"]
+            .str.split("%", expand=True)
+            .iloc[:, 0]
         )
         temp_df["季度"] = item_label[item]
         temp_df.columns = [
@@ -280,13 +292,15 @@ def fund_portfolio_change_em(
                 "季度",
             ]
         ]
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
+        big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
     del big_df["序号"]
     big_df.reset_index(inplace=True)
     big_df["index"] = big_df.index + 1
     big_df.rename(columns={"index": "序号"}, inplace=True)
 
-    big_df["本期累计买入金额"] = pd.to_numeric(big_df["本期累计买入金额"], errors="coerce")
+    big_df["本期累计买入金额"] = pd.to_numeric(
+        big_df["本期累计买入金额"], errors="coerce"
+    )
     big_df["占期初基金资产净值比例"] = pd.to_numeric(
         big_df["占期初基金资产净值比例"], errors="coerce"
     )
@@ -294,9 +308,7 @@ def fund_portfolio_change_em(
 
 
 if __name__ == "__main__":
-    fund_portfolio_hold_em_df = fund_portfolio_hold_em(
-        symbol="011934", date="2023"
-    )
+    fund_portfolio_hold_em_df = fund_portfolio_hold_em(symbol="000001", date="2024")
     print(fund_portfolio_hold_em_df)
 
     fund_portfolio_bond_hold_em_df = fund_portfolio_bond_hold_em(
@@ -304,8 +316,8 @@ if __name__ == "__main__":
     )
     print(fund_portfolio_bond_hold_em_df)
 
-    fund_portfolio_industry_allocation_em_df = (
-        fund_portfolio_industry_allocation_em(symbol="000001", date="2023")
+    fund_portfolio_industry_allocation_em_df = fund_portfolio_industry_allocation_em(
+        symbol="000001", date="2023"
     )
     print(fund_portfolio_industry_allocation_em_df)
 

akshare/fund/fund_position_lg.py

@@ -5,6 +5,7 @@ Date: 2023/4/5 22:05
 Desc: 乐咕乐股-基金仓位
 https://legulegu.com/stockdata/fund-position/pos-stock
 """
+
 import pandas as pd
 import requests
 
@@ -20,11 +21,16 @@ def fund_stock_position_lg() -> pd.DataFrame:
     """
     url = "https://legulegu.com/api/stockdata/fund-position"
     token = get_token_lg()
-    params = {"token": token, "type": "pos_stock", "category": "总仓位", "marketId": "5"}
+    params = {
+        "token": token,
+        "type": "pos_stock",
+        "category": "总仓位",
+        "marketId": "5",
+    }
     r = requests.get(
         url,
         params=params,
-        **get_cookie_csrf(url="https://legulegu.com/stockdata/fund-position/pos-stock")
+        **get_cookie_csrf(url="https://legulegu.com/stockdata/fund-position/pos-stock"),
     )
     data_json = r.json()
     temp_df = pd.DataFrame(data_json)
@@ -36,7 +42,7 @@ def fund_stock_position_lg() -> pd.DataFrame:
             "position",
         ]
     ]
-    temp_df['date'] = pd.to_datetime(temp_df['date']).dt.date
+    temp_df["date"] = pd.to_datetime(temp_df["date"]).dt.date
     temp_df["close"] = pd.to_numeric(temp_df["close"], errors="coerce")
     temp_df["position"] = pd.to_numeric(temp_df["position"], errors="coerce")
     return temp_df
@@ -62,7 +68,7 @@ def fund_balance_position_lg() -> pd.DataFrame:
         params=params,
         **get_cookie_csrf(
             url="https://legulegu.com/stockdata/fund-position/pos-pingheng"
-        )
+        ),
     )
     data_json = r.json()
     temp_df = pd.DataFrame(data_json)
@@ -74,7 +80,7 @@ def fund_balance_position_lg() -> pd.DataFrame:
             "position",
         ]
     ]
-    temp_df['date'] = pd.to_datetime(temp_df['date']).dt.date
+    temp_df["date"] = pd.to_datetime(temp_df["date"]).dt.date
     temp_df["close"] = pd.to_numeric(temp_df["close"], errors="coerce")
     temp_df["position"] = pd.to_numeric(temp_df["position"], errors="coerce")
     return temp_df
@@ -89,13 +95,18 @@ def fund_linghuo_position_lg() -> pd.DataFrame:
     """
     url = "https://legulegu.com/api/stockdata/fund-position"
     token = get_token_lg()
-    params = {"token": token, "type": "pos_linghuo", "category": "总仓位", "marketId": "5"}
+    params = {
+        "token": token,
+        "type": "pos_linghuo",
+        "category": "总仓位",
+        "marketId": "5",
+    }
     r = requests.get(
         url,
         params=params,
         **get_cookie_csrf(
             url="https://legulegu.com/stockdata/fund-position/pos-linghuo"
-        )
+        ),
     )
     data_json = r.json()
     temp_df = pd.DataFrame(data_json)
@@ -107,7 +118,7 @@ def fund_linghuo_position_lg() -> pd.DataFrame:
             "position",
         ]
     ]
-    temp_df['date'] = pd.to_datetime(temp_df['date']).dt.date
+    temp_df["date"] = pd.to_datetime(temp_df["date"]).dt.date
     temp_df["close"] = pd.to_numeric(temp_df["close"], errors="coerce")
     temp_df["position"] = pd.to_numeric(temp_df["position"], errors="coerce")
     return temp_df