siat 3.7.6__py3-none-any.whl → 3.7.7__py3-none-any.whl

siat/__init__.py

@@ -10,42 +10,64 @@
 #屏蔽所有警告性信息
 import warnings; warnings.filterwarnings('ignore')
 #==============================================================================
-from siat.allin import *
-#==============================================================================
-#同一命令行多个输出，主要用于Jupyter Notebook
-from IPython.core.interactiveshell import InteractiveShell
-InteractiveShell.ast_node_interactivity='all'
-#==============================================================================
-# 检查是否存在新版本
-check_newer_version=False
-
 try:
-    import pkg_resources
-    current_version=pkg_resources.get_distribution("siat").version
-    current_list=current_version.split('.')
-    print("Successfully enabled siat version",current_version)
+    from siat.allin import *
+    success=True
+except:
+    print("  #Warning: failed to enable siat!")
+    import sys; version=sys.version
+    version_list=version.split('|')
+    python_version=version_list[0].strip()
+    python_version_list=python_version.split('.')
+    python_version2="{0}.{1}".format(python_version_list[0],python_version_list[1])
+    
+    if python_version2 < '3.11':
+        print("  Solution: your Python version is {0}, suggest upgrade to {1} or above".format(python_version2,'3.11'))
+    elif python_version2 < '3.12':
+        print("  Solution: your Python version is {0}, suggest upgrade to {1} or above".format(python_version2,'3.12'))
+    else:
+        print("  Solution: your Python version is {}, suggest upgrade to the newest one".format(python_version2))
+    
+    success=False
 
-    if check_newer_version:
-        import luddite
-        latest_version=luddite.get_version_pypi("siat")
-        latest_list=latest_version.split('.')
-        
-        newest=True
-        for i in range(3):
-            #print(i)
-            if int(current_list[i]) < int(latest_list[i]):
-                newest=False
-        
-        if not newest:
-            #print("The latest version of siat is",latest_version,'\n')
-            print("There is a newer version of siat",latest_version,'\n')
-            print("*** How to upgrade siat?")
-            print("Upgrade from official website? Command: upgrade_siat()")
-            print("Upgrade from Tsinghua? Command: upgrade_siat(alternative='tsinghua')")
-            print("Upgrade from Alibaba? Command: upgrade_siat(alternative='alibaba')")
+if success:
+    #==============================================================================
+    #同一命令行多个输出，主要用于Jupyter Notebook
+    from IPython.core.interactiveshell import InteractiveShell
+    InteractiveShell.ast_node_interactivity='all'
+    #==============================================================================
+    # 检查是否存在新版本
+    check_newer_version=False
     
-except:
-    pass
+    try:
+        import pkg_resources
+        current_version=pkg_resources.get_distribution("siat").version
+        current_list=current_version.split('.')
+        print("Successfully enabled siat version",current_version)
+    
+        if check_newer_version:
+            import luddite
+            latest_version=luddite.get_version_pypi("siat")
+            latest_list=latest_version.split('.')
+            
+            newest=True
+            for i in range(3):
+                #print(i)
+                if int(current_list[i]) < int(latest_list[i]):
+                    newest=False
+            
+            if not newest:
+                #print("The latest version of siat is",latest_version,'\n')
+                print("There is a newer version of siat",latest_version,'\n')
+                print("*** How to upgrade siat?")
+                print("Upgrade from official website? Command: upgrade_siat()")
+                print("Upgrade from Tsinghua? Command: upgrade_siat(alternative='tsinghua')")
+                print("Upgrade from Alibaba? Command: upgrade_siat(alternative='alibaba')")
+        
+    except:
+        print("  #Warning: plugin went unexpected with either {0} or {1}".format("pkg_resources","luddite"))
+        print("  Solution: please re-run. If problem remains, contact the author of siat for help")
+        #pass
     
 
 #==============================================================================

siat/markowitz2.py

