akshare 1.16.80__py3-none-any.whl → 1.16.82__py3-none-any.whl

akshare/__init__.py

@@ -3088,9 +3088,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.16.78 fix: fix stock_zh_a_spot_em interface
 1.16.79 fix: fix stock_individual_basic_info_xq interface
 1.16.80 fix: fix stock_zh_a_disclosure_report_cninfo interface
+1.16.81 fix: fix option_shfe_daily interface
+1.16.82 fix: fix index_global_spot_em interface
 """
 
-__version__ = "1.16.80"
+__version__ = "1.16.82"
 __author__ = "AKFamily"
 
 import sys

akshare/index/index_global_em.py

@@ -49,10 +49,10 @@ def index_global_spot_em() -> pd.DataFrame:
             "index": "序号",
             "f12": "代码",
             "f14": "名称",
-            "f17": "最新价",
+            "f17": "开盘价",
             "f4": "涨跌额",
             "f3": "涨跌幅",
-            "f2": "开盘价",
+            "f2": "最新价",
             "f15": "最高价",
             "f16": "最低价",
             "f18": "昨收价",

akshare/option/option_commodity.py

@@ -373,11 +373,11 @@ def option_czce_daily(
 
 
 def option_shfe_daily(
-    symbol: str = "铝期权", trade_date: str = "20200827"
+    symbol: str = "铝期权", trade_date: str = "20250418"
 ) -> Optional[Tuple[pd.DataFrame, pd.DataFrame]]:
     """
     上海期货交易所-期权-日频行情数据
-    https://tsite.shfe.com.cn/statements/dataview.html?paramid=kxQ
+    https://www.shfe.com.cn/reports/tradedata/dailyandweeklydata/
     :param trade_date: 交易日
     :type trade_date: str
     :param symbol: choice of {"铜期权", "天胶期权", "黄金期权", "铝期权", "锌期权"}
