siat 3.10.131__py3-none-any.whl → 3.10.133__py3-none-any.whl

siat/security_prices.py

@@ -571,7 +571,45 @@ if __name__=='__main__':
     
     #有问题
     cvt_stooq_ticker('002504.SZ')
-#==================================================================================
+#==============================================================================
+if __name__=='__main__':
+    ticker='1YCNY.B'
+    
+    market_RF("1YCNY.B")
+    
+def market_RF(ticker='1YCNY.B',start='MRW',end='today',printout=True):
+    """
+    功能：获取一个经济体市场的无风险收益率，以国债收益率替代。
+        默认1年期国债收益率最近一周的均值    
+    """
+    start,end=start_end_preprocess(start,end)
+    
+    #屏蔽函数内print信息输出的类
+    import os, sys
+    class HiddenPrints:
+        def __enter__(self):
+            self._original_stdout = sys.stdout
+            sys.stdout = open(os.devnull, 'w')
+
+        def __exit__(self, exc_type, exc_val, exc_tb):
+            sys.stdout.close()
+            sys.stdout = self._original_stdout
+
+    with HiddenPrints():    
+        RFdf=get_price_stooq(ticker,start=start,end=end)
+
+    if RFdf is None:
+        print(f"  #Error(market_RF): yield {ticker} not found or unavailable in the period")
+        return None
+    
+    RF=round(RFdf['Close'].mean()/100,6)
+
+    if printout:
+        print(f"  {round(RF*100,4)}% in average from {start} to {end}")
+
+    return RF
+
+#==============================================================================
 
 if __name__=='__main__':
     ticker='AAPL'
@@ -604,10 +642,12 @@ if __name__=='__main__':
     
     p=get_price_stooq(ticker,start,end)
 
-def get_price_stooq(ticker,start,end):
+def get_price_stooq(ticker,start='MRM',end='today'):
     """
     从stooq抓取单个股价
     """
+    start,end=start_end_preprocess(start,end)
+    
     #转换证券代码
     ticker2=cvt_stooq_ticker(ticker)
     

siat/security_trend2.py

@@ -466,7 +466,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
                               facecolor=facecolor)
         return df
     
-    # 情形2：单个证券，两个普通指标，twinx==True =================================
+    # 情形2：单个证券，两个普通指标，twinx==True/UD/LR ===========================
     if ticker_num==1 and indicator_num == 2 and indicator_group1 and twinx:
         if DEBUG:
             print("Scenario 2: ticker_num==1 and indicator_num == 2 and indicator_group1 and twinx")

siat/stock.py

@@ -660,8 +660,8 @@ if __name__ =="__main__":
     
     df=security_indicator(ticker,indicator,fromdate,todate,ticker_type=ticker_type)
 
