siat 3.2.55__py3-none-any.whl → 3.2.56__py3-none-any.whl

siat/common.py

@@ -3898,6 +3898,10 @@ def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
         print("All specified modules are successfully upgraded except",end='')
         print_list(fail_list,leading_blanks=1)
         
+        if 'pip' in fail_list:
+            print("Upgrading for pip, in Anaconda Prompt (Windows) or Terminal (Mac):")
+            print("  python -m pip install --upgrade pip")
+        
     return
 
 def df_index_timezone_remove(df):

siat/stock_technical.py

@@ -2799,14 +2799,31 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
     fromdate,todate=start_end_preprocess(start=start,end=end)
     
     #检查指标类别
-    tech_list={'Bollinger':'布林带','MACD':'指数平滑异同平均', \
-                'RSI':'相对强弱','KDJ':'随机指标','OBV':'能量潮', \
-                'SAR':'抛物转向','VOL':'成交量','ARBR':'人气与意愿', \
-                'CR':'能力线','EMV':'简易波动','TRIX':'三重指数平滑', \
-                'DMA':'均线差','BIAS':'乖离率','CCI':'顺势线', \
-                'W%R':'威廉比率','ROC':'变动速率','DMI':'趋向线','PSY':'心理线', \
-                'MFI':'资金流','MOM':'动量指标','BETA':'动态贝塔', \
-                'TSF':'时间序列预测','AD':'量价指标','MA':'移动平均','EMA':'指数移动平均'}
+    tech_list={'Bollinger':text_lang('布林带','Bollinger Band'), \
+               'MACD':text_lang('移动异同平均线','Moving Average Convergence Divergence'), \
+               'RSI':text_lang('相对强弱','Relative Strength Index'), \
+               'KDJ':text_lang('随机指标','Stochastics'), \
+               'OBV':text_lang('能量潮','On-Balance-Volume'), \
+               'SAR':text_lang('抛物线/停损转向指标','Stop and Reverse Indicator'), \
+               'VOL':text_lang('成交量指标','Volume Indicator'), \
+               'ARBR':text_lang('人气(AR)意愿(BR)指标','Emotion AR & Willingness BR'), \
+               'CR':text_lang('中间意愿指标','Commodity Channel Index Reversal'), \
+               'EMV':text_lang('简易波动','Ease of Movement Value'), \
+               'TRIX':text_lang('三重指数平滑均线','Triple Exponentially Smoothed Moving Average'), \
+               'DMA':text_lang('均线差','Difference in Moving Averages'), \
+               'BIAS':text_lang("乖离率",'Bias Indicator'), \
+               'CCI':text_lang('顺势指标','Commodity Channel Index'), \
+               'W%R':text_lang('威廉超买/超卖指标','William Overbought/Oversold Index'), \
+               'ROC':text_lang('变动率','Rate of Change'), \
+               'DMI':text_lang('动向指标','Directional Movement Index'), \
+               'PSY':text_lang('心理线','Phycholoigical Line'), \
+               'MFI':text_lang('资金流向指标','Money Flow Index'), \
+               'MOM':text_lang('动量指标','Momentum'), \
+               'BETA':text_lang("移动贝塔系数",'Moving Beta Coefficient'), \
+               'TSF':text_lang("时间序列分析",'Time Series Forecasting'), \
+               'AD':text_lang('集散指标','Accumulation/Distribution'), \
+               'MA':text_lang('移动平均','Moving Average'), \
+               'EMA':text_lang('指数移动平均','Exponential Moving Average')}
 
     technical1=technical
     if isinstance(technical,list):
@@ -2930,30 +2947,31 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
     
     #绘图数值缩放比例，以便使指标数量级与股价更加协调
     magnitude_list={'RSI':[1,''],
-                    'OBV':[1/1000000,'百万'],
+                    'OBV':[1/1000000,text_lang('百万','in millions')],
                     'MACD':[1,''],
                     'KDJ':[1,''],
                     'SAR':[1,''],
-                    'VOL':[1/1000000,'百万'],
+                    'VOL':[1/1000000,text_lang('百万','in millions')],
                     'PSY':[1,''],
                     'ARBR':[1,''],
                     'CR':[1,''],
-                    'EMV':[100000000,'亿分之一'],
+                    'EMV':[1000000000,text_lang('十亿分之一','in 1 billionth')],
                     'Bollinger':[1,''],
-                    'TRIX':[100,'百分之一'],
+                    'TRIX':[100,text_lang('百分之一','%')],
                     'BIAS':[1,''],
                     'CCI':[1,''],
                     'W%R':[1,''],
                     'ROC':[1,''],
                     'DMI':[1,''],
                     'DMA':[1,''],
-                    'MA':[1,''],'EMA':[1,''],
+                    'MA':[1,''],
+                    'EMA':[1,''],
                     'MFI':[1,''],
                     'MOM':[1,''],
                     'BETA':[1,''],
                     'TSF':[1,''],
-                    'AD':[1/1000000,'百万'],
-                    'Volume':[1/1000000,'百万']}
+                    'AD':[1/1000000,text_lang('百万','in millions')],
+                    'Volume':[1/1000000,text_lang('百万','in millions')]}
 
     mag_times=magnitude_list[technical1][0]
     mag_label=magnitude_list[technical1][1]
@@ -3039,9 +3057,9 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
         
         labeltxt=l.upper()
         if labeltxt =='DEA':
-            labeltxt='慢线(DEA)'
+            labeltxt=text_lang('慢线(DEA)','DEA (Slow line)')
         if labeltxt =='DIF':
