akshare 1.15.27__tar.gz → 1.15.29__tar.gz

{akshare-1.15.27 → akshare-1.15.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.15.27
+Version: 1.15.29
 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
@@ -40,7 +40,7 @@ Requires-Dist: akqmt; extra == "qmt"
 
 **欢迎加入专注于财经数据和量化投资的知识社区，请点击[了解更多](https://akshare.akfamily.xyz/learn.html)**
 
-**首门量化投资教程：《PyBroker-入门及实战》已经录制完成，目前已经上架！**
+**量化投研视频课程：《PyBroker-入门及实战》已经上架！**
 
 **更多视频教程已经发布：《AKShare-初阶-使用教学》、《AKShare-初阶-实战应用》、《AKShare-源码解析》、《开源项目巡礼》**，
 详情请关注【数据科学实战】公众号，查看更多课程信息！

{akshare-1.15.27 → akshare-1.15.29}/README.md

@@ -1,6 +1,6 @@
 **欢迎加入专注于财经数据和量化投资的知识社区，请点击[了解更多](https://akshare.akfamily.xyz/learn.html)**
 
-**首门量化投资教程：《PyBroker-入门及实战》已经录制完成，目前已经上架！**
+**量化投研视频课程：《PyBroker-入门及实战》已经上架！**
 
 **更多视频教程已经发布：《AKShare-初阶-使用教学》、《AKShare-初阶-实战应用》、《AKShare-源码解析》、《开源项目巡礼》**，
 详情请关注【数据科学实战】公众号，查看更多课程信息！

{akshare-1.15.27 → akshare-1.15.29}/akshare/__init__.py

@@ -2937,9 +2937,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.25 fix: fix stock_news_main_cx interface
 1.15.26 fix: fix option_dce_daily interface
 1.15.27 fix: fix stock_zh_index_spot_em interface
+1.15.28 fix: fix stock_hk_valuation_baidu interface
+1.15.29 fix: fix option_dce_daily interface
 """
 
-__version__ = "1.15.27"
+__version__ = "1.15.29"
 __author__ = "AKFamily"
 
 import sys

{akshare-1.15.27 → akshare-1.15.29}/akshare/index/index_stock_zh.py

@@ -216,6 +216,7 @@ def stock_zh_index_spot_em(symbol: str = "上证系列指数") -> pd.DataFrame:
     """
     if symbol == "沪深重要指数":
         return __stock_zh_main_spot_em()
+
     url = "https://48.push2.eastmoney.com/api/qt/clist/get"
     symbol_map = {
         "上证系列指数": "m:1 s:2",

{akshare-1.15.27 → akshare-1.15.29}/akshare/index/index_sw.py

@@ -95,6 +95,9 @@ def sw_index_second_info() -> pd.DataFrame:
     )
     code = [item.get_text() for item in code_raw]
     name = [item.get_text().split("(")[0] for item in name_raw]
+    parent_name = [
+        item.find("span").get_text().split("(")[0][1:-1] for item in name_raw
+    ]
     num = [item.get_text().split("(")[1].split(")")[0] for item in name_raw]
     num_1 = [
         item.find_all("span", attrs={"class": "value"})[0].get_text().strip()
@@ -112,10 +115,11 @@ def sw_index_second_info() -> pd.DataFrame:
         item.find_all("span", attrs={"class": "value"})[3].get_text().strip()
         for item in value_raw
     ]
-    temp_df = pd.DataFrame([code, name, num, num_1, num_2, num_3, num_4]).T
+    temp_df = pd.DataFrame([code, name, parent_name, num, num_1, num_2, num_3, num_4]).T
     temp_df.columns = [
         "行业代码",
         "行业名称",
+        "上级行业",
         "成份个数",
         "静态市盈率",
         "TTM(滚动)市盈率",
@@ -153,6 +157,9 @@ def sw_index_third_info() -> pd.DataFrame:
     )
     code = [item.get_text() for item in code_raw]
     name = [item.get_text().split("(")[0] for item in name_raw]
+    parent_name = [
+        item.find("span").get_text().split("(")[0][1:-1] for item in name_raw
+    ]
     num = [item.get_text().split("(")[1].split(")")[0] for item in name_raw]
     num_1 = [
         item.find_all("span", attrs={"class": "value"})[0].get_text().strip()
@@ -170,10 +177,11 @@ def sw_index_third_info() -> pd.DataFrame:
         item.find_all("span", attrs={"class": "value"})[3].get_text().strip()
         for item in value_raw
     ]
-    temp_df = pd.DataFrame([code, name, num, num_1, num_2, num_3, num_4]).T
+    temp_df = pd.DataFrame([code, name, parent_name, num, num_1, num_2, num_3, num_4]).T
     temp_df.columns = [
         "行业代码",
         "行业名称",
+        "上级行业",
         "成份个数",
         "静态市盈率",
         "TTM(滚动)市盈率",

{akshare-1.15.27 → akshare-1.15.29}/akshare/option/option_commodity.py

@@ -80,7 +80,7 @@ def option_dce_daily(
     elif symbol == "玉米期权":
         result_one_df, result_two_df = (
             table_df[table_df["商品名称"] == "玉米"],
-            another_df[another_df.iloc[:, 0].str.contains("c")],
+            another_df[another_df.iloc[:, 0].str.contains(r"^c\d")],
         )
     elif symbol == "铁矿石期权":
         result_one_df, result_two_df = (
@@ -163,6 +163,43 @@ def option_dce_daily(
     return result_one_df, result_two_df
 
 
+def __option_czce_daily_convert_numeric_columns(df):
+    # 定义要处理的列
+    columns_to_convert = [
+        "昨结算",
+        "今开盘",
+        "最高价",
+        "最低价",
+        "今收盘",
+        "今结算",
+        "涨跌1",
+        "涨跌2",
+        "成交量(手)",
+        "持仓量",
+        "增减量",
+        "成交额(万元)",
+        "DELTA",
+        "隐含波动率",
+        "行权量",
+    ]
+
+    # 转换函数：去除逗号并转换为float
+    def convert_to_float(x):
+        try:
+            return float(str(x).replace(",", ""))
+        except:  # noqa: E722
+            return x
+
+    # 创建DataFrame的副本以避免SettingWithCopyWarning
+    df_copy = df.copy()
+    df_copy.columns = [item.strip() for item in df_copy]
+    # 应用转换
+    for col in columns_to_convert:
+        df_copy[col] = df_copy[col].apply(convert_to_float)
+
+    return df_copy
+
+
 def option_czce_daily(
     symbol: str = "白糖期权", trade_date: str = "20191017"
 ) -> pd.DataFrame:
@@ -192,82 +229,118 @@ def option_czce_daily(
             if symbol == "白糖期权":
                 temp_df = table_df[table_df.iloc[:, 0].str.contains("SR")]
                 temp_df.reset_index(inplace=True, drop=True)
-                return temp_df.iloc[:-1, :]
+                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("CF")]
                 temp_df.reset_index(inplace=True, drop=True)
-                return temp_df.iloc[:-1, :]
+                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("MA")]
                 temp_df.reset_index(inplace=True, drop=True)
-                return temp_df.iloc[:-1, :]
+                temp_df = temp_df.iloc[:-1, :].copy()
+                new_df = __option_czce_daily_convert_numeric_columns(temp_df)
+                return new_df
             elif symbol == "PTA期权":
                 temp_df = table_df[table_df.iloc[:, 0].str.contains("TA")]
                 temp_df.reset_index(inplace=True, drop=True)
-                return temp_df.iloc[:-1, :]
+                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)
-                return temp_df.iloc[:-1, :]
+                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)
-                return temp_df.iloc[:-1, :]
+                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)
-                return temp_df.iloc[:-1, :]
+                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")]
                 temp_df.reset_index(inplace=True, drop=True)
-                return temp_df.iloc[:-1, :]
+                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)
-                return temp_df.iloc[:-1, :]
+                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("SA")]
                 temp_df.reset_index(inplace=True, drop=True)
-                return temp_df.iloc[:-1, :]
+                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)
-                return temp_df.iloc[:-1, :]
+                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("SF")]
                 temp_df.reset_index(inplace=True, drop=True)
