siat 3.0.41__py3-none-any.whl → 3.0.43__py3-none-any.whl

siat/common.py

@@ -3854,5 +3854,16 @@ def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
         
     return
 #==============================================================================
+
+def df_index_timezone_remove(df):
+    """
+    功能：去掉df索引日期中的时区信息，避免日期过滤时出错
+    注意：从雅虎财经获取的数据中日期索引项很可能带有时区
+    """
+    import pandas as pd
+    df.index = pd.to_datetime(df.index)
+    df.index = df.index.tz_localize(None)
+
+    return df
 #==============================================================================
 #==============================================================================

siat/financials_china.py

@@ -655,7 +655,8 @@ if __name__=='__main__':
 
 def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
                          hatchlist=['.', 'o', '\\'],printout=True,sort='PM', \
-                         facecolor='papayawhip',font_size='16px'):
+                         facecolor='papayawhip',font_size='16px',
+                         loc='best'):
     """
     功能：获得tickerlist中每只股票的杜邦分析项目，绘制柱状叠加比较图
     tickerlist：股票代码列表，建议在10只以内
@@ -724,6 +725,12 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
             }
 
     df = pd.DataFrame(raw_data,columns=[ticker,name1,name2,name3,name4,name5])
+    if len(df)==0:
+        print('')
+        print("  #Error(compare_dupont_china): no data to plot dupont identity bar chart.")
+        print("  If the stock code is correct, you may suffer from anti-spyder from data source. Try later")
+        return None
+    
     if sort=='PM':
         df.sort_values(name1,ascending=False,inplace=True)
     elif sort=='TAT':
@@ -736,7 +743,7 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
     num=len(df['公司'])
     for i in range(num):
         code=df.loc[i,'公司']
-        df.loc[i,'公司']=ticker_name(code).replace("(A股)",'')
+        df.loc[i,'公司']=ticker_name(code,'stock').replace("(A股)",'')
     
     f,ax1 = plt.subplots(1,figsize=(10,5))
     w = 0.75
@@ -752,6 +759,11 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
     ax1.bar(x,df[name1],width=w,label=name1,alpha=0.5,color='blue', \
             hatch=hatchlist[2], edgecolor='black',align='center')
 
+    #判断是否绘制零线
+    pm_max=df[name1].max(); pm_min=df[name1].min()
+    if pm_max * pm_min < 0:
+        plt.axhline(y=0,ls=":",c="black",linewidth=2,label='')
+    
     plt.xticks(tick_pos,df[ticker])
     plt.ylabel("杜邦分析分解项目")
     
@@ -768,8 +780,17 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
     footnote2=footnote+'\n'+footnote1+'\n'+"数据来源：sina/EM，"+str(today)
     plt.xlabel(footnote2)
     
-    plt.legend(loc='best')
-    plt.title("杜邦分析对比图")
+    plt.legend(loc=loc)
+    
+    titletxt1="杜邦分析对比图："
+    if sort=='PM':
+        titletxt2="按照"+name1+"降序排列"
+    elif sort=='TAT':
+        titletxt2="按照"+name2+"降序排列"
+    else:
+        titletxt2="按照"+name3+"降序排列"
+            
+    plt.title(titletxt1+titletxt2)
     plt.xlim([min(tick_pos)-w,max(tick_pos)+w])
     
     plt.gca().set_facecolor('whitesmoke')
@@ -794,7 +815,7 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
         print("===== 杜邦分析分项数据表 =====")
         print("*** 数据来源：sina/EM，"+str(today))
         """
-        title_txt="杜邦分析分项数据表"
+        title_txt="杜邦分析分项数据表："+titletxt2
         footnote0="1、表中各个上市公司的财报日期可能存在差异，但均为可获得(已公布)的最新财报"
         footnote1="2、表中数值基于期末数字直接计算，而非期初期末均值，可能与公告数字存在差异。"
         footnote2="*** 数据来源：sina/EM，"+str(today)
@@ -2274,12 +2295,12 @@ def cn_codetranslate(ticker):
     """
     result,prefix,suffix=split_prefix_suffix(ticker)
     if suffix in SUFFIX_LIST_CN:
-        name=ticker_name(ticker)
+        name=ticker_name(ticker,'stock')
 
     if suffix =='':
         for s in SUFFIX_LIST_CN:
             ticker_try=ticker+'.'+s
-            name=ticker_name(ticker_try)
+            name=ticker_name(ticker_try,'stock')
             print('\b'*99," Looking for the short name of stock",ticker)
             if not (name == ticker_try): break
         
@@ -2446,7 +2467,7 @@ def compare_history_china(tickers,items,start,end,period_type='annual', \
         #collabel=ectranslate(item1)
         collabel=colname
         ylabeltxt=''
-        titletxt=ticker_name(ticker1)+": 财务指标历史"
+        titletxt=ticker_name(ticker1,'stock')+": 财务指标历史"
         
         colmin=round(df1[colname].min(),2)
         colmax=round(df1[colname].max(),2)
@@ -2500,9 +2521,9 @@ def compare_history_china(tickers,items,start,end,period_type='annual', \
         colmin2=round(df2[colname2].min(),2)
         colmax2=round(df2[colname2].max(),2)
         colmean2=round(df2[colname2].mean(),2)
-        footnote1=ticker_name(ticker1)+"："+ \
+        footnote1=ticker_name(ticker1,'stock')+"："+ \
             str(colmin1)+" - "+str(colmax1)+"，均值"+str(colmean1)
-        footnote2=ticker_name(ticker2)+"："+ \
+        footnote2=ticker_name(ticker2,'stock')+"："+ \
             str(colmin2)+" - "+str(colmax2)+"，均值"+str(colmean2)
         footnote=footnote1+'\n'+footnote2+'\n'+footnote9
         
@@ -2589,7 +2610,7 @@ def compare_snapshot_china(tickers,itemk,endDate='latest',datatag=True,tag_offse
         t=rdf['ticker'].values[0]
         item=cols[1]
         value=rdf[item].values[0]
-        name=ticker_name(t)
+        name=ticker_name(t,'stock')
         if name == t:
             name=rdf[cols[2]].values[0]
         row=pd.Series({'ticker':t,'item':item,'value':value,'name':name})
@@ -2674,7 +2695,7 @@ def compare_tax_china(tickers,endDate='latest',datatag=True,tag_offset=0.01,grap
             print("  #Error(compare_tax_china): failed to get financial info for",t)
             continue
         df1=df0.tail(1)
-        name=ticker_name(t)
+        name=ticker_name(t,'stock')
         reportdate=df1.index[0]
         taxrate=df1['tax rate'][0]
         row=pd.Series({'ticker':t,'name':name,'date':reportdate,'tax rate%':round(taxrate*100,2)})
@@ -2773,7 +2794,7 @@ def compare_igr_sgr_china(tickers,endDate='latest',graph=True,axisamp1=1.3,axisa
         if igr is None or sgr is None: 
             print("  #Warning(compare_igr_sgr_china): no stock info found for",t)
             continue
-        name=ticker_name(t)
+        name=ticker_name(t,'stock')
         row=pd.Series({'ticker':t,'name':name,'IGR%':round(igr*100,2),'SGR%':round(sgr*100,2)})
         try:
             df=df.append(row,ignore_index=True)
@@ -2848,7 +2869,7 @@ def dupont_decompose_china(ticker,fsdate,gview=False,facecolor='papayawhip'):
     #亿元
     yi=100000000
 
-    company_name=ticker_name(ticker)
+    company_name=ticker_name(ticker,'stock')
     # 定义杜邦分解项目变量
     
     roe='【'+company_name+'】\n('+fsdate+')\n'+'净资产收益率'
@@ -3231,7 +3252,7 @@ def dupont_decompose_china(ticker,fsdate,gview=False,facecolor='papayawhip'):
     
     from graphviz import Digraph
     #按各公司的层数生产分层的节点：
-    g=Digraph(name=ticker_name(ticker)+fsdate)
+    g=Digraph(name=ticker_name(ticker,'stock')+fsdate)
     
     for key in dic:
         for n in range(number_of_layers+1):
@@ -3256,7 +3277,7 @@ def dupont_decompose_china(ticker,fsdate,gview=False,facecolor='papayawhip'):
     
     #打印信息
     if not gview:
-        print("\n注:",ticker_name(ticker),"\b，金额单位：亿元，财报日期:",fsdate)
+        print("\n注:",ticker_name(ticker,'stock'),"\b，金额单位：亿元，财报日期:",fsdate)
         print("1、为避免图示过大，这里未列出所有分解项目")
         print("2、金融机构报表与普通企业结构不同，此处仅为约算")
         print("3、应收款项包括应收账款、应收利息、应收保费以及应收票据等")
@@ -3429,7 +3450,7 @@ def get_fin_summary_1ticker_china(ticker,fsdates):
     try:
         dft2=dft[['选项','指标']+fsdates3]
     except:
-        print("  #Warning(get_fin_summary_1ticker_china): fin stmt of",fsdates3[0],"unavailable for",ticker+'('+ticker_name(ticker)+')')
+        print("  #Warning(get_fin_summary_1ticker_china): fin stmt of",fsdates3[0],"unavailable for",ticker+'('+ticker_name(ticker,'stock')+')')
         return None
     
     # 金额变换：元-->亿元，小数位截取
@@ -3545,6 +3566,10 @@ if __name__=='__main__':
     tickers=['000002.SZ','600048.SS','001979.SZ','600325.SS','000069.SZ','600383.SS','600895.SS','601155.SS']
     fsdates='2022-12-31'
     
+    tickers=['002373.SZ', '002279.SZ', '002368.SZ', '600410.SS', '603927.SS', '002405.SS']
+    fsdates='2023-12-31'
+    
+    
 def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke',font_size='16px'):
     """
     功能：分类别显示财报摘要中的指标
