siat 2.12.1__py3-none-any.whl → 2.12.2__py3-none-any.whl

siat/option_china.py

@@ -475,7 +475,7 @@ def option_fin_china(detail=False):
         print(lead_blanks,"标的证券：华夏上证50ETF基金（510050.SS）")
         print(lead_blanks,"行权价格：9个（1个平值合约、4个虚值合约、4个实值合约）")
         print(lead_blanks,"合约单位：10000份，1手期权=10000份基金，实物交割")
-        print(lead_blanks,"合约交易代码：xCyMz，xPyMz，x-标的代码，y-到期年月，z-行权指数点位")
+        print(lead_blanks,"合约交易代码：xCyMz，xPyMz，x-标的代码，y-到期年月，z-基金行权价")
         print(lead_blanks,"上市日期：2015-2-9")
         print(lead_blanks,"到期月份：当月、下月及随后两个季月（季度末月）")
         print(lead_blanks,"到期日期：到期月份的第四个星期三（节假日顺延）")
@@ -490,7 +490,7 @@ def option_fin_china(detail=False):
         print(lead_blanks,"上市日期：2023-6-5")
         print(lead_blanks,"行权价格：9个（1个平值合约、4个虚值合约、4个实值合约）")
         print(lead_blanks,"合约单位：10000份，1手期权=10000份基金，实物交割")
-        print(lead_blanks,"合约交易代码：xCyMz，xPyMz，x-标的代码，y-到期年月，z-行权指数点位")
+        print(lead_blanks,"合约交易代码：xCyMz，xPyMz，x-标的代码，y-到期年月，z-基金行权价")
         print(lead_blanks,"到期月份：当月、下月及随后两个季月（季度末月）")
         print(lead_blanks,"到期日期：到期月份的第四个星期三（节假日顺延）")
         print(lead_blanks,"交易所  ：上海证券交易所")  
@@ -504,7 +504,7 @@ def option_fin_china(detail=False):
         print(lead_blanks,"上市日期：2023-6-5")
         print(lead_blanks,"行权价格：9个（1个平值合约、4个虚值合约、4个实值合约）")
         print(lead_blanks,"合约单位：10000份，1手期权=10000份基金，实物交割")
-        print(lead_blanks,"合约交易代码：xCyMz，xPyMz，x-标的代码，y-到期年月，z-行权指数点位")
+        print(lead_blanks,"合约交易代码：xCyMz，xPyMz，x-标的代码，y-到期年月，z-基金行权价")
         print(lead_blanks,"到期月份：当月、下月及随后两个季月（季度末月）")
         print(lead_blanks,"到期日期：到期月份的第四个星期三（节假日顺延）")
         print(lead_blanks,"交易所  ：上海证券交易所") 
@@ -518,7 +518,7 @@ def option_fin_china(detail=False):
         print(lead_blanks,"上市日期：2019-12-23")
         print(lead_blanks,"行权价格：9个（1个平值合约、4个虚值合约、4个实值合约）")
         print(lead_blanks,"合约单位：10000份，1手期权=10000份基金，实物交割")
-        print(lead_blanks,"合约交易代码：xCyMz，xPyMz，x-标的代码，y-到期年月，z-行权指数点位")
+        print(lead_blanks,"合约交易代码：xCyMz，xPyMz，x-标的代码，y-到期年月，z-基金行权价")
         print(lead_blanks,"到期月份：当月、下月及随后两个季月（季度末月）")
         print(lead_blanks,"到期日期：到期月份的第四个星期三（节假日顺延）")
         print(lead_blanks,"交易所  ：上海证券交易所")   
@@ -532,7 +532,7 @@ def option_fin_china(detail=False):
         print(lead_blanks,"上市日期：2022-9-19")
         print(lead_blanks,"行权价格：9个（1个平值合约、4个虚值合约、4个实值合约）")
         print(lead_blanks,"合约单位：10000份，1手期权=10000份基金，实物交割")
-        print(lead_blanks,"合约交易代码：xCyMz，xPyMz，x-标的代码，y-到期年月，z-行权指数点位")
+        print(lead_blanks,"合约交易代码：xCyMz，xPyMz，x-标的代码，y-到期年月，z-基金行权价")
         print(lead_blanks,"到期月份：当月、下月及随后两个季月（季度末月）")
         print(lead_blanks,"到期日期：到期月份的第四个星期三（节假日顺延）")
         print(lead_blanks,"交易所  ：上海证券交易所")  
