siat 3.0.10__py3-none-any.whl → 3.0.20__py3-none-any.whl

siat/stock.py

@@ -455,7 +455,7 @@ if __name__ =="__main__":
 
 
 def stock_price(ticker,fromdate,todate,adj=False, \
-                datatag=False,power=0,source='auto'):
+                datatag=False,power=0,source='auto',facecolor='whitesmoke'):
     """
     功能：绘制证券价格折线图。
     输入：证券代码ticker；开始日期fromdate，结束日期todate；
@@ -486,7 +486,8 @@ def stock_price(ticker,fromdate,todate,adj=False, \
         
         collabel=ectranslate(pricetype)
         ylabeltxt=collabel
-        plot_line(df1,pricetype,collabel,ylabeltxt,titletxt,footnote,datatag=datatag,power=power)
+        plot_line(df1,pricetype,collabel,ylabeltxt,titletxt,footnote, \
+                  datatag=datatag,power=power,facecolor=facecolor)
     
     return df
 
@@ -604,8 +605,9 @@ if __name__ =="__main__":
 def security_indicator(ticker,indicator,fromdate,todate, \
                        zeroline=False, \
                        average_value=False, \
-                       datatag=False,power=0,graph=True,source='auto',
-                       mark_top=True,mark_bottom=True,mark_end=True,ticker_type='auto'):
+                       datatag=False,power=0,graph=True,source='auto', \
+                       mark_top=True,mark_bottom=True,mark_end=True, \
+                       ticker_type='auto',facecolor='whitesmoke'):
     """
     功能：单只证券的全部指标
     """
@@ -667,7 +669,8 @@ def security_indicator(ticker,indicator,fromdate,todate, \
     
     plot_line(erdf3,indicator,collabel,ylabeltxt,titletxt,footnote,datatag=datatag, \
               power=power,zeroline=zeroline,average_value=average_value, \
-              mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)
+              mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
+                  facecolor=facecolor)
     
     return erdf3
     
@@ -762,7 +765,7 @@ if __name__ =="__main__":
     annotate=False
 
 def security_mindicators(ticker,measures,fromdate,todate, \
-                         graph=True,smooth=True,loc='best', \
+                         graph=True,smooth=True,loc='best',facecolor='whitesmoke', \
                          date_range=False,date_freq=False, \
                          annotate=False,annotate_value=False, \
                          source='auto', \
@@ -837,7 +840,7 @@ def security_mindicators(ticker,measures,fromdate,todate, \
                data_label=False,resample_freq='6H',smooth=smooth, \
                date_range=date_range,date_freq=date_freq,date_fmt='%Y-%m-%d', \
                annotate=annotate,annotate_value=annotate_value, \
-               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)
+               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor)
 
     return df1
 
@@ -1204,7 +1207,8 @@ if __name__ =="__main__":
 #==============================================================================
 def comp_1security_2measures(df,measure1,measure2,twinx=False, \
                              loc1='upper left',loc2='lower left', \
-                             graph=True,ticker_type='auto'):
+                             graph=True,facecolor='whitesmoke', \
+                                 ticker_type='auto'):
     """
     功能：对比绘制一只证券两个指标的折线图。
     输入：证券指标数据集df；行情类别measure1/2。
@@ -1249,7 +1253,7 @@ def comp_1security_2measures(df,measure1,measure2,twinx=False, \
     #绘图
     plot_line2(df,ticker,measure1,label1,df,ticker,measure2,label2, \
                    ylabeltxt,titletxt,footnote,zeroline=zeroline,twinx=twinx, \
-                       loc1=loc1,loc2=loc2)
+                       loc1=loc1,loc2=loc2,facecolor=facecolor)
 
     return 
 
