akshare 1.16.57__py3-none-any.whl → 1.16.59__py3-none-any.whl

akshare/__init__.py

@@ -3066,9 +3066,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.16.55 fix: fix stock_zh_a_spot_em interface
 1.16.56 fix: fix stock_zh_a_daily interface
 1.16.57 fix: fix stock_market_pe_lg interface
+1.16.58 fix: fix stock_zh_a_spot interface
+1.16.59 fix: fix option_czce_hist interface
 """
 
-__version__ = "1.16.57"
+__version__ = "1.16.59"
 __author__ = "AKFamily"
 
 import sys

akshare/option/option_czce.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2021/7/21 14:22
+Date: 2025/3/22 16:30
 Desc: 郑州商品交易所-交易数据-历史行情下载-期权历史行情下载
 http://www.czce.com.cn/cn/jysj/lshqxz/H770319index_1.htm
 自 20200101 起，成交量、空盘量、成交额、行权量均为单边计算
@@ -12,7 +12,21 @@ http://www.czce.com.cn/cn/jysj/lshqxz/H770319index_1.htm
 "MA": "20191217"
 "RM": "20200116"
 "ZC": "20200630"
+"OI": "20220826"
+"PK": "20220826"
+"PX": "20230915"
+"SH": "20230915"
+"SA": "20231020"
+"PF": "20231020"
+"SM": "20231020"
+"SF": "20231020"
+"UR": "20231020"
+"AP": "20231020"
+"CJ": "20240621"
+"FG": "20240621"
+"PR": "20241227"
 """
+
 from io import StringIO
 import warnings
 
@@ -24,7 +38,9 @@ def option_czce_hist(symbol: str = "SR", year: str = "2021") -> pd.DataFrame:
     """
     郑州商品交易所-交易数据-历史行情下载-期权历史行情下载
     http://www.czce.com.cn/cn/jysj/lshqxz/H770319index_1.htm
-    :param symbol: choice of {"白糖": "SR", "棉花": "CF", "PTA": "TA", "甲醇": "MA", "菜籽粕": "RM", "动力煤": "ZC"}
+    :param symbol: choice of {"白糖": "SR", "棉花": "CF", "PTA": "TA", "甲醇": "MA", "菜籽粕": "RM",
+    "动力煤": "ZC", "菜籽油": "OI", "花生": "PK", "对二甲苯": "PX", "烧碱": "SH", "纯碱": "SA", "短纤": "PF",
+    "锰硅": "SM", "硅铁": "SF", "尿素": "UR", "苹果": "AP", "红枣": "CJ", "玻璃": "FG", "瓶片": "PR"}
     :type symbol: str
     :param year: 需要获取数据的年份, 注意品种的上市时间
     :type year: str
@@ -38,17 +54,29 @@ def option_czce_hist(symbol: str = "SR", year: str = "2021") -> pd.DataFrame:
         "MA": "2019",
         "RM": "2020",
         "ZC": "2020",
+        "OI": "2022",
+        "PK": "2022",
+        "PX": "2023",
+        "SH": "2023",
+        "SA": "2023",
+        "PF": "2023",
+        "SM": "2023",
+        "SF": "2023",
+        "UR": "2023",
+        "AP": "2023",
+        "CJ": "2024",
+        "FG": "2024",
+        "PR": "2024",
     }
     if int(symbol_year_dict[symbol]) > int(year):
         warnings.warn(f"{year} year, symbol {symbol} is not on trade")
-        return None
-    warnings.warn("正在下载中, 请稍等")
-    url = f'http://www.czce.com.cn/cn/DFSStaticFiles/Option/2021/OptionDataAllHistory/{symbol}OPTIONS{year}.txt'
+        return pd.DataFrame()
+    url = f"http://www.czce.com.cn/cn/DFSStaticFiles/Option/{year}/OptionDataAllHistory/{symbol}OPTIONS{year}.txt"
     r = requests.get(url)
     option_df = pd.read_table(StringIO(r.text), skiprows=1, sep="|", low_memory=False)
     return option_df
 
 
 if __name__ == "__main__":
-    option_czce_hist_df = option_czce_hist(symbol="ZC", year="2021")
+    option_czce_hist_df = option_czce_hist(symbol="RM", year="2025")
     print(option_czce_hist_df)

akshare/stock/stock_zh_a_sina.py

@@ -10,6 +10,7 @@ import json
 import re
 
 import pandas as pd
+import py_mini_racer
 import requests
 
 from akshare.stock.cons import (
@@ -23,7 +24,6 @@ from akshare.stock.cons import (
     zh_sina_a_stock_amount_url,
 )
 from akshare.utils import demjson
-from akshare.utils.multi_decrypt import execute_js_in_executor
 from akshare.utils.tqdm import get_tqdm
 
 
@@ -175,15 +175,13 @@ def stock_zh_a_daily(
         return _fq_factor(adjust.split("-")[0])
 
     r = requests.get(zh_sina_a_stock_hist_url.format(symbol))
-    # 使用示例
-    dict_list = execute_js_in_executor(
-        hk_js_decode,  # JS 代码
-        "call",  # 方法类型
-        "d",  # 函数名
-        r.text.split("=")[1].split(";")[0].replace('"', ""),  # 函数参数
-    )
+    js_code = py_mini_racer.MiniRacer()
+    js_code.eval(hk_js_decode)
+    dict_list = js_code.call(
+        "d", r.text.split("=")[1].split(";")[0].replace('"', "")
+    )  # 执行js解密代码
     data_df = pd.DataFrame(dict_list)
-    data_df.index = pd.to_datetime(data_df["date"], errors="coerce").dt.date
+    data_df.index = pd.to_datetime(data_df["date"]).dt.date
     del data_df["date"]
     try:
         del data_df["prevclose"]
@@ -346,13 +344,12 @@ def stock_zh_a_cdr_daily(
     :return: specific data
     :rtype: pandas.DataFrame
     """