@@ -3715,7 +3740,7 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke',font_size='
         titletxt="\n===== 上市公司财务报表摘要："+ticker_name(ticker1)+" ====="    
         print(titletxt)    
         """
-        titletxt=ticker_name(ticker1)+'：'+"财报摘要"
+        titletxt=ticker_name(ticker1,'stock')+'：'+"财报摘要"
         
         fsdf1=fsdf[fsdf['ticker']==ticker1]
         for ty in typelist:
@@ -3766,7 +3791,7 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke',font_size='
             
             try:
                 dft2=dft[['选项','指标',fsdates3[0]]]
-                dft2.rename(columns={fsdates3[0]:ticker_name(t)},inplace=True)
+                dft2.rename(columns={fsdates3[0]:ticker_name(t,'stock')},inplace=True)
             except:
                 print("  #Error(compare_fin_summary_china): fin stmt of",t,'not found on',fsdates3[0])
                 return None
@@ -3840,9 +3865,9 @@ def get_fin_indicator_1ticker_china(ticker,fsdates):
     fsdate_field=list(dft)[0]
     dft2=dft[dft[fsdate_field].isin(fsdates3)]
     if len(dft2) < len(fsdates3):
-        print("  #Warning(get_fin_summary_1ticker_china): fin stmt of some dates unavailable for",ticker+'('+ticker_name(ticker)+')')
+        print("  #Warning(get_fin_summary_1ticker_china): fin stmt of some dates unavailable for",ticker+'('+ticker_name(ticker,'stock')+')')
     if len(dft2) ==0:
-        print("  #Error(get_fin_summary_1ticker_china): no fin stmts found for",ticker+'('+ticker_name(ticker)+') on',fsdates)
+        print("  #Error(get_fin_summary_1ticker_china): no fin stmts found for",ticker+'('+ticker_name(ticker,'stock')+') on',fsdates)
         return None
 
     # 去掉重复行
@@ -4222,7 +4247,7 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip',font_size
         titletxt="\n===== 上市公司主要财务比率和重要指标："+ticker_name(ticker1)+" ====="    
         print(titletxt)    
         """
-        titletxt="主要财务比率和指标："+ticker_name(ticker1)
+        titletxt="主要财务比率和指标："+ticker_name(ticker1,'stock')
         
         fsdf1=fsdf[fsdf['ticker']==ticker1]
         for ty in typelist:
@@ -4282,7 +4307,7 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip',font_size
             
             try:
                 dft2=dft[['选项','指标',fsdates3[0]]]
-                dft2.rename(columns={fsdates3[0]:ticker_name(t)},inplace=True)
+                dft2.rename(columns={fsdates3[0]:ticker_name(t,'stock')},inplace=True)
             except:
                 print("  #Error(compare_fin_summary_china): fin stmt of",fsdates3[0],'not found for',t)
                 return None

siat/financials_china2.py