@@ -549,7 +549,7 @@ def option_fin_china(detail=False):
         print(lead_blanks,"行权价格：9个（1个平值合约、4个虚值合约、4个实值合约）")
         print(lead_blanks,"合约单位：10000份，1手期权=10000份基金，实物交割")
         print(lead_blanks,"合约编码：9000xxxx，后4位为合约序号")
-        print(lead_blanks,"合约简称：x购y月z，x沽y月z，x-标的名称，y-到期月，z-行权指数点位")
+        print(lead_blanks,"合约简称：x购y月z，x沽y月z，x-标的名称，y-到期月，z-基金行权价")
         print(lead_blanks,"上市日期：2022-12-12")
         print(lead_blanks,"到期月份：当月、下月及随后两个季月（季度末月）")
         print(lead_blanks,"到期日期：到期月份的第四个星期三（节假日顺延）")
@@ -564,7 +564,7 @@ def option_fin_china(detail=False):
         print(lead_blanks,"行权价格：9个（1个平值合约、4个虚值合约、4个实值合约）")
         print(lead_blanks,"合约单位：10000份，1手期权=10000份基金，实物交割")
         print(lead_blanks,"合约编码：9000xxxx，后4位为合约序号")
-        print(lead_blanks,"合约简称：x购y月z，x沽y月z，x-标的名称，y-到期月，z-行权指数点位")
+        print(lead_blanks,"合约简称：x购y月z，x沽y月z，x-标的名称，y-到期月，z-基金行权价")
         print(lead_blanks,"上市日期：2022-9-19")
         print(lead_blanks,"到期月份：当月、下月及随后两个季月（季度末月）")
         print(lead_blanks,"到期日期：到期月份的第四个星期三（节假日顺延）")
@@ -580,7 +580,7 @@ def option_fin_china(detail=False):
         print(lead_blanks,"行权价格：9个（1个平值合约、4个虚值合约、4个实值合约）")
         print(lead_blanks,"合约单位：10000份，1手期权=10000份基金，实物交割")
         print(lead_blanks,"合约编码：9000xxxx，后4位为合约序号")
-        print(lead_blanks,"合约简称：x购y月z，x沽y月z，x-标的名称，y-到期月，z-行权指数点位")
+        print(lead_blanks,"合约简称：x购y月z，x沽y月z，x-标的名称，y-到期月，z-基金行权价")
         print(lead_blanks,"到期月份：当月、下月及随后两个季月（季度末月）")
         print(lead_blanks,"到期日期：到期月份的第四个星期三（节假日顺延）")
         print(lead_blanks,"交易所  ：深圳证券交易所")
@@ -595,7 +595,7 @@ def option_fin_china(detail=False):
         print(lead_blanks,"行权价格：9个（1个平值合约、4个虚值合约、4个实值合约）")
         print(lead_blanks,"合约单位：10000份，1手期权=10000份基金，实物交割")
         print(lead_blanks,"合约编码：9000xxxx，后4位为合约序号")
-        print(lead_blanks,"合约简称：x购y月z，x沽y月z，x-标的名称，y-到期月，z-行权指数点位")
+        print(lead_blanks,"合约简称：x购y月z，x沽y月z，x-标的名称，y-到期月，z-基金行权价")
         print(lead_blanks,"上市日期：2022-9-19")
         print(lead_blanks,"到期月份：当月、下月及随后两个季月（季度末月）")
         print(lead_blanks,"到期日期：到期月份的第四个星期三（节假日顺延）")
@@ -611,7 +611,7 @@ def option_fin_china(detail=False):
         print(lead_blanks,"标的证券：上证50指数（000016.SS）")
         print(lead_blanks,"上市日期：2022-12-19")
         print(lead_blanks,"合约乘数：现金交割，每点人民币100元")
-        print(lead_blanks,"交易代码：HO合约月份-C-行权价格，HO合约月份-P-行权价格")
+        print(lead_blanks,"交易代码：HO合约月份-C-行权股指点位，HO合约月份-P-行权股指点位")
         print(lead_blanks,"到期月份：当月、下2个月、随后3个季月（季度末月）")
         print(lead_blanks,"到期日期：到期月份的第三个星期五（节假日顺延）")
         print(lead_blanks,"交易所  ：中国金融期货交易所")          
@@ -623,7 +623,7 @@ def option_fin_china(detail=False):
         print(lead_blanks,"标的证券：沪深300指数（000300.SS，399300.SZ）")
         print(lead_blanks,"上市日期：2019-12-23")
         print(lead_blanks,"合约乘数：现金交割，每点人民币100元")
