siat 2.13.18__py3-none-any.whl → 2.13.21__py3-none-any.whl

siat/common.py

@@ -2294,6 +2294,7 @@ def sround(a,decimal=4):
 #==============================================================================
 if __name__=='__main__':
     file='stooq.py'
+    package='pandas_datareader'
 
 def fix_package(file='stooq.py',package='pandas_datareader'):
     """
@@ -2319,7 +2320,7 @@ def fix_package(file='stooq.py',package='pandas_datareader'):
         srcfile=srcpath1+'/'+file
     else:
         srcpath1=srcpath
-        srcfile=srcpath1+'\\'+file
+        srcfile=srcpath1+'/'+file
     
     #目标地址
     cmdstr1='import '+package
@@ -2334,7 +2335,7 @@ def fix_package(file='stooq.py',package='pandas_datareader'):
         objfile=objpath1+'/'+file
     else:
         objpath1=objpath
-        objfile=objpath1+'\\'+file
+        objfile=objpath1+'/'+file
     
     #复制文件
     from shutil import copyfile
@@ -2345,7 +2346,7 @@ def fix_package(file='stooq.py',package='pandas_datareader'):
         result=copyfile(srcfile,objfile)
     except IOError as e:
         print("  #Error(fix_package): Unable to copy file. %s" % e)
-        print("  Program failed becos of operating system permission denied.")
+        print("  Program failed most likely becos of incorrect source/target directories.")
         print("  Solution: manually copy the file",srcfile,"to the folder",objpath1)
         #exit(1)
     except:

siat/grafix.py

@@ -67,7 +67,8 @@ if czxt in ['linux']: #website Jupyter
 plt.rcParams['axes.unicode_minus'] = False 
 #==============================================================================
 def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
-              power=0,zeroline=False,resample_freq='H',loc='best', \
+              power=0,zeroline=False,average_value=False, \
+              resample_freq='H',loc='best', \
               date_range=False,date_freq=False,date_fmt='%Y-%m-%d'):
     """
     功能：绘制折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
@@ -112,8 +113,18 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
         ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
         plt.xticks(pd.date_range(date_start,date_end,freq=date_freq))
 
+    if ylabeltxt != '' or ylabeltxt == "stooq_MB":
+        collabel=''
+        if ylabeltxt == "stooq_MB":
+            ylabeltxt=''
+            
     plt.plot(df.index,df[colname],'-',label=collabel, \
              linestyle='-',color='blue', linewidth=2)
+        
+    haveLegend=True
+    if collabel == '':
+        haveLegend=False
+    
     #绘制数据标签
     if datatag:
         for x, y in zip(df.index, df[colname]):
@@ -136,18 +147,27 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     if isinstance(zeroline,bool):#若zeroline为True
         if zeroline: 
             hline=0
-            plt.axhline(y=hline,ls=":",c="black",linewidth=2)
+            plt.axhline(y=hline,ls=":",c="green",linewidth=2,label="零线")
+            haveLegend=True
     else:
         if isinstance(zeroline,float) or isinstance(zeroline,int):
             hline=zeroline
-            plt.axhline(y=hline,ls=":",c="black",linewidth=3)
+            plt.axhline(y=hline,ls=":",c="darkorange",linewidth=3,label="关注值")
+            haveLegend=True
+            footnote=footnote + "，关注值"+str(hline)
+    
+    if average_value:
+        av=df[colname].mean()
+        plt.axhline(y=av,ls="dashed",c="blueviolet",linewidth=2,label="均值")
+        haveLegend=True
+        footnote=footnote + "，均值"+str(round(av,2))
     
     #绘制趋势线
     #print("--Debug(plot_line): power=",power)
     if power > 0:
         lang=check_language()
-        #trend_txt='趋势线'
-        trend_txt=''
+        trend_txt='趋势线'
+        #trend_txt=''
         if lang == 'English':
             trend_txt='Trend line'           
         
@@ -160,13 +180,16 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
             parameter = np.polyfit(df.id, df[colname], power)
             f = np.poly1d(parameter)
             plt.plot(df.index, f(df.id),"r--", label=trend_txt,linewidth=1)
+            haveLegend=True
         except: 
             print("  Warning(plot_line): failed to converge trend line, try a smaller power.")
     