-                return temp_df.iloc[:-1, :]
+                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("UR")]
                 temp_df.reset_index(inplace=True, drop=True)
-                return temp_df.iloc[:-1, :]
+                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("AP")]
                 temp_df.reset_index(inplace=True, drop=True)
-                return temp_df.iloc[:-1, :]
+                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("CJ")]
                 temp_df.reset_index(inplace=True, drop=True)
-                return temp_df.iloc[:-1, :]
+                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)
-                return temp_df.iloc[:-1, :]
+                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)
-                return temp_df.iloc[:-1, :]
+                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)
-                return temp_df.iloc[:-1, :]
+                temp_df = temp_df.iloc[:-1, :].copy()
+                new_df = __option_czce_daily_convert_numeric_columns(temp_df)
+                return new_df
         except:  # noqa: E722
             return pd.DataFrame()
 
 
 def option_shfe_daily(
     symbol: str = "铝期权", trade_date: str = "20200827"
-) -> Optional[pd.DataFrame]:
+) -> Optional[tuple[pd.DataFrame, pd.DataFrame]]:
     """
     上海期货交易所-期权-日频行情数据
     https://tsite.shfe.com.cn/statements/dataview.html?paramid=kxQ
@@ -527,11 +600,11 @@ def option_gfex_vol_daily(symbol: str = "碳酸锂", trade_date: str = "20230724
 
 
 if __name__ == "__main__":
-    option_czce_daily_df = option_czce_daily(symbol="短纤期权", trade_date="20240718")
+    option_czce_daily_df = option_czce_daily(symbol="白糖期权", trade_date="20240711")
     print(option_czce_daily_df)
 
     option_dce_daily_one, option_dce_daily_two = option_dce_daily(
-        symbol="鸡蛋期权", trade_date="20241118"
+        symbol="玉米期权", trade_date="20241121"
     )
     print(option_dce_daily_one)
     print(option_dce_daily_two)

{akshare-1.15.27 → akshare-1.15.29}/akshare/stock_feature/stock_hk_valuation_baidu.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/3/9 20:26
+Date: 2024/11/21 18:26
 Desc: 百度股市通-港股-财务报表-估值数据
 https://gushitong.baidu.com/stock/hk-06969
 """
