siat 3.4.4__py3-none-any.whl → 3.4.6__py3-none-any.whl

siat/financials_china.py

@@ -57,6 +57,7 @@ if __name__=='__main__':
     ticker='600791.SS'
     
     ticker="601375.SS"
+    ticker="600305.SS"
     
     akfs=get_fin_stmt_ak(ticker)
     
@@ -3427,8 +3428,8 @@ def str_contain_any_substr(astr,substrlist):
 
 #==============================================================================
 if __name__=='__main__':
-    ticker='000002.SZ'
-    fsdates=['2022-12-31','2021-12-31','2020-12-31']
+    ticker='600305.SS'
+    fsdates=['2023-6-30','2022-6-30','2021-6-30']
     
     fsdf1=get_fin_summary_1ticker_china(ticker,fsdates)
 
@@ -3455,6 +3456,10 @@ def get_fin_summary_1ticker_china(ticker,fsdates):
     _,t1,_=split_prefix_suffix(ticker)
     dft=ak.stock_financial_abstract(t1)
     
+    #akshare错误更正：此处的“营业成本”其实为“营业总成本”
+    if ("营业成本" in list(dft['指标'])) and not ("营业总成本" in list(dft['指标'])):
+        dft.loc[dft['指标']=="营业成本","指标"]="营业总成本"
+        
     # 处理金额单位和百分号字段
     # 选项-指标对照表
     option_indicator_df=dft[['选项','指标']]