-        print(lead_blanks,"交易代码：IO合约月份-C-行权价格，IO合约月份-P-行权价格")
+        print(lead_blanks,"交易代码：IO合约月份-C-行权股指点位，IO合约月份-P-行权股指点位")
         print(lead_blanks,"到期月份：当月、下2个月、随后3个季月（季度末月）")
         print(lead_blanks,"到期日期：到期月份的第三个星期五（节假日顺延）")
         print(lead_blanks,"交易所  ：中国金融期货交易所") 
@@ -635,7 +635,7 @@ def option_fin_china(detail=False):
         print(lead_blanks,"标的证券：中证1000指数（000852.SS）")
         print(lead_blanks,"上市日期：2022-7-22")
         print(lead_blanks,"合约乘数：现金交割，每点人民币100元")
-        print(lead_blanks,"交易代码：MO合约月份-C-行权价格，MO合约月份-P-行权价格")
+        print(lead_blanks,"交易代码：MO合约月份-C-行权股指点位，MO合约月份-P-行权股指点位")
         print(lead_blanks,"到期月份：当月、下2个月、随后3个季月（季度末月）")
         print(lead_blanks,"到期日期：到期月份的第三个星期五（节假日顺延）")
         print(lead_blanks,"交易所  ：中国金融期货交易所")   
@@ -1626,7 +1626,16 @@ def index_option_price_china2(option,contract, \
     功能：绘制期权合约与其标的证券价格的双轴对照图，支持中金所三种股指期权
     """
     #获取期权合约的历史行情
-    df1=get_price_option_fin_china(option,contract)
+    if not (option in option_fin_list_cffe):
+        print("  #Warning(index_option_price_china2): currently only support:",option_fin_list_cffe)
+        return None,None
+    
+    try:
+        df1=get_price_option_fin_china(option,contract)
+    except:
+        print("  #Warning(index_option_price_china2): contract",contract,"unaccessible")
+        return None,None
+        
     start=df1['date'].values[0].strftime('%Y-%m-%d')
     end=df1['date'].values[-1].strftime('%Y-%m-%d')
     

{siat-2.12.1.dist-info → siat-2.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 2.12.1
+Version: 2.12.2
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, Business School, BFSU

{siat-2.12.1.dist-info → siat-2.12.2.dist-info}/RECORD

@@ -73,7 +73,7 @@ siat/markowitz_test2.py,sha256=FcVZqYU5va4567WGUVUJ7cMQdVbBGxeBAz82Y3BhCTI,2193
 siat/ml_cases.py,sha256=FYDk0O7l9hhHlbrlOVGgbH-h2DA503lhKFi9XugH1f0,86874
 siat/ml_cases_example.py,sha256=xRGb3YTQEDTOnaWNzZN_myU5umQnA2RdMNiPrxTmn9c,1673
 siat/ml_cases_example1.py,sha256=xRGb3YTQEDTOnaWNzZN_myU5umQnA2RdMNiPrxTmn9c,1673
-siat/option_china.py,sha256=SlMShz7VrPhlBCdPlhucVJ0rAsX2K8FBhm9AMZWnsgA,112383
+siat/option_china.py,sha256=SZcO7xkAg1AbTYjobn4XxY7Id9UTKpwYJh8UhkkovX4,112725
 siat/option_china_test.py,sha256=UQ-YUHUjoGBQyanLcM-yzqeEIUQP_gCQIeT0W6rnUnA,16355
 siat/option_pricing.py,sha256=hTz0lD4Yoeq0jK4Kt38qKJC_iOz9a5qXC2OeXgnMmv8,70231
 siat/option_pricing_test.py,sha256=eeorV5Ja5vjlRXnP6fWJHetGU5Vb8SnLopkC6RV3GfA,2203
@@ -124,7 +124,7 @@ siat/valuation.py,sha256=3VKrO9b9xY9dOJGGuF0ZhytzB5d2pCx3kO3TtMml7mo,44025
 siat/valuation_china.py,sha256=oEQRrktJNHiOG1mJSQN1aSSQAQrwrg-ppIHyNVjMjNg,67603
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=zB_Skk_tmzIR15l6oAW3am4HBGVIG-eZ8gJhCdXZ8Qw,14859
-siat-2.12.1.dist-info/METADATA,sha256=q8nIQGb5SBa9xZknlCS7_vuSM37y3qmH2nuLDCKkJ4o,1378
-siat-2.12.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-2.12.1.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-2.12.1.dist-info/RECORD,,
+siat-2.12.2.dist-info/METADATA,sha256=nzT3EBKNNDxcBkSHFW_dR-q3f1GoL0w0HhTjy0Bpvz4,1378
+siat-2.12.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-2.12.2.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-2.12.2.dist-info/RECORD,,