akshare 1.15.28__py3-none-any.whl → 1.15.29__py3-none-any.whl

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/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.dist-info → akshare-1.15.29.dist-info}/METADATA

@@ -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.dist-info → akshare-1.15.29.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=8i1-bF44iMG9EqOv0Dfa2TsKHf8wo-1DQzOm1pqlphE,184088
+akshare/__init__.py,sha256=e5PdNsfetmWVaoDmM_98FfYWblj0IR_Pre91MGiF98o,184132
 akshare/datasets.py,sha256=-qdwaQjgBlftX84uM74KJqCYJYkQ50PV416_neA4uls,995
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -194,7 +194,7 @@ akshare/nlp/nlp_interface.py,sha256=PyZjT3PkuTbloop-JwLwZ2kNi22zdO-r_pRUWQ5SmgM,
 akshare/option/__init__.py,sha256=RMTf1bT5EOE3ttWpn3hGu1LtUmsVxDoa0W7W0gXHOy8,81
 akshare/option/cons.py,sha256=zTRZ62RFwOcAKfmso-7nZJtT3a8Dt1nQbNnEjSqgjpI,4811
 akshare/option/option_comm_qihuo.py,sha256=kjbdp-94KJJJi1ex5U03abtlgviqwP0Aahb6FwddPkk,3128
-akshare/option/option_commodity.py,sha256=M1R5dGQcW1iZzQ6d3DztZ2yq7V0jzrkCuoW1GKJTwjU,22274
+akshare/option/option_commodity.py,sha256=DMn-PM82xUr_HcHQqF1VLVmJaD35RiXDH4RwpFVMX7k,25338
 akshare/option/option_commodity_sina.py,sha256=r6qK_K7w3A6Uqp5ZtBb4pW7vH04oMyeCEZLLGqi0jpA,7776
 akshare/option/option_czce.py,sha256=L4i7TVKcOns5ZKoqq-mrSykdx3SGwu6OL4eI77-A_lc,1812
 akshare/option/option_daily_stats_sse_szse.py,sha256=Ip_vE81qbEGt4ocbtWfUT7XGu0HWU0zKkzauZeq9RJA,4962
@@ -383,8 +383,8 @@ akshare/utils/token_process.py,sha256=K4rGXjh_tgugbRcyOK2h2x0jP3PT65IIK7nxhUKhOe
 akshare/utils/tqdm.py,sha256=MuPNwcswkOGjwWQOMWXi9ZvQ_RmW4obCWRj2i7HM7FE,847
 tests/__init__.py,sha256=gNzhlO0UPjFq6Ieb38kaVIODXv4cTDByrdohAZnDYt4,82
 tests/test_func.py,sha256=j1MGYbZI2if2j_LY1S4FLsf4qfq4NwVqD5wmRlv5Log,832
-akshare-1.15.28.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.15.28.dist-info/METADATA,sha256=rxPymXOcNH6roYEJGJCKgBlt59BTmPoEkqhOzgA5zP0,14232
-akshare-1.15.28.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-akshare-1.15.28.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.15.28.dist-info/RECORD,,
+akshare-1.15.29.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.15.29.dist-info/METADATA,sha256=Kv3aeIVBLwaYj8zh5qAjV4QQUji9m9NmoB2x5guSVik,14232
+akshare-1.15.29.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+akshare-1.15.29.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.15.29.dist-info/RECORD,,