@@ -1264,7 +1268,7 @@ if __name__ =="__main__":
 #==============================================================================
 def comp_2securities_1measure(df1,df2,measure,twinx=False,loc1='upper left', \
                               loc2='lower left',graph=True, \
-                              ticker_type=['auto','auto']):
+                              ticker_type=['auto','auto'],facecolor='whitesmoke'):
     """
     功能：对比绘制两只证券的相同指标折线图。
     输入：指标数据集df1/2；证券代码ticker1/2；指标类别measure。
@@ -1315,7 +1319,7 @@ def comp_2securities_1measure(df1,df2,measure,twinx=False,loc1='upper left', \
 
     plot_line2(df1,ticker1,measure,label,df2,ticker2,measure,label, \
                    ylabeltxt,titletxt,footnote,zeroline=zeroline,twinx=twinx, \
-                       loc1=loc1,loc2=loc2)
+                       loc1=loc1,loc2=loc2,facecolor=facecolor)
 
     return 
 
@@ -1331,7 +1335,7 @@ if __name__ =="__main__":
 #==============================================================================
 def compare_security(tickers,measures,fromdate,todate,twinx=False, \
                      loc1='best',loc2='lower left',graph=True,source='auto', \
-                     ticker_type='auto'):
+                     ticker_type='auto',facecolor='whitesmoke'):
     """
     功能：函数克隆compare_stock
     """
@@ -1341,13 +1345,13 @@ def compare_security(tickers,measures,fromdate,todate,twinx=False, \
     result=compare_stock(tickers=tickers,measures=measures, \
                          fromdate=fromdate,todate=todate,twinx=twinx, \
                          loc1=loc1,loc2=loc2,graph=graph,source=source, \
-                         ticker_type=ticker_type)
+                         ticker_type=ticker_type,facecolor=facecolor)
     return result
 
 #==============================================================================
 def compare_stock(tickers,measures,fromdate,todate,twinx=False, \
                   loc1='best',loc2='lower left',graph=True,source='auto', \
-                  ticker_type='auto'):    
+                  ticker_type='auto',facecolor='whitesmoke'):    
     """
     功能：对比绘制折线图：一只证券的两种测度，或两只证券的同一个测度。
     输入：
@@ -1419,7 +1423,8 @@ def compare_stock(tickers,measures,fromdate,todate,twinx=False, \
         #绘制单个证券的双指标对比图
         if graph:
             comp_1security_2measures(pltdf1,measure1,measure2,twinx=twinx, \
-                                     loc1=loc1,loc2=loc2,graph=graph,ticker_type=ticker_type)
+                                     loc1=loc1,loc2=loc2,graph=graph, \
+                                     ticker_type=ticker_type,facecolor=facecolor)
         
         try:
             result1=pltdf1[[measure1]]
@@ -1466,7 +1471,7 @@ def compare_stock(tickers,measures,fromdate,todate,twinx=False, \
         if graph:
             comp_2securities_1measure(pltdf1,pltdf2,measure1,twinx=twinx, \
                                       loc1=loc1,loc2=loc2,graph=graph, \
-                                      ticker_type=ticker_type_list)
+                                      ticker_type=ticker_type_list,facecolor=facecolor)
         
         try:
             result1=pltdf1[[measure1]]