-    r = requests.get(zh_sina_a_stock_hist_url.format(symbol))
-    dict_list = execute_js_in_executor(
-        hk_js_decode,  # JS 代码
-        "call",  # 方法类型
-        "d",  # 函数名
-        r.text.split("=")[1].split(";")[0].replace('"', ""),  # 函数参数
-    )
+    res = requests.get(zh_sina_a_stock_hist_url.format(symbol))
+    js_code = py_mini_racer.MiniRacer()
+    js_code.eval(hk_js_decode)
+    dict_list = js_code.call(
+        "d", res.text.split("=")[1].split(";")[0].replace('"', "")
+    )  # 执行js解密代码
     data_df = pd.DataFrame(dict_list)
     data_df.index = pd.to_datetime(data_df["date"])
     del data_df["date"]
@@ -397,10 +394,7 @@ def stock_zh_a_minute(
         data_json = json.loads(data_text.split("=(")[1].split(");")[0])
         temp_df = pd.DataFrame(data_json).iloc[:, :6]
     except:  # noqa: E722
-        url = (
-            f"https://quotes.sina.cn/cn/api/jsonp_v2.php/var%20_{symbol}_{period}_1658852984203="
-            f"/CN_MarketDataService.getKLineData"
-        )
+        url = f"https://quotes.sina.cn/cn/api/jsonp_v2.php/var%20_{symbol}_{period}_1658852984203=/CN_MarketDataService.getKLineData"
         params = {
             "symbol": symbol,
             "scale": period,

akshare/utils/multi_decrypt.py

@@ -1,3 +1,13 @@
+"""
+利用多进行执行 js 代码方案
+
+1. 未能解决 gevent 调用问题
+2. 导致 js 代码执行缓慢
+3. 该方案废弃，这里仅作参考
+
+同时发现 gevent 里面无法调用异步的接口
+"""
+
 import concurrent.futures
 
 

{akshare-1.16.57.dist-info → akshare-1.16.59.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=jzkG2puExLIua-1Q6qPR2FjRBi7wDNbs1PJd4PIH3NM,191765
+akshare/__init__.py,sha256=HEbv8G2scqyBqUsgEWkVoDdfIwIZ0hYB_d3y8J_g3W8,191852
 akshare/datasets.py,sha256=rKuRNZrqi6IMsZ9nyvO3Rx02js0tH3zMLjz8HQNAoPQ,963
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -197,7 +197,7 @@ akshare/option/cons.py,sha256=zTRZ62RFwOcAKfmso-7nZJtT3a8Dt1nQbNnEjSqgjpI,4811
 akshare/option/option_comm_qihuo.py,sha256=kjbdp-94KJJJi1ex5U03abtlgviqwP0Aahb6FwddPkk,3128
 akshare/option/option_commodity.py,sha256=KQ690k83wKnjYN5Sf3meLx0pvEYAc5dE2tOkv3AK3dk,26758
 akshare/option/option_commodity_sina.py,sha256=r6qK_K7w3A6Uqp5ZtBb4pW7vH04oMyeCEZLLGqi0jpA,7776
-akshare/option/option_czce.py,sha256=L4i7TVKcOns5ZKoqq-mrSykdx3SGwu6OL4eI77-A_lc,1812
+akshare/option/option_czce.py,sha256=TxmLZn6hxjZa8TyEpwhZazL2m5XbympRHaRjJw1q7lk,2509
 akshare/option/option_daily_stats_sse_szse.py,sha256=Ip_vE81qbEGt4ocbtWfUT7XGu0HWU0zKkzauZeq9RJA,4962
 akshare/option/option_em.py,sha256=SV_pBGDE4rer1wZ3wsBsfjtOIIudBAHPuk6_5kPAPBc,5860
 akshare/option/option_finance.py,sha256=7rnEeHo-7Sddrs36Q4c99CXL_9m8IJzw9S1Aqh3Bw90,12568
@@ -281,7 +281,7 @@ akshare/stock/stock_us_pink.py,sha256=BX7-tG4Zs0k2vSYGxHH0Yob-moD6AAu2a-ytZpxgIR
 akshare/stock/stock_us_sina.py,sha256=D4fhJgpmvnlVoeSV2wQQ7H6lig8h6vaJp71o88dZhDg,8200
 akshare/stock/stock_weibo_nlp.py,sha256=eM7ofsNSrKiYeS0g38Qj9CxT6dkJZrn_pmziIiTqp4U,3286
 akshare/stock/stock_xq.py,sha256=mPBVg2zA4XkTVAUXeZx8c3nzchm4D1AaMBbC-g87yLQ,4641
-akshare/stock/stock_zh_a_sina.py,sha256=VrtDVSp_7S82H2RB8CD7CkDt8tBZeLhVUfRteWkva-4,19061
+akshare/stock/stock_zh_a_sina.py,sha256=-LbBNkqs2i_AAJ77PylfgXRK26pjResCHfM35_n-7G8,18907
 akshare/stock/stock_zh_a_special.py,sha256=VInvKbA6u_hJjjUKj7I5pG9rqt3kSZzJrZNfVs2Fqas,10169
 akshare/stock/stock_zh_a_tick_tx.py,sha256=TJUAWLKAeoLEaVVJQlj0t-1smZGoAO0X0rPsUPVhZZ4,2131
 akshare/stock/stock_zh_ah_tx.py,sha256=1DfvP1xF9G4jDnqlacZiYIMWZBujxW9Kycre3yr6MhM,9212
@@ -387,13 +387,13 @@ akshare/utils/cons.py,sha256=PFZndkG3lMW1Qhg-wqcZmSowFXwQUsYYCLZT4s1Xkwc,225
 akshare/utils/context.py,sha256=Hl4kPUzQ1CecRzu5JvTKpTpiMLfzAzYzG7F5hktlsCQ,934
 akshare/utils/demjson.py,sha256=xW2z0UGS2zzyH_dzhd765ZveuXRbfjkM7KBiI8H5fJA,241609
 akshare/utils/func.py,sha256=4cwmXFztU86yJNONJ40KJLvsIEQHBbct4iMm3zT2v30,2315
-akshare/utils/multi_decrypt.py,sha256=0GDWfnMTd71ncLR_YqmgAcP6vfOLRBNI_O8M1OeJUmI,1446
+akshare/utils/multi_decrypt.py,sha256=aWoL2iEPeuXHJg8-n7OtMKixLnIhfzepACgxfrfmQB4,1657
 akshare/utils/token_process.py,sha256=K4rGXjh_tgugbRcyOK2h2x0jP3PT65IIK7nxhUKhOeQ,666
 akshare/utils/tqdm.py,sha256=MuPNwcswkOGjwWQOMWXi9ZvQ_RmW4obCWRj2i7HM7FE,847
-akshare-1.16.57.dist-info/licenses/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.16.59.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.57.dist-info/METADATA,sha256=vyKla8HWa_fe6sj2EYRCkAiKkGV4gMQroJOUJTMcQ9I,13767
-akshare-1.16.57.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
-akshare-1.16.57.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.16.57.dist-info/RECORD,,
+akshare-1.16.59.dist-info/METADATA,sha256=xHAVn1deyr5CGklutnkGXcrEpQL4mZICtpHUqnO_NeA,13767
+akshare-1.16.59.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+akshare-1.16.59.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.16.59.dist-info/RECORD,,

{akshare-1.16.57.dist-info → akshare-1.16.59.dist-info}/WHEEL

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