@@ -3633,7 +3638,7 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke',font_size='
     typelist=['常用指标','每股指标','营运能力','盈利能力','收益质量','成长能力','财务风险']
     # 手工设定项目显示顺序，使其看起来更合理
     typedict={'常用指标':
-              ['营业总收入(亿元)','营业成本(亿元)',
+              ['营业总收入(亿元)','营业总成本(亿元)',
                '净利润(亿元)','扣非净利润(亿元)','归母净利润(亿元)',
                '毛利率%','销售净利率%','期间费用率%',  
                '基本每股收益(元)','总资产报酬率(ROA)%','净资产收益率(ROE)%', 
@@ -3642,7 +3647,7 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke',font_size='
                '资产负债率%','商誉(亿元)',],
               
               '每股指标':
-              ['每股营业总收入(元)','每股营业收入(元)',
+              ['每股营业总收入(元)',#'每股营业收入(元)',
                '每股息税前利润(元)','基本每股收益(元)','稀释每股收益(元)',
                '每股净资产_最新股数(元)','摊薄每股净资产_期末股数(元)','调整每股净资产_期末股数(元)', 
                '每股未分配利润(元)','每股留存收益(元)','每股盈余公积金(元)','每股资本公积金(元)',

siat/stock.py

@@ -2453,10 +2453,10 @@ def candlestick_demo(stkcd,fromdate,todate, \
     low_txt=text_lang('最低价','Low')
     close_txt=text_lang('收盘价','Close')
     
-    plt.plot(p.index,p['Open'],color='green',ls="--",label=open_txt,marker='>',markersize=10,linewidth=2)
-    plt.plot(p.index,p['High'],color='cyan',ls="-.",label=high_txt,marker='^',markersize=10,linewidth=2)
-    plt.plot(p.index,p['Low'],color='k',ls=":",label=low_txt,marker='v',markersize=10,linewidth=2)
-    plt.plot(p.index,p['Close'],color='blue',ls="-",label=close_txt,marker='<',markersize=10,linewidth=2)
+    plt.plot(p.index,p['Open'],color='green',ls="--",label=open_txt,marker='>',markersize=10,linewidth=2,alpha=0.5)
+    plt.plot(p.index,p['High'],color='cyan',ls="-.",label=high_txt,marker='^',markersize=10,linewidth=2,alpha=0.5)
+    plt.plot(p.index,p['Low'],color='k',ls=":",label=low_txt,marker='v',markersize=10,linewidth=2,alpha=0.5)
+    plt.plot(p.index,p['Close'],color='blue',ls="-",label=close_txt,marker='<',markersize=10,linewidth=2,alpha=0.5)
     
     #绘制蜡烛图
     try:
@@ -2468,7 +2468,7 @@ def candlestick_demo(stkcd,fromdate,todate, \
         return None    
         
     #candlestick_ohlc(ax,b,colorup=colorup,colordown=colordown,width=width,alpha=0.5)
-    candlestick_ohlc(ax,b,colorup=colorup,colordown=colordown,width=width)
+    candlestick_ohlc(ax,b,colorup=colorup,colordown=colordown,width=width,alpha=0.5)
 
     ax.xaxis_date()	#draw dates in x axis
     ax.autoscale_view()

siat/stock_technical.py

@@ -2267,7 +2267,7 @@ def security_bollinger(ticker,fromdate,todate,boll_days=20, \
 
     y_label=text_lang('价格',"Price")
     import datetime; today = datetime.date.today()
-    x_label=text_lang("数据来源：综合新浪/东方财富/stooq/雅虎财经，","Data source: Sina/EM/Stooq/Yahoo, ")+str(today)
+    x_label=text_lang("数据来源：Sina/EM/Stooq/Yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")+str(today)
 
     axhline_value=0
     axhline_label=''
@@ -2444,7 +2444,7 @@ def security_bubble(ticker,fromdate,todate,boll_years=7, \
 
     y_label=indicatorname
     import datetime; today = datetime.date.today()
-    x_label="数据来源：综合新浪/东方财富/stooq/雅虎财经，"+str(today)+"，估值前置窗口期"+str(boll_years)+"年"
+    x_label="数据来源：Sina/EM/Stooq/Yahoo，"+str(today)+"，估值前置窗口期"+str(boll_years)+"年"
 
     axhline_value=0
     axhline_label=''

{siat-3.4.4.dist-info → siat-3.4.6.dist-info}/METADATA

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

@@ -41,7 +41,7 @@ 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=BkfY8A3YH2_NRyqIwGZ3MA1dq75VGhMaTqE0SAlbYrk,191413
+siat/financials_china.py,sha256=Pgi-CTl7ZT_RxHt70N7wBjMQ_UUAqZFClLh6GpcK0MQ,191709
 siat/financials_china2.py,sha256=tUvWZhUORrZ0EuCVVkJifbO-8d_hXUyA73OPmOX1CL0,92862
 siat/financials_china2_test.py,sha256=Erz5k4LyOplBBvYls2MypuqHpVNJ3daiLdyeJezNPu0,2722
 siat/financials_china2_test2.py,sha256=C8CuYTMHN4Mhp-sTu-Bmg0zMXRCaYV6ezGDoYartRYQ,3507
@@ -105,7 +105,7 @@ siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmW
 siat/security_trend2.py,sha256=lUMab8HilXIUPo_z9ZkztMiZ5kf3jAbbCwPPkYbQ1TI,25288
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=ouP2nnjYqgzAol0ljQHnnMPfG63U0NrEdME75w2J_ps,152394
+siat/stock.py,sha256=22HTy0BfmynrkWuprNGlfRsYuWdTyCV0CJ9t_w5x238,152444
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -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=bB53TCI3DE5pEwleEQjjrsuzMwhaEcmDmSuXt2xKceo,136112
+siat/stock_technical.py,sha256=WpiB-e1u3PqUqu8uyY0xFP2rxXNvY9L9f7DZ7V4LQnU,136062
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
 siat/stooq.py,sha256=dOc_S5HLrYg48YAKTCs1eX8UTJOOkPM8qLL2KupqlLY,2470
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
@@ -139,7 +139,7 @@ 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=H1EM8YYXA8nQHIqsJlso0I3HKPiJLT3QujO4gRVQXWs,13945
-siat-3.4.4.dist-info/METADATA,sha256=ylhx2EuylQVSae5MeAMZhLOSUwZ0Og377KP_JmKV3dI,7309
-siat-3.4.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-siat-3.4.4.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.4.4.dist-info/RECORD,,
+siat-3.4.6.dist-info/METADATA,sha256=Agk7WFoMV7XNYw3oVZAWg1hEo1UmDFKgavjPoVFN0z8,7309
+siat-3.4.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.4.6.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.4.6.dist-info/RECORD,,

{siat-3.4.4.dist-info → siat-3.4.6.dist-info}/WHEEL

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