-def security_indicator(ticker,indicator, \
-                       fromdate,todate,adjust='', \
+def security_indicator(ticker,indicator='Close', \
+                       fromdate='MRM',todate='today',adjust='', \
                        zeroline=False, \
                            attention_value='',attention_value_area='', \
                            attention_point='',attention_point_area='', \
@@ -673,6 +673,8 @@ def security_indicator(ticker,indicator, \
     """
     功能：单只证券的全部指标
     """
+    fromdate,todate=start_end_preprocess(fromdate,todate)
+    
     #判断复权价
     adjust_list=['','qfq','hfq']
     if adjust not in adjust_list:

siat/translate.py

@@ -1968,7 +1968,7 @@ def codetranslate1(code):
         
         #股票：指数==============================================================
         ['000300.SS','CSI300 Index'],['399300.SS','CSI300 Index'],
-        ['000001.SS','SSE Composite Index'],['399001.SZ','SZE Component Index'],
+        ['000001.SS','SSE Composite Index'],['399001.SZ','SZSE Component Index'],
         ['000016.SS','SSE50 Index'],['000132.SS','SSE100 Index'],
         ['000133.SS','SSE150 Index'],['000010.SS','SSE180 Index'],
         ['000688.SS','STAR50 Index'],['000043.SS','SSE Supercap Index'],
@@ -1997,15 +1997,15 @@ def codetranslate1(code):
         ['S41.SI','Hong Leong Finance(SG)'],
         
         ['000002.SS','SSE A Index'],['000003.SS','SSE B Index'],
-        ['399107.SZ','SZE A Index'],['399108.SZ','SZE B Index'],
-        ['399106.SZ','SZE Composite Index'],['399004.SZ','SZE100 Index'],
+        ['399107.SZ','SZSE A Index'],['399108.SZ','SZSE B Index'],
+        ['399106.SZ','SZSE Composite Index'],['399004.SZ','SZSE100 Index'],
         ['399012.SZ','GEM300 Index'],
         
-        ['399232.SZ','SZE Mining Index'],['399233.SZ','SZE Manufacturing Index'],
-        ['399234.SZ','SZE Utility Index'],['399236.SZ','SZE Commercial Index'],
-        ['399237.SZ','SZE Logistics Index'],['399240.SZ','SZE Financial Index'],
-        ['399241.SZ','SZE Realestate Index'],['399244.SZ','SZE EP Index'],
-        ['399991.SZ','SZE BRI Index'],['399997.SZ','CSI China Baijiu Index'],
+        ['399232.SZ','SZSE Mining Index'],['399233.SZ','SZSE Manufacturing Index'],
+        ['399234.SZ','SZSE Utility Index'],['399236.SZ','SZSE Commercial Index'],
+        ['399237.SZ','SZSE Logistics Index'],['399240.SZ','SZSE Financial Index'],
+        ['399241.SZ','SZSE Realestate Index'],['399244.SZ','SZSE EP Index'],
+        ['399991.SZ','SZSE BRI Index'],['399997.SZ','CSI China Baijiu Index'],
         
         ['000903.SS','CSI100 Index'],['399903.SZ','CSI100 Index'],
         ['000904.SS','CSI200 Index'],['399904.SZ','CSI200 Index'],
@@ -2022,7 +2022,7 @@ def codetranslate1(code):
         ['002594.SZ','BYD Auto(A)'],['01211.HK','BYD Auto(HK)'],['81211.HK','BYD Auto(HK RMB)'],
         ['600941.SS','China Mobile'],['00941.HK','China Mobile (HK)'],['80941.HK','China Mobile (HK RMB)'],
         ['ULVR.UK','Unilever (UK)'],['605011.SS','Hangzou Power'],['000723.SZ','Meijin Energy'],
-        ['EL','Estee Lauder'],['LOR.DE','L\'Oreal(DE)'],
+        ['EL','Estée Lauder'],['LOR.DE','L\'Oreal(DE)'],
 
         ['^GSPC','S&P500 Index'],['^DJI','Dow Jones Index'],
         ['WISGP.SI','FTSE Singapore Index'], ['^STI','Straits Times Index'],
@@ -2074,8 +2074,8 @@ def codetranslate1(code):
         ['050111','博时信债C'],['320019','诺安货币B基金'],
         ['510580','Yifangda CSI500 ETF'],['510210.SS','SSE Composite Index ETF'],
         ["510050.SS",'Huaxia CSI50 ETF'],['510880.SS','SSE Dividend ETF'],
-        ["510180.SS",'SSE180 ETF'],['159901.SZ','SZE100 ETF'],
-        ["159902.SZ",'SZE SMB ETF'],['159901.SZ','SZE100 ETF'],
+        ["510180.SS",'SSE180 ETF'],['159901.SZ','SZSE100 ETF'],
+        ["159902.SZ",'SZSE SMB ETF'],['159901.SZ','SZSE100 ETF'],
         ["159919.SZ",'Jiashi CSI300 ETF'],["510300.SS",'Huaxia Borui CSI300 ETF'],
         
         ["004972",'长城收益宝货币A基金'],["004137",'博时合惠货币B基金'],

{siat-3.10.131.dist-info → siat-3.10.133.dist-info}/METADATA

@@ -1,11 +1,17 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.10.131
+Version: 3.10.133
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
-Author-email: wdehong2000@163.com
+Author-email: "Prof. WANG Dehong" <wdehong2000@163.com>
+Maintainer-email: "Prof. WANG Dehong" <wdehong2000@163.com>
 License: Copyright (C) WANG Dehong, 2025. For educational purpose only!
+Project-URL: Homepage, https://pypi.org/project/siat/
+Keywords: investment,finance,technical analysis,siat
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+Requires-Python: <3.13,>=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas-datareader
@@ -23,7 +29,6 @@ Requires-Dist: scipy
 Requires-Dist: pandas
 Requires-Dist: scikit-learn
 Requires-Dist: baostock
-Requires-Dist: pyproject.toml
 Requires-Dist: pathlib
 Requires-Dist: ruamel-yaml
 Requires-Dist: prettytable
@@ -38,11 +43,11 @@ Requires-Dist: translators
 Requires-Dist: nbconvert
 Requires-Dist: ipywidgets ==8.1.6
 Requires-Dist: yahooquery ==2.3.7
-Requires-Dist: lxml ==4.9.4
 Requires-Dist: alpha-vantage
 Requires-Dist: tiingo[pandas]
 Requires-Dist: numpy <2
 Requires-Dist: playwright
+Requires-Dist: lxml ==4.9.4
 
 
 # What is siat?
@@ -116,7 +121,7 @@ apple=security_technical("AAPL",
 
 ```python
 # security_technical2 supports up to 14 popular technical indicators.
-# security_technical2 uses a simplied drawing method (Dehong graph) to avoid trypophobia [藢tr瑟p蓹u'f蓹蕣bj蓹]
+# security_technical2 uses a simplied drawing method (Dehong graph) to avoid trypophobia [ˌtrɪpəu'fəʊbjə]
 apple=security_technical2("AAPL",
                          technical="CCI",
                          start="MRM",

{siat-3.10.131.dist-info → siat-3.10.133.dist-info}/RECORD

@@ -10,7 +10,7 @@ siat/bond_china.py,sha256=WzUhjYYk8tsr3BDWLQcpuj9DqNxTzBSIi_wuAOZ48kY,3082
 siat/bond_zh_sina.py,sha256=26BohGcS120utwqg9dJvdGm5OkuNpNu5bco80uOuQpU,4423
 siat/capm_beta.py,sha256=t8-xr90II0JzbjsTOZNpRze_mKTvBRXjwN2o0N0tgD8,30521
 siat/capm_beta2.py,sha256=4g8pOFCwFrEpLx2NJbhL2nl_nrWaOwgbPCHx1G6P_tI,35949
-siat/common.py,sha256=x2NeGGST15qG42oLo2R9r1LyZOPxMIMTnzjLe6z6rdc,188811
+siat/common.py,sha256=PctlUcwb7MheTR-Ync-4hYWjPidsT9LufEsZXNJqbjw,193728
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/copyrights.py,sha256=YMLjZb328YpFMR-s_GUu0HBgeGce3pV7DgRut8S3I7w,690
 siat/cryptocurrency.py,sha256=QSc4jK9VFlqBWVu-0th1BIMt8wC-5R5sWky3EaNupy0,27940
@@ -32,12 +32,14 @@ siat/fund_china.pickle,sha256=x_nPPdwy7wzIhtZQOplgDyTSyyUdXy9lbNxWysq7N6k,243777
 siat/fund_china.py,sha256=U7bN8mOJ_4RBkxRzrR26LSj4YJyMNpRjBtrZNUH8JI4,138286
 siat/future_china.py,sha256=LORFv7AaaQHq9QBk9ZSVVOjmxY_YWyPVRdpDxfCJvdo,17828
 siat/google_authenticator.py,sha256=ZUbZR8OW0IAKDbcYtlqGqIpZdERpFor9NccFELxg9yI,1637
-siat/grafix.py,sha256=HSCBSAvoYpP-WcuThvwiQ1--bba9_mtPu4y5X5WBk4A,145099
+siat/grafix.py,sha256=TvmbEAsdWKOJA5JK8xcwQz0vnoqq67AtGbRWbw-Vosk,145100
 siat/holding_risk.py,sha256=SCHVxRBEhseUrgMpsnvR9Pt6ns-V-voRl3hCuK1p5y4,31114
 siat/luchy_draw.py,sha256=8Ue-NKnvSVqINPY1eXat0NJat5MR-gex_K62aOYFdmA,20486
-siat/market_china.py,sha256=d8bHryhMJti5dqz7-XfuVgbOIoqo5dBg-UWz6-f82UE,51757
+siat/market_china.py,sha256=Ki9Kpq-fwA9F_uI_-0b2KS0ir1gkOwQfB5Yd_hCWSeg,51758
 siat/markowitz.py,sha256=PtQ_6rLyh5SEXyO7SCDyYChcgXl6ddcdgQ06HETjDVE,97990
-siat/markowitz2.py,sha256=wjmfvsFYXPz3nhnhDi7S9D_V6iCyXniquW2uvxgpe5c,125857
+siat/markowitz2.py,sha256=elpZr1nsALlrdxbMPT7pBREpA6I5P7TL6qpuLmMKPA8,133215
+siat/markowitz2_20250704.py,sha256=x10MfBaWZ42xcmDAbPU02oOZ4J02QDB1nyVKX8QobiA,126468
+siat/markowitz2_20250705.py,sha256=jwDhQUvr5fcjA7scYbI8bJo-5zFPE4LyUsnK-hlqz90,133997
 siat/markowitz_simple.py,sha256=aJVvx669ngcCsqoQtA9kvFOQVjsuipYt2fyTc4yMItE,14286
 siat/ml_cases.py,sha256=FYDk0O7l9hhHlbrlOVGgbH-h2DA503lhKFi9XugH1f0,86874
 siat/ml_cases_example.py,sha256=xRGb3YTQEDTOnaWNzZN_myU5umQnA2RdMNiPrxTmn9c,1673
@@ -50,10 +52,10 @@ siat/risk_evaluation.py,sha256=xfgLSKlIWYmRJrIL4kn2k2hp9fyOMAzYGIhi9ImvKOw,88917
 siat/risk_free_rate.py,sha256=IBuRqA2kppdZsW4D4fapW7vnM5HMEXOn95A5r9Pkwlo,12384
 siat/sector_china.py,sha256=uLsDXdRBDVfgG6tnXWnQOTyDmyZfglVO9DRUYU2e3pk,157914
 siat/security_price2.py,sha256=DDiZ2dlv_TYPLhA8-gGb9i9xrl88r4rgSMEcxqQ6aU0,28065
-siat/security_prices.py,sha256=8hDAzq7hmanuUC-sIV9NaedA47OMIbFQoHji19W32Ac,122899
+siat/security_prices.py,sha256=vbz85xjxMBFfipTcmF4ZnpOODnOKuEm4NfTKMi1C3OY,124171
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
-siat/security_trend2.py,sha256=HmUk1Va94qSbgo-WQw-n5DuwBVfO8yb1m9B-d9rEGd8,31762
-siat/stock.py,sha256=s7ny7He7vAIuF8xcWQKjc8VK_9_XuI9P4niobHX-5vw,161339
+siat/security_trend2.py,sha256=czagiFIU3A3ow_dMn_-xQYnzgSTOP5Ds38PtHC1uyP0,31762
+siat/stock.py,sha256=ufhC3CWfx6KEDgCSTSwplf1EAi8AIlKmy6kdkoBAkbE,161426
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=vHIc2UuXIGRkRvyL4fjTaNAoyFaq022p9FxPah6dscI,96399
@@ -64,13 +66,13 @@ siat/stock_profile.py,sha256=BuvdrQ3bqIAUCaM2GxPR6_rUhigQQa_YMeUov2zY6Y0,26084
 siat/stock_technical.py,sha256=1P4FkOTPknG2m18NTgwMxN-NgwIAdW3qR09VoFz00Hc,140928
 siat/stooq.py,sha256=TTLjAAp-TcoEezgCPu6eM_5naI4yCshp1S7V3pyc-og,2519
 siat/transaction.py,sha256=nZTYYkx1BVBLDovSlZCtcviRuFxrYe9YFXOMZgo6QXo,14563
-siat/translate.py,sha256=kQhCLVivJeKT05aHedYAZD-C0PKQ0Ux2Lwd0l9s94O4,263513
+siat/translate.py,sha256=6mHTT6sWo12TNYJMo7CYF9ysFa_tCAQd5ePci9Xv3YI,263531
 siat/valuation.py,sha256=xGizcKJZ3ADLWWHm2TFQub18FxiDv2doQwBwbEqyqz0,51980
 siat/valuation_china.py,sha256=eSKIDckyjG8QkENlW_OKkqbQHno8pzDcomBO9iGNJVM,83079
 siat/var_model_validation.py,sha256=loqziBYO2p0xkeWm3Rb1rJsDhbcgAZ5aR9rBLRwLU5E,17624
 siat/yf_name.py,sha256=laNKMTZ9hdenGX3IZ7G0a2RLBKEWtUQJFY9CWuk_fp8,24058
-siat-3.10.131.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.10.131.dist-info/METADATA,sha256=dn1zkJ9eec1lfHFwSuzpXGmJEBUfXtFHFB68R7iRnlY,8255
-siat-3.10.131.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.10.131.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.10.131.dist-info/RECORD,,
+siat-3.10.133.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.10.133.dist-info/METADATA,sha256=9y4HQxe8Jl1vjMqwkIDruTWGU6GMpHI49LDTHSeUW50,8538
+siat-3.10.133.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.10.133.dist-info/top_level.txt,sha256=X5R8wrVviq8agwJFVRVDsufkuOJuit-1qAT_kXeptrY,17
+siat-3.10.133.dist-info/RECORD,,

siat-3.10.133.dist-info/top_level.txt

@@ -0,0 +1,3 @@
+README
+dist
+siat

siat-3.10.131.dist-info/top_level.txt

@@ -1 +0,0 @@
-siat