From c77b88538e0f6d36c5b7dc6a2f89d644c1ef8b1b Mon Sep 17 00:00:00 2001 From: jindaxiang Date: Sat, 28 Oct 2023 18:39:50 +0800 Subject: [PATCH 1/5] add version --- akshare/__init__.py | 6 ++---- docs/changelog.md | 6 ++++++ docs/tutorial.md | 7 ++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/akshare/__init__.py b/akshare/__init__.py index 0d80f25bbc5..0d0e563cf1f 100644 --- a/akshare/__init__.py +++ b/akshare/__init__.py @@ -2567,9 +2567,10 @@ 1.11.51 fix: fix stock_zh_a_daily interface 1.11.52 fix: fix fund_scale_change_em interface 1.11.53 add: add stock_zh_a_hist_tx interface +1.11.54 fix: fix fund_portfolio_hold_em interface """ -__version__ = "1.11.53" +__version__ = "1.11.54" __author__ = "AKFamily" import sys @@ -3525,7 +3526,6 @@ """ from akshare.stock_feature.stock_cls_alerts import ( - stock_zh_a_alerts_cls, stock_telegraph_cls, ) @@ -4801,8 +4801,6 @@ macro_china_whxd, macro_china_wbck, macro_china_bond_public, - macro_china_gksccz, - macro_china_hb, macro_china_xfzxx, macro_china_reserve_requirement_ratio, macro_china_consumer_goods_retail, diff --git a/docs/changelog.md b/docs/changelog.md index cbf5c6abb1d..dcfc0dede3f 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -68,6 +68,10 @@ ## 更新说明详情 +1.11.54 fix: fix fund_portfolio_hold_em interface + + 1. 修复 fund_portfolio_hold_em 接口 + 1.11.53 add: add stock_zh_a_hist_tx interface 1. 新增 stock_zh_a_hist_tx 接口 @@ -3054,6 +3058,8 @@ ## 版本更新说明 +1.11.54 fix: fix fund_portfolio_hold_em interface + 1.11.53 add: add stock_zh_a_hist_tx interface 1.11.52 fix: fix fund_scale_change_em interface diff --git a/docs/tutorial.md b/docs/tutorial.md index 1356930ed09..49d74f63a49 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -281,8 +281,6 @@ "macro_china_czsr" # 中国-财政收入 "macro_china_whxd" # 中国-外汇贷款数据 "macro_china_wbck" # 中国-本外币存款 - "macro_china_hb" # 中国-货币净投放与净回笼 - "macro_china_gksccz" # 中国-央行公开市场操作 "macro_china_bond_public" # 中国-债券发行 # 美国 "macro_usa_gdp_monthly" # 金十数据中心-经济指标-美国-经济状况-美国GDP @@ -1097,9 +1095,8 @@ "stock_industry_change_cninfo" # 巨潮资讯-上市公司行业归属的变动情况 # 公司股本变动 "stock_share_change_cninfo" # 巨潮资讯-公司股本变动 - # 咨询-财联社 - "stock_zh_a_alerts_cls" # 咨询-财联社-今日快讯 - "stock_telegraph_cls" # 咨询-财联社-电报 + # 资讯-财联社-电报 + "stock_telegraph_cls" # 资讯-财联社-电报 # 上海金属网 "futures_news_shmet" # 上海金属网-快讯 # 分红配股 From f8c81c7f8d45b40b6e0979788b6c256d7d75c4d3 Mon Sep 17 00:00:00 2001 From: jindaxiang Date: Sat, 28 Oct 2023 18:40:23 +0800 Subject: [PATCH 2/5] remove interfaces --- akshare/economic/macro_china.py | 132 +---------------------------- docs/data/macro/macro.md | 145 -------------------------------- 2 files changed, 1 insertion(+), 276 deletions(-) diff --git a/akshare/economic/macro_china.py b/akshare/economic/macro_china.py index 323b318b2f6..757fd936c35 100644 --- a/akshare/economic/macro_china.py +++ b/akshare/economic/macro_china.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding:utf-8 -*- """ -Date: 2023/10/8 20:20 +Date: 2023/10/28 18:20 Desc: 宏观数据-中国 """ import json @@ -3332,130 +3332,6 @@ def macro_china_wbck() -> pd.DataFrame: return temp_df -def macro_china_hb(symbol: str = "weekly") -> pd.DataFrame: - """ - 中国-货币净投放与净回笼 - http://www.chinamoney.com.cn/chinese/hb/ - :param symbol: choice of {"weekly", "monthly"} - :type symbol: str - :return: 货币净投放与净回笼 - :rtype: pandas.DataFrame - """ - import warnings - - warnings.warn("由于目标网站未更新数据，该接口即将移除", DeprecationWarning) - - # if symbol == "weekly": - # current_year = datetime.today().year - # url = "https://www.chinamoney.com.cn/ags/ms/cm-u-bond-publish/TicketPutAndBackStatByWeek" - # params = { - # "t": "1597986289666", - # "t": "1597986289666", - # } - # big_df = pd.DataFrame() - # for year in tqdm(range(1997, current_year + 1)): - # payload = { - # "startWeek": f"{year}-01", - # "endWeek": f"{year}-52", - # "pageSize": "5000", - # "pageNo": "1", - # } - # r = requests.post(url, params=params, data=payload) - # temp_df = pd.DataFrame(r.json()["data"]["resultList"]) - # big_df = big_df.append(temp_df, ignore_index=True) - # big_df = big_df.sort_values(by=["startDate"]) - # big_df.reset_index(inplace=True, drop=True) - # big_df.columns = ["日期", "投放量", "回笼量", "净投放", "开始日期", "结束日期"] - # big_df = big_df[["日期", "开始日期", "结束日期", "投放量", "回笼量", "净投放"]] - # big_df["开始日期"] = pd.to_datetime(big_df["开始日期"]).dt.date - # big_df["结束日期"] = pd.to_datetime(big_df["结束日期"]).dt.date - # big_df["投放量"] = pd.to_numeric(big_df["投放量"]) - # big_df["回笼量"] = pd.to_numeric(big_df["回笼量"]) - # big_df["净投放"] = pd.to_numeric(big_df["净投放"]) - # return big_df - # else: - # current_year = datetime.today().year - # url = "https://www.chinamoney.com.cn/ags/ms/cm-u-bond-publish/TicketPutAndBackStatByMonth" - # params = { - # "t": "1597986289666", - # "t": "1597986289666", - # } - # big_df = pd.DataFrame() - # for year in tqdm(range(1997, current_year + 1)): - # payload = { - # "startMonth": f"{year}-01", - # "endMonth": f"{year}-12", - # "pageSize": "5000", - # "pageNo": "1", - # } - # r = requests.post(url, params=params, data=payload) - # temp_df = pd.DataFrame(r.json()["data"]["resultList"]) - # big_df = big_df.append(temp_df, ignore_index=True) - # big_df.columns = ["日期", "投放量", "回笼量", "净投放", "-", "-"] - # big_df = big_df[["日期", "投放量", "回笼量", "净投放"]] - # big_df["投放量"] = pd.to_numeric(big_df["投放量"]) - # big_df["回笼量"] = pd.to_numeric(big_df["回笼量"]) - # big_df["净投放"] = pd.to_numeric(big_df["净投放"]) - # return big_df - - -def macro_china_gksccz() -> pd.DataFrame: - """ - 中国外汇交易中心暨全国银行间同业拆借中心-央行公开市场操作 - http://www.chinamoney.com.cn/chinese/yhgkscczh/ - :return: 央行公开市场操作 - :rtype: pandas.DataFrame - """ - import warnings - - warnings.warn("由于目标网站未更新数据，该接口即将移除", DeprecationWarning) - # url = "https://www.chinamoney.com.cn/ags/ms/cm-u-bond-publish/TicketHandle" - # params = { - # "t": "1597986289666", - # "t": "1597986289666", - # } - # payload = { - # "pageSize": "15", - # "pageNo": "1", - # } - # headers = { - # "Accept": "application/json, text/javascript, */*; q=0.01", - # "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", - # "Referer": "https://www.chinamoney.com.cn/chinese/yhgkscczh/", - # "sec-ch-ua": '" Not A;Brand";v="99", "Chromium";v="96", "Google Chrome";v="96"', - # "sec-ch-ua-mobile": "?0", - # "sec-ch-ua-platform": '"Windows"', - # "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36", - # "X-Requested-With": "XMLHttpRequest", - # } - # r = requests.post(url, params=params, data=payload, headers=headers) - # data_json = r.json() - # total_page = data_json["data"]["pageTotal"] - # big_df = pd.DataFrame() - # for page in tqdm(range(1, total_page + 1)): - # payload.update( - # { - # "pageNo": page, - # } - # ) - # r = requests.post(url, params=params, data=payload) - # data_json = r.json() - # temp_df = pd.DataFrame(data_json["data"]["resultList"]) - # big_df = big_df.append(temp_df, ignore_index=True) - # big_df.columns = [ - # "操作日期", - # "期限", - # "交易量", - # "中标利率", - # "正/逆回购", - # ] - # big_df["操作日期"] = pd.to_datetime(big_df["操作日期"]).dt.date - # big_df["期限"] = pd.to_numeric(big_df["期限"]) - # big_df["交易量"] = pd.to_numeric(big_df["交易量"]) - # big_df["中标利率"] = pd.to_numeric(big_df["中标利率"]) - # return big_df - - def macro_china_bond_public() -> pd.DataFrame: """ 中国-债券信息披露-债券发行 @@ -4499,12 +4375,6 @@ def macro_china_real_estate() -> pd.DataFrame: macro_china_wbck_df = macro_china_wbck() print(macro_china_wbck_df) - macro_china_hb_df = macro_china_hb(symbol="weekly") - print(macro_china_hb_df) - - macro_china_gksccz_df = macro_china_gksccz() - print(macro_china_gksccz_df) - macro_china_bond_public_df = macro_china_bond_public() print(macro_china_bond_public_df) diff --git a/docs/data/macro/macro.md b/docs/data/macro/macro.md index 12f4ce245f0..2144ab8ddb6 100644 --- a/docs/data/macro/macro.md +++ b/docs/data/macro/macro.md @@ -2961,151 +2961,6 @@ print(macro_china_wbck_df) 175 2008年03月份 10737.68 25.845804 -19.689339 426596.93 176 2008年02月份 13370.18 152.665137 829.976560 415859.25 177 2008年01月份 1437.69 -72.142704 -59.893939 402489.07 - -``` - -##### 货币净投放与净回笼 - -提示: 该接口暂停更新 - -接口: macro_china_hb - -目标地址: http://www.chinamoney.com.cn/chinese/hb/ - -描述: 央行币净投放与净回笼, 数据区间从 19970310 至今, 周或则月频率 - -限量: 单次返回指定 symbol 的所有历史数据 - -输入参数 - -| 名称 | 类型 | 描述 | -|--------|-----|--------------------------------------------------| -| symbol | str | symbol="weekly"; choice of {"weekly", "monthly"} | - -输出参数-weekly - -| 名称 | 类型 | 描述 | -|------|---------|---------| -| 日期 | object | - | -| 开始日期 | object | - | -| 结束日期 | object | - | -| 投放量 | float64 | 注意单位: 亿 | -| 回笼量 | float64 | 注意单位: 亿 | -| 净投放 | float64 | 注意单位: 亿 | - -接口示例-weekly - -```python -import akshare as ak - -macro_china_hb_df = ak.macro_china_hb(symbol="weekly") -print(macro_china_hb_df) -``` - -数据示例-weekly - -``` - 日期 开始日期 结束日期 投放量 回笼量 净投放 -0 1997-11 1997-03-10 1997-03-16 0.0 0.0 0.0 -1 1997-12 1997-03-17 1997-03-23 0.0 0.0 0.0 -2 1997-13 1997-03-24 1997-03-30 0.0 0.0 0.0 -3 1997-14 1997-03-31 1997-04-06 0.0 0.0 0.0 -4 1997-15 1997-04-07 1997-04-13 0.0 0.0 0.0 - ... ... ... ... ... ... -1287 2021-50 2021-12-06 2021-12-12 500.0 2300.0 -1800.0 -1288 2021-51 2021-12-13 2021-12-19 500.0 500.0 0.0 -1289 2021-52 2021-12-20 2021-12-26 1000.0 500.0 500.0 -1290 2022-01 2021-12-27 2022-01-02 6500.0 500.0 6000.0 -1291 2022-02 2022-01-03 2022-01-09 300.0 7000.0 -6700.0 -``` - -输出参数-monthly - -| 名称 | 类型 | 描述 | -|------|---------|---------| -| 日期 | object | - | -| 投放量 | float64 | 注意单位: 亿 | -| 回笼量 | float64 | 注意单位: 亿 | -| 净投放 | float64 | 注意单位: 亿 | - -接口示例-monthly - -```python -import akshare as ak - -macro_china_hb_df = ak.macro_china_hb(symbol="monthly") -print(macro_china_hb_df) -``` - -数据示例-monthly - -``` - 日期 投放量 回笼量 净投放 -0 1997-12 0.0 0.0 0.0 -1 1997-11 0.0 0.0 0.0 -2 1997-10 0.0 0.0 0.0 -3 1997-09 0.0 0.0 0.0 -4 1997-08 0.0 0.0 0.0 -.. ... ... ... ... -294 2021-04 2200.0 2100.0 100.0 -295 2021-03 2400.0 2500.0 -100.0 -296 2021-02 8300.0 11440.0 -3140.0 -297 2021-01 10740.0 12450.0 -1710.0 -298 2022-01 300.0 7300.0 -7000.0 -``` - -##### 央行公开市场操作 - -提示: 该接口暂停更新 - -接口: macro_china_gksccz - -目标地址: http://www.chinamoney.com.cn/chinese/yhgkscczh/ - -描述: 央行公开市场操作; 数据区间从 20040116 至今 - -限量: 单次返回所有历史数据 - -输入参数 - -| 名称 | 类型 | 描述 | -|-----|-----|-----| -| - | - | - | - -输出参数 - -| 名称 | 类型 | 描述 | -|-------|---------|---------| -| 操作日期 | object | - | -| 期限 | float64 | 注意单位: 天 | -| 交易量 | float64 | 注意单位: 亿 | -| 中标利率 | float64 | 注意单位: % | -| 正/逆回购 | object | - | - -接口示例 - -```python -import akshare as ak - -macro_china_gksccz_df = ak.macro_china_gksccz() -print(macro_china_gksccz_df) -``` - -数据示例 - -``` - 操作日期 期限 交易量 中标利率 正/逆回购 -0 2021-12-31 7 1000 2.20 逆回购 -1 2021-12-30 7 1000 2.20 逆回购 -2 2021-12-29 7 2000 2.20 逆回购 -3 2021-12-28 7 2000 2.20 逆回购 -4 2021-12-27 7 500 2.20 逆回购 - ... .. ... ... ... -2311 2004-05-27 28 200 2.69 正回购 -2312 2004-05-20 28 300 2.65 正回购 -2313 2004-05-13 28 150 2.55 正回购 -2314 2004-05-13 91 50 2.83 正回购 -2315 2004-01-16 14 400 2.82 逆回购 ``` ##### 新债发行 From c72793c1782138b49924fd838af8a6125fcb77b4 Mon Sep 17 00:00:00 2001 From: jindaxiang Date: Sat, 28 Oct 2023 18:40:55 +0800 Subject: [PATCH 3/5] remove interface --- akshare/stock_feature/stock_cls_alerts.py | 60 +---------------------- 1 file changed, 1 insertion(+), 59 deletions(-) diff --git a/akshare/stock_feature/stock_cls_alerts.py b/akshare/stock_feature/stock_cls_alerts.py index 8554702fb9c..eeb6c22d000 100644 --- a/akshare/stock_feature/stock_cls_alerts.py +++ b/akshare/stock_feature/stock_cls_alerts.py @@ -1,72 +1,17 @@ #!/usr/bin/env python # -*- coding:utf-8 -*- """ -Date: 2022/8/5 11:20 +Date: 2023/10/28 18:00 Desc: 财联社-今日快讯 https://www.cls.cn/searchPage?keyword=%E5%BF%AB%E8%AE%AF&type=all 财联社-电报 https://www.cls.cn/telegraph """ -import warnings import pandas as pd import requests -def stock_zh_a_alerts_cls() -> pd.DataFrame: - """ - 财联社-今日快讯 - https://www.cls.cn/searchPage?keyword=%E5%BF%AB%E8%AE%AF&type=all - :return: 财联社-今日快讯 - :rtype: pandas.DataFrame - """ - warnings.warn( - "该接口将被移除，请使用 ak.stock_telegraph_cls() 接口替代", DeprecationWarning - ) - url = "https://www.cls.cn/api/sw" - params = { - "app": "CailianpressWeb", - "os": "web", - "sv": "7.7.5", - } - r = requests.get(url, params=params) - headers = { - "Host": "www.cls.cn", - "Connection": "keep-alive", - "Content-Length": "112", - "Accept": "application/json, text/plain, */*", - "User-Agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.150 Safari/537.36", - "Content-Type": "application/json;charset=UTF-8", - "Origin": "https://www.cls.cn", - "Sec-Fetch-Site": "same-origin", - "Sec-Fetch-Mode": "cors", - "Sec-Fetch-Dest": "empty", - "Accept-Encoding": "gzip, deflate, br", - "Accept-Language": "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7", - } - payload = { - "app": "CailianpressWeb", - "keyword": "快讯", - "os": "web", - "page": 0, - "rn": 10000, - "sv": "7.7.5", - "type": "telegram", - } - r = requests.post(url, headers=headers, params=params, json=payload) - data_json = r.json() - temp_df = pd.DataFrame(data_json["data"]["telegram"]["data"]) - temp_df = temp_df[["descr", "time"]] - temp_df["descr"] = temp_df["descr"].astype(str).str.replace("", "") - temp_df["descr"] = temp_df["descr"].str.replace("", "") - temp_df["time"] = pd.to_datetime(temp_df["time"], unit="s").dt.date - temp_df.columns = ["快讯信息", "时间"] - temp_df = temp_df[["时间", "快讯信息"]] - temp_df.sort_values(["时间"], inplace=True) - temp_df.reset_index(inplace=True, drop=True) - return temp_df - - def stock_telegraph_cls() -> pd.DataFrame: """ 财联社-电报 @@ -115,8 +60,5 @@ def stock_telegraph_cls() -> pd.DataFrame: if __name__ == "__main__": - stock_zh_a_alerts_cls_df = stock_zh_a_alerts_cls() - print(stock_zh_a_alerts_cls_df) - stock_telegraph_cls_df = stock_telegraph_cls() print(stock_telegraph_cls_df) From ef1d42db55941c4dd4e1b5598a320dfdf6caf55f Mon Sep 17 00:00:00 2001 From: jindaxiang Date: Sat, 28 Oct 2023 18:41:17 +0800 Subject: [PATCH 4/5] fix fund_portfolio_hold_em --- akshare/fund/fund_portfolio_em.py | 35 +++++++++++----------- docs/data/fund/fund_public.md | 8 ++--- docs/data/stock/stock.md | 49 ------------------------------- 3 files changed, 22 insertions(+), 70 deletions(-) diff --git a/akshare/fund/fund_portfolio_em.py b/akshare/fund/fund_portfolio_em.py index 0a3b65123c4..7025bec049d 100644 --- a/akshare/fund/fund_portfolio_em.py +++ b/akshare/fund/fund_portfolio_em.py @@ -1,10 +1,12 @@ #!/usr/bin/env python # -*- coding:utf-8 -*- """ -Date: 2022/3/21 17:40 +Date: 2023/10/28 18:30 Desc: 天天基金网-基金档案-投资组合 https://fundf10.eastmoney.com/ccmx_000001.html """ +from io import StringIO + import pandas as pd import requests from bs4 import BeautifulSoup @@ -13,7 +15,7 @@ def fund_portfolio_hold_em( - symbol: str = "162411", date: str = "2020" + symbol: str = "162411", date: str = "2020" ) -> pd.DataFrame: """ 天天基金网-基金档案-投资组合-基金持仓 @@ -36,7 +38,7 @@ 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]) + data_json = demjson.decode(data_text[data_text.find("{"): -1]) soup = BeautifulSoup(data_json["content"], "lxml") item_label = [ item.text.split("\xa0\xa0")[1] @@ -44,7 +46,7 @@ def fund_portfolio_hold_em( ] big_df = pd.DataFrame() for item in range(len(item_label)): - temp_df = pd.read_html(data_json["content"], converters={"股票代码": str})[ + temp_df = pd.read_html(StringIO(data_json["content"]), converters={"股票代码": str})[ item ] del temp_df["相关资讯"] @@ -67,7 +69,6 @@ def fund_portfolio_hold_em( columns={"持股数 （万股）": "持股数", "持仓市值 （万元人民币）": "持仓市值"}, inplace=True ) - temp_df["季度"] = item_label[item] temp_df = temp_df[ [ @@ -89,11 +90,11 @@ def fund_portfolio_hold_em( def fund_portfolio_bond_hold_em( - symbol: str = "000001", date: str = "2021" + symbol: str = "000001", date: str = "2021" ) -> pd.DataFrame: """ 天天基金网-基金档案-投资组合-债券持仓 - http://fundf10.eastmoney.com/ccmx1_000001.html + https://fundf10.eastmoney.com/ccmx1_000001.html :param symbol: 基金代码 :type symbol: str :param date: 查询年份 @@ -110,7 +111,7 @@ 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]) + data_json = demjson.decode(data_text[data_text.find("{"): -1]) soup = BeautifulSoup(data_json["content"], "lxml") item_label = [ item.text.split("\xa0\xa0")[1] @@ -118,7 +119,7 @@ def fund_portfolio_bond_hold_em( ] big_df = pd.DataFrame() for item in range(len(item_label)): - temp_df = pd.read_html(data_json["content"], converters={"债券代码": str})[ + temp_df = pd.read_html(StringIO(data_json["content"]), converters={"债券代码": str})[ item ] temp_df["占净值比例"] = ( @@ -144,11 +145,11 @@ def fund_portfolio_bond_hold_em( def fund_portfolio_industry_allocation_em( - symbol: str = "000001", date: str = "2021" + symbol: str = "000001", date: str = "2021" ) -> pd.DataFrame: """ 天天基金网-基金档案-投资组合-行业配置 - http://fundf10.eastmoney.com/hytz_000001.html + https://fundf10.eastmoney.com/hytz_000001.html :param symbol: 基金代码 :type symbol: str :param date: 查询年份 @@ -176,7 +177,7 @@ def fund_portfolio_industry_allocation_em( } 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"]) @@ -211,17 +212,17 @@ def fund_portfolio_industry_allocation_em( "截止时间", ] ] - temp_df["市值"] = pd.to_numeric(temp_df["市值"]) + temp_df["市值"] = pd.to_numeric(temp_df["市值"], errors="coerce") temp_df["占净值比例"] = pd.to_numeric(temp_df["占净值比例"], errors="coerce") return temp_df def fund_portfolio_change_em( - symbol: str = "003567", indicator: str = "累计买入", date: str = "2020" + symbol: str = "003567", indicator: str = "累计买入", date: str = "2020" ) -> pd.DataFrame: """ 天天基金网-基金档案-投资组合-重大变动 - http://fundf10.eastmoney.com/ccbd_000001.html + https://fundf10.eastmoney.com/ccbd_000001.html :param symbol: 基金代码 :type symbol: str :param indicator: choice of {"累计买入", "累计卖出"} @@ -245,7 +246,7 @@ 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]) + data_json = demjson.decode(data_text[data_text.find("{"): -1]) soup = BeautifulSoup(data_json["content"], "lxml") item_label = [ item.text.split("\xa0\xa0")[1] @@ -253,7 +254,7 @@ def fund_portfolio_change_em( ] big_df = pd.DataFrame() for item in range(len(item_label)): - temp_df = pd.read_html(data_json["content"], converters={"股票代码": str})[ + temp_df = pd.read_html(StringIO(data_json["content"]), converters={"股票代码": str})[ item ] del temp_df["相关资讯"] diff --git a/docs/data/fund/fund_public.md b/docs/data/fund/fund_public.md index 262c8e00a81..9e482d672cb 100644 --- a/docs/data/fund/fund_public.md +++ b/docs/data/fund/fund_public.md @@ -2311,7 +2311,7 @@ print(fund_value_estimation_em_df) 接口: fund_portfolio_hold_em -目标地址: http://fundf10.eastmoney.com/ccmx_000001.html +目标地址: https://fundf10.eastmoney.com/ccmx_000001.html 描述: 天天基金网-基金档案-投资组合-基金持仓 @@ -2366,7 +2366,7 @@ print(fund_portfolio_hold_em_df) 接口: fund_portfolio_bond_hold_em -目标地址: http://fundf10.eastmoney.com/ccmx_000001.html +目标地址: https://fundf10.eastmoney.com/ccmx_000001.html 描述: 天天基金网-基金档案-投资组合-债券持仓 @@ -2445,7 +2445,7 @@ print(fund_portfolio_bond_hold_em_df) 接口: fund_portfolio_industry_allocation_em -目标地址: http://fundf10.eastmoney.com/hytz_000001.html +目标地址: https://fundf10.eastmoney.com/hytz_000001.html 描述: 天天基金网-基金档案-投资组合-行业配置 @@ -2534,7 +2534,7 @@ print(fund_portfolio_industry_allocation_em_df) 接口: fund_portfolio_change_em -目标地址: http://fundf10.eastmoney.com/ccbd_000001.html +目标地址: https://fundf10.eastmoney.com/ccbd_000001.html 描述: 天天基金网-基金档案-投资组合-重大变动 diff --git a/docs/data/stock/stock.md b/docs/data/stock/stock.md index 790f60ba8dd..20a1c405c6c 100644 --- a/docs/data/stock/stock.md +++ b/docs/data/stock/stock.md @@ -21488,55 +21488,6 @@ print(stock_average_position_legu_df) ### 资讯数据 -#### 每日快讯 - -接口：stock_zh_a_alerts_cls - -目标地址：https://www.cls.cn/searchPage?keyword=%E5%BF%AB%E8%AE%AF&type=all - -描述：财联社-快讯数据 - -限量：单次返回财联社-快讯最近的 100 条数据 - -输入参数 - -| 名称 | 类型 | 描述 | -|-----|-----|-----| -| - | - | - | - -输出参数 - -| 名称 | 类型 | 描述 | -|------|--------|-----| -| 时间 | object | - | -| 快讯信息 | object | - | - -接口示例： - -```python -import akshare as ak - -stock_zh_a_alerts_cls_df = ak.stock_zh_a_alerts_cls() -print(stock_zh_a_alerts_cls_df) -``` - -数据示例 - -``` - 时间 快讯信息 -0 2022-06-27 【快讯：深成指涨逾1%】财联社6月27日电，指数走强，深成指拉升涨逾1%，沪指涨0.79%，... -1 2022-06-27 【快讯：汽配股继续走强 十余股涨停】财联社6月27日电，英利汽车拉升封板，威唐工业、湘油泵、... -2 2022-06-27 【快讯：猪肉、鸡肉股震荡走强】财联社6月27日电，温氏股份、天康生物、巨星农牧涨超5%，新希... -3 2022-06-27 【快讯：创业板指翻绿】财联社6月27日电，指数午后大幅回落，创业板指率先翻绿，此前一度涨超1... -4 2022-06-27 【快讯：机器人、智能制造概念反复活跃】财联社6月27日电，华东数控拉升封板，绿的谐波、劲拓股... -.. ... ... -95 2022-07-01 【快讯：面板概念股开盘走强 创业板股易天股份涨停】财联社7月1日电，创业板股易天股份涨停，深... -96 2022-07-01 【快讯：三大指数开盘涨跌不一】财联社7月1日电，沪指高开0.05%，深成指高开0.03%，创... -97 2022-07-01 【快讯：工程机械板块走强 多股涨停】财联社7月1日电，宇通重工拉升封板，厦工股份、山推股份此... -98 2022-07-04 【快讯：深成指涨逾1%】财联社7月4日电，指数走强，深成指拉升涨逾1.00%，沪指涨0.26... -99 2022-07-05 【快讯：创业板指涨逾1%】财联社7月5日电，指数走强，创业板指拉升涨逾1%，沪指涨0.46%... -``` - #### 电报 接口：stock_telegraph_cls From 4332e2fe0d0f1d08f688219ab79abf0b2c50edd4 Mon Sep 17 00:00:00 2001 From: jindaxiang Date: Sat, 28 Oct 2023 18:41:28 +0800 Subject: [PATCH 5/5] update date --- docs/introduction.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/introduction.md b/docs/introduction.md index c76a4fd8009..cf39a7aed18 100644 --- a/docs/introduction.md +++ b/docs/introduction.md @@ -6,7 +6,7 @@ **风险提示：[AKShare](https://github.com/akfamily/akshare) 开源财经数据接口库所采集的数据皆来自公开的数据源，不涉及任何个人隐私数据和非公开数据。 同时本项目提供的数据接口及相关数据仅用于学术研究，任何个人、机构及团体使用本项目的数据接口及相关数据请注意商业风险。** -1. 本文档更新时间：**2023-10-27**； +1. 本文档更新时间：**2023-10-28**； 2. 如有 [AKShare](https://github.com/akfamily/akshare) 库、文档及数据的相关问题，请在 [AKShare Issues](https://github.com/akfamily/akshare/issues) 中提 Issues； 3. 欢迎关注 **数据科学实战** 微信公众号：
； 4. 如果您的问题未能在文档中找到答案，您也可以加入 **AKShare-VIP QQ 群**: 为了提高问答质量，此群为收费群(一杯咖啡钱即可入群，赠送[《AKShare-初阶-使用教学》](https://zmj.xet.tech/s/wck86)视频课)，可以添加 **AKShare-小助手** QQ：1254836886，由小助手邀请入群! ![](https://jfds-1252952517.cos.ap-chengdu.myqcloud.com/akshare/readme/qrcode/qr_code_1254836886.jpg)