@@ -390,8 +390,8 @@ def option_shfe_daily(
     if day.strftime("%Y%m%d") not in calendar:
         warnings.warn("%s非交易日" % day.strftime("%Y%m%d"))
         return pd.DataFrame(), pd.DataFrame()
-    if day > datetime.date(2010, 8, 24):
-        url = SHFE_OPTION_URL.format(day.strftime("%Y%m%d"))
+    if day > datetime.date(year=2010, month=8, day=24):
+        url = f"""https://www.shfe.com.cn/data/tradedata/option/dailydata/kx{day.strftime("%Y%m%d")}.dat"""
         try:
             r = requests.get(url, headers=SHFE_HEADERS)
             json_data = r.json()
@@ -408,31 +408,25 @@ def option_shfe_daily(
             volatility_df = volatility_df[
                 volatility_df["PRODUCTNAME"].str.strip() == symbol
             ]
-            contract_df.columns = [
-                "_",
-                "_",
-                "_",
-                "合约代码",
-                "前结算价",
-                "开盘价",
-                "最高价",
-                "最低价",
-                "收盘价",
-                "结算价",
-                "涨跌1",
-                "涨跌2",
-                "成交量",
-                "持仓量",
-                "持仓量变化",
-                "_",
-                "行权量",
-                "成交额",
-                "德尔塔",
-                "_",
-                "_",
-                "_",
-                "_",
-            ]
+            contract_df.rename(
+                columns={
+                    "INSTRUMENTID": "合约代码",
+                    "OPENPRICE": "开盘价",
+                    "HIGHESTPRICE": "最高价",
+                    "LOWESTPRICE": "最低价",
+                    "CLOSEPRICE": "收盘价",
+                    "PRESETTLEMENTPRICE": "前结算价",
+                    "SETTLEMENTPRICE": "结算价",
+                    "ZD1_CHG": "涨跌1",
+                    "ZD2_CHG": "涨跌2",
+                    "VOLUME": "成交量",
+                    "OPENINTEREST": "持仓量",
+                    "OPENINTERESTCHG": "持仓量变化",
+                    "TURNOVER": "成交额",
+                    "DELTA": "德尔塔",
+                    "EXECVOLUME": "行权量"
+                }, inplace=True
+            )
             contract_df = contract_df[
                 [
                     "合约代码",
@@ -452,21 +446,15 @@ def option_shfe_daily(
                     "行权量",
                 ]
             ]
-
-            volatility_df.columns = [
-                "_",
-                "_",
-                "_",
-                "合约系列",
-                "成交量",
-                "持仓量",
-                "持仓量变化",
-                "行权量",
-                "成交额",
-                "隐含波动率",
-                "_",
-            ]
-
+            volatility_df.rename(columns={
+                "INSTRUMENTID": "合约系列",
+                "VOLUME": "成交量",
+                "OPENINTEREST": "持仓量",
+                "OPENINTERESTCHG": "持仓量变化",
+                "TURNOVER": "成交额",
+                "EXECVOLUME": "行权量",
+                "SIGMA": "隐含波动率"
+            }, inplace=True)
             volatility_df = volatility_df[
                 [
                     "合约系列",
@@ -482,7 +470,9 @@ def option_shfe_daily(
             volatility_df.reset_index(inplace=True, drop=True)
             return contract_df, volatility_df
         except:  # noqa: E722
-            return
+            return pd.DataFrame(), pd.DataFrame()
+    else:
+        return pd.DataFrame(), pd.DataFrame()
 
 
 def option_gfex_daily(symbol: str = "工业硅", trade_date: str = "20230724"):
@@ -657,7 +647,7 @@ if __name__ == "__main__":
     print(option_dce_daily_two)
 
     option_shfe_daily_one, option_shfe_daily_two = option_shfe_daily(
-        symbol="天胶期权", trade_date="20210312"
+        symbol="天胶期权", trade_date="20250418"
     )
     print(option_shfe_daily_one)
     print(option_shfe_daily_two)

{akshare-1.16.80.dist-info → akshare-1.16.82.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akshare
-Version: 1.16.80
+Version: 1.16.82
 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.16.80.dist-info → akshare-1.16.82.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=0G1oQgVW_uMRxoSdzCerbO0GbJ0y5OeNwzXdYMWiQRc,193507
+akshare/__init__.py,sha256=bdPm47zcxa1kgLQA3Y69ji4lV4wLR3qsSYlstRAMq8A,193600
 akshare/datasets.py,sha256=rKuRNZrqi6IMsZ9nyvO3Rx02js0tH3zMLjz8HQNAoPQ,963
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -162,7 +162,7 @@ akshare/index/index_cons.py,sha256=exCYkXauu3u_liWS5Y0W89F19eSwt6gJmlBciM86txQ,7
 akshare/index/index_cx.py,sha256=aAmsIKkswKFNOhAsW0QOhp-q6q1aFOSBtqcDaZhIh6A,16775
 akshare/index/index_drewry.py,sha256=BM7V6P8K4QUFQArsdaWRu5qJUZaCoyNz97_b8dmLeCw,2937
 akshare/index/index_eri.py,sha256=N1yP2_n04WCIJ_vdPb7w5xdSNMIdomqgZ43Wg69hzts,2112
-akshare/index/index_global_em.py,sha256=NoLGd-fATpYGH9xRL-PJk2xjg9rw3aPHzbqyb_2qDP8,5912
+akshare/index/index_global_em.py,sha256=UNYBCpO-sD16RKgSmaEDE4IXVLMgKL9SKiv_mSxiQ_0,5912
 akshare/index/index_global_sina.py,sha256=fFJeW-u6Jo1iiuRMVaGJaUZBUA6wUT0L0u6KT3vkJ4I,2494
 akshare/index/index_hog.py,sha256=kb867BVagt70_ycZMn22ks5Z9jlVbMiuTsvq5ygjeig,1657
 akshare/index/index_kq_fz.py,sha256=7RoRYptw5pwKzkfE94qLlhUkK_fXQzwm7G6o6vPk7jM,3376
@@ -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=rDtKK_dF8CiJAmJkdbdD6ryju17UwMO5clAO54Wcqx4,26899
+akshare/option/option_commodity.py,sha256=7KCJ9QScHgdVzX76GF5io32RPTeVmjg8-XwisKT9LnM,27238
 akshare/option/option_commodity_sina.py,sha256=NN2qywfGZphKlHiEuwU7_3aNXTEKaXH0UrU8xLIQ5XQ,7731
 akshare/option/option_czce.py,sha256=TxmLZn6hxjZa8TyEpwhZazL2m5XbympRHaRjJw1q7lk,2509
 akshare/option/option_daily_stats_sse_szse.py,sha256=Igqi2IPX_1UT2qgIsPDJtSZ660TjvHy9twn_q7Vrodw,4932
@@ -394,10 +394,10 @@ akshare/utils/func.py,sha256=4cwmXFztU86yJNONJ40KJLvsIEQHBbct4iMm3zT2v30,2315
 akshare/utils/multi_decrypt.py,sha256=aWoL2iEPeuXHJg8-n7OtMKixLnIhfzepACgxfrfmQB4,1657
 akshare/utils/token_process.py,sha256=nGtgnZGRprXJkhLXH8mcUH4TgIFwzsTOb0EaEPa0Euo,667
 akshare/utils/tqdm.py,sha256=MuPNwcswkOGjwWQOMWXi9ZvQ_RmW4obCWRj2i7HM7FE,847
-akshare-1.16.80.dist-info/licenses/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.16.82.dist-info/licenses/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
 tests/__init__.py,sha256=gNzhlO0UPjFq6Ieb38kaVIODXv4cTDByrdohAZnDYt4,82
 tests/test_func.py,sha256=j1MGYbZI2if2j_LY1S4FLsf4qfq4NwVqD5wmRlv5Log,832
-akshare-1.16.80.dist-info/METADATA,sha256=uxPrnJshHncFOmLs6T0BXdrpGA8CdDJjikWbokURvbw,11902
-akshare-1.16.80.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-akshare-1.16.80.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.16.80.dist-info/RECORD,,
+akshare-1.16.82.dist-info/METADATA,sha256=0Qn7NiqPLLsqCnRX1l3icy5rEgeuHOJ62vk6VAu3qJk,11902
+akshare-1.16.82.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+akshare-1.16.82.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.16.82.dist-info/RECORD,,

{akshare-1.16.80.dist-info → akshare-1.16.82.dist-info}/WHEEL

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