akshare 1.15.28__tar.gz → 1.15.29__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.15.28
+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

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

@@ -2938,9 +2938,10 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 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.28"
+__version__ = "1.15.29"
 __author__ = "AKFamily"
 
 import sys

{akshare-1.15.28 → 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.28 → akshare-1.15.29}/akshare.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.15.28
+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