Skip to content

Commit

Permalink
Date (#4163)
Browse files Browse the repository at this point in the history 
* add version

* fix option_dce_daily
  • Loading branch information
@albertandking
albertandking authored Sep 30, 2023
1 parent dd6107b commit ca6813c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 41 deletions.
3 changes: 2 additions & 1 deletion akshare/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2533,9 +2533,10 @@
1.11.17 fix: fix futures_spot_price_daily interface
1.11.18 fix: fix get_rank_sum_daily interface
1.11.19 fix: fix drewry_wci_index interface
1.11.20 fix: fix option_dce_daily interface
"""

__version__ = "1.11.19"
__version__ = "1.11.20"
__author__ = "AKFamily"

import sys
Expand Down
45 changes: 5 additions & 40 deletions akshare/option/option_commodity.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def option_dce_daily(
"exportFlag": "excel",
}
res = requests.post(url, data=payload)
table_df = pd.read_excel(BytesIO(res.content), header=0)
table_df = pd.read_excel(BytesIO(res.content), header=1)
another_df = table_df.iloc[
table_df[table_df.iloc[:, 0].str.contains("合约")].iloc[-1].name :,
[0, 1],
Expand All @@ -73,105 +73,70 @@ def option_dce_daily(
table_df[table_df["商品名称"] == "豆粕"],
another_df[another_df.iloc[:, 0].str.contains("m")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
elif symbol == "玉米期权":
result_one_df, result_two_df = (
table_df[table_df["商品名称"] == "玉米"],
another_df[another_df.iloc[:, 0].str.contains("c")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
elif symbol == "铁矿石期权":
result_one_df, result_two_df = (
table_df[table_df["商品名称"] == "铁矿石"],
another_df[another_df.iloc[:, 0].str.contains("i")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
elif symbol == "液化石油气期权":
result_one_df, result_two_df = (
table_df[table_df["商品名称"] == "液化石油气"],
another_df[another_df.iloc[:, 0].str.contains("pg")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
elif symbol == "聚乙烯期权":
result_one_df, result_two_df = (
table_df[table_df["商品名称"] == "聚乙烯"],
another_df[another_df.iloc[:, 0].str.contains("l")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
elif symbol == "聚氯乙烯期权":
result_one_df, result_two_df = (
table_df[table_df["商品名称"] == "聚氯乙烯"],
another_df[another_df.iloc[:, 0].str.contains("v")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
elif symbol == "聚丙烯期权":
result_one_df, result_two_df = (
table_df[table_df["商品名称"] == "聚丙烯"],
another_df[another_df.iloc[:, 0].str.contains("pp")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
elif symbol == "棕榈油期权":
result_one_df, result_two_df = (
table_df[table_df["商品名称"] == "棕榈油"],
another_df[another_df.iloc[:, 0].str.contains(r"^p\d")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
elif symbol == "黄大豆1号期权":
result_one_df, result_two_df = (
table_df[table_df["商品名称"] == "豆一"],
another_df[another_df.iloc[:, 0].str.contains("a")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
elif symbol == "黄大豆2号期权":
result_one_df, result_two_df = (
table_df[table_df["商品名称"] == "豆二"],
another_df[another_df.iloc[:, 0].str.contains("b")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
elif symbol == "豆油期权":
result_one_df, result_two_df = (
table_df[table_df["商品名称"] == "豆油"],
another_df[another_df.iloc[:, 0].str.contains("y")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
elif symbol == "乙二醇期权":
result_one_df, result_two_df = (
table_df[table_df["商品名称"] == "乙二醇"],
another_df[another_df.iloc[:, 0].str.contains("eg")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
elif symbol == "苯乙烯期权":
result_one_df, result_two_df = (
table_df[table_df["商品名称"] == "苯乙烯"],
another_df[another_df.iloc[:, 0].str.contains("eb")],
)
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
return result_one_df, result_two_df
result_one_df.reset_index(inplace=True, drop=True)
result_two_df.reset_index(inplace=True, drop=True)
result_two_df.columns.name = None
return result_one_df, result_two_df


def option_czce_daily(
Expand Down
6 changes: 6 additions & 0 deletions docs/changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@

## 更新说明详情

1.11.20 fix: fix option_dce_daily interface

1. 修复 option_dce_daily 接口

1.11.19 fix: fix drewry_wci_index interface

1. 修复 drewry_wci_index 接口
Expand Down Expand Up @@ -2908,6 +2912,8 @@

## 版本更新说明

1.11.20 fix: fix option_dce_daily interface

1.11.19 fix: fix drewry_wci_index interface

1.11.18 fix: fix get_rank_sum_daily interface
Expand Down

0 comments on commit ca6813c

Please sign in to comment.