akshare 1.14.35__py3-none-any.whl → 1.14.36__py3-none-any.whl

akshare/__init__.py

@@ -2846,9 +2846,10 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.14.33 fix: fix stock_concept_cons_futu interface
 1.14.34 add: add macro_rmb_loan interface
 1.14.35 add: add macro_rmb_deposit interface
+1.14.36 fix: fix option_czce_daily interface
 """
 
-__version__ = "1.14.35"
+__version__ = "1.14.36"
 __author__ = "AKFamily"
 
 import sys

akshare/option/option_commodity.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/11/17 17:00
+Date: 2024/7/19 14:00
 Desc: 商品期权数据
 说明：
 (1) 价格：自2019年12月02日起，纤维板报价单位由元/张改为元/立方米
@@ -144,10 +144,11 @@ def option_czce_daily(
 ) -> pd.DataFrame:
     """
     郑州商品交易所-期权-日频行情数据
-
+    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
@@ -157,7 +158,7 @@ def option_czce_daily(
     if day.strftime("%Y%m%d") not in calendar:
         warnings.warn("{}非交易日".format(day.strftime("%Y%m%d")))
         return pd.DataFrame()
-    if day > datetime.date(2010, 8, 24):
+    if day > datetime.date(year=2010, month=8, day=24):
         url = CZCE_DAILY_OPTION_URL_3.format(day.strftime("%Y"), day.strftime("%Y%m%d"))
         try:
             r = requests.get(url)
@@ -215,6 +216,22 @@ def option_czce_daily(
                 temp_df = table_df[table_df.iloc[:, 0].str.contains("UR")]
                 temp_df.reset_index(inplace=True, drop=True)
                 return temp_df.iloc[:-1, :]
+            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, :]
+            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, :]
+            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, :]
+            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, :]
             else:
                 temp_df = table_df[table_df.iloc[:, 0].str.contains("AP")]
                 temp_df.reset_index(inplace=True, drop=True)
@@ -485,7 +502,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="20220808")
+    option_czce_daily_df = option_czce_daily(symbol="短纤期权", trade_date="20240718")
     print(option_czce_daily_df)
 
     option_dce_daily_one, option_dce_daily_two = option_dce_daily(

akshare/stock_feature/stock_board_industry_ths.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2024/7/16 22:30
+Date: 2024/7/19 14:20
 Desc: 同花顺-板块-行业板块
 https://q.10jqka.com.cn/thshy/
 """
@@ -117,6 +117,8 @@ def stock_board_industry_name_ths() -> pd.DataFrame:
         "881180": "石油加工贸易",
         "881181": "环保",
         "881182": "美容护理",
+        "881207": "元件",  # 20240719
+        "881266": "橡胶制品",  # 20240719
         "884001": "种子生产",
         "884002": "粮食种植",
         "884003": "其他种植业",
@@ -572,7 +574,7 @@ def stock_board_industry_summary_ths() -> pd.DataFrame:
         url = f"http://q.10jqka.com.cn/thshy/index/field/199112/order/desc/page/{page}/ajax/1/"
         r = requests.get(url, headers=headers)
         temp_df = pd.read_html(StringIO(r.text))[0]
-        big_df = pd.concat([big_df, temp_df], ignore_index=True)
+        big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
 
     big_df.columns = [
         "序号",
@@ -604,7 +606,7 @@ if __name__ == "__main__":
     stock_board_industry_name_ths_df = stock_board_industry_name_ths()
     print(stock_board_industry_name_ths_df)
 
-    stock_board_industry_info_ths_df = stock_board_industry_info_ths(symbol="小家电")
+    stock_board_industry_info_ths_df = stock_board_industry_info_ths(symbol="橡胶制品")
     print(stock_board_industry_info_ths_df)
 
     stock_board_industry_index_ths_df = stock_board_industry_index_ths(

{akshare-1.14.35.dist-info → akshare-1.14.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.14.35
+Version: 1.14.36
 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.14.35.dist-info → akshare-1.14.36.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=8LMVecGuDBi3n7ZnMoKy1OOF2b3kvdCeKPs0F0meXok,179550
+akshare/__init__.py,sha256=4Y7cTqbOXw2mVnmx31CfTyVD8tP2JerFwQ7RiJjqJ34,179595
 akshare/datasets.py,sha256=oIu1zC7o_LMHY22lQmdM7vCnryHibKrJLBqJwQiitlI,1167
 akshare/air/__init__.py,sha256=RMTf1bT5EOE3ttWpn3hGu1LtUmsVxDoa0W7W0gXHOy8,81
 akshare/air/air_hebei.py,sha256=xIXNGLK7IGYqrkteM9fxnHAwWqk6PCQs6D9-ggZ7byY,4442
@@ -196,7 +196,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=MVxFaGLeBE1Qh-IdLBkmDumyLNy8oObauptwAbcpxcU,20112
+akshare/option/option_commodity.py,sha256=_SWFCP0EoKtwwF72WecK6YL-ogKnY7Yjnd2IwjA95Og,21261
 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
@@ -293,7 +293,7 @@ akshare/stock_feature/stock_a_pe_and_pb.py,sha256=0HMD-49G9KYSe1pQFN6UnqvPHa-JZq
 akshare/stock_feature/stock_account_em.py,sha256=PA-531xnv5uerFrYGc40mk8q8O0DGciHC_XVlE9udis,3342
 akshare/stock_feature/stock_all_pb.py,sha256=2yQLq03qXNbTB5AtJ-Q8uJldOluElH5zTjYneY3aaZ0,1194
 akshare/stock_feature/stock_analyst_em.py,sha256=0MmDNZYET0TAn7PBasGJgBV0Y3ljkgocQL4X5bn-7RU,9610
-akshare/stock_feature/stock_board_industry_ths.py,sha256=cM6qkpKsnQx1eqQ5gCzibxGnXYis-TJeqbHTpa1HiPA,21696
+akshare/stock_feature/stock_board_industry_ths.py,sha256=epezEJd7Hfpg7795bKzuZiMX2r1OBD5SYU8eKZtsFlE,21790
 akshare/stock_feature/stock_buffett_index_lg.py,sha256=NpNccHmGjtqLz6aUladB6InPzO2pjoImbgCgmNEYUuM,2027
 akshare/stock_feature/stock_classify_sina.py,sha256=Lg7ROG5W9HioFRplJI2rZ6tAAHM09N3g9qF6kReIQYI,3210
 akshare/stock_feature/stock_comment_em.py,sha256=3HpMZkCiIC6o6LzLZLNA-rYKBMRPeuTaj6xfuU7o4J0,14252
@@ -380,8 +380,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=tfvy_YnYmDra2dkKZ5JvprU1gNW5X9T634PszdSdH1A,944
-akshare-1.14.35.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.14.35.dist-info/METADATA,sha256=QbQecgHz_qrq_jyzgVsvEmjkzTjUof4Hhrl8jHUvtF8,14010
-akshare-1.14.35.dist-info/WHEEL,sha256=FZ75kcLy9M91ncbIgG8dnpCncbiKXSRGJ_PFILs6SFg,91
-akshare-1.14.35.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.14.35.dist-info/RECORD,,
+akshare-1.14.36.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.14.36.dist-info/METADATA,sha256=ilOLiSMmeJvZacscRcVdoaTNOjry7NFrgVOHPac9-Cc,14010
+akshare-1.14.36.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
+akshare-1.14.36.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.14.36.dist-info/RECORD,,

{akshare-1.14.35.dist-info → akshare-1.14.36.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.0.1)
+Generator: setuptools (71.0.3)
 Root-Is-Purelib: true
 Tag: py3-none-any