@@ -1957,8 +1957,8 @@ if __name__=='__main__':
 
 def fs_analysis_china(tickers,fsdates=[],analysis_type='balance sheet', \
                       category='profile',business_period='recent', \
-                      printout=False,gview=False, \
-                      loc1='upper left',loc2='upper right', \
+                      sort='PM',printout=False,gview=False, \
+                      loc1='best',loc2='best', \
                       facecolor='papayawhip',font_size='16px'):
     """
     【功能】财务报表分析，仅适用于中国A股，注意不适用于港股和美股（含中概股）
@@ -2134,8 +2134,8 @@ def fs_analysis_china(tickers,fsdates=[],analysis_type='balance sheet', \
 
         # 多只股票的杜邦分析对比      
         from siat.financials_china import compare_dupont_china           
-        df_db=compare_dupont_china(tickers,fsdate=fsdates,printout=printout, \
-                                   facecolor=facecolor,font_size=font_size)
+        df_db=compare_dupont_china(tickers,fsdate=fsdates,sort=sort,printout=printout, \
+                                   facecolor=facecolor,font_size=font_size,loc=loc1)
         return        
     
     elif ('dupont' in analysis_type1) and ('decompose' in analysis_type1):

siat/risk_adjusted_return2.py

@@ -523,7 +523,8 @@ if __name__=='__main__':
 
 def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alpha'], \
                          ret_type="Annual Ret%",RF=0,regression_period=365, \
-                         graph=True,axhline_value=0,axhline_label='',facecolor='whitesmoke', \
+                         graph=True,loc1='best', \
+                         axhline_value=0,axhline_label='',facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
                          mark_top=False,mark_bottom=False,mark_end=False, \
@@ -618,7 +619,7 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
                    title_txt=title_txt,data_label=False, \
                    annotate=annotate,annotate_value=annotate, \
                        mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
-                   facecolor=facecolor)
+                   facecolor=facecolor,loc=loc1)
             
     #制表
     recommenddf=pd.DataFrame()
@@ -671,7 +672,8 @@ if __name__=='__main__':
 
 def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
                          ret_type="Annual Ret%",RF=0,regression_period=365, \
-                         graph=True,axhline_value=0,axhline_label='', \
+                         graph=True,loc1='best', \
+                         axhline_value=0,axhline_label='', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
                              mark_top=False,mark_bottom=False,mark_end=False, \
@@ -767,7 +769,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
                    title_txt=title_txt,data_label=False, \
                    annotate=annotate,annotate_value=annotate, \
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
-                   facecolor=facecolor)
+                   facecolor=facecolor,loc=loc1)
             
     #制表
     recommenddf=pd.DataFrame()
@@ -791,7 +793,7 @@ def compare_mticker_1rar(ticker,start,end,rar='sharpe', \
         footnotey=footnote6+'\n'+footnote7+'\n'+footnotex
         
         #删除含有Nan的行，否则可能引起近期优先加权平均计算结果市场出现Nan
-        df1.dropna(inplace=True)    
+        df1.dropna(inplace=True,axis=1)    
         recommenddf=descriptive_statistics2(df1,title_txt,footnotey,decimals=4, \
                                sortby=sortby,recommend_only=True,trailing=trailing, \
                                trend_threshhold=trend_threshhold, \
@@ -820,7 +822,8 @@ if __name__=='__main__':
 
 def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treynor'], \
                          ret_type="Annual Ret%",RF=0,regression_period=365, \
-                         graph=True,axhline_value=0,axhline_label='', \
+                         graph=True,loc1='best', \
+                         axhline_value=0,axhline_label='', \
                          printout=True,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
                          mark_top=False,mark_bottom=False,mark_end=False, \
@@ -854,7 +857,7 @@ def compare_mticker_mrar(ticker,start,end,rar=['sharpe','alpha','sortino','treyn
                                  annotate=annotate,annotate_value=annotate, \
                                  mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
                                  mktidx=mktidx,source=source,style_print=True, \
-                                 ticker_type=ticker_type)        
+                                 ticker_type=ticker_type,loc1=loc1)        
         if df_tmp is None:
             break
         else:
@@ -1010,7 +1013,8 @@ if __name__=='__main__':
 def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
                          ret_type=["Annual Ret%","Monthly Ret%"], \
                          RF=0,regression_period=365, \
-                         graph=True,axhline_value=0,axhline_label='',facecolor='whitesmoke', \
+                         graph=True,loc1='best', \
+                         axhline_value=0,axhline_label='',facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
                          mark_top=False,mark_bottom=False,mark_end=False, \
@@ -1101,7 +1105,7 @@ def compare_1ticker_1rar_mret(ticker,start,end,rar='sharpe', \
                    title_txt=title_txt,data_label=False, \
                    annotate=annotate,annotate_value=annotate, \
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
-                   facecolor=facecolor)
+                   facecolor=facecolor,loc=loc1)
             
     #制表
     recommenddf=pd.DataFrame()
@@ -1155,7 +1159,8 @@ if __name__=='__main__':
 
 def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
                          ret_type="Annual Ret%",RF=[0,0.02,0.05],regression_period=365, \
-                         graph=True,axhline_value=0,axhline_label='',facecolor='whitesmoke', \
+                         graph=True,loc1='best', \
+                         axhline_value=0,axhline_label='',facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
                          mark_top=False,mark_bottom=False,mark_end=False, \
@@ -1244,7 +1249,7 @@ def compare_1ticker_1rar_1ret_mRF(ticker,start,end,rar='sharpe', \
                    title_txt=title_txt,data_label=False, \
                    annotate=annotate,annotate_value=annotate, \
                    mark_top=mark_top,mark_bottom=mark_bottom,mark_end=mark_end, \
-                   facecolor=facecolor)
+                   facecolor=facecolor,loc=loc1)
             
     #制表
     recommenddf=pd.DataFrame()
@@ -1313,7 +1318,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                          ret_type="Annual Ret%", \
                          RF=0, \
                          regression_period=365, \
-                         graph=True,axhline_value=0,axhline_label='',facecolor='whitesmoke', \
+                         graph=True,loc1='best', \
+                         axhline_value=0,axhline_label='',facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.05, \
                          annotate=False,annotate_value=False, \
                          mark_top=False,mark_bottom=False,mark_end=False, \
@@ -1343,7 +1349,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
             if rar_num ==1:   #一个RAR             
                 df=compare_mticker_1rar(ticker=ticker,start=start,end=end,rar=rar, \
                                          ret_type=ret_type,RF=RF,regression_period=regression_period, \
-                                         graph=graph,axhline_value=axhline_value,axhline_label=axhline_label, \
+                                         graph=graph,loc1=loc1, \
+                                         axhline_value=axhline_value,axhline_label=axhline_label, \
                                          printout=printout, \
                                          sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
                                          annotate=annotate,annotate_value=annotate, \
@@ -1356,7 +1363,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                 printout=True #否则无法运行descriptive_statistics2函数
                 df=compare_mticker_mrar(ticker=ticker,start=start,end=end,rar=rar, \
                                         ret_type=ret_type,RF=RF,regression_period=regression_period, \
-                                        graph=graph,axhline_value=axhline_value,axhline_label=axhline_label, \
+                                        graph=graph,loc1=loc1, \
+                                        axhline_value=axhline_value,axhline_label=axhline_label, \
                                         printout=printout, \
                                         sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
                                         annotate=annotate,annotate_value=annotate, \
@@ -1378,7 +1386,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                 
             df=compare_1ticker_mrar(ticker=ticker,start=start,end=end,rar=rar, \
                                      ret_type=ret_type,RF=RF,regression_period=regression_period, \
-                                     graph=graph,axhline_value=axhline_value,axhline_label=axhline_label, \
+                                     graph=graph,loc1=loc1, \
+                                     axhline_value=axhline_value,axhline_label=axhline_label, \
                                      printout=printout,facecolor=facecolor, \
                                      sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
                                      annotate=annotate,annotate_value=annotate, \
@@ -1398,7 +1407,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                 
             df=compare_1ticker_1rar_mret(ticker=ticker,start=start,end=end,rar=rar, \
                                      ret_type=ret_type,RF=RF,regression_period=regression_period, \
-                                     graph=graph,axhline_value=axhline_value,axhline_label=axhline_label, \
+                                     graph=graph,loc1=loc1, \
+                                     axhline_value=axhline_value,axhline_label=axhline_label, \
                                      printout=printout, \
                                      sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
                                      annotate=annotate,annotate_value=annotate, \
@@ -1416,7 +1426,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
                 
             df=compare_1ticker_1rar_1ret_mRF(ticker=ticker,start=start,end=end,rar=rar, \
                                      ret_type=ret_type,RF=RF,regression_period=regression_period, \
-                                     graph=graph,axhline_value=axhline_value,axhline_label=axhline_label, \
+                                     graph=graph,loc1=loc1, \
+                                     axhline_value=axhline_value,axhline_label=axhline_label, \
                                      printout=printout,facecolor=facecolor, \
                                      sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
                                      annotate=annotate,annotate_value=annotate, \
@@ -1431,7 +1442,8 @@ def compare_rar_security(ticker,start,end,rar='sharpe', \
     #情形5：1只证券，1个RAR，1个收益率类型，1个RF
     df=compare_1ticker_mrar(ticker=ticker,start=start,end=end,rar=rar, \
                              ret_type=ret_type,RF=RF,regression_period=regression_period, \
-                             graph=graph,axhline_value=axhline_value,axhline_label=axhline_label, \
+                             graph=graph,loc1=loc1, \
+                             axhline_value=axhline_value,axhline_label=axhline_label, \
                              printout=printout,sortby=sortby, \
                              trailing=trailing,trend_threshhold=trend_threshhold, \
                              annotate=annotate,annotate_value=annotate, \

siat/security_prices.py

@@ -309,7 +309,12 @@ def remove_timezone(pricedf):
 def remove_timezone_tmp(pricedf):
     """
     功能：去掉df索引中可能存在的时区信息，避免时区错误
-    注意：有问题，一直未搞定！！！
+    注意：有问题，应该改用common中的df_index_timezone_remove函数
+    """
+    #去掉时区
+    pricedf2=df_index_timezone_remove(pricedf)    
+    return pricedf2
+
     """
     if pricedf is None:
         return pricedf
@@ -319,9 +324,6 @@ def remove_timezone_tmp(pricedf):
     
     import pandas as pd
     pricedf['date']=pricedf['date_y4m2d2'].apply(lambda x: pd.to_datetime(x))
-    """
-    pricedf['date']=pricedf['date'].apply(lambda x: x.replace(tzinfo=None))   #去掉时区
-    """
     pricedf2=pricedf.reset_index(drop=True)
     try:
         pricedf2=pricedf2.set_index('Date',drop=True)
@@ -331,7 +333,7 @@ def remove_timezone_tmp(pricedf):
     pricedf2.drop(['date_tz','date_y4m2d2'],axis=1,inplace=True)
     
     return pricedf2
-
+    """
     
 #==============================================================================
 if __name__=='__main__':
@@ -591,7 +593,10 @@ def get_price_stooq(ticker,start,end):
             else:            
                 #print("  Sorry, zero records found from stooq for",ticker,"from",start,'to',end)
                 return None   
-        
+            
+            #仍然无记录
+            if len(prices)==0:return None
+            
         prices.sort_index(axis=0, ascending=True, inplace=True)
         #prices.dropna(inplace=True)
         
@@ -1238,7 +1243,10 @@ def get_prices_yahoo(ticker,start,end,retry_count=3,pause=1):
         if ptname == ticker: ptname=''
 
         print("  Successfully retrieved",len(p),"records for",ticker,ptname)
-        
+
+    #去掉时区
+    p=df_index_timezone_remove(p)
+    
     return p
 
 if __name__=='__main__':
@@ -1327,6 +1335,9 @@ def get_prices_yf(ticker,start,end,threads=False):
         pass
         #print("  #Error(get_prices_yf):",ticker1,"not found or no prices in the period or inaccessible to yahoo")
 
+    #去掉时区
+    p=df_index_timezone_remove(p)
+
     return p
 
 if __name__=='__main__':
@@ -1391,6 +1402,9 @@ def get_index_fred(ticker,start,end):
         print("  Successfully retrieved",num,"records for",ticker,ptname)    
     else:
         print("  Sorry, no records retrieved for",ticker)
+
+    #去掉时区
+    df=df_index_timezone_remove(df)
     
     return df
 
@@ -1761,6 +1775,9 @@ def calc_expanding_return(drdf0,basedate):
     日收益率数据集drdf。
     输出：期间累计收益率序列，按照日期升序排列。
     """