@@ -1531,7 +1536,7 @@ def compare_msecurity(tickers,measure,start,end, \
                       preprocess='none',linewidth=1.5, \
                       scaling_option='start', \
                       plus_sign=False, \
-                      graph=True,loc='best', \
+                      graph=True,loc='best',facecolor='whitesmoke', \
                       annotate=False,annotate_value=False, \
                       smooth=True, \
                       source='auto', \
@@ -1672,7 +1677,7 @@ def compare_msecurity(tickers,measure,start,end, \
     draw_lines(dfs2,y_label,x_label,axhline_value,axhline_label,title_txt, \
                data_label=False,resample_freq='H',smooth=smooth,linewidth=linewidth,loc=loc, \
                annotate=annotate,annotate_value=annotate_value,plus_sign=plus_sign, \
-               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end)
+               mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end,facecolor=facecolor)
 
     return dfs2
 
@@ -1698,7 +1703,8 @@ if __name__ =="__main__":
     
     
 def compare_mrrr(tickers,start,end,ret_measure='Exp Ret%',risk_type='Volatility', \
-                 annotate=False,graph=True,smooth=True,winsorize_limits=[0.05,0.05]):
+                 annotate=False,graph=True,smooth=True,winsorize_limits=[0.05,0.05], \
+                 facecolor='whitesmoke'):
     """
     功能：rrr = return-risk ratio
     比较多个证券的简单收益-风险性价比，基于compare_msecurity
@@ -1759,7 +1765,8 @@ def compare_mrrr(tickers,start,end,ret_measure='Exp Ret%',risk_type='Volatility'
     
     print("Rendering graphics ...")
     draw_lines(df2,y_label,x_label,axhline_value=0,axhline_label='',title_txt=title_txt, \
-               data_label=False,resample_freq='D',smooth=smooth,annotate=annotate)
+               data_label=False,resample_freq='D',smooth=smooth,annotate=annotate, \
+               facecolor=facecolor)
 
     return df2
         
@@ -1778,7 +1785,9 @@ if __name__ =="__main__":
     df=compare_msecurity(tickers2,measure1,start,end)
     df=compare_msecurity(tickers2,measure2,start,end)
 #==============================================================================
-def stock_Kline(ticker,start='default',end='default',volume=True,style='China',mav=[5,10]):
+def stock_Kline(ticker,start='default',end='default',volume=True, \
+                style='China',facecolor='whitesmoke', \
+                mav=[5,10]):
     """
     套壳函数，为了与stock_MACD等函数相似
     """
@@ -1803,13 +1812,14 @@ def stock_Kline(ticker,start='default',end='default',volume=True,style='China',m
             print("  #Warning(stock_Kline): invalid date for",start)
             start=date_adjust(todate,adjust=-31)
     
-    df=candlestick(stkcd=ticker,fromdate=start,todate=end,volume=volume,style=style,mav=mav)
+    df=candlestick(stkcd=ticker,fromdate=start,todate=end,volume=volume, \
+                   style=style,facecolor=facecolor,mav=mav)
     
     return df
 
 
 def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
-                ticker_type='auto'):
+                ticker_type='auto',facecolor='whitesmoke'):
     """
     功能：绘制证券价格K线图。
     输入：证券代码ticker；开始日期fromdate，结束日期todate；
@@ -1862,7 +1872,7 @@ def candlestick(stkcd,fromdate,todate,volume=True,style='China',mav=[5,10], \
             marketcolors=mc,
             edgecolor='black',
             figcolor='white',
-            facecolor='white', 
+            facecolor=facecolor, 
             gridcolor='cyan',
             rc=mpfrc)        
     
@@ -2002,7 +2012,7 @@ if __name__ =="__main__":
 #==============================================================================
 def stock_Kline_demo(ticker,start='default',end='default', \
                      colorup='red',colordown='green',width=0.5, \
-                     ticker_type='auto'):
+                     ticker_type='auto',facecolor='whitesmoke'):
     """
     套壳函数，为了与stock_Kline保持一致
     """
@@ -2029,7 +2039,7 @@ def stock_Kline_demo(ticker,start='default',end='default', \
     
     df=candlestick_demo(stkcd=ticker,fromdate=start,todate=end, \
                         colorup=colorup,colordown=colordown,width=width, \
-                        ticker_type=ticker_type)
+                        ticker_type=ticker_type,facecolor=facecolor)
     
     return df
 
@@ -2043,7 +2053,7 @@ if __name__ =="__main__":
     
 def candlestick_demo(stkcd,fromdate,todate, \
                      colorup='red',colordown='green',width=0.7, \
-                     ticker_type='auto'):
+                     ticker_type='auto',facecolor='whitesmoke'):
     """
     功能：绘制证券价格K线图，叠加收盘价。
     输入：证券代码ticker；开始日期fromdate，结束日期todate；
@@ -2100,6 +2110,7 @@ def candlestick_demo(stkcd,fromdate,todate, \
     ax.xaxis_date()	#draw dates in x axis
     ax.autoscale_view()
     fig.autofmt_xdate()
+    fig.gca().set_facecolor(facecolor)
 
     titletxt0=text_lang("K线图/蜡烛图演示：","Security Price Candlestick Demo: ")
     titletxt=titletxt0 + ticker_name(str(stkcd),ticker_type=ticker_type)
@@ -2129,13 +2140,13 @@ if __name__ =="__main__":
     fromdate="2021-1-1"
     todate="2022-9-26" 
 
-def stock_dividend(ticker,fromdate,todate):
+def stock_dividend(ticker,fromdate,todate,facecolor='whitesmoke',fontcolor='black'):
     """
     功能：显示股票的分红历史
     输入：单一股票代码
     输出：分红历史
     """   
-    print("...Searching for the dividend info of stock",ticker)
+    print("  Searching for the dividend info of stock",ticker,"... ...")
     result,startdt,enddt=check_period(fromdate,todate)
     if not result: 
         print("  #Error(stock_dividend): invalid period",fromdate,todate)
@@ -2174,6 +2185,7 @@ def stock_dividend(ticker,fromdate,todate):
     pd.set_option('display.unicode.ambiguous_as_wide', True)
     pd.set_option('display.unicode.east_asian_width', True)
     pd.set_option('display.width', 180) # 设置打印宽度(**重要**)
+    pd.set_option('display.colheader_justify', 'center')
     """
     pd.set_option('display.max_columns', 1000)
     pd.set_option('display.width', 1000)