-    if ylabeltxt != '':
-        plt.legend(loc=loc,fontsize=legend_txt_size)
+    if ylabeltxt != '' or average_value or isinstance(zeroline,bool):
+        if haveLegend:
+            plt.legend(loc=loc,fontsize=legend_txt_size)
+
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
-    
+        
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
     plt.xlabel(footnote,fontsize=xlabel_txt_size)
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)

siat/security_prices.py

@@ -490,9 +490,12 @@ if __name__=='__main__':
     ticker='CPIYCN.M'
     ticker='INPYCN.M'
     ticker='TRBNCN.M'
+    ticker='RSAYCN.M'
     
     start='2023-1-1'
-    end='2024-1-28'    
+    end='2024-2-19' 
+    
+    p=get_price_stooq(ticker,start,end)
 
 def get_price_stooq(ticker,start,end):
     """

siat/security_trend.py

@@ -81,6 +81,7 @@ if __name__=='__main__':
 def security_trend(ticker,indicator='Close', \
                    start='default',end='default', \
                    critical_value='', \
+                   average_value=False, \
                    kline=False,kline_demo=False,mav=[5,10,20], \
                    stock_dividend=False,stock_split=False, \
                    market="China",market_index="000300.SS",RF=False,window=252, \
@@ -266,6 +267,7 @@ def security_trend(ticker,indicator='Close', \
         df=security_indicator(ticker=tickers[0],indicator=measures[0], \
                               fromdate=fromdate,todate=todate, \
                               zeroline=zeroline, \
+                              average_value=average_value, \
                               datatag=datatag,power=power,graph=graph, \
                               source=source)
         return df

siat/stock.py

@@ -590,6 +590,7 @@ if __name__ =="__main__":
 
 def security_indicator(ticker,indicator,fromdate,todate, \
                        zeroline=False, \
+                       average_value=False, \
                        datatag=False,power=0,graph=True,source='auto'):
     """
     功能：单只证券的全部指标
@@ -642,13 +643,13 @@ def security_indicator(ticker,indicator,fromdate,todate, \
     tickersplit=ticker.split('.')
     if (len(tickersplit) > 1) and (indicator == 'Close'):
         if tickersplit[1].upper() in ['M','B']:
-            ylabeltxt=""
+            ylabeltxt="stooq_MB" #特殊标志，告知绘图函数不显示某些标记
     
     if 'Ret%' in indicator:
         zeroline=True
     
     plot_line(erdf3,indicator,collabel,ylabeltxt,titletxt,footnote,datatag=datatag, \
-              power=power,zeroline=zeroline)
+              power=power,zeroline=zeroline,average_value=average_value)
     
     return erdf3
     
@@ -2035,7 +2036,11 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10]):
     if daily is None:
         print("  #Error(candlestick): failed to get price info of",stkcd,fromdate,todate)
         return
-   
+    
+    #如果抓取到的数据没有Volume字段，创造一个但填充为零
+    if 'Volume' not in list(daily):
+        daily['Volume']=0
+    
     #绘制蜡烛图
     lang=check_language()
     if lang == 'English':

siat/translate.py

@@ -1362,7 +1362,11 @@ def codetranslate0(code):
         ['RSAYPL.M','波兰零售业增长率%(同比)'],['RSAYRO.M','罗马尼亚零售业增长率%(同比)'],
         ['RSAYTR.M','土耳其零售业增长率%(同比)'],['RSAYUS.M','美国零售业增长率%(同比)'],
         ['RSAYUK.M','英国零售业增长率%(同比)'],['RSAYZA.M','南非零售业增长率%(同比)'],
+        ['RSAYSE.M','瑞典零售业增长率%(同比)'],['RSAYSG.M','新加坡零售业增长率%(同比)'],
+        ['RSAYLT.M','立陶宛零售业增长率%(同比)'],
         
+        ['RTTYGR.M','希腊零售业增长率%(同比)'],['RTTYJP.M','日本零售业增长率%(同比)'],
+        ['RTTYSK.M','斯洛伐克零售业增长率%(同比)'],
         
         #======================================================================
         # 白酒行业

{siat-2.13.18.dist-info → siat-2.13.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 2.13.18
+Version: 2.13.21
 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-2.13.18.dist-info → siat-2.13.21.dist-info}/RECORD