+
 import http.client
 import json
 import urllib
@@ -22,25 +23,36 @@ def stock_hk_valuation_baidu(
     :type symbol: str
     :param indicator: choice of {"总市值", "市盈率(TTM)", "市盈率(静)", "市净率", "市现率"}
     :type indicator: str
-    :param period: choice of {"近一年", "近三年", "近五年", "近十年", "全部"}
+    :param period: choice of {"近一年", "近三年", "全部"}
     :type period: str
     :return: 估值数据
     :rtype: pandas.DataFrame
     """
     params = {
-        "srcid": "51171",
+        "openapi": "1",
+        "dspName": "iphone",
+        "tn": "tangram",
+        "client": "app",
+        "query": indicator,
         "code": symbol,
+        "word": "",
+        "resource_id": "51171",
         "market": "hk",
         "tag": indicator,
         "chart_select": period,
-        "skip_industry": "0",
+        "industry_select": "",
+        "skip_industry": "1",
         "finClientType": "pc",
     }
-    conn = http.client.HTTPSConnection("finance.pae.baidu.com")
-    conn.request("GET", f"/selfselect/openapi?{urllib.parse.urlencode(params)}")
+    conn = http.client.HTTPSConnection("gushitong.baidu.com")
+    conn.request(method="GET", url=f"/opendata?{urllib.parse.urlencode(params)}")
     r = conn.getresponse()
     data_json = json.loads(r.read())
-    temp_df = pd.DataFrame(data_json["Result"]["chartInfo"][0]["body"])
+    temp_df = pd.DataFrame(
+        data_json["Result"][0]["DisplayData"]["resultData"]["tplData"]["result"][
+            "chartInfo"
+        ][0]["body"]
+    )
     temp_df.columns = ["date", "value"]
     temp_df["date"] = pd.to_datetime(temp_df["date"]).dt.date
     temp_df["value"] = pd.to_numeric(temp_df["value"])
@@ -49,6 +61,6 @@ def stock_hk_valuation_baidu(
 
 if __name__ == "__main__":
     stock_hk_valuation_baidu_df = stock_hk_valuation_baidu(
-        symbol="00700", indicator="总市值", period="近五年"
+        symbol="06969", indicator="总市值", period="近三年"
     )
     print(stock_hk_valuation_baidu_df)

{akshare-1.15.27 → akshare-1.15.29}/akshare.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.15.27
+Version: 1.15.29
 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
@@ -40,7 +40,7 @@ Requires-Dist: akqmt; extra == "qmt"
 
 **欢迎加入专注于财经数据和量化投资的知识社区，请点击[了解更多](https://akshare.akfamily.xyz/learn.html)**
 
-**首门量化投资教程：《PyBroker-入门及实战》已经录制完成，目前已经上架！**
+**量化投研视频课程：《PyBroker-入门及实战》已经上架！**
 
 **更多视频教程已经发布：《AKShare-初阶-使用教学》、《AKShare-初阶-实战应用》、《AKShare-源码解析》、《开源项目巡礼》**，
 详情请关注【数据科学实战】公众号，查看更多课程信息！