akshare 1.16.6__tar.gz → 1.16.8__tar.gz

{akshare-1.16.6 → akshare-1.16.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: akshare
-Version: 1.16.6
+Version: 1.16.8
 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.6 → akshare-1.16.8}/akshare/__init__.py

@@ -3015,9 +3015,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.16.4 fix: fix stock_hk_ggt_components_em interface
 1.16.5 fix: fix stock_sector_fund_flow_rank interface
 1.16.6 fix: fix stock_sgt_reference_exchange_rate_sse interface
+1.16.7 fix: fix fund_lof_hist_em interface
+1.16.8 fix: fix option_czce_daily interface
 """
 
-__version__ = "1.16.6"
+__version__ = "1.16.8"
 __author__ = "AKFamily"
 
 import sys

{akshare-1.16.6 → akshare-1.16.8}/akshare/fund/fund_etf_em.py

@@ -7,10 +7,9 @@ https://quote.eastmoney.com/sh513500.html
 """
 
 from functools import lru_cache
-import math
+
 import pandas as pd
 import requests
-from akshare.utils.tqdm import get_tqdm
 
 
 @lru_cache()
@@ -24,9 +23,9 @@ def _fund_etf_code_id_map_em() -> dict:
     url = "https://88.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "200",
+        "pz": "50000",
         "po": "1",
-        "np": "1",
+        "np": "2",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -38,20 +37,7 @@ def _fund_etf_code_id_map_em() -> dict:
     }
     r = requests.get(url, params=params, timeout=15)
     data_json = r.json()
-    total_page = math.ceil(data_json["data"]["total"] / 200)
-    temp_list = []
-    tqdm = get_tqdm()
-    for page in tqdm(range(1, total_page + 1), leave=False):
-        params.update(
-            {
-                "pn": page,
-            }
-        )
-        r = requests.get(url, params=params, timeout=15)
-        data_json = r.json()
-        inner_temp_df = pd.DataFrame(data_json["data"]["diff"])
-        temp_list.append(inner_temp_df)
-    temp_df = pd.concat(temp_list, ignore_index=True)
+    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
     temp_dict = dict(zip(temp_df["f12"], temp_df["f13"]))
     return temp_dict
 
@@ -66,9 +52,9 @@ def fund_etf_spot_em() -> pd.DataFrame:
     url = "https://88.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "200",
+        "pz": "50000",
         "po": "1",
-        "np": "1",
+        "np": "2",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -87,20 +73,7 @@ def fund_etf_spot_em() -> pd.DataFrame:
     }
     r = requests.get(url, timeout=15, params=params)
     data_json = r.json()
