akshare 1.16.58__tar.gz → 1.16.60__tar.gz

{akshare-1.16.58 → akshare-1.16.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare
-Version: 1.16.58
+Version: 1.16.60
 Summary: AKShare is an elegant and simple financial data interface library for Python, built for human beings!
 Home-page: https://github.com/akfamily/akshare
 Author: AKFamily

{akshare-1.16.58 → akshare-1.16.60}/akshare/__init__.py

@@ -3067,9 +3067,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.16.56 fix: fix stock_zh_a_daily interface
 1.16.57 fix: fix stock_market_pe_lg interface
 1.16.58 fix: fix stock_zh_a_spot interface
+1.16.59 fix: fix option_czce_hist interface
+1.16.60 fix: fix stock_individual_fund_flow_rank interface
 """
 
-__version__ = "1.16.58"
+__version__ = "1.16.60"
 __author__ = "AKFamily"
 
 import sys
@@ -3095,6 +3097,8 @@ del sys
 异步接口
 """
 from akshare.stock_a.stock_zh_a_spot import stock_zh_a_spot_em
+from akshare.stock_a.stock_individual_fund_flow_rank import stock_individual_fund_flow_rank
+from akshare.stock_a.stock_board_concept_name_em import stock_board_concept_name_em
 
 """
 雪球-个股-公司概况-公司简介
@@ -4138,7 +4142,7 @@ from akshare.stock.stock_board_concept_em import (
     stock_board_concept_cons_em,
     stock_board_concept_hist_em,
     stock_board_concept_hist_min_em,
-    stock_board_concept_name_em,
+    # stock_board_concept_name_em,
     stock_board_concept_spot_em,
 )
 
@@ -4781,7 +4785,7 @@ from akshare.stock.stock_fund_em import (
     stock_individual_fund_flow,
     stock_market_fund_flow,
     stock_sector_fund_flow_rank,
-    stock_individual_fund_flow_rank,
+    # stock_individual_fund_flow_rank,
     stock_sector_fund_flow_summary,
     stock_sector_fund_flow_hist,
     stock_concept_fund_flow_hist,

{akshare-1.16.58 → akshare-1.16.60}/akshare/option/option_czce.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2021/7/21 14:22
+Date: 2025/3/22 16:30
 Desc: 郑州商品交易所-交易数据-历史行情下载-期权历史行情下载
 http://www.czce.com.cn/cn/jysj/lshqxz/H770319index_1.htm
 自 20200101 起，成交量、空盘量、成交额、行权量均为单边计算
@@ -12,7 +12,21 @@ http://www.czce.com.cn/cn/jysj/lshqxz/H770319index_1.htm
 "MA": "20191217"
 "RM": "20200116"
 "ZC": "20200630"
+"OI": "20220826"
+"PK": "20220826"
+"PX": "20230915"
+"SH": "20230915"
+"SA": "20231020"
+"PF": "20231020"
+"SM": "20231020"
+"SF": "20231020"
+"UR": "20231020"
+"AP": "20231020"
+"CJ": "20240621"
+"FG": "20240621"
+"PR": "20241227"
 """
+
 from io import StringIO
 import warnings
 
@@ -24,7 +38,9 @@ def option_czce_hist(symbol: str = "SR", year: str = "2021") -> pd.DataFrame:
     """
     郑州商品交易所-交易数据-历史行情下载-期权历史行情下载
     http://www.czce.com.cn/cn/jysj/lshqxz/H770319index_1.htm
-    :param symbol: choice of {"白糖": "SR", "棉花": "CF", "PTA": "TA", "甲醇": "MA", "菜籽粕": "RM", "动力煤": "ZC"}
+    :param symbol: choice of {"白糖": "SR", "棉花": "CF", "PTA": "TA", "甲醇": "MA", "菜籽粕": "RM",
+    "动力煤": "ZC", "菜籽油": "OI", "花生": "PK", "对二甲苯": "PX", "烧碱": "SH", "纯碱": "SA", "短纤": "PF",
+    "锰硅": "SM", "硅铁": "SF", "尿素": "UR", "苹果": "AP", "红枣": "CJ", "玻璃": "FG", "瓶片": "PR"}
     :type symbol: str
     :param year: 需要获取数据的年份, 注意品种的上市时间
     :type year: str
@@ -38,17 +54,29 @@ def option_czce_hist(symbol: str = "SR", year: str = "2021") -> pd.DataFrame:
         "MA": "2019",
         "RM": "2020",
         "ZC": "2020",
+        "OI": "2022",
+        "PK": "2022",
+        "PX": "2023",
+        "SH": "2023",
+        "SA": "2023",
+        "PF": "2023",
+        "SM": "2023",
+        "SF": "2023",
+        "UR": "2023",
+        "AP": "2023",
+        "CJ": "2024",
+        "FG": "2024",
+        "PR": "2024",
     }
     if int(symbol_year_dict[symbol]) > int(year):
         warnings.warn(f"{year} year, symbol {symbol} is not on trade")
-        return None
-    warnings.warn("正在下载中, 请稍等")
-    url = f'http://www.czce.com.cn/cn/DFSStaticFiles/Option/2021/OptionDataAllHistory/{symbol}OPTIONS{year}.txt'
+        return pd.DataFrame()
+    url = f"http://www.czce.com.cn/cn/DFSStaticFiles/Option/{year}/OptionDataAllHistory/{symbol}OPTIONS{year}.txt"
     r = requests.get(url)
     option_df = pd.read_table(StringIO(r.text), skiprows=1, sep="|", low_memory=False)
     return option_df
 
 
 if __name__ == "__main__":
-    option_czce_hist_df = option_czce_hist(symbol="ZC", year="2021")
+    option_czce_hist_df = option_czce_hist(symbol="RM", year="2025")
     print(option_czce_hist_df)

akshare-1.16.60/akshare/stock_a/stock_board_concept_name_em.py

@@ -0,0 +1,171 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+"""
+Date: 2025/3/22 18:00
+Desc: 东方财富网-行情中心-沪深京板块-概念板块-名称
+https://quote.eastmoney.com/center/boardlist.html#concept_board
+异步接口-测试版
+"""
+
+import asyncio
+from typing import Dict, List
+
+import aiohttp
+import pandas as pd
+
+
+async def fetch_single_page(
+    session: aiohttp.ClientSession, url: str, params: Dict
+) -> Dict:
+    """异步获取单页数据"""
+    async with session.get(url, params=params, ssl=False) as response:
+        return await response.json()
+
+
+async def fetch_all_pages_async(url: str, base_params: Dict) -> List[Dict]:
+    """异步获取所有页面数据"""
+    # 首先获取总数以计算页数
+    first_page_params = base_params.copy()
+    first_page_params["pn"] = "1"
+
+    async with aiohttp.ClientSession() as session:
+        first_page_data = await fetch_single_page(session, url, first_page_params)
+
+        # 检查是否成功获取数据
+        if first_page_data.get("rc") != 0 or not first_page_data.get("data"):
+            return [first_page_data]  # 返回错误信息
+
+        total = first_page_data["data"]["total"]
+        page_size = int(base_params["pz"])
+        total_pages = (total + page_size - 1) // page_size
+
+        # 限制页数，避免过大请求
+        total_pages = min(total_pages, 100)
+
+        # 创建所有页面的任务
+        tasks = []
+        for page in range(1, total_pages + 1):
+            page_params = base_params.copy()
+            page_params["pn"] = str(page)
+            tasks.append(fetch_single_page(session, url, page_params))
+
+        # 并发执行所有任务
+        results = await asyncio.gather(*tasks)
+        return results
+
+
+def process_concept_board_data(page_results: List[Dict]) -> pd.DataFrame:
+    """处理概念板块数据，转换为DataFrame"""
+    all_data = []
+
+    for result in page_results:
+        if result.get("data") and result["data"].get("diff"):
+            page_data = result["data"]["diff"]
+            all_data.extend(page_data)
+
+    if not all_data:
+        return pd.DataFrame()
+
+    temp_df = pd.DataFrame(all_data)
+
+    # 转换数值类型，确保排序正确
+    numeric_columns = ["f2", "f3", "f4", "f8", "f20", "f104", "f105", "f136"]
+    for col in numeric_columns:
+        if col in temp_df.columns:
+            temp_df[col] = pd.to_numeric(temp_df[col], errors="coerce")
+
+    # 按涨跌幅(f3)降序排序
+    if "f3" in temp_df.columns:
+        temp_df.sort_values(by="f3", ascending=False, inplace=True)
+
+    # 重命名列
+    columns_map = {
+        "f2": "最新价",
+        "f3": "涨跌幅",
+        "f4": "涨跌额",
+        "f8": "换手率",
+        "f12": "板块代码",
+        "f14": "板块名称",
+        "f20": "总市值",
+        "f104": "上涨家数",
+        "f105": "下跌家数",
+        "f128": "领涨股票",
+        "f136": "领涨股票-涨跌幅",
+    }
+
+    # 选择需要的列并重命名
+    selected_columns = list(columns_map.keys())
+    available_columns = [col for col in selected_columns if col in temp_df.columns]
+    temp_df = temp_df[available_columns]
+    temp_df.rename(columns=columns_map, inplace=True)
+
+    # 重置索引并添加排名列
+    temp_df.reset_index(drop=True, inplace=True)
+    temp_df.insert(0, "排名", range(1, len(temp_df) + 1))
+
+    # 调整列顺序，与原函数保持一致
+    final_columns = [
+        "排名",
+        "板块名称",
+        "板块代码",
+        "最新价",
+        "涨跌额",
+        "涨跌幅",
+        "总市值",
+        "换手率",
+        "上涨家数",
+        "下跌家数",
+        "领涨股票",
+        "领涨股票-涨跌幅",
+    ]
+
+    # 只保留存在的列
+    final_columns = [col for col in final_columns if col in temp_df.columns]
+    temp_df = temp_df[final_columns]
+
+    return temp_df
+
+
+async def stock_board_concept_name_em_async() -> pd.DataFrame:
+    """
+    异步获取东方财富网-行情中心-沪深京板块-概念板块-名称
+    https://quote.eastmoney.com/center/boardlist.html#concept_board
+    :return: 概念板块-名称
+    :rtype: pandas.DataFrame
+    """
+    url = "https://79.push2.eastmoney.com/api/qt/clist/get"
+    params = {
+        "pn": "1",
+        "pz": "100",
+        "po": "1",  # 按涨跌幅排序，1为降序
+        "np": "1",
+        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
+        "fltt": "2",
+        "invt": "2",
+        "fid": "f3",  # 按涨跌幅排序
+        "fs": "m:90 t:3 f:!50",
+        "fields": "f2,f3,f4,f8,f12,f14,f15,f16,f17,f18,f20,f21,f24,f25,f22,f33,f11,f62,f128,f124,f107,f104,f105,f136",
+        "_": "1626075887768",
+    }
+
+    results = await fetch_all_pages_async(url, params)
+    return process_concept_board_data(results)
+
+
+def stock_board_concept_name_em() -> pd.DataFrame:
+    """
+    东方财富网-行情中心-沪深京板块-概念板块-名称 (同步接口)
+    https://quote.eastmoney.com/center/boardlist.html#concept_board
+    :return: 概念板块-名称
+    :rtype: pandas.DataFrame
+    """
+    import nest_asyncio
+
+    nest_asyncio.apply()
+    return asyncio.run(stock_board_concept_name_em_async())
+
+
+if __name__ == "__main__":
+    # 测试同步接口
+    stock_board_concept_name_em_df = stock_board_concept_name_em()
+    print(stock_board_concept_name_em_df)

akshare-1.16.60/akshare/stock_a/stock_individual_fund_flow_rank.py

@@ -0,0 +1,258 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+"""
+Date: 2025/3/22 18:00
+Desc: 东方财富网-数据中心-资金流向-排名
+https://data.eastmoney.com/zjlx/detail.html
+异步接口-测试版
+"""
+
+import asyncio
+from typing import Dict, List
+
+import aiohttp
+import pandas as pd
+
+
+async def fetch_single_page(
+    session: aiohttp.ClientSession, url: str, params: Dict
+) -> Dict:
+    """异步获取单页数据"""
+    async with session.get(url, params=params, ssl=False) as response:
+        return await response.json()
+
+
+async def fetch_all_pages_async(url: str, base_params: Dict) -> List[Dict]:
+    """异步获取所有页面数据"""
+    # 首先获取总数以计算页数
+    first_page_params = base_params.copy()
+    first_page_params["pn"] = "1"
+
+    async with aiohttp.ClientSession() as session:
+        first_page_data = await fetch_single_page(session, url, first_page_params)
+
+        # 检查是否成功获取数据
+        if first_page_data.get("rc") != 0 or not first_page_data.get("data"):
+            return [first_page_data]  # 返回错误信息
+
+        total = first_page_data["data"]["total"]
+        page_size = int(base_params["pz"])
+        total_pages = (total + page_size - 1) // page_size
+
+        # 限制页数，避免过大请求
+        total_pages = min(total_pages, 100)
+
+        # 创建所有页面的任务
+        tasks = []
+        for page in range(1, total_pages + 1):
+            page_params = base_params.copy()
+            page_params["pn"] = str(page)
+            tasks.append(fetch_single_page(session, url, page_params))
+
+        # 并发执行所有任务
+        results = await asyncio.gather(*tasks)
+        return results
+
+
+def process_fund_flow_data(page_results: List[Dict], indicator: str) -> pd.DataFrame:
+    """处理资金流向排名数据，转换为DataFrame"""
+    all_data = []
+
+    for result in page_results:
+        if result.get("data") and result["data"].get("diff"):
+            page_data = result["data"]["diff"]
+            all_data.extend(page_data)
+
+    if not all_data:
+        return pd.DataFrame()
+
+    temp_df = pd.DataFrame(all_data)
+
+    # 根据不同的指标设置列名并选择需要的列
+    if indicator == "今日":
+        columns_map = {
+            "f12": "代码",
+            "f14": "名称",
+            "f2": "最新价",
+            "f3": "今日涨跌幅",
+            "f62": "今日主力净流入-净额",
+            "f184": "今日主力净流入-净占比",
+            "f66": "今日超大单净流入-净额",
+            "f69": "今日超大单净流入-净占比",
+            "f72": "今日大单净流入-净额",
+            "f75": "今日大单净流入-净占比",
+            "f78": "今日中单净流入-净额",
+            "f81": "今日中单净流入-净占比",
+            "f84": "今日小单净流入-净额",
+            "f87": "今日小单净流入-净占比",
+        }
+        main_column = "f62"  # 今日主力净流入-净额
+
+    elif indicator == "3日":
+        columns_map = {
+            "f12": "代码",
+            "f14": "名称",
+            "f2": "最新价",
+            "f127": "3日涨跌幅",
+            "f267": "3日主力净流入-净额",
+            "f268": "3日主力净流入-净占比",
+            "f269": "3日超大单净流入-净额",
+            "f270": "3日超大单净流入-净占比",
+            "f271": "3日大单净流入-净额",
+            "f272": "3日大单净流入-净占比",
+            "f273": "3日中单净流入-净额",
+            "f274": "3日中单净流入-净占比",
+            "f275": "3日小单净流入-净额",
+            "f276": "3日小单净流入-净占比",
+        }
+        main_column = "f267"  # 3日主力净流入-净额
+
+    elif indicator == "5日":
+        columns_map = {
+            "f12": "代码",
+            "f14": "名称",
+            "f2": "最新价",
+            "f109": "5日涨跌幅",
+            "f164": "5日主力净流入-净额",
+            "f165": "5日主力净流入-净占比",
+            "f166": "5日超大单净流入-净额",
+            "f167": "5日超大单净流入-净占比",
+            "f168": "5日大单净流入-净额",
+            "f169": "5日大单净流入-净占比",
+            "f170": "5日中单净流入-净额",
+            "f171": "5日中单净流入-净占比",
+            "f172": "5日小单净流入-净额",
+            "f173": "5日小单净流入-净占比",
+        }
+        main_column = "f164"  # 5日主力净流入-净额
+
+    elif indicator == "10日":
+        columns_map = {
+            "f12": "代码",
+            "f14": "名称",
+            "f2": "最新价",
+            "f160": "10日涨跌幅",
+            "f174": "10日主力净流入-净额",
+            "f175": "10日主力净流入-净占比",
+            "f176": "10日超大单净流入-净额",
+            "f177": "10日超大单净流入-净占比",
+            "f178": "10日大单净流入-净额",
+            "f179": "10日大单净流入-净占比",
+            "f180": "10日中单净流入-净额",
+            "f181": "10日中单净流入-净占比",
+            "f182": "10日小单净流入-净额",
+            "f183": "10日小单净流入-净占比",
+        }
+        main_column = "f174"  # 10日主力净流入-净额
+
+    # 确保数值型列为数值类型
+    numeric_columns = [
+        col
+        for col in temp_df.columns
+        if col.startswith("f") and col not in ["f12", "f14"]
+    ]
+    for col in numeric_columns:
+        if col in temp_df.columns:
+            temp_df[col] = pd.to_numeric(temp_df[col], errors="coerce")
+
+    # 按照主力净流入额降序排序
+    if main_column in temp_df.columns:
+        temp_df.sort_values(by=main_column, ascending=False, inplace=True)
+
+    # 首先重命名列
+    temp_df.rename(columns=columns_map, inplace=True)
+
+    # 选择需要的列
+    selected_columns = list(columns_map.values())
+    available_columns = [col for col in selected_columns if col in temp_df.columns]
+    temp_df = temp_df[available_columns]
+
+    # 重置索引并生成序号列
+    temp_df.reset_index(drop=True, inplace=True)
+    temp_df.insert(0, "序号", range(1, len(temp_df) + 1))
+
+    return temp_df
+
+
+async def stock_individual_fund_flow_rank_async(indicator: str = "5日") -> pd.DataFrame:
+    """
+    异步获取东方财富网-数据中心-资金流向-排名
+    https://data.eastmoney.com/zjlx/detail.html
+    :param indicator: choice of {"今日", "3日", "5日", "10日"}
+    :type indicator: str
+    :return: 指定 indicator 资金流向排行
+    :rtype: pandas.DataFrame
+    """
+    indicator_map = {
+        "今日": [
+            "f62",
+            "f12,f14,f2,f3,f62,f184,f66,f69,f72,f75,f78,f81,f84,f87,f204,f205,f124",
+        ],
+        "3日": [
+            "f267",
+            "f12,f14,f2,f127,f267,f268,f269,f270,f271,f272,f273,f274,f275,f276,f257,f258,f124",
+        ],
+        "5日": [
+            "f164",
+            "f12,f14,f2,f109,f164,f165,f166,f167,f168,f169,f170,f171,f172,f173,f257,f258,f124",
+        ],
+        "10日": [
+            "f174",
+            "f12,f14,f2,f160,f174,f175,f176,f177,f178,f179,f180,f181,f182,f183,f260,f261,f124",
+        ],
+    }
+
+    url = "https://push2.eastmoney.com/api/qt/clist/get"
+    params = {
+        "fid": indicator_map[indicator][0],
+        "po": "1",  # 按照降序排列
+        "pz": "100",  # 每页100条
+        "pn": "1",  # 从第1页开始
+        "np": "1",
+        "fltt": "2",
+        "invt": "2",
+        "ut": "b2884a393a59ad64002292a3e90d46a5",
+        "fs": "m:0+t:6+f:!2,m:0+t:13+f:!2,m:0+t:80+f:!2,m:1+t:2+f:!2,m:1+t:23+f:!2,m:0+t:7+f:!2,m:1+t:3+f:!2",
+        "fields": indicator_map[indicator][1],
+    }
+
+    results = await fetch_all_pages_async(url, params)
+    return process_fund_flow_data(results, indicator)
+
+
+def stock_individual_fund_flow_rank(indicator: str = "5日") -> pd.DataFrame:
+    """
+    东方财富网-数据中心-资金流向-排名 (同步接口)
+    https://data.eastmoney.com/zjlx/detail.html
+    :param indicator: choice of {"今日", "3日", "5日", "10日"}
+    :type indicator: str
+    :return: 指定 indicator 资金流向排行
+    :rtype: pandas.DataFrame
+    """
+    import nest_asyncio
+
+    nest_asyncio.apply()
+    return asyncio.run(stock_individual_fund_flow_rank_async(indicator))
+
+
+if __name__ == "__main__":
+    # 测试同步接口
+    stock_individual_fund_flow_rank_df = stock_individual_fund_flow_rank(
+        indicator="今日"
+    )
+    print(stock_individual_fund_flow_rank_df)
+
+    stock_individual_fund_flow_rank_df = stock_individual_fund_flow_rank(
+        indicator="3日"
+    )
+    print(stock_individual_fund_flow_rank_df)
+
+    stock_individual_fund_flow_rank_df = stock_individual_fund_flow_rank(
+        indicator="5日"
+    )
+    print(stock_individual_fund_flow_rank_df)
+
+    stock_individual_fund_flow_rank_df = stock_individual_fund_flow_rank(
+        indicator="10日"
+    )
+    print(stock_individual_fund_flow_rank_df)

{akshare-1.16.58 → akshare-1.16.60}/akshare.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare
-Version: 1.16.58
+Version: 1.16.60
 Summary: AKShare is an elegant and simple financial data interface library for Python, built for human beings!
 Home-page: https://github.com/akfamily/akshare
 Author: AKFamily

{akshare-1.16.58 → akshare-1.16.60}/akshare.egg-info/SOURCES.txt

@@ -298,6 +298,8 @@ akshare/stock/stock_zh_b_sina.py
 akshare/stock/stock_zh_kcb_report.py
 akshare/stock/stock_zh_kcb_sina.py
 akshare/stock_a/__init__.py
+akshare/stock_a/stock_board_concept_name_em.py
+akshare/stock_a/stock_individual_fund_flow_rank.py
 akshare/stock_a/stock_zh_a_spot.py
 akshare/stock_feature/__init__.py
 akshare/stock_feature/cons.py