+    #去掉时区
+    drdf0=df_index_timezone_remove(drdf0)
+    
     import pandas as pd
     basedate_pd=pd.to_datetime(basedate)
     drdf=drdf0[drdf0.index >= basedate_pd]

siat/security_trend2.py

@@ -428,6 +428,7 @@ def security_trend(ticker,indicator='Close', \
         df=compare_rar_security(ticker=tickers,start=fromdate,end=todate,rar=measures, \
                                  ret_type=ret_type,RF=RF,regression_period=regression_period, \
                                  graph=graph,axhline_value=0,axhline_label='', \
+                                 loc1=loc1, \
                                  printout=printout, \
                                  sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
                                  annotate=annotate,annotate_value=annotate_value, \

siat/stock.py

@@ -623,9 +623,15 @@ def security_indicator(ticker,indicator,fromdate,todate, \
     if len(pricedf) == 0:
         print("  #Error(security_indicator): zero record found for",ticker)
         return None
-    
-    # 检查是否存在满足给定日期的记录
+
+    # 去掉时区信息，避免日期时区冲突问题
+    pricedf=df_index_timezone_remove(pricedf)
+    """
     import pandas as pd
+    pricedf.index = pd.to_datetime(pricedf.index)
+    pricedf.index = pricedf.index.tz_localize(None)
+    """
+    # 检查是否存在满足给定日期的记录
     fromdate_pd=pd.to_datetime(fromdate)
     tmp_df=pricedf[pricedf.index >= fromdate_pd]
     if len(tmp_df)==0:

siat/stock_china.py

@@ -676,7 +676,7 @@ def price_direction_knn(ticker,df,ndays=1,diff=0.01,min_score=0.9,votes=100,max_
     if not printout: return decision,today_close,today
 
     print("  Model voting for stock price after "+str(ndays)+" trading days: Higher("+str(zhang)+'), Lower('+str(die)+')')
-    print("  "+ticker_name(ticker)+': previously closed '+str(known_close)+' @ '+str(known_day))
+    print("  "+ticker_name(ticker,'stock')+': previously closed '+str(known_close)+' @ '+str(known_day))
     
     ndate=date_adjust(known_day,adjust=ndays)
     print("  Prediction to close at",decision_text,"price trend ("+decision+') @',ndate)
@@ -726,7 +726,7 @@ def forecast_direction_knn(ticker,ndays=1,diff=0.01,min_score=0.9,votes=100,max_
                                                        max_RS=max_RS)
         decisionlist=decisionlist+[decision]
 
-    print("\nStock information:",ticker_name(ticker),'\b, closed',known_close,'@',known_day)
+    print("\nStock information:",ticker_name(ticker,'stock'),'\b, closed',known_close,'@',known_day)
     for nd in list(range(1,ndays+1)):
         ndate=date_adjust(known_day, adjust=nd)
         print("Forecasting stock close price trend on",ndate,end=': ')
@@ -952,7 +952,7 @@ def price_price_knn(ticker,df,ndays=1,max_neighbours=10,max_RS=20,printout=True)
     if not printout: return decision,decision_score,today_close,today
 
     print("  Model poll for stock price after "+str(ndays)+" trading days:",decision)
-    print("  Last close price: "+ticker_name(ticker)+', closed '+str(known_close)+', '+str(known_day))
+    print("  Last close price: "+ticker_name(ticker,'stock')+', closed '+str(known_close)+', '+str(known_day))
     
     ndate=date_adjust(known_day,adjust=ndays)
         
@@ -1009,7 +1009,7 @@ def forecast_price_knn(ticker,ndays=1,max_neighbours=10,max_RS=20,end='latest'):
         decisionlist=decisionlist+[decision]
         confidencelist=confidencelist+[confidence]
 
-    print("\nStock information:",ticker_name(ticker),'\b, closed',known_close,'@',known_day)
+    print("\nStock information:",ticker_name(ticker,'stock'),'\b, closed',known_close,'@',known_day)
 
     for nd in list(range(1,ndays+1)):
         ndate=date_adjust(known_day, adjust=nd)
@@ -1237,7 +1237,7 @@ def stock_profile_china(ticker,category='profile', \
         dftmp15=dftmp14.T
         dftmp15.reset_index(inplace=True)
               
-        titletxt=ticker_name(ticker)
+        titletxt=ticker_name(ticker,'stock')
         """
         if prettytab:
             pandas2prettytable(dftmp15,titletxt,firstColSpecial=False,leftColAlign='l',otherColAlign='l',tabborder=tabborder)
@@ -1313,7 +1313,7 @@ def stock_profile_china(ticker,category='profile', \
         cols2=['分类方向','分类','营业收入-同比增长','营业成本-同比增长','毛利率','毛利率-同比增长']
         
         dftmp1=dftmp[cols1]        
-        titletxt1=ticker_name(ticker)+'：主营业务构成，'+period
+        titletxt1=ticker_name(ticker,'stock')+'：主营业务构成，'+period
         """
         if prettytab:
             pandas2prettytable(dftmp1,titletxt1,firstColSpecial=True,leftColAlign='l',otherColAlign='c',tabborder=tabborder)
@@ -1331,7 +1331,7 @@ def stock_profile_china(ticker,category='profile', \
                            data_font_size=data_font_size)
         
         dftmp2=dftmp[cols2]        
-        titletxt2=ticker_name(ticker)+'：主营业务增长，'+period
+        titletxt2=ticker_name(ticker,'stock')+'：主营业务增长，'+period
         """
         if prettytab:
             pandas2prettytable(dftmp2,titletxt2,firstColSpecial=True,leftColAlign='l',otherColAlign='c',tabborder=tabborder)
@@ -1392,7 +1392,7 @@ def stock_profile_china(ticker,category='profile', \
     #if category in ['dividend','split']:
     if any(s in category for s in ['dividend','split']):
         # 分红
-        titletxt=ticker_name(ticker)+'：分红历史'
+        titletxt=ticker_name(ticker,'stock')+'：分红历史'
         try:
             #df3=ak.stock_dividents_cninfo(symbol=ticker1) 
             df3=ak.stock_history_dividend_detail(symbol=ticker1, indicator="分红")
@@ -1416,7 +1416,7 @@ def stock_profile_china(ticker,category='profile', \
         newcols=['公告日期','送股','转增','派息','股权登记日','除权除息日']
         dftmp3=dftmp[newcols]
         
-        titletxt=ticker_name(ticker)+'：分红历史'
+        titletxt=ticker_name(ticker,'stock')+'：分红历史'
         """
         if prettytab:
             pandas2prettytable(dftmp3,titletxt,firstColSpecial=False,leftColAlign='l',otherColAlign='c',tabborder=tabborder)
@@ -1434,7 +1434,7 @@ def stock_profile_china(ticker,category='profile', \
                        data_font_size=data_font_size)
             
         # 配股
-        titletxt=ticker_name(ticker)+'：配股历史'
+        titletxt=ticker_name(ticker,'stock')+'：配股历史'
         try:
             df3p=ak.stock_history_dividend_detail(symbol=ticker1, indicator="配股")
         except:
@@ -1525,7 +1525,7 @@ def stock_profile_china(ticker,category='profile', \
         enddate=str(dftmp.head(1)['截至日期'][0])
         shareholder_num=dftmp.head(1)['股东总数'][0]
         avg_shares=dftmp.head(1)['平均持股数'][0]
-        titletxt=ticker_name(ticker)+'：十大股东（截至'+str(enddate)+'，股东总数'+str(int(shareholder_num))+'，平均持股数'+str(int(avg_shares))+'）'
+        titletxt=ticker_name(ticker,'stock')+'：十大股东（截至'+str(enddate)+'，股东总数'+str(int(shareholder_num))+'，平均持股数'+str(int(avg_shares))+'）'
         
         dftmp.drop(['截至日期','公告日期','股东说明','股东总数','平均持股数'],axis=1,inplace=True)
         
@@ -1595,7 +1595,7 @@ def stock_profile_china(ticker,category='profile', \
         mv_min=round(dftmp2['total_mv(yi)'].min(),1)
         mv_txt="总市值(亿元)："+str(mv_min)+'-'+str(mv_max)+"，均值"+str(mv_mean)+"，中位数"+str(mv_median)
         
-        titletxt=ticker_name(ticker)+'：估值与市值'
+        titletxt=ticker_name(ticker,'stock')+'：估值与市值'
         import datetime as dt
         today=dt.date.today()
         footnote3="数据来源：乐咕乐股，"+str(today)
@@ -1627,7 +1627,7 @@ def stock_profile_china(ticker,category='profile', \
                    df2=dftmp2,ticker2='',colname2='total_mv(yi)',label2='总市值(亿元)', \
                    ylabeltxt='',titletxt=titletxt,footnote=footnote, \
                    twinx=True, \
-                   resample_freq='D',loc1='best',loc2='best', \
+                   resample_freq='D',loc1=loc1,loc2=loc2, \
                    color1='red',color2='blue',facecolor='whitesmoke')   
         
         # 计算市净率的均值，中位数、最大最小值
@@ -1653,7 +1653,7 @@ def stock_profile_china(ticker,category='profile', \
                    df2=dftmp2,ticker2='',colname2='total_mv(yi)',label2='总市值(亿元)', \
                    ylabeltxt='',titletxt=titletxt,footnote=footnote, \
                    twinx=True, \
-                   resample_freq='D',loc1='best',loc2='best', \
+                   resample_freq='D',loc1=loc1,loc2=loc2, \
                    color1='red',color2='blue',facecolor='whitesmoke')   
             
         # 计算市销率的均值，中位数、最大最小值
@@ -1679,7 +1679,7 @@ def stock_profile_china(ticker,category='profile', \
                    df2=dftmp2,ticker2='',colname2='total_mv(yi)',label2='总市值(亿元)', \
                    ylabeltxt='',titletxt=titletxt,footnote=footnote, \
                    twinx=True, \
-                   resample_freq='D',loc1='best',loc2='best', \
+                   resample_freq='D',loc1=loc1,loc2=loc2, \
                    color1='red',color2='blue',facecolor='whitesmoke')           
         
         # 计算股息率的均值，中位数、最大最小值
@@ -1706,7 +1706,7 @@ def stock_profile_china(ticker,category='profile', \
                    df2=dftmp2,ticker2='',colname2='total_mv(yi)',label2='总市值(亿元)', \
                    ylabeltxt='',titletxt=titletxt,footnote=footnote, \
                    twinx=True, \
-                   resample_freq='D',loc1='best',loc2='best', \
+                   resample_freq='D',loc1=loc1,loc2=loc2, \
                    color1='red',color2='blue',facecolor='whitesmoke')           
         
         
@@ -1732,7 +1732,7 @@ def stock_profile_china(ticker,category='profile', \
         if numOfQ > 8:
             numOfQ=8
         
-        titletxt=ticker_name(ticker)+"：主要财务信息，每股指标(元)"
+        titletxt=ticker_name(ticker,'stock')+"：主要财务信息，每股指标(元)"
         df7['加权每股收益']=df7['加权每股收益(元)']
         df7['每股收益_调整后']=df7['每股收益_调整后(元)']
         df7['扣非后每股收益']=df7['扣除非经常性损益后的每股收益(元)']
@@ -1783,7 +1783,7 @@ def stock_profile_china(ticker,category='profile', \
         为了准确评估每股收益，就必须用稀释每股收益。
         """
         
-        titletxt=ticker_name(ticker)+"：主要财务信息，利润与成本"
+        titletxt=ticker_name(ticker,'stock')+"：主要财务信息，利润与成本"
         df7['扣非后净利润(元)']=df7['扣除非经常性损益后的净利润(元)']
         colList=['日期','财报类别','总资产利润率(%)','主营业务利润率(%)','总资产净利润率(%)','成本费用利润率(%)', \
                  '营业利润率(%)','主营业务成本率(%)','销售净利率(%)', '销售毛利率(%)','三项费用比重','非主营比重', \
@@ -1832,7 +1832,7 @@ def stock_profile_china(ticker,category='profile', \
         成本费用利润率=利润总额/成本费用总额（即成本总额+费用总额）
         """
         
-        titletxt=ticker_name(ticker)+"：主要财务信息，报酬与收益"
+        titletxt=ticker_name(ticker,'stock')+"：主要财务信息，报酬与收益"
         colList=['日期','财报类别', '股本报酬率(%)','净资产报酬率(%)','资产报酬率(%)', '股息发放率(%)','投资收益率(%)', \
                  '净资产收益率(%)','加权净资产收益率(%)']
         dftmp=df7[colList].head(numOfQ)
@@ -1876,7 +1876,7 @@ def stock_profile_china(ticker,category='profile', \
         股本报酬率/回报率=净利润/期初期末总股本的均值。股本是实收资本，而股权是股东权益。
         """
         
-        titletxt=ticker_name(ticker)+"：主要财务信息，增长率"
+        titletxt=ticker_name(ticker,'stock')+"：主要财务信息，增长率"
         colList=['日期','财报类别','主营业务收入增长率(%)','净利润增长率(%)','总资产增长率(%)','净资产增长率(%)']
         dftmp=df7[colList].head(numOfQ)
         
@@ -1909,7 +1909,7 @@ def stock_profile_china(ticker,category='profile', \
                        data_font_size=data_font_size)        
 
         
-        titletxt=ticker_name(ticker)+"：主要财务信息，资产负债分析"
+        titletxt=ticker_name(ticker,'stock')+"：主要财务信息，资产负债分析"
         colList=['日期','财报类别','流动比率','速动比率','现金比率(%)','利息支付倍数','长期债务与营运资金比率(%)', \
                  '股东权益比率(%)','长期负债比率(%)','股东权益与固定资产比率(%)','负债与所有者权益比率(%)', \
                      '长期资产与长期资金比率(%)','资本化比率(%)','固定资产净值率(%)','资本固定化比率(%)', \
@@ -1960,7 +1960,7 @@ def stock_profile_china(ticker,category='profile', \
         
         """
         
-        titletxt=ticker_name(ticker)+"：主要财务信息，现金流量指标（均为%）"
+        titletxt=ticker_name(ticker,'stock')+"：主要财务信息，现金流量指标（均为%）"
         colList=['日期','财报类别','经营现金净流量对销售收入比率(%)','资产的经营现金流量回报率(%)','经营现金净流量与净利润的比率(%)', \
                  '经营现金净流量对负债比率(%)','现金流量比率(%)']
         dftmp=df7[colList].head(numOfQ)

siat/translate.py

@@ -1459,6 +1459,7 @@ def codetranslate0(code):
         # 找到目录C:\Users\Peter\anaconda3\Lib\site-packages\pandas_datareader\
         # 打开stooq.py中的函数def _get_params(self, symbol, country="US")
         # 在函数列表中加入一项"m"即可避免自动在ticker加上后缀.us的问题
+        # 或者使用fix_package()函数自动修正
         ['CPIYKR.M','韩国CPI(同比)'],
         ['CPIYUK.M','英国CPI(同比)'],['CPIYDE.M','德国CPI(同比)'],
         ['CPIYJP.M','日本CPI(同比)'],['CPIYCN.M','中国CPI(同比)'],
@@ -1575,72 +1576,141 @@ def codetranslate0(code):
         ['EXPRCA.M','加拿大出口增速%'],['IMPRCA.M','加拿大进口增速%'],
         ['EXPRMX.M','墨西哥出口增速%'],['IMPRMX.M','墨西哥进口增速%'],
         
+        #雅虎汇率
+        ['CNYUSD=X','CCY人民币兑美元汇率'],['CNY=X','CCY美元兑人民币汇率'],
+        ['JPYUSD=X','CCY日元兑美元汇率'],['JPY=X','CCY美元兑日元汇率'],
+        ['KRWUSD=X','CCY韩元兑美元汇率'],['KRW=X','CCY美元兑韩元汇率'],
+        ['HKDUSD=X','CCY港币兑美元汇率'],['HKD=X','CCY美元兑港币汇率'],
+        ['TWDUSD=X','CCY新台币兑美元汇率'],['TWD=X','CCY美元兑新台币汇率'],
+        ['PHPUSD=X','CCY菲律宾比索兑美元汇率'],['PHP=X','CCY比索美元兑菲律宾汇率'],
+        ['IDRUSD=X','CCY印尼盾兑美元汇率'],['IDR=X','CCY美元兑印尼盾汇率'],
+        ['THBUSD=X','CCY泰铢兑美元汇率'],['THB=X','CCY美元兑泰铢汇率'],
+        ['MYRUSD=X','CCY马来西亚林吉特兑美元汇率'],['MYR=X','CCY美元兑马来西亚林吉特汇率'],
+        ['SGDUSD=X','CCY新加坡币兑美元汇率'],['SGD=X','CCY美元兑新加坡币汇率'],
+        ['INRUSD=X','CCY印度卢比兑美元汇率'],['INR=X','CCY美元兑印度卢比汇率'],
+        ['AUDUSD=X','CCY澳大利亚元兑美元汇率'],['AUD=X','CCY美元兑澳大利亚元汇率'],
+        ['NZDUSD=X','CCY新西兰元兑美元汇率'],['NZD=X','CCY美元兑新西兰元汇率'],
+        ['TRYUSD=X','CCY土耳其里拉兑美元汇率'],['TRY=X','CCY美元兑土耳其里拉汇率'],
+        ['ILSUSD=X','CCY新谢克尔兑美元汇率'],['ILS=X','CCY美元兑新谢克尔汇率'],
+        ['VNDUSD=X','CCY越南盾兑美元汇率'],['VND=X','CCY美元兑越南盾汇率'],
+        ['MOPUSD=X','CCY澳门元兑美元汇率'],['MOP=X','CCY美元兑澳门元汇率'],
+        ['LAKUSD=X','CCY老挝基普兑美元汇率'],['LAK=X','CCY美元兑老挝基普汇率'],
+        ['KHRUSD=X','CCY柬埔寨瑞尔兑美元汇率'],['KHR=X','CCY美元兑柬埔寨瑞尔汇率'],
+        ['MMKUSD=X','CCY缅甸元兑美元汇率'],['MMK=X','CCY美元兑缅甸元汇率'],
+        ['LKRUSD=X','CCY斯里兰卡卢比兑美元汇率'],['LKR=X','CCY美元兑斯里兰卡卢比汇率'],
+        ['PKRUSD=X','CCY巴基斯坦卢比兑美元汇率'],['PKR=X','CCY美元兑巴基斯坦卢比汇率'],
+        ['NPRUSD=X','CCY尼泊尔卢比兑美元汇率'],['NPR=X','CCY美元兑尼泊尔卢比汇率'],
+        ['AFNUSD=X','CCY阿富汗尼兑美元汇率'],['AFN=X','CCY美元兑阿富汗尼汇率'],
+        ['IRRUSD=X','CCY伊朗里亚尔兑美元汇率'],['IRR=X','CCY美元兑伊朗里亚尔汇率'],
+        ['IQDUSD=X','CCY伊拉克第纳尔兑美元汇率'],['IQD=X','CCY美元兑伊拉克第纳尔汇率'],
+        ['SYPUSD=X','CCY叙利亚镑兑美元汇率'],['SYP=X','CCY美元兑叙利亚镑汇率'],
+        ['JODUSD=X','CCY约旦第纳尔兑美元汇率'],['JOD=X','CCY美元兑约旦第纳尔汇率'],
+        ['SARUSD=X','CCY沙特亚尔兑美元汇率'],['SAR=X','CCY美元兑沙特亚尔汇率'],
+        ['KWDUSD=X','CCY科威特第纳尔兑美元汇率'],['KWD=X','CCY美元兑科威特第纳尔汇率'],
+        ['LBPUSD=X','CCY黎巴嫩镑兑美元汇率'],['LBP=X','CCY美元兑黎巴嫩镑汇率'],
+        ['CADUSD=X','CCY加拿大元兑美元汇率'],['CAD=X','CCY美元兑加拿大元汇率'],
+        ['MXNUSD=X','CCY墨西哥比索兑美元汇率'],['MXN=X','CCY美元兑墨西哥比索汇率'],
+        ['ARSUSD=X','CCY阿根廷比索兑美元汇率'],['ARS=X','CCY美元兑阿根廷比索汇率'],
+        ['CLPUSD=X','CCY智利比索兑美元汇率'],['CLP=X','CCY美元兑智利比索汇率'],
+        ['BRLUSD=X','CCY巴西雷亚尔兑美元汇率'],['BRL=X','CCY美元兑巴西雷亚尔汇率'],
+        ['EURUSD=X','CCY欧元兑美元汇率'],['EUR=X','CCY美元兑欧元汇率'],
+        ['GBPUSD=X','CCY英镑兑美元汇率'],['GBP=X','CCY美元兑英镑汇率'],
+        ['CHFUSD=X','CCY瑞士法郎兑美元汇率'],['CHF=X','CCY美元兑瑞士法郎汇率'],
+        ['HUFUSD=X','CCY匈牙利福林兑美元汇率'],['HUF=X','CCY美元兑匈牙利福林汇率'],
+        ['SEKUSD=X','CCY瑞典克朗兑美元汇率'],['SEK=X','CCY美元兑瑞典克朗汇率'],
+        ['DKKUSD=X','CCY丹麦克朗兑美元汇率'],['DKK=X','CCY美元兑丹麦克朗汇率'],
+        ['NOKUSD=X','CCY挪威克朗兑美元汇率'],['NOK=X','CCY美元兑挪威克朗汇率'],
+        ['RUBUSD=X','CCY俄罗斯卢布兑美元汇率'],['RUB=X','CCY美元兑俄罗斯卢布汇率'],
+        ['PLNUSD=X','CCY波兰兹罗提兑美元汇率'],['PLN=X','CCY美元兑波兰兹罗提汇率'],
+        ['RONUSD=X','CCY罗马尼亚列伊兑美元汇率'],['RON=X','CCY美元兑罗马尼亚列伊汇率'],
+        ['BGNUSD=X','CCY保加利亚列弗兑美元汇率'],['BGN=X','CCY美元兑保加利亚列弗汇率'],
+        ['ZARUSD=X','CCY南非兰特兑美元汇率'],['ZAR=X','CCY美元兑南非兰特汇率'],
+        ['EGPUSD=X','CCY埃及镑兑美元汇率'],['EGP=X','CCY美元兑埃及镑汇率'],
+        ['MADUSD=X','CCY摩洛哥迪拉姆兑美元汇率'],
+        ['NGNUSD=X','CCY尼日利亚奈拉兑美元汇率'],
+        ['XOFUSD=X','CCY西非法郎兑美元汇率'],
+        ['XAFUSD=X','CCY中非法郎兑美元汇率'],
+        ['XCUUSD=X','CCY安巴东加元兑美元汇率'],
+        ['XDRUSD=X','CCYIMF特别提款权兑美元汇率'],['XDR=X','CCY美元兑IMF特别提款权汇率'],
+        
+        ['USDCNY','美元兑人民币汇率'],['CNYUSD','人民币兑美元汇率'],
+        ['AUDCNY','澳大利亚元兑人民币汇率'],['CNYAUD','人民币兑澳大利亚元汇率'],
+        ['JPYCNY','日元兑人民币汇率'],['CNYJPY','人民币兑日元汇率'],
+        ['USDJPY','美元兑日元汇率'],['JPYUSD','日元兑美元汇率'],
+        ['SGDCNY','新加坡元兑人民币汇率'],['CNYSGD','人民币兑新加坡元汇率'],
+        ['SGDMYR','新加坡元兑马来西亚林吉特汇率'],['MYRSGD','马来西亚林吉特兑新加坡元汇率'],
+        ['EURCNY','欧元兑人民币汇率'],['CNYEUR','人民币兑欧元汇率'],
+        ['GBPCNY','英镑兑人民币汇率'],['CNYGBP','人民币兑英镑汇率'],
+        ['KRWCNY','韩元兑人民币汇率'],['CNYKRW','人民币兑韩元汇率'],
+        ['HKDCNY','港币兑人民币汇率'],['CNYHKD','人民币兑港币汇率'],
+        ['CADCNY','加拿大元兑人民币汇率'],['CNYCAD','人民币兑加拿大元汇率'],
+        ['INRCNY','印度卢比兑人民币汇率'],['CNYINR','人民币兑印度卢比汇率'],
+        ['RUBCNY','俄罗斯卢布兑人民币汇率'],['CNYRUB','人民币兑俄罗斯卢布汇率'],
+        ['MOPCNY','澳门元兑人民币汇率'],['CNYMOP','人民币兑澳门元汇率'],
+        
+        ['AUDJPY','澳大利亚元兑日元汇率'],
+        
+        ['AUDUSD','澳大利亚元兑美元汇率'],
+        ['KRWUSD','韩元兑美元汇率'],
+        ['HKDUSD','港币兑美元汇率'],
+        ['TWDUSD','新台币兑美元汇率'],
+        ['PHPUSD','菲律宾比索兑美元汇率'],
+        ['IDRUSD','印尼盾兑美元汇率'],
+        ['THBUSD','泰铢兑美元汇率'],
+        ['MYRUSD','马来西亚林吉特兑美元汇率'],
+        ['SGDUSD','新加坡币兑美元汇率'],
+        ['INRUSD','印度卢比兑美元汇率'],
+        ['AUDUSD','澳大利亚元兑美元汇率'],
+        ['NZDUSD','新西兰元兑美元汇率'],
+        ['TRYUSD','土耳其里拉兑美元汇率'],
+        ['ILSUSD','新谢克尔兑美元汇率'],
+        ['CADUSD','加拿大元兑美元汇率'],
+        ['MXNUSD','墨西哥比索兑美元汇率'],
+        ['ARSUSD','阿根廷比索兑美元汇率'],
+        ['CLPUSD','智利比索兑美元汇率'],
+        ['BRLUSD','巴西雷亚尔兑美元汇率'],
+        ['EURUSD','欧元兑美元汇率'],
+        ['GBPUSD','英镑兑美元汇率'],
+        ['CHFUSD','瑞士法郎兑美元汇率'],
+        ['HUFUSD','匈牙利福林兑美元汇率'],
+        ['SEKUSD','瑞典克朗兑美元汇率'],
+        ['DKKUSD','丹麦克朗兑美元汇率'],
+        ['NOKUSD','挪威克朗兑美元汇率'],
+        ['RUBUSD','俄罗斯卢布兑美元汇率'],
+        ['PLNUSD','波兰兹罗提兑美元汇率'],
+        ['RONUSD','罗马尼亚列伊兑美元汇率'],
+        ['BGNUSD','保加利亚列弗兑美元汇率'],
+        ['ZARUSD','南非兰特兑美元汇率'],
+        ['EGPUSD','埃及镑兑美元汇率'],
+        ['XDRUSD','IMF特别提款权兑美元汇率'],
         
-        ['CNYUSD=X','人民币/美元汇率'],['CNYUSD','人民币/美元汇率'],
-        ['JPYUSD=X','日元/美元汇率'],['JPYUSD','日元/美元汇率'],
-        ['KRWUSD=X','韩元/美元汇率'],['KRWUSD','韩元/美元汇率'],
-        ['HKDUSD=X','港币/美元汇率'],['HKDUSD','港币/美元汇率'],
-        ['TWDUSD=X','新台币/美元汇率'],['TWDUSD','新台币/美元汇率'],
-        ['PHPUSD=X','菲律宾比索/美元汇率'],['PHPUSD','菲律宾比索/美元汇率'],
-        ['IDRUSD=X','印尼盾/美元汇率'],['IDRUSD','印尼盾/美元汇率'],
-        ['THBUSD=X','泰铢/美元汇率'],['THBUSD','泰铢/美元汇率'],
-        ['MYRUSD=X','马来西亚林吉特/美元汇率'],['MYRUSD','马来西亚林吉特/美元汇率'],
-        ['SGDUSD=X','新加坡币/美元汇率'],['SGDUSD','新加坡币/美元汇率'],
-        ['INRUSD=X','印度卢比/美元汇率'],['INRUSD','印度卢比/美元汇率'],
-        ['AUDUSD=X','澳大利亚元/美元汇率'],['AUDUSD','澳大利亚元/美元汇率'],
-        ['NZDUSD=X','新西兰元/美元汇率'],['NZDUSD','新西兰元/美元汇率'],
-        ['TRYUSD=X','土耳其里拉/美元汇率'],['TRYUSD','土耳其里拉/美元汇率'],
-        ['ILSUSD=X','新谢克尔/美元汇率'],['ILSUSD','新谢克尔/美元汇率'],
-        ['VNDUSD=X','越南盾/美元汇率'],
-        ['MOPUSD=X','澳门元/美元汇率'],
-        ['LAKUSD=X','老挝基普/美元汇率'],
-        ['KHRUSD=X','柬埔寨瑞尔/美元汇率'],
-        ['MMKUSD=X','缅甸元/美元汇率'],
-        ['LKRUSD=X','斯里兰卡卢比/美元汇率'],
-        ['PKRUSD=X','巴基斯坦卢比/美元汇率'],
-        ['NPRUSD=X','尼泊尔卢比/美元汇率'],
-        ['AFNUSD=X','阿富汗尼/美元汇率'],
-        ['IRRUSD=X','伊朗里亚尔/美元汇率'],
-        ['IQDUSD=X','伊拉克第纳尔/美元汇率'],
-        ['SYPUSD=X','叙利亚镑/美元汇率'],
-        ['JODUSD=X','约旦第纳尔/美元汇率'],
-        ['SARUSD=X','沙特亚尔/美元汇率'],
-        ['KWDUSD=X','科威特第纳尔/美元汇率'],
-        ['LBPUSD=X','黎巴嫩镑/美元汇率'],
-        
-        ['CADUSD=X','加拿大元/美元汇率'],['CADUSD','加拿大元/美元汇率'],
         ['^NYICDX','ICE美元指数'],['DX-Y.NYB','ICE美元指数'],
-        ['MXNUSD=X','墨西哥比索/美元汇率'],['MXNUSD','墨西哥比索/美元汇率'],
-        ['ARSUSD=X','阿根廷比索/美元汇率'],['ARSUSD','阿根廷比索/美元汇率'],
-        ['CLPUSD=X','智利比索/美元汇率'],['CLPUSD','智利比索/美元汇率'],
-        ['BRLUSD=X','巴西雷亚尔/美元汇率'],['BRLUSD','巴西雷亚尔/美元汇率'],
-        
-        ['INRTUS.M','美联储基准利率'],['USDCNY','美元/人民币汇率'],
-        ['AUDCNY','澳大利亚元/人民币汇率'],['JPYCNY','日元/人民币汇率'],
-        ['USDJPY','美元/日元汇率'],['AUDJPY','澳大利亚元/日元汇率'],
-        
         ['EUR_I','STOOQ欧元指数'],
-        ['EURUSD=X','欧元/美元汇率'],['EURUSD','欧元/美元汇率'],
-        ['GBPUSD=X','英镑/美元汇率'],['GBPUSD','英镑/美元汇率'],
-        ['CHFUSD=X','瑞士法郎/美元汇率'],['CHFUSD','瑞士法郎/美元汇率'],
-        ['HUFUSD=X','匈牙利福林/美元汇率'],['HUFUSD','匈牙利福林/美元汇率'],
-        ['SEKUSD=X','瑞典克朗/美元汇率'],['SEKUSD','瑞典克朗/美元汇率'],
-        ['DKKUSD=X','丹麦克朗/美元汇率'],['DKKUSD','丹麦克朗/美元汇率'],
-        ['NOKUSD=X','挪威克朗/美元汇率'],['NOKUSD','挪威克朗/美元汇率'],
-        ['RUBUSD=X','俄罗斯卢布/美元汇率'],['RUBUSD','俄罗斯卢布/美元'],
-        ['PLNUSD=X','波兰兹罗提/美元汇率'],['PLNUSD','波兰兹罗提/美元'],
-        ['RONUSD=X','罗马尼亚列伊/美元汇率'],['RONUSD','罗马尼亚列伊/美元汇率'],
-        ['BGNUSD=X','保加利亚列弗/美元汇率'],['BGNUSD','保加利亚列弗/美元汇率'],
-        
-        ['ZARUSD=X','南非兰特/美元汇率'],['ZARUSD','南非兰特/美元汇率'],
-        ['EGPUSD=X','埃及镑/美元汇率'],['EGPUSD','埃及镑/美元汇率'],
-        ['MADUSD=X','摩洛哥迪拉姆/美元汇率'],
-        ['NGNUSD=X','尼日利亚奈拉/美元汇率'],
-        
-        ['XOFUSD=X','西非法郎/美元汇率'],
-        ['XAFUSD=X','中非法郎/美元汇率'],
-        ['XCUUSD=X','安巴东加元/美元汇率'],
-        ['XDRUSD=X','IMF特别提款权/美元汇率'],['XDRUSD','IMF特别提款权/美元汇率'],
+        
+        #经济体基准利率
+        ['INRTAU.M','澳大利亚基准利率'],
+        ['INRTBR.M','巴西基准利率'],
+        ['INRTCZ.M','捷克基准利率'],
+        ['INRTCA.M','加拿大基准利率'],  
+        ['INRTCH.M','瑞士基准利率'],              
+        ['INRTEU.M','欧元区基准利率'],
+        ['INRTHU.M','匈牙利基准利率'],
+        ['INRTIN.M','印度基准利率'],
+        ['INRTIS.M','冰岛基准利率'],
+        ['INRTJP.M','日本基准利率'],
+        ['INRTKR.M','韩国基准利率'],
+        ['INRTMX.M','墨西哥基准利率'],
+        ['INRTMY.M','马来西亚基准利率'],
+        ['INRTNO.M','挪威基准利率'],
+        ['INRTNZ.M','新西兰基准利率'],
+        ['INRTPL.M','波兰基准利率'],
+        ['INRTPH.M','菲律宾基准利率'],
+        ['INRTRO.M','罗马尼亚基准利率'],
+        ['INRTSE.M','瑞典基准利率'],
+        ['INRTTR.M','土耳其基准利率'],
+        ['INRTUS.M','美联储基准利率'],
+        ['INRTUK.M','英国基准利率'],
+        ['INRTZA.M','南非基准利率'],
         
         
         ], columns=['code','codename'])
@@ -3186,6 +3256,10 @@ def ticker1_name(ticker,ticker_type='auto'):
         #查找证券名称文件：优先股票
         if tt in ['stock']:
             df1=file_position(file='stock_info.pickle',package='siat',mode='read')
+            
+            #港股
+            if '.HK' in symbol and len(symbol)==8: symbol=symbol[1:]
+            
             try:
                 tname=df1[df1['SYMBOL']==symbol]['CNAME'].values[0]
             except: pass

{siat-3.0.41.dist-info → siat-3.0.43.dist-info}/METADATA

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

@@ -17,7 +17,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=hta-X1iWPjNbG1YYIVlQF-YvKA8An3KuEyLmUEZ3hH8,25562
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=PVVP59khcYr0B0Kd-lcOPlekAU8ZzmKP_nuwIgJcjro,142643
+siat/common.py,sha256=F83kondrh_QRJB5bAw8fKSoh29Vg8AvivdqDDcbg0Hw,142991
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -40,8 +40,8 @@ siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHY
 siat/financials.py,sha256=mbEZSNeHMMFcnPUryQWvdmNlWQvpnOG9eItgS7IVw3k,80458
 siat/financials2 - 副本.py,sha256=dKlNjIfKeoSy055fQ6E6TUj9HEoO5Ney9grD84J5kfk,14389
 siat/financials2.py,sha256=7mnsTncKsgwFu8PP4refh5C5iMIO9P0KOMSF87ZyncY,45736
-siat/financials_china.py,sha256=CzihEqLmCvzEpBqi4kxQCCm9S9J7njTO3vYgSQR7HDA,189079
-siat/financials_china2.py,sha256=ESxKyBoIETokRXLIkjkyhSjM0b1YSdXcP_rP2R5BUlU,92639
+siat/financials_china.py,sha256=HdX6YKI4tUC7VnPCTAjtdC3JxGgGepu07wdrpyykxbE,190119
+siat/financials_china2.py,sha256=mFwWtzwPbantjmXkGsr4CTEj9VRdZe5yITG3VwlJC9E,92655
 siat/financials_china2_test.py,sha256=Erz5k4LyOplBBvYls2MypuqHpVNJ3daiLdyeJezNPu0,2722
 siat/financials_china2_test2.py,sha256=C8CuYTMHN4Mhp-sTu-Bmg0zMXRCaYV6ezGDoYartRYQ,3507
 siat/financials_china2_test3.py,sha256=UXYSA80DNSPRhHpovc2MA9JkpILWMAQaRatbWCHBNPs,3118
@@ -85,7 +85,7 @@ siat/option_sina_api_test.py,sha256=dn-k_wrQnAaNKHoROvWJEc7lqlU0bwiV2Aa4usWAFGM,
 siat/proxy_test.py,sha256=erQJrmGs2X46z8Gb1h-7GYQ0rTUcaR8dxHExWoBz2eM,2610
 siat/quandl_test.py,sha256=EcPoXnLuqzPl5dKyVEZi3j3PJZFpsnU_iNPhLWC9p-A,1552
 siat/risk_adjusted_return.py,sha256=L5FoeOFzvItT03gNBTCaIo32hUvncOJkbchtHOveSBM,54929
-siat/risk_adjusted_return2.py,sha256=t-_JQRpz7Pcte9-QLUc4SYXKz8vWZtT7NnIw644w8hQ,63734
+siat/risk_adjusted_return2.py,sha256=y9Eux9bbQgprFs_a-0J-7pC9P4yEpJHssDbcbFct0K0,64338
 siat/risk_adjusted_return_test.py,sha256=m_VHL5AtT74cJv5i7taTeTfnkX48y0AFJk5phawyYWg,3416
 siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
@@ -95,16 +95,16 @@ siat/sector_china.py,sha256=QSNJclhzT6V9NidziMwwAs-Kk6f7nzdK6PiPGkKrBCk,111617
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=kuYh0V5cqclkM6MjZUd-N361fv3oxGVVerYINuTzZrE,24622
-siat/security_prices.py,sha256=MUwVNuZuG_A9fGlxNYFdMalD08MkZx3Ps_In7AmOppI,102351
+siat/security_prices.py,sha256=m_dWQ24Au9WMNOb1o0Igm6Sg1llz7kyIX3vSXrE5Jng,102705
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
-siat/security_trend2.py,sha256=AhIheVc0EvXShwDvMX3UbR3cX5cKYxSgUVqA_bHeCEI,24579
+siat/security_trend2.py,sha256=4yBY3ve0Kddu95JemS02gfLbrHVN2_gl_irr5pA4F6w,24626
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=PkNSJPwMlvwnRcbsyIrkslk_jvFfveQ7FDQg5XbEPoc,138964
+siat/stock.py,sha256=9w7LzOZzt-gAzfdVfYB8nd73DrG73wLmFpIolJKUCBc,139188
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
-siat/stock_china.py,sha256=UsC8vy1wnyBMGGsm5r1XMjIeGoHQyIcbxS6VKGiIlRs,91425
+siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
 siat/stock_china_test.py,sha256=eO4HWsSvc6qezl0LndjtL24lViEyrBjH_sx2c2Y2Q2M,1294
 siat/stock_info.pickle,sha256=IGUkPbvwtXbngKBMWAzgYhplE96FucuTfnc26wvBiLQ,1319270
 siat/stock_info_test.py,sha256=gfG3DbhDACbtD8wnv_R6zhj0t11XaC8NX8uLD9Qv3Fo,6122
@@ -126,13 +126,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=fmI2K6o2klJEQCxYqdh1njLg7aTYPjU_P_tCRqki2W8,209799
+siat/translate.py,sha256=dqzySnqC0A0IxFKhY1AUvBbj3RIE5_l_wRMn-ZJNJxs,215034
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 siat/valuation_china.py,sha256=Tde2LzPDQy3Z7xOQQDw4ckQMPdROp_z0-GjFE6Z5_lI,67639
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=f-oDewg7bPzyNanz_Y_jLH68NowAA3gXFehW_weKGG0,14898
-siat-3.0.41.dist-info/METADATA,sha256=seEw_evcNzXWMM5VhRD1XWxlxbsKT9XkDX5eUOi_jSw,1448
-siat-3.0.41.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-siat-3.0.41.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.0.41.dist-info/RECORD,,
+siat-3.0.43.dist-info/METADATA,sha256=8x9wW6A3GWrxYLw-PKD4UfzcY4MPZby_RNo1socVEyw,1448
+siat-3.0.43.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.0.43.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.0.43.dist-info/RECORD,,

{siat-3.0.41.dist-info → siat-3.0.43.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.38.4)
 Root-Is-Purelib: true
 Tag: py3-none-any