siat 3.4.16__py3-none-any.whl → 3.4.27__py3-none-any.whl

siat/economy.py

@@ -197,7 +197,8 @@ if __name__=='__main__':
     
     
 
-def economy_trend(start,end,scope='China',factor='GDP',datatag=False,power=0,zeroline=False):
+def economy_trend(start,end,scope='China',factor='GDP',datatag=False,power=0, \
+                  zeroline=False,yline=999,facecolor='papayawhip'):
     """
     功能：绘制宏观经济指标，单线，有趋势线    
     """
@@ -222,7 +223,26 @@ def economy_trend(start,end,scope='China',factor='GDP',datatag=False,power=0,zer
     footnote='单位: '+list(ds['units'])[0]+', '+list(ds['freq'])[0]+ \
         '\n数据来源: OECD|IMF|WB|FRED, '+str(today)
     ds.dropna(inplace=True)
-    plot_line(ds,'VALUE',ectranslate(factor),ylabeltxt,titletxt,footnote,datatag,power=power,zeroline=zeroline)
+
+    if factor in ['GNP Ratio','GNI Ratio']:
+        ylabeltxt='GNP(GNI)/GDP'
+        if yline==999:
+            yline=1 #绘制y=1的水平线
+    if factor in ['Currency Value','Constant CPI']:
+        ylabeltxt=ectranslate(factor)
+        if yline==999:
+            yline=100 #绘制y=100的水平线
+    
+    if yline !=999:
+        zeroline=yline
+    if power==0:
+        power=3
+        
+    plot_line(ds,'VALUE',ectranslate(factor), \
+              ylabeltxt=ylabeltxt,titletxt=titletxt,footnote=footnote,datatag=datatag, \
+              power=power,zeroline=zeroline, \
+              mark_top=False,mark_bottom=False,mark_end=False, \
+              facecolor=facecolor)
     
     return ds
 
@@ -236,16 +256,26 @@ if __name__=='__main__':
 
 #==============================================================================
 if __name__=='__main__':
+    #测试1
     tickers=['China','USA']
     measures='M2 GoB'
     measures='GNI'
+    
+    #测试2
+    tickers=['China','USA']
+    measures='Constant CPI'
+    measures='Currency Value'
+    
+    
+    
     fromdate='1999-12-1'
     todate='2022-4-1'
     power=0; twinx=False; loc1='upper left'; loc2='lower right'
 
 
 def compare_economy(tickers,measures,fromdate,todate,power=0,twinx=False, \
-                    loc1='upper left',loc2='lower right'):
+                    yline=999, \
+                    loc1='upper left',loc2='lower right',facecolor='papayawhip'):
     """
     功能：对比绘制折线图：一个国家的两种测度，或两个国家的同一个测度。
     输入：
@@ -260,6 +290,10 @@ def compare_economy(tickers,measures,fromdate,todate,power=0,twinx=False, \
     输出：绘制经济指标折线图，手动指定是否使用单轴或双轴坐标。
     返回：无
     """
+    DEBUG=False
+    if DEBUG:
+        print("DEBUG: tickers =",tickers,"\b, measures =",measures)
+    
     #检查日期期间的合理性
     valid,_,_=check_period(fromdate,todate)
     if not valid:
@@ -354,15 +388,21 @@ def compare_economy(tickers,measures,fromdate,todate,power=0,twinx=False, \
             source_txt+str(today)
 
         if lang == 'Chinese':
+            """
             plot_line2(df1,ectranslate(ticker1),'VALUE',ectranslate(measure1), \
                    df2,ectranslate(ticker1),'VALUE',ectranslate(measure2), \
                    ylabeltxt,titletxt,footnote, \
                    power=power,twinx=twinx,loc1=loc1,loc2=loc2)    
+            """
+            plot_line2(df1,ticker1,'VALUE',ectranslate(measure1), \
+                   df2,ticker1,'VALUE',ectranslate(measure2), \
+                   ylabeltxt,titletxt,footnote, \
+                   power=power,twinx=twinx,loc1=loc1,loc2=loc2,facecolor=facecolor)   
         else:
             plot_line2(df1,ticker1,'VALUE',measure1, \
                        df2,ticker1,'VALUE',measure2, \
                    ylabeltxt,titletxt,footnote, \
-                   power=power,twinx=twinx,loc1=loc1,loc2=loc2)    
+                   power=power,twinx=twinx,loc1=loc1,loc2=loc2,facecolor=facecolor)    
         
     elif (security_num >= 2) and (measure_num >= 1):
         #双国家+单个测度指标        