-    total_page = math.ceil(data_json["data"]["total"] / 200)
-    temp_list = []
-    tqdm = get_tqdm()
-    for page in tqdm(range(1, total_page + 1), leave=False):
-        params.update(
-            {
-                "pn": page,
-            }
-        )
-        r = requests.get(url, params=params, timeout=15)
-        data_json = r.json()
-        inner_temp_df = pd.DataFrame(data_json["data"]["diff"])
-        temp_list.append(inner_temp_df)
-    temp_df = pd.concat(temp_list, ignore_index=True)
+    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
     temp_df.rename(
         columns={
             "f12": "代码",

{akshare-1.16.6 → akshare-1.16.8}/akshare/fund/fund_lof_em.py

@@ -26,7 +26,7 @@ def _fund_lof_code_id_map_em() -> dict:
         "pn": "1",
         "pz": "5000",
         "po": "1",
-        "np": "1",
+        "np": "2",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -38,7 +38,7 @@ def _fund_lof_code_id_map_em() -> dict:
     }
     r = requests.get(url, params=params)
     data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
     temp_dict = dict(zip(temp_df["f12"], temp_df["f13"]))
     return temp_dict
 
@@ -55,7 +55,7 @@ def fund_lof_spot_em() -> pd.DataFrame:
         "pn": "1",
         "pz": "5000",
         "po": "1",
-        "np": "1",
+        "np": "2",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -68,7 +68,7 @@ def fund_lof_spot_em() -> pd.DataFrame:
     }
     r = requests.get(url, params=params)
     data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
     temp_df.rename(
         columns={
             "f12": "代码",

{akshare-1.16.6 → akshare-1.16.8}/akshare/futures/futures_hist_em.py

@@ -1,13 +1,14 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/1/17 19:30
+Date: 2024/2/20 17:00
 Desc: 东方财富网-期货行情
 https://qhweb.eastmoney.com/quote
 """
 
 import re
 from functools import lru_cache
+from typing import Tuple, Dict
 
 import pandas as pd
 import requests
@@ -53,7 +54,7 @@ def __fetch_exchange_symbol_raw_em() -> list:
 
 
 @lru_cache()
-def __get_exchange_symbol_map() -> tuple[dict, dict, dict, dict]:
+def __get_exchange_symbol_map() -> Tuple[Dict, Dict, Dict, Dict]:
     """
     东方财富网-期货行情-交易所品种映射
     https://quote.eastmoney.com/qihuo/al2505.html

{akshare-1.16.6 → akshare-1.16.8}/akshare/option/option_commodity.py

@@ -190,7 +190,7 @@ def __option_czce_daily_convert_numeric_columns(df):
         except:  # noqa: E722
             return x
 
-    # 创建DataFrame的副本以避免SettingWithCopyWarning
+    # 创建 DataFrame 的副本以避免 SettingWithCopyWarning
     df_copy = df.copy()
     df_copy.columns = [item.strip() for item in df_copy]
     # 应用转换
@@ -208,9 +208,9 @@ def option_czce_daily(
     http://www.czce.com.cn/cn/sspz/dejbqhqq/H770227index_1.htm#tabs-2
     :param trade_date: 交易日
     :type trade_date: str
-    :param symbol: choice of {"白糖期权", "棉花期权", "甲醇期权", "PTA期权",  "菜籽粕期权", "动力煤期权", "短纤期权",
-    "菜籽油期权", "花生期权", "纯碱期权", "锰硅期权", "硅铁期权", "尿素期权", "对二甲苯期权", "苹果期权", "红枣期权"
-    "烧碱期权", "玻璃期权", "瓶片期权"}
+    :param symbol: choice of {"白糖期权", "棉花期权", "甲醇期权", "PTA期权", "动力煤期权", "菜籽粕期权", "菜籽油期权",
+    "花生期权", "对二甲苯期权", "烧碱期权", "纯碱期权", "短纤期权", "锰硅期权", "硅铁期权", "尿素期权", "苹果期权", "红枣期权",
+    "玻璃期权", "瓶片期权"}
     :type symbol: str
     :return: 日频行情数据
     :rtype: pandas.DataFrame
@@ -226,6 +226,24 @@ def option_czce_daily(
             r = requests.get(url)
             f = StringIO(r.text)
             table_df = pd.read_table(f, encoding="utf-8", skiprows=1, sep="|")
+            table_df.columns = [
+                "合约代码",
+                "昨结算",
+                "今开盘",
+                "最高价",
+                "最低价",
+                "今收盘",
+                "今结算",
+                "涨跌1",
+                "涨跌2",
+                "成交量(手)",
+                "持仓量",
+                "增减量",
+                "成交额(万元)",
+                "DELTA",
+                "隐含波动率",
+                "行权量",
+            ]
             if symbol == "白糖期权":
                 temp_df = table_df[table_df.iloc[:, 0].str.contains("SR")]
                 temp_df.reset_index(inplace=True, drop=True)
@@ -250,14 +268,26 @@ def option_czce_daily(
                 temp_df = temp_df.iloc[:-1, :].copy()
                 new_df = __option_czce_daily_convert_numeric_columns(temp_df)
                 return new_df
+            elif symbol == "动力煤期权":
+                temp_df = table_df[table_df.iloc[:, 0].str.contains("ZC")]
+                temp_df.reset_index(inplace=True, drop=True)
+                temp_df = temp_df.iloc[:-1, :].copy()
+                new_df = __option_czce_daily_convert_numeric_columns(temp_df)
+                return new_df
             elif symbol == "菜籽粕期权":
                 temp_df = table_df[table_df.iloc[:, 0].str.contains("RM")]
                 temp_df.reset_index(inplace=True, drop=True)
                 temp_df = temp_df.iloc[:-1, :].copy()
                 new_df = __option_czce_daily_convert_numeric_columns(temp_df)
                 return new_df
-            elif symbol == "动力煤期权":
-                temp_df = table_df[table_df.iloc[:, 0].str.contains("ZC")]
+            elif symbol == "菜籽油期权":
+                temp_df = table_df[table_df.iloc[:, 0].str.contains("OI")]
+                temp_df.reset_index(inplace=True, drop=True)
+                temp_df = temp_df.iloc[:-1, :].copy()
+                new_df = __option_czce_daily_convert_numeric_columns(temp_df)
+                return new_df
+            elif symbol == "花生期权":
+                temp_df = table_df[table_df.iloc[:, 0].str.contains("PK")]
                 temp_df.reset_index(inplace=True, drop=True)
                 temp_df = temp_df.iloc[:-1, :].copy()
                 new_df = __option_czce_daily_convert_numeric_columns(temp_df)
@@ -268,14 +298,14 @@ def option_czce_daily(
                 temp_df = temp_df.iloc[:-1, :].copy()
                 new_df = __option_czce_daily_convert_numeric_columns(temp_df)
                 return new_df
-            elif symbol == "菜籽油期权":
-                temp_df = table_df[table_df.iloc[:, 0].str.contains("OI")]
+            elif symbol == "对二甲苯期权":
+                temp_df = table_df[table_df.iloc[:, 0].str.contains("PX")]
                 temp_df.reset_index(inplace=True, drop=True)
                 temp_df = temp_df.iloc[:-1, :].copy()
                 new_df = __option_czce_daily_convert_numeric_columns(temp_df)
                 return new_df
-            elif symbol == "花生期权":
-                temp_df = table_df[table_df.iloc[:, 0].str.contains("PK")]
+            elif symbol == "烧碱期权":
+                temp_df = table_df[table_df.iloc[:, 0].str.contains("SH")]
                 temp_df.reset_index(inplace=True, drop=True)
                 temp_df = temp_df.iloc[:-1, :].copy()
                 new_df = __option_czce_daily_convert_numeric_columns(temp_df)
@@ -286,6 +316,12 @@ def option_czce_daily(
                 temp_df = temp_df.iloc[:-1, :].copy()
                 new_df = __option_czce_daily_convert_numeric_columns(temp_df)
                 return new_df
+            elif symbol == "短纤期权":
+                temp_df = table_df[table_df.iloc[:, 0].str.contains("PF")]
+                temp_df.reset_index(inplace=True, drop=True)
+                temp_df = temp_df.iloc[:-1, :].copy()
+                new_df = __option_czce_daily_convert_numeric_columns(temp_df)
+                return new_df
             elif symbol == "锰硅期权":
                 temp_df = table_df[table_df.iloc[:, 0].str.contains("SM")]
                 temp_df.reset_index(inplace=True, drop=True)
@@ -316,18 +352,6 @@ def option_czce_daily(
                 temp_df = temp_df.iloc[:-1, :].copy()
                 new_df = __option_czce_daily_convert_numeric_columns(temp_df)
                 return new_df
-            elif symbol == "对二甲苯期权":
-                temp_df = table_df[table_df.iloc[:, 0].str.contains("PX")]
-                temp_df.reset_index(inplace=True, drop=True)
-                temp_df = temp_df.iloc[:-1, :].copy()
-                new_df = __option_czce_daily_convert_numeric_columns(temp_df)
-                return new_df
-            elif symbol == "烧碱期权":
-                temp_df = table_df[table_df.iloc[:, 0].str.contains("SH")]
-                temp_df.reset_index(inplace=True, drop=True)
-                temp_df = temp_df.iloc[:-1, :].copy()
-                new_df = __option_czce_daily_convert_numeric_columns(temp_df)
-                return new_df
             elif symbol == "玻璃期权":
                 temp_df = table_df[table_df.iloc[:, 0].str.contains("FG")]
                 temp_df.reset_index(inplace=True, drop=True)
@@ -340,8 +364,12 @@ def option_czce_daily(
                 temp_df = temp_df.iloc[:-1, :].copy()
                 new_df = __option_czce_daily_convert_numeric_columns(temp_df)
                 return new_df
+            else:
+                return pd.DataFrame()
         except:  # noqa: E722
             return pd.DataFrame()
+    else:
+        return pd.DataFrame()
 
 
 def option_shfe_daily(
@@ -607,7 +635,7 @@ def option_gfex_vol_daily(symbol: str = "碳酸锂", trade_date: str = "20230724
 
 
 if __name__ == "__main__":
-    option_czce_daily_df = option_czce_daily(symbol="白糖期权", trade_date="20240711")
+    option_czce_daily_df = option_czce_daily(symbol="白糖期权", trade_date="20170419")
     print(option_czce_daily_df)
 
     option_dce_daily_one, option_dce_daily_two = option_dce_daily(

{akshare-1.16.6 → akshare-1.16.8}/akshare/stock/stock_us_pink.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/4/11 17:00
+Date: 2025/2/20 17:00
 Desc: 东方财富网-行情中心-美股市场-粉单市场
 https://quote.eastmoney.com/center/gridlist.html#us_pinksheet
 """
@@ -20,9 +20,9 @@ def stock_us_pink_spot_em() -> pd.DataFrame:
     url = "https://23.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "2000",
+        "pz": "50000",
         "po": "1",
-        "np": "1",
+        "np": "2",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
         "fltt": "2",
         "invt": "2",
@@ -34,7 +34,7 @@ def stock_us_pink_spot_em() -> pd.DataFrame:
     }
     r = requests.get(url, params=params)
     data_json = r.json()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
+    temp_df = pd.DataFrame(data_json["data"]["diff"]).T
     temp_df.columns = [
         "_",
         "最新价",

{akshare-1.16.6 → akshare-1.16.8}/akshare.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: akshare
-Version: 1.16.6
+Version: 1.16.8
 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