@@ -961,27 +961,27 @@ def portfolio_ranks_cn(portfolio_returns,pname,facecolor='papayawhip'):
                          "风险排名":text_lang("风险排名","Risk#"), \
                          "年化标准差%":text_lang("年化标准差%","pa Std%"), \
                          "标准差变化":text_lang("标准差变化","Std%+/-"), \
-                         "收益率/标准差":text_lang("收益率/标准差","Return/Std")}, \
+                         "收益率/标准差":text_lang("收益/风险性价比","Return/Std")}, \
                 inplace=True)
     
     #重新排名：相同的值赋予相同的序号
-    prr2["pa Return%"]=prr2["pa Return%"].apply(lambda x: round(float(x),ndecimals))
-    prr2["Return#"]=prr2["pa Return%"].rank(ascending=False,method='dense')
-    prr2["Return#"]=prr2["Return#"].apply(lambda x: int(x))
+    prr2[text_lang("年化收益率%","pa Return%")]=prr2[text_lang("年化收益率%","pa Return%")].apply(lambda x: round(float(x),ndecimals))
+    prr2[text_lang("收益排名","Return#")]=prr2[text_lang("年化收益率%","pa Return%")].rank(ascending=False,method='dense')
+    prr2[text_lang("收益排名","Return#")]=prr2[text_lang("收益排名","Return#")].apply(lambda x: int(x))
     
-    prr2["pa Std%"]=prr2["pa Std%"].apply(lambda x: round(float(x),ndecimals))
-    prr2["Risk#"]=prr2["pa Std%"].rank(ascending=False,method='dense')
-    prr2["Risk#"]=prr2["Risk#"].apply(lambda x: int(x))
+    prr2[text_lang("年化标准差%","pa Std%")]=prr2[text_lang("年化标准差%","pa Std%")].apply(lambda x: round(float(x),ndecimals))
+    prr2[text_lang("风险排名","Risk#")]=prr2[text_lang("年化标准差%","pa Std%")].rank(ascending=False,method='dense')
+    prr2[text_lang("风险排名","Risk#")]=prr2[text_lang("风险排名","Risk#")].apply(lambda x: int(x))
     