@@ -2188,7 +2200,9 @@ def stock_dividend(ticker,fromdate,todate):
     from datetime import datetime
     weekdayfmt=lambda x : x.isoweekday()
     divdf['Weekdayiso']= divdf['Index Date'].apply(weekdayfmt)
-    wdlist=['Mon','Tue','Wed','Thu','Fri','Sat','Sun']
+    #wdlist=['Mon','Tue','Wed','Thu','Fri','Sat','Sun']
+    #wdlist=['Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday']
+    wdlist=['星期一','星期二','星期三','星期四','星期五','星期六','星期日']
     wdfmt=lambda x : wdlist[x-1]
     divdf['Weekday']= divdf['Weekdayiso'].apply(wdfmt)
     
@@ -2198,29 +2212,49 @@ def stock_dividend(ticker,fromdate,todate):
     divprt=divdf[['Seq','Dividend Date','Weekday','Dividends']]
     
     lang=check_language()
+    tname=ticker_name(ticker,'stock')
+    fromdatey2md=startdt.strftime('%y/%m/%d')
+    todatey2md=enddt.strftime('%y/%m/%d')
+
     if lang == 'English':
-        print('\n======== '+texttranslate("股票分红历史")+' ========')
-        print(texttranslate("股票:"),ticker,'\b,',ticker_name(ticker))
-        print(texttranslate("历史期间:"),fromdate,"-",todate)
+        titletxt=texttranslate("股票分红历史")+': '+tname
+        periodtxt=texttranslate("历史期间:")+' '+fromdatey2md+"-"+todatey2md
+        sourcetxt=texttranslate("数据来源: 雅虎财经,")
         
         #修改列命为英文
         divprt.columns = [texttranslate('序号'),texttranslate('日期'),texttranslate('星期'),texttranslate('股息')]
-        
-        sourcetxt=texttranslate("数据来源: 雅虎财经,")
     else:
-        print('\n======== '+"股票分红历史"+' ========')
-        print("股票:",ticker,'\b,',ticker_name(ticker))
-        print("历史期间:",fromdate,"-",todate)
+        titletxt="股票分红历史："+tname
+        periodtxt="期间: "+fromdatey2md+"-"+todatey2md
+        sourcetxt="数据来源: 雅虎,"
         
         #修改列命为中文
         divprt.columns = ['序号','日期','星期','股息']
-        
-        sourcetxt="数据来源: 雅虎财经,"
-        
+    """        
     print(divprt.to_string(index=False))   
-    
-    import datetime; today = datetime.date.today()
-    print('\n*** '+sourcetxt,today)
+    """
+    print(' ') #空一行
+    
+    disph=divprt.style.hide() #不显示索引列
+    dispp=disph.format(precision=4) #设置带有小数点的列精度调整为小数点后2位
+    #设置标题/列名对齐
+    dispt=dispp.set_caption(titletxt).set_table_styles(
+        [{'selector':'caption', #设置标题
+          'props':[('color','black'),('font-size','16px'),('font-weight','bold')]}, \
+         {'selector':'th.col_heading', #设置列名
+           'props':[('color','black'),('text-align','center'),('margin','auto')]}])        
+    #设置列数值对齐
+    dispf=dispt.set_properties(**{'text-align':'center'})
+    #设置前景背景颜色
+    dispf2=dispf.set_properties(**{'background-color':facecolor,'color':fontcolor})
+
+    from IPython.display import display
+    display(dispf2)
+    
+    print(periodtxt)
+    import datetime; todaydt=datetime.date.today(); todayy2md=todaydt.strftime('%y/%m/%d')
+    #print('\n*** '+sourcetxt,today)
+    print(sourcetxt,todayy2md)
     
     return divdf
     