@@ -402,13 +442,15 @@ def compare_economy(tickers,measures,fromdate,todate,power=0,twinx=False, \
         #绘制双国家单指标对比图
         ylabeltxt=ectranslate(measure1)
         #这里的GNP指标实际上是GNP vs GDP的百分比
-        yline=999   #默认不绘制水平线
+        #yline=999   #默认不绘制水平线
         if measure1 in ['GNP Ratio','GNI Ratio']:
             ylabeltxt='GNP(GNI)/GDP'
-            yline=1 #绘制y=1的水平线
+            if yline==999:
+                yline=1 #绘制y=1的水平线
         if measure1 in ['Currency Value','Constant CPI']:
             ylabeltxt=ectranslate(measure1)
-            yline=100 #绘制y=100的水平线
+            if yline==999:
+                yline=100 #绘制y=100的水平线
         
         if lang == 'Chinese':
             titletxt=ectranslate(list(df1['name'])[0])+'趋势对比：'+ \
@@ -425,15 +467,21 @@ def compare_economy(tickers,measures,fromdate,todate,power=0,twinx=False, \
             source_txt+str(today)
         
         if lang == 'Chinese':
+            """
             plot_line2(df1,ectranslate(ticker1),'VALUE',ectranslate(measure1), \
                    df2,ectranslate(ticker2),'VALUE',ectranslate(measure1), \
                    ylabeltxt,titletxt,footnote, \
                    power=power,twinx=twinx,yline=yline,loc1=loc1,loc2=loc2)  
+            """
+            plot_line2(df1,ticker1,'VALUE',measure1, \
+                   df2,ticker2,'VALUE',measure1, \
+                   ylabeltxt,titletxt,footnote, \
+                   power=power,twinx=twinx,yline=yline,loc1=loc1,loc2=loc2,facecolor=facecolor)                  
         else:
             plot_line2(df1,ticker1,'VALUE',measure1, \
                        df2,ticker2,'VALUE',measure1, \
                     ylabeltxt,titletxt,footnote, \
-                    power=power,twinx=twinx,yline=yline,loc1=loc1,loc2=loc2)  
+                    power=power,twinx=twinx,yline=yline,loc1=loc1,loc2=loc2,facecolor=facecolor)  
             
     else:
         print("  #Error(compare_economy): no idea on what to compare")
@@ -711,7 +759,7 @@ def fred_factor_codes():
         ['Italy','Current GDP','Annual','Gross Domestic Product','MKTGDPITA646NWDB','Current USD, Not Seasonally Adjusted'],
         ['Cambodia','Current GDP','Annual','Gross Domestic Product','MKTGDPKHA646NWDB','Current USD, Not Seasonally Adjusted'],
         
-        # Real GDP at Constant National Prices：不变价格GDP，年度指标，百万美元，2017年基准，未经季节性调整。扣除通胀因素，扣除汇率变化因素
+        # Real GDP at Constant National Prices：不变价格GDP，年度指标，百万元，2017年基准，未经季节性调整。扣除通胀因素，扣除汇率变化因素
         ['India','Constant GDP','Annual','Real GDP at Constant National Prices','RGDPNAINA666NRUG','2017 USD Millions, Not Seasonally Adjusted'],
         ['China','Constant GDP','Annual','Real GDP at Constant National Prices','RGDPNACNA666NRUG','2017 USD Millions, Not Seasonally Adjusted'],
         ['Japan','Constant GDP','Annual','Real GDP at Constant National Prices','RGDPNAJPA666NRUG','2017 USD Millions, Not Seasonally Adjusted'],
@@ -1027,11 +1075,12 @@ def fred_factor_codes():
 #==============================================================================
 #==============================================================================
 if __name__ =="__main__":
-    fromdate='2022-1-1'
-    todate='2023-3-18'
+    fromdate='2024-1-1'
+    todate='2024-8-31'
     df=pmi_china(fromdate,todate)
+    loc='best'; facecolor='papayawhip'
 
-def pmi_china(fromdate,todate,loc='lower center'):
+def pmi_china(fromdate,todate,date_range=True,loc='best',facecolor='papayawhip'):
     """
     功能：绘制中国的PMI指数制造业/非制造业单线图
     """
@@ -1072,6 +1121,7 @@ def pmi_china(fromdate,todate,loc='lower center'):
     df2['制造业PMI']=df2['制造业-指数'].astype('float')
     df2['非制造业PMI']=df2['非制造业-指数'].astype('float')
     
+    """
     #绘图：制造业
     ticker1=ticker2='PMI'
     colname2="benchmark"
@@ -1087,7 +1137,7 @@ def pmi_china(fromdate,todate,loc='lower center'):
     titletxt="中国采购经理人指数PMI：制造业"
     plot_line2(df2,ticker1,colname1,label1, \
                df2,ticker2,colname2,label2, \
-               ylabeltxt,titletxt,footnote,loc1=loc)
+               ylabeltxt,titletxt,footnote,loc1=loc,facecolor=facecolor)
     
     #绘图：非制造业
     colname1="非制造业PMI"
@@ -1095,13 +1145,24 @@ def pmi_china(fromdate,todate,loc='lower center'):
     titletxt="中国采购经理人指数PMI：非制造业"
     plot_line2(df2,ticker1,colname1,label1, \
                df2,ticker2,colname2,label2, \
-               ylabeltxt,titletxt,footnote,loc1=loc)    
+               ylabeltxt,titletxt,footnote,loc1=loc,facecolor=facecolor)    
     """
+    titletxt="中国采购经理人指数PMI"
+    ticker1=ticker2='PMI'
+    colname1="制造业PMI"; label1="制造业"
+    colname2="非制造业PMI"; label2="非制造业"
+    ylabeltxt=''
+        
+    import datetime
+    today=datetime.date.today()
+    footnote="数据来源：东方财富，"+str(today)
+    
     plot2_line2(df2,ticker1,colname1,label1, \
                df2,ticker2,colname2,label2, \
-               ylabeltxt,titletxt,footnote,loc1=loc, \
-               date_range=True,date_freq='1M',date_fmt='%Y-%m')    
-    """
+               yline=50, \
+               ylabeltxt=ylabeltxt,titletxt=titletxt,footnote=footnote,loc1=loc, \
+               date_range=date_range,date_fmt='%Y-%m',facecolor=facecolor)    
+    
     #返回数据
     return df2
 
@@ -1168,13 +1229,13 @@ def internal_growth_rate_df(df0,fieldlist=['VALUE','scope','factor','freq','name
     if lang == 'Chinese':
         print('从'+date0+'至'+date1+'：')
         if freq != 'Annual':
-            print('    '+ectranslate(scope)+ectranslate(factor)+'的'+ectranslate(freq)+'均环比增长率：',round(item_gr*100.0,4),'\b%')
-        print('    '+ectranslate(scope)+ectranslate(factor)+'的年均增长率：',round(annual_gr*100.0,4),'\b%')
+            print('    '+ectranslate(scope)+ectranslate(factor)+'的'+ectranslate(freq)+'均环比复合增长率：',round(item_gr*100.0,4),'\b%')
+        print('    '+ectranslate(scope)+ectranslate(factor)+'的年均复合增长率：',round(annual_gr*100.0,4),'\b%')
     else:
         print('From '+date0+' to '+date1+':')
         if freq != 'Annual':
-            print('    '+scope+', '+factor+' mom growth rate:',round(item_gr*100.0,4),'\b%')
-        print('    '+scope+', '+factor+' yoy growth rate:',round(annual_gr*100.0,4),'\b%')
+            print('    '+scope+', '+factor+' mom compound growth rate:',round(item_gr*100.0,4),'\b%')
+        print('    '+scope+', '+factor+' yoy compound growth rate:',round(annual_gr*100.0,4),'\b%')
         
     return 
 
@@ -1204,6 +1265,81 @@ def internal_growth_rate(rvar,fieldlist=['VALUE','scope','factor','freq','name',
 if __name__ =="__main__":
     internal_growth_rate(df)
 #==============================================================================
+if __name__ =="__main__":
+    ticker='China'
+    indicator='GDP'
+
+
+def macro_trend(ticker,indicator,start='L10Y',end='today', \
+                power=0,twinx=False,attention_value=999,zeroline=False, \
+                datatag=False,date_range=False, \
+                loc1='best',loc2='best',facecolor='papayawhip'):
+    """
+    功能：套壳函数，compare_economy, economy_trend
+    """
+    
+    # 处理日期
+    fromdate,todate=start_end_preprocess(start,end)
+    
+    # 判断ticker个数
+    if isinstance(ticker,str):
+        ticker_num=1
+    if isinstance(ticker,list):
+        ticker_num=len(ticker)
+        if ticker_num==1:
+            ticker=ticker[0]
+    
+    # 判断indicator个数
+    if isinstance(indicator,str):
+        indicator_num=1
+    if isinstance(indicator,list):
+        indicator_num=len(indicator) 
+        if indicator_num==1:
+            indicator=indicator[0]        
+
+    # 是否PMI
+    if ticker_num==1 and indicator_num==1:
+        if indicator.upper()=='PMI' and ticker.title()=='China':
+            df=pmi_china(fromdate=fromdate,todate=todate, \
+                         date_range=date_range,loc=loc1,facecolor=facecolor)
+        
+            return df
+        
+    # 双ticker或者双indicator
+    if ticker_num>=2 or indicator_num>=2:
+        if 'YoY PPI' in indicator:
+            attention_value=0
+
+        df=compare_economy(tickers=ticker,measures=indicator, \
+                           fromdate=fromdate,todate=todate, \
+                           power=power,twinx=twinx, \
+                           yline=attention_value, \
+                           loc1=loc1,loc2=loc2,facecolor=facecolor)
+        # 计算增长率
+        # 有inf/nan错误，未找出原因，先避开
+        if not 'YoY PPI' in indicator:
+            internal_growth_rate(df)
+        return df
+        
+    # 单ticker且单indicator
+    if ticker_num==1 and indicator_num==1:
+        if 'YoY PPI' in indicator:
+            attention_value=0
+        
+        df=economy_trend(start=fromdate,end=todate,scope=ticker,factor=indicator, \
+                         datatag=datatag,power=power, \
+                         zeroline=zeroline,yline=attention_value,facecolor=facecolor)    
+        # 计算增长率
+        # 有inf/nan错误，未找出原因，先避开
+        if not 'YoY PPI' in indicator:
+            internal_growth_rate(df)
+            
+        return df
+    
+    print("  #Warning(macro_trend): puzzled on what to for",ticker,"with",indicator)
+    return None
+
+
 #==============================================================================
 #==============================================================================
 

siat/grafix.py

@@ -119,7 +119,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
               resample_freq='H',loc='best', \
               date_range=False,date_freq=False,date_fmt='%Y-%m-%d', \
               mark_top=True,mark_bottom=True,mark_end=True, \
-                  facecolor='whitesmoke'):
+              facecolor='whitesmoke'):
     """
     功能：绘制折线图。如果power=0不绘制趋势图，否则绘制多项式趋势图
     假定：数据表有索引，且已经按照索引排序
@@ -296,7 +296,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
         ylabeltxt=ylabeltxt.replace('收盘价','单位净值')
         
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
-    plt.xlabel(footnote,fontsize=xlabel_txt_size)
+    plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     
     plt.show()
@@ -560,7 +560,7 @@ def plot_line2_coaxial(df01,ticker1,colname1,label1, \
         plt.gca().set_facecolor("whitesmoke")
     
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
-    plt.xlabel(footnote,fontsize=xlabel_txt_size)
+    plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     plt.show()
     plt.close()
@@ -749,7 +749,7 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
         plt.gca().set_facecolor("whitesmoke")  
         
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
-    plt.xlabel(footnote,fontsize=xlabel_txt_size)
+    plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     plt.show()
     plt.close()
@@ -877,7 +877,7 @@ def plot_line2_twinx(df01,ticker1,colname1,label1, \
             label2txt=ticker_name(ticker2,ticker_type_list[1])+"("+trend_txt+")"
         ax2.plot(df2.index, f(df2.id),"c--", label=label2txt,linewidth=1)        
         
-    ax.set_xlabel(footnote,fontsize=xlabel_txt_size)
+    ax.set_xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     
     if ticker1 == '':
         label1txt=label1
@@ -1019,7 +1019,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
             label1txt=ticker_name(ticker1,ticker_type_list[0])+"("+trend_txt+")"
         ax.plot(df1.index, f(df1.id),"r--", label=label1txt,linewidth=1)
         
-    ax.set_xlabel(footnote,fontsize=xlabel_txt_size)
+    ax.set_xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     
     if ticker1 == '':
         label1txt=label1
@@ -1307,7 +1307,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     
     x_label_t=ectranslate(x_label)
     if x_label != "":
-        plt.xlabel(x_label_t,fontweight='bold',fontsize=xlabel_txt_size)
+        plt.xlabel(x_label_t,fontweight='bold',fontsize=xlabel_txt_size,ha='center')
     #图示标题
     plt.title(title_txt,fontweight='bold',fontsize=title_txt_size)
     
@@ -1541,7 +1541,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     #坐标轴标记
     plt.ylabel(y_label,fontweight='bold',fontsize=ylabel_txt_size)
     if x_label != "":
-        plt.xlabel(x_label,fontweight='bold',fontsize=xlabel_txt_size)
+        plt.xlabel(x_label,fontweight='bold',fontsize=xlabel_txt_size,ha='center')
     #图示标题
     plt.title(title_txt,fontweight='bold',fontsize=title_txt_size)
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
@@ -1579,7 +1579,7 @@ def plot_barh(df,colname,titletxt,footnote,datatag=True, \
 
     plt.barh(df.index,df[colname],align='center',color=colors,alpha=0.8)
     coltxt=ectranslate(colname)
-    plt.xlabel(footnote,fontsize=xlabel_txt_size)
+    plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     
     #xmin=int(min(df[colname]))
@@ -1784,7 +1784,7 @@ def plot_2lines(df01,colname1,label1, \
         plt.axvline(x=vline,ls=":",c="black")
     
     plt.ylabel(ylabeltxt,fontsize=ylabel_txt_size)
-    plt.xlabel(footnote,fontsize=xlabel_txt_size)
+    plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.legend(loc='best',fontsize=legend_txt_size)
     
     plt.gcf().autofmt_xdate() # 优化标注（自动倾斜）
@@ -2007,7 +2007,7 @@ def plot_norm(mu,sd,graph='pdf',obs_num=100,facecolor='whitesmoke'):
         wid1=5*sd+mu
         wid2=1*sd+mu
         plt.xticks(np.arange(-wid,wid1,wid2))
-        plt.xlabel('分位点',fontsize=xlabel_txt_size) #x轴文本
+        plt.xlabel('分位点',fontsize=xlabel_txt_size,ha='center') #x轴文本
         plt.yticks(np.arange(0,0.45,0.05))
         plt.ylabel('概率密度',fontsize=ylabel_txt_size) #y轴文本
 
@@ -2015,7 +2015,7 @@ def plot_norm(mu,sd,graph='pdf',obs_num=100,facecolor='whitesmoke'):
         wid1=3.5*sd+mu
         wid2=0.5*sd+mu        
         plt.xticks(np.arange(-wid,wid1,wid2))
-        plt.xlabel('分位点',fontsize=xlabel_txt_size) #x轴文本
+        plt.xlabel('分位点',fontsize=xlabel_txt_size,ha='center') #x轴文本
         plt.yticks(np.arange(0,1.1,0.1))
         plt.ylabel('累积概率密度',fontsize=ylabel_txt_size) #y轴文本
 
@@ -2026,7 +2026,7 @@ def plot_norm(mu,sd,graph='pdf',obs_num=100,facecolor='whitesmoke'):
         plt.yticks(np.arange(-wid,wid1,wid2))
         plt.ylabel('分位点',fontsize=ylabel_txt_size) #y轴文本
         plt.xticks(np.arange(0,1.1,0.1))
-        plt.xlabel('累积概率密度',fontsize=xlabel_txt_size) #x轴文本        
+        plt.xlabel('累积概率密度',fontsize=xlabel_txt_size,ha='center') #x轴文本        
         
     plt.title('正态分布示意图: $\mu$=%.1f, $\sigma$=%.1f'%(mu,sd),fontweight='bold',fontsize=title_txt_size) #标题
     plt.tight_layout()

siat/security_price2.py

@@ -37,8 +37,11 @@ if __name__=='__main__':
     ticker='sz159998' #基金
     
     ticker='801010.SW' #申万
+    ticker='851242.SW' #申万
     
     ticker='AAPL'
+    
+    
     fromdate='2024-5-1'; todate='2024-5-20'
     
     ticker_type='auto'
@@ -49,7 +52,7 @@ if __name__=='__main__':
     ticker_type='fund'
     
     source='auto'
-    source='yahoo'
+    #source='yahoo'
     
     adjust='qfq'
     fill=True
@@ -84,6 +87,7 @@ def get_price_1ticker(ticker,fromdate,todate, \
     #检查日期期间合理性
     valid_period,fromdatepd,todatepd=check_period(fromdate,todate)
     if not valid_period:
+        pass
         #print("  #Warning(get_price_1ticker): invalid date period from",fromdate,"to",todate)
         return df,found
         
@@ -612,6 +616,9 @@ if __name__=='__main__':
     ticker='180202.SZ'
     ticker_type='fund'
     
+    ticker='851242.SW'
+    ticker_type='auto'    
+    
     fromdate='2021-1-1'
     todate='2024-5-30'
     adjust=''

siat/security_prices.py

@@ -2805,10 +2805,10 @@ def china_security_identify(ticker6):
     
 #==============================================================================
 if __name__=='__main__':
-    ticker='850831'
+    ticker='850831.SW'
     
-    start='2023-1-1'
-    end='2023-4-4'
+    start='2024-1-1'
+    end='2024-4-4'
     info_types=['Close','Volume']
     
     df3=fetch_price_swindex(ticker,start,end)
@@ -2834,12 +2834,17 @@ def fetch_price_swindex(ticker,start,end,info_types=['Close','Volume'],adjust=-2
     _,start1pd,_=check_period(start1,end)
     
     import akshare as ak
+    if len(ticker)==6:
+        ticker=ticker+'.SW'
+    ticker6=ticker[:6]
     try:
-        prices= ak.index_hist_sw(symbol=ticker,period="day")
+        prices= ak.index_hist_sw(symbol=ticker6,period="day")
     except: pass
 
     found=df_have_data(prices)
-    if found not in ['Found','Empty']: return df
+    if found not in ['Found','Empty']: 
+        pass
+        return df
 
     prices.columns=['Code','Date','Close','Open','High','Low','Volume','Amount']
     million=1000000

siat/security_trend2.py

@@ -76,6 +76,7 @@ if __name__=='__main__':
     indicator='Close'
     start="2020-1-1"
     end="2020-6-30"
+    ticker_type='auto'
     
     
     #测试组5
@@ -85,6 +86,29 @@ if __name__=='__main__':
     end="2024-5-30"   
     ticker_type='fund'
     
+    #测试组6
+    ticker="851242.SW"
+    indicator='Close'
+    start="2024-1-1"
+    end="2024-6-30"
+    ticker_type='auto'  
+    
+    attention_value=''; average_value=False
+    kline=False; kline_demo=False; mav=[5,10,20]
+    dividend=False; split=False
+    ret_type='Annual Adj Ret%'; RF=0; regression_period=365; market_index="auto"
+    sortby='tpw_mean'; trailing=7; trend_threshhold=0.05
+    band_area=''
+    graph=True; twinx=False; loc1='best'; loc2='best'
+    datatag=False; power=0
+    smooth=True; date_range=False; date_freq=False
+    preprocess='none'; scaling_option='change%'
+    annotate=False; annotate_value=False
+    mark_top=False; mark_bottom=False; mark_end=False
+    printout=False; source='auto'
+    ticker_type='auto'
+    facecolor='papayawhip'    
+    
     df=security_trend(ticker,indicator,start,end,ticker_type=ticker_type)
     
     

siat/stock.py

@@ -613,6 +613,16 @@ if __name__ =="__main__":
     ticker_type='auto'
     facecolor='whitesmoke'
     
+    # 测试组5
+    ticker='851242.SW'
+    indicator='Close'
+    fromdate='2024-5-1'; todate='2024-5-20'
+    adjust=''
+    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'
+    facecolor='whitesmoke'    
     
     df=security_indicator(ticker,indicator,fromdate,todate,ticker_type=ticker_type)
 

siat/translate.py

@@ -3266,6 +3266,10 @@ def ticker1_name(ticker,ticker_type='auto'):
     """
     功能：翻译单个证券名称：股票，基金，债券，投资组合
     """
+    DEBUG=False
+    if DEBUG:
+        print("DEBUG: ticker=",ticker)
+    
     #投资组合
     if isinstance(ticker,dict):
         return portfolio_name(ticker)
@@ -3282,7 +3286,11 @@ def ticker1_name(ticker,ticker_type='auto'):
             return tname
     """
     tname=codetranslate(ticker)
-    if tname != ticker: #翻译成功，注意证券代码与其名称相同的情形，例如IBM
+    if tname != ticker or ticker in ["IBM"]: #翻译成功，注意证券代码与其名称相同的情形，例如IBM
+        return tname
+
+    tname=ectranslate(ticker)
+    if tname != ticker: 
         return tname
     
     symbol=ticker1_cvt2yahoo(ticker)

siat-3.4.27.dist-info/LICENSE

@@ -0,0 +1,7 @@
+Copyright 2024 WANG Dehong
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software (siat) and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

{siat-3.4.16.dist-info → siat-3.4.27.dist-info}/METADATA

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.4.16
+Version: 3.4.27
 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
 License: Copyright (C) WANG Dehong, 2024. For educational purpose only!
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: pandas-datareader
 Requires-Dist: yfinance
 Requires-Dist: tqdm
@@ -35,18 +36,18 @@ Requires-Dist: itables
 Requires-Dist: py-trans
 Requires-Dist: bottleneck
 
-<center><font size=6>Welcome to SIAT
 
 # What is siat?
-siat is a Python plug-in for security investment analysis, specially designed for teaching and learning purposes in universities for undergraduate and postgraduate programs.
+siat is a Python 3 plug-in for security investment analysis, primarily designed for teaching and learning purposes in universities for undergraduate and postgraduate programs.
 
-Most of the results by siat are in the form of figures and/or tables.
-# Version history
+siat is recommended to run in Jupyter Notebook or Jupyter Lab, and most of its results are in the forms of figures and/or tables.
+# Version naming
 Version structure: X.Y.Z
 
 X is the major version for architecture upgrade only.
-Y is the functional version for functional enhancement.
+Y is the functional version for functional enhancements.
 Z is the minor version just for bug fixing.
+
 # Quick examples of using siat
 
 
@@ -68,7 +69,7 @@ set_language("English")
 # Simple way: show Apple's stock price in recent month
 apple=security_trend("AAPL")
 ```
-You may expect to more information, such as price trend in a recent year (MRY), with the high/low point, current price and average price, like below:
+You may expect more information, such as price trend in a recent year (MRY), with the high/low point, current price and average price, like below:
 
 ```python
 apple=security_trend("AAPL", start="MRY",
@@ -85,7 +86,7 @@ Since there is a major stock split for NVidia in 2024 by 1:10, it is necessary t
 comp=security_trend(['AAPL','MSFT','NVDA'], 
                     start='MRQ', 
                     indicator='Adj Close', 
-                    preprocess='scaling', 
+                    preprocess='scaling', #use scaling drawing method to avoid loss of details
                     mark_top=True, mark_bottom=True, 
                     annotate=True, annotate_value=True)
 ```
@@ -94,8 +95,7 @@ comp=security_trend(['AAPL','MSFT','NVDA'],
 
 
 ```python
-# Script security_technical only supports 4 popular technical indicators: MACD, Bollinger band, KDJ and RSI. 
-
+# security_technical only supports 4 popular technical indicators: MACD, Bollinger, KDJ and RSI. 
 apple=security_technical("AAPL",
                          technical="Bollinger",
                          start="MRQ",
@@ -107,15 +107,15 @@ apple=security_technical("AAPL",
 
 
 ```python
-# Script security_technical2 supports about 20 popular technical methods.
-
+# 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蓹]
 apple=security_technical2("AAPL",
                          technical="CCI",
                          start="MRM",
                          loc1="upper left", loc2="lower right")
 ```
 
-# What security product does siat support?
+# What security products does siat support?
 1. Public company profile:  world-wide
 2. Stock & stock market index: world-wide
 3. Stock valuation: primarily in China (mainland and HK) and the U.S.
@@ -131,13 +131,13 @@ apple=security_technical2("AAPL",
 13. Cash flow statement: in China mainland (full function) and world-wide (basic function)
 14. DuPont Identity: world-wide
 15. Sector trend and valuation: primarily in China
-# What analytical methodology does siat support?
+# What analytical methods does siat support?
 1. Trend analysis
 2. Panel comparation
 3. Return analysis: rolling returns, holding period returns
 4. Risk analysis: rolling volatility, holding period volatility, LPSD
 5. Technical analysis: more than 15 indicators
-6. Risk-adjusted return: sharpe, sortino, treynor, Jensen alpha
+6. Risk-adjusted return: Sharpe ratio, Sortino ratio, Treynor ratio, Jensen alpha
 7. Portfolio optimization: four risk-adjusted returns
 8. CAPM beta trend
 9. Beta adjustments: simple adjustment, Scholes-Williams, Dimson
@@ -163,11 +163,15 @@ The main data sources siat uses:
 7. IMF
 8. Shanghai Stock Exchange
 9. Shenzhen Stock Exchange
-10. Tokyo Stock Exchange
-11. HKEX
-12. Sustainalytics
-
-Thanks the above websites for their valuable data supply!
+10. Hong Kong Stock Exchange
+11. Beijing Stock Exchange
+12. Tokyo Stock Exchange
+13. London Stock Exchange
+14. New York Stock Exchange
+15. NASDAQ
+16. Sustainalytics
+
+Thanks the above websites for their valuable data!
 # How to install siat?
 The author strongly recommends using siat together with Jupyter Notebook or Jupyter Lab in Anaconda.
 In order to install siat for the very first time, open a Jupyter Notebook, and type in the following command:
@@ -202,7 +206,7 @@ pip install --upgrade siat https://mirrors.aliyun.com/pypi/simple/
 *** Warning
 1. The pip command itself may need upgrade as well.
 2. The pip command sometimes may have conflicts with some vpn programs.
-If in this case, try quit vpn program, and try again. 
+If in this case, try quit vpn program first, and try again. 
 # Are there more detailed case studies on using siat?
 YES!
 

{siat-3.4.16.dist-info → siat-3.4.27.dist-info}/RECORD

@@ -28,7 +28,7 @@ siat/cryptocurrency.py,sha256=IjQTzqTkdp19aS0PrD15nU3-tfCJHyzt0oBd5nWvwk8,27449
 siat/cryptocurrency_test.py,sha256=3AikTNJ7j-HwLGLIYEfyXZ3bLVuLeru9mwiwHQi2SdA,2669
 siat/derivative.py,sha256=qV8n09799eqLc26ojR6vN5n_X-xd7rGwdYjgq-wBih8,41483
 siat/economy-20230125.py,sha256=vxZZlPnLkh7SpGMVEPLwxjt0yYLSVmdZrO-s2NYLyoM,73848
-siat/economy.py,sha256=J0-xBtp6gg6CNP9N-UvpKLJ-0Tw5O_DKaDvEq1R35Fw,73853
+siat/economy.py,sha256=ijMAVA5ydghbQDgNDDdz8fz9NPd2eq90RzpJSRGWz5c,78638
 siat/economy_test.py,sha256=6vjNlPz7W125pJb7simCddobSEp3jmLIMvVkLRZ7zW8,13339
 siat/esg.py,sha256=GMhaonIKtvOK83rhpQUH5aJt2OL3HQBSVfD__Yw-0oo,19040
 siat/esg_test.py,sha256=Z9m6GUt8O7oHZSEG9aDYpGdvvrv2AiRJdHTiU6jqmZ0,2944
@@ -60,7 +60,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=dFec-2Ds76JEfvsMj2HS-gHcufv3vpsWe4LwpNX_XoM,87219
+siat/grafix.py,sha256=4e8_w2QT8cJo0uoKyICvod9b5a-L4-qFHnlr4YVnPwg,87359
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=G3wpaewAKF9CwEqRpr4khyuDu9SU2EGyQUHdk7cmHOA,30693
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
@@ -97,15 +97,15 @@ siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4
 siat/sector_china.py,sha256=_-NgVSI2AMRCZw3U85ov6CgU5riii4Y9oY-rfUrfVSk,132551
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
-siat/security_price2.py,sha256=65s64L68aRZdVVK3V8UYxdPd_JHMqgJ2FBJJX5MSW-Q,26174
-siat/security_prices.py,sha256=ZEnuKgLnkw1O41BpR44Mpq53N69mW3UdSzEnI_4LuPc,106387
+siat/security_price2.py,sha256=Y4suVC-4koUSI_n8kY0l0y4lo_CTcoeM_kwTHiIFzyM,26291
+siat/security_prices.py,sha256=lh4G7Q20HoC3Iph8hOuACFcIc33xKyWBgMqhTykh8Qo,106492
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmWBPk,24854
-siat/security_trend2.py,sha256=lUMab8HilXIUPo_z9ZkztMiZ5kf3jAbbCwPPkYbQ1TI,25288
+siat/security_trend2.py,sha256=za9vUgWUsfG_xCjwjtCdo3kpQKWjzw8pDNAJZuDwXl0,26115
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=IY4-RC8jztjFEN4FFdc6YP299IRyIOwIcPRObswg588,152527
+siat/stock.py,sha256=o8Mowq8qKYnRUczYdjV4Q_HSSMfbShylLUowDyYkXQ8,152856
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -131,7 +131,7 @@ 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=Isa2gjmuY6xKo3HwaPOR0CJzPqLalcu0J1Qw2cZbmFs,218567
+siat/translate.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
@@ -139,7 +139,8 @@ siat/valuation_china.py,sha256=EkZQaVkoBjM0c4MCNbaX-bMnlG0e3FXeaWczZDnkptU,67784
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=9U_XfEeMlS3TrCrO3Bww21nuFgghbnO-cqDJMhQWqew,16193
-siat-3.4.16.dist-info/METADATA,sha256=6jn_hf0WErGP2RdyweWl-65rvA-ypaJ2y-UumDF2fyU,7683
-siat-3.4.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.4.16.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.4.16.dist-info/RECORD,,
+siat-3.4.27.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.4.27.dist-info/METADATA,sha256=q5-qoM2N-gp0-nDdPBTIigtYlPFAQldahmL6euBi0a0,8010
+siat-3.4.27.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.4.27.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.4.27.dist-info/RECORD,,