-            labeltxt='快线(DIF)'            
+            labeltxt=text_lang('快线(DIF)','DIF (Fast line)')            
             
         axline, = ax.plot(df1.index,df1[l],label=labeltxt)
         last_line_color = axline.get_color()
@@ -3082,7 +3100,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
 
                 attention_draws[pos]=True
         
-    ylabeltxt1=technical1+'指标'
+    ylabeltxt1=technical1+text_lang('指标',' indicators ')
     if mag_label != '':
         ylabeltxt1=ylabeltxt1+'('+mag_label+')'
     ax.set_ylabel(ylabeltxt1,fontsize=ylabel_txt_size)
@@ -3145,12 +3163,12 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
             seg_color=price_line_color1
             #labeltxt=ylabeltxt2+'(当日↑)'
             #labeltxt=ylabeltxt2+'(当日阳线)'
-            labeltxt='当日↑'
+            labeltxt=text_lang('当日↑','Bullish day')
         else:
             seg_color=price_line_color2
             #labeltxt=ylabeltxt2+'(当日↓)'
             #labeltxt=ylabeltxt2+'(当日阴线)'
-            labeltxt='当日↓'
+            labeltxt=text_lang('当日↓','Bearish day')
             
         if first_time:
             first_time=False; second_time=True
@@ -3170,14 +3188,14 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
     ax3.bar(df1up.index,df1up['Volume'],color=price_line_color1)
     ax3.bar(df1down.index,df1down['Volume'],color=price_line_color2)
     
-    ax3.set_ylabel("交易量(百万股)",fontsize=ylabel_txt_size -4)
+    ax3.set_ylabel(text_lang("交易量(百万股)","Volume (in millions)"),fontsize=ylabel_txt_size -4)
     
-    footnote1="\n注："
-    footnote2="价格曲线端点大中小对应当日涨跌幅度的高中低情形。"
-    footnote3="横轴日期上的空白处为非交易日。\n"
+    footnote1=text_lang("\n注：","\nNote: ")
+    footnote2=text_lang("价格曲线端点大中小对应当日涨跌幅度的高中低情形。","The node sizes in curve refelct the amplitudes of close-open price changes in a day\n")
+    footnote3=text_lang("横轴日期上的空白处为非交易日。\n","The blank areas of bars are non-trading days. ")
     
     import datetime; todaydt = str(datetime.date.today())
-    footnote4="数据来源：新浪/雅虎/stooq/东方财富等，"+todaydt+"统计"
+    footnote4=text_lang("数据来源：新浪/Stooq/Yahoo等，","Data source: Sina/Stooq/Yahoo, ")+todaydt+text_lang("统计",'')
     
     footnote=footnote1+footnote2+footnote3+footnote4
     ax3.set_xlabel(footnote,fontsize=ylabel_txt_size -2)
@@ -3185,7 +3203,7 @@ def security_technical2(ticker,start='default',end='default',technical='MACD', \
     #fig.text(0.5, 0.04, 'x', ha='center')
     plt.subplots_adjust(hspace=0.2)
     
-    titletxt=ticker_name(ticker)+': '+tech_list[technical1]+technical1
+    titletxt=ticker_name(ticker)+': '+text_lang(tech_list[technical1]+technical1,technical1+' ('+tech_list[technical1]+')')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     
     plt.gcf().autofmt_xdate()

{siat-3.2.55.dist-info → siat-3.2.56.dist-info}/METADATA

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

@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=d7lZ-VXVVmBkMVGDPlozL-9gAU3cYpHG23X1WSRCOgY,26907
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=ZRf7eq9trFmOSG_JQfWjcpSxn7B6ShB8bQ-kHi1qu9g,151526
+siat/common.py,sha256=voALy4D-hTj7VOmibBH-1P0QUJf6PU-aS7hjjbFP7Zo,151717
 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
@@ -117,7 +117,7 @@ siat/stock_prices_kneighbors.py,sha256=WfZvo5EyeBsm-T37zDj7Sl9dPSRq5Bx4JxIJ9IUum
 siat/stock_prices_linear.py,sha256=-OUKRr27L2aStQgJSlJOrJ4gay_G7P-m-7t7cU2Yoqk,13991
 siat/stock_profile.py,sha256=B3eIwzEmiCqiCaxIlhfdEPsQBoW1PFOe1hkiY3mVF6Y,26038
 siat/stock_technical-20240620.py,sha256=A4x18mZgYSA8SSiDz4u_O3gd5oVRgbI6JIiBfFY0tVw,116013
-siat/stock_technical.py,sha256=1pdhk0FwiQ5v252EckmQMlr2RJQIgR3wDtaSeliDyxY,134192
+siat/stock_technical.py,sha256=bB53TCI3DE5pEwleEQjjrsuzMwhaEcmDmSuXt2xKceo,136112
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -138,7 +138,7 @@ siat/valuation.py,sha256=NKfeZMdDJOW42oLVHob6eSVBXUqlN1OCnnzwyGAst8c,48855
 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-3.2.55.dist-info/METADATA,sha256=zJ-SJEQaVRRrlmNS4L0WZ86GAQfMubiIP286T1U_Qc4,7310
-siat-3.2.55.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.2.55.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.2.55.dist-info/RECORD,,
+siat-3.2.56.dist-info/METADATA,sha256=1763AmUDNyuc4gvJuqulmK7jTWVHMbE3SnDVv3evte8,7310
+siat-3.2.56.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-3.2.56.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.2.56.dist-info/RECORD,,