-    prr2["Return/Std"]=prr2["Return/Std"].apply(lambda x: round(float(x),ndecimals))
-    prr2["Ret/Std#"]=prr2["Return/Std"].rank(ascending=False,method='dense')
-    prr2["Ret/Std#"]=prr2["Ret/Std#"].apply(lambda x: int(x))
+    prr2[text_lang("收益/风险性价比","Return/Std")]=prr2[text_lang("收益/风险性价比","Return/Std")].apply(lambda x: round(float(x),ndecimals))
+    prr2[text_lang("性价比排名","Ret/Std#")]=prr2[text_lang("收益/风险性价比","Return/Std")].rank(ascending=False,method='dense')
+    prr2[text_lang("性价比排名","Ret/Std#")]=prr2[text_lang("性价比排名","Ret/Std#")].apply(lambda x: int(x))
     
     df_display_CSS(prr2,titletxt=titletxt,footnote='',facecolor='papayawhip',decimals=ndecimals, \
                        first_col_align='left',second_col_align='center', \
                        last_col_align='center',other_col_align='center', \
-                       titile_font_size='15px',heading_font_size='14px', \
-                       data_font_size='14px')
+                       titile_font_size='15px',heading_font_size='13px', \
+                       data_font_size='13px')
     
     """
     print(' ') #空一行

siat/security_prices.py

@@ -2211,8 +2211,16 @@ if __name__ =="__main__":
     portfolio={'Market':('US','^GSPC'),'AAPL':1}
     portfolio={'Market':('China','^HSI'),'0823.HK':1.0}
     portfolio={'Market':('China','000001.SS'),'000661.SZ':2,'603392.SS':3,'300601.SZ':4}
+    
     fromdate='2019-7-19'
     todate='2020-7-20'
+    
+    market={"Market":("China","000300.SS","我的地产组合")}
+    stocks1={"600048.SS":.4,"001979":.3}
+    stocks2={"600515.SS":.2,"600895":.1}
+    portfolio=dict(market,**stocks1,**stocks2)
+    
+    fromdate="2024-1-1"; todate="2024-11-25"
     adj=False
     source='auto'
     

{siat-3.7.6.dist-info → siat-3.7.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.7.6
+Version: 3.7.7
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University

{siat-3.7.6.dist-info → siat-3.7.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 siat/__init__ -20240701.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
-siat/__init__.py,sha256=sJP_LlLfNAssg5ZCPxxkVMi2v6h5x3WcSco3KBN5CsE,2040
+siat/__init__.py,sha256=pIo4CV3lNPKIhitmhIh_6aAfZrmzQWGNDcEnvZ7GXoc,3216
 siat/allin.py,sha256=JLuxVmxtlOTDelnfulK6rPoFTIhzTNe5_GShXCiKGZY,2904
 siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
 siat/assets_liquidity.py,sha256=o_UZdLs693uNWPEQB2OzxDH0mdWimOmq4qe_vx1pue0,28987
@@ -70,7 +70,7 @@ siat/luchy_draw.py,sha256=8Ue-NKnvSVqINPY1eXat0NJat5MR-gex_K62aOYFdmA,20486
 siat/market_china.py,sha256=fQjAFyu4JAqtVA8I1QYfzv0fmYhLP3zoNe5Ftk63qgM,50724
 siat/markowitz.py,sha256=DsfS6vG9TAfdJP4GgN-CCArujPi84XjD23CWbxaA2o4,97627
 siat/markowitz2-20240620.py,sha256=irZAPnjaatFsKQmFRMENP-cO6bEUl2narYtkU5NKTWI,108019
-siat/markowitz2.py,sha256=LK2pDEtE5PUmBtCHmCcRs8FlPqZKmhFXiuLIL4JeQa8,121991
+siat/markowitz2.py,sha256=s7-E43VskzSsPpZXQVBe3VTR1AM81EDIn_uVZn3mLpw,122525
 siat/markowitz_ccb_test.py,sha256=xBkkoaNHdq9KSUrNuHGgKTdNYUvgi84kNYcf719eoyE,1593
 siat/markowitz_ef_test.py,sha256=wjNlICkgRIqnonPeSIHo4Mu2GRtb9dr21wDt2kMNEcI,4032
 siat/markowitz_old.py,sha256=Lf7O_4QWT8RsdkHiUyc_7kKY3eZjKDtFR89Fz3pwYnY,33046
@@ -99,7 +99,7 @@ siat/sector_china.py,sha256=Mxx5Zd5qvhLdwutedwoPRoXlAopTsPww4rRhOgpRmb8,150762
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=FkX-EeqS5Gqm2kIKnDqrqSk_nvG3BbL3Eu4eEmw1OEY,26379
-siat/security_prices.py,sha256=Zhn6pvwLy996mbBHDorbqWQdQw9RHdr9m0yzke3ya8M,108597
+siat/security_prices.py,sha256=i_4ZA7sRb9gMRVOgTT-XxQ1Jrz9eHDjZznsoXPDhh0Y,108859
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmWBPk,24854
@@ -141,8 +141,8 @@ siat/valuation_china.py,sha256=CVp1IwIsF3Om0J29RGkyxZLt4n9Ug-ua_RKhLwL9fUQ,69624
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=r0Q67cSMMlfebEkI9h9pdGlJCooEq7hw_3M5IUs4cSI,20081
-siat-3.7.6.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.7.6.dist-info/METADATA,sha256=VBhwM1YCtzZwZbd51whrNXU_MA7CNw_-4bi2xzjDo5k,8009
-siat-3.7.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.7.6.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.7.6.dist-info/RECORD,,
+siat-3.7.7.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.7.7.dist-info/METADATA,sha256=4VE1VSyUItSI2OgG2CW5PSJ4PS7C9xZRhSt8TizioV8,8009
+siat-3.7.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.7.7.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.7.7.dist-info/RECORD,,