@@ -15,7 +15,7 @@ siat/bond_test.py,sha256=yUOFw7ddGU-kb1rJdnsjkJWziDNgUR7OLDA7F7Ub91A,5246
 siat/capm_beta.py,sha256=cqbmfM4mrq73Ub0bq5QjWJjmJHj9x7-dSqbmNxnEj7k,28946
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=HOom7FK_U2iVcU3_Q5gF6bIuc-tt1L_sDkfTyNDXzCg,81903
+siat/common.py,sha256=QOKGCaxREeCtHjvQZPNIFmBRgMyBeUA4A-gUJSYFHi0,81947
 siat/compare_cross.py,sha256=-MZzxmX8_9oFZ7X0IcR51w87EWwssbitiw-BcmHMFzQ,26228
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -57,7 +57,7 @@ siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
 siat/future_china_test.py,sha256=BrSzmDVaOHki6rntOtosmRn-6dkfOBuLulJNqh7MOpc,1163
 siat/global_index_test.py,sha256=hnFp3wqqzzL-kAP8mgxDZ54Bd5Ijf6ENi5YJlGBgcXw,2402
 siat/google_authenticator.py,sha256=ZUbZR8OW0IAKDbcYtlqGqIpZdERpFor9NccFELxg9yI,1637
-siat/grafix.py,sha256=66e1wwNZ2kzWL-soibBtHhHX0FOos1rKjRfvpHE_CcU,68524
+siat/grafix.py,sha256=NAw6VzTuxg0LIAyzJ8_lmT4X8-TNPJ8v2vAyat-y_o4,69287
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=Dh4zXEw-0hnbMNorbsRS142C8mUzq4NhFjYnauWu5tc,30548
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
@@ -90,12 +90,12 @@ siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4
 siat/sector_china.py,sha256=jflt5whcS65cRh37gj25cDU2U3cdW5L5Hx-gQaU79nc,120800
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
-siat/security_prices.py,sha256=bTsN6Kj2ZiTYGEwQbDrK5lEMmX3diT30Y4QgTK98DSU,76883
+siat/security_prices.py,sha256=kGBAqHwmN_iupBZ6v3AUrRHjCSNxP09sz2nlBSVyaHs,76950
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
-siat/security_trend.py,sha256=HEGza36mpdkyvF69cuBjD9FETe-ztWGjTBbI2AS6AhY,15262
+siat/security_trend.py,sha256=rWYjeR-KONBdJB7Va96gVieci2bOIxkc87rvqxZ80P4,15367
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=QUbS7SM3rl4aCC6sBSK-CMJFcOXvtPzgpuKGIUmO8zI,140045
+siat/stock.py,sha256=aK9yVfb6367v7OXT81WoumMhvNksROa51mC3Taw-AC4,140334
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=B1hbZCxJuE5GVvGGmf_rSmQodYHmEFuyiDrUvxHhg4w,83969
@@ -120,13 +120,13 @@ siat/transaction_test.py,sha256=Z8g1LJCN4-mnUByXMUMoFmN0t105cbmsz2QmvSuIkbU,1858
 siat/translate-20230125.py,sha256=NPPSXhT38s5t9fzMvl_fvi4ckSB73ThLmZetVI-xGdU,117953
 siat/translate-20230206.py,sha256=-vtI125WyaJhmPotOpDAmclt_XnYVaWU9ByLWZ6FyYE,118133
 siat/translate-20230215.py,sha256=TJgtPE3n8IjljmZ4Pefy8dmHoNdFF-1zpML6BhA9FKE,121657
-siat/translate.py,sha256=WZ07zBpaYvGQslagyGLo9KDJgRVH1PtsIQFgPjPfoQ0,166486
+siat/translate.py,sha256=rLEk2PMwkQ9cLrzsjGh46ol3trx5JKYl3cupqZY7zYo,166832
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 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.13.18.dist-info/METADATA,sha256=x6QZwrznAMS4MvpODdQ4LNDz9PKNaweEoqzdJY6lkv4,1449
-siat-2.13.18.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-2.13.18.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-2.13.18.dist-info/RECORD,,
+siat-2.13.21.dist-info/METADATA,sha256=o2xK5jJvotka-h75LzHUJmVCmkAxJATgohFYPgXn988,1449
+siat-2.13.21.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-2.13.21.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-2.13.21.dist-info/RECORD,,