@@ -2231,13 +2265,13 @@ if __name__ =="__main__":
     todate='2020-6-30'
 
 #==============================================================================   
-def stock_split(ticker,fromdate,todate):
+def stock_split(ticker,fromdate,todate,facecolor='whitesmoke',fontcolor='black'):
     """
     功能：显示股票的分拆历史
     输入：单一股票代码
     输出：分拆历史
     """   
-    print("...Searching for the split info of stock",ticker)
+    print("  Searching for the split info of stock",ticker,"... ...")
     result,startdt,enddt=check_period(fromdate,todate)
     if not result: 
         print("  #Error(stock_split): invalid period",fromdate,todate)
@@ -2290,7 +2324,8 @@ def stock_split(ticker,fromdate,todate):
     from datetime import datetime
     weekdayfmt=lambda x : x.isoweekday()
     divdf['Weekdayiso']= divdf['Index Date'].apply(weekdayfmt)
-    wdlist=['Mon','Tue','Wed','Thu','Fri','Sat','Sun']
+    #wdlist=['Mon','Tue','Wed','Thu','Fri','Sat','Sun']
+    wdlist=['星期一','星期二','星期三','星期四','星期五','星期六','星期日']
     wdfmt=lambda x : wdlist[x-1]
     divdf['Weekday']= divdf['Weekdayiso'].apply(wdfmt)
     
@@ -2305,6 +2340,8 @@ def stock_split(ticker,fromdate,todate):
     divprt=divdf[['Seq','Split Date','Weekday','Splits']]
 
     lang=check_language()
+    tname=ticker_name(ticker,'stock')
+    """
     if lang == 'English':
         print('\n======== '+texttranslate("股票分拆历史")+' ========')
         print(texttranslate("股票:"),ticker,'\b,',ticker_name(ticker))
@@ -2325,6 +2362,49 @@ def stock_split(ticker,fromdate,todate):
     import datetime
     today = datetime.date.today()
     print('\n*** '+sourcetxt,today)
+    """
+    fromdatey2md=startdt.strftime('%y/%m/%d')
+    todatey2md=enddt.strftime('%y/%m/%d')
+    
+    if lang == 'English':
+        titletxt=texttranslate("股票分拆历史")+': '+tname
+        periodtxt=texttranslate("历史期间:")+' '+fromdatey2md+"-"+todatey2md
+        sourcetxt=texttranslate("数据来源: 雅虎财经,")
+        
+        #修改列命为英文
+        divprt.columns = [texttranslate('序号'),texttranslate('日期'),texttranslate('星期'),texttranslate('股息')]
+    else:
+        titletxt="股票分拆历史："+tname
+        periodtxt="期间: "+fromdatey2md+"-"+todatey2md
+        sourcetxt="数据来源: 雅虎,"
+        
+        #修改列命为中文
+        divprt.columns = ['序号','日期','星期','股息']
+    """        
+    print(divprt.to_string(index=False))   
+    """
+    print(' ') #空一行
+    
+    disph=divprt.style.hide() #不显示索引列
+    dispp=disph.format(precision=4) #设置带有小数点的列精度调整为小数点后2位
+    #设置标题/列名
+    dispt=dispp.set_caption(titletxt).set_table_styles(
+        [{'selector':'caption', #设置标题
+          'props':[('color','black'),('font-size','16px'),('font-weight','bold')]}, \
+         {'selector':'th.col_heading', #设置列名
+           'props':[('color','black'),('text-align','center'),('margin','auto')]}])        
+    #设置列数值对齐
+    dispf=dispt.set_properties(**{'text-align':'center'})
+    #设置前景背景颜色
+    dispf2=dispf.set_properties(**{'background-color':facecolor,'color':fontcolor})
+
+    from IPython.display import display
+    display(dispf2)
+    
+    print(periodtxt)
+    import datetime; todaydt=datetime.date.today(); todayy2md=todaydt.strftime('%y/%m/%d')
+    #print('\n*** '+sourcetxt,today)
+    print(sourcetxt,todayy2md)
     
     return divdf