siat 2.10.6__py3-none-any.whl → 2.10.12__py3-none-any.whl

siat/__init__.py

@@ -16,13 +16,14 @@ from siat.allin import *
 from IPython.core.interactiveshell import InteractiveShell
 InteractiveShell.ast_node_interactivity='all'
 #==============================================================================
+# 检查是否存在新版本
 import pkg_resources
 current_version=pkg_resources.get_distribution("siat").version
 import luddite
 latest_version=luddite.get_version_pypi("siat")
 
 if latest_version != current_version:
-    print("\nWelcome to Security Investment Analysis Toolkit (siat)")
+    print("Welcome to Security Investment Analysis Toolkit (siat)")
     print("The siat version in your computer is",current_version,"\b, latest version is",latest_version,'\n')
     print("*** If you expect to upgrade siat, use the instruction below in a command window:")
     print("    pip install siat --upgrade")

siat/common.py

@@ -2218,4 +2218,47 @@ def change_recommend_stars(stars_current,change='+'):
 
 
 #==============================================================================
+if __name__=='__main__':
+    symbol='---'
+    exclude_collist=['c1']
+    
+    import pandas as pd
+    df=pd.DataFrame({'c1':[10,11,12],'c2':['---',110,'---'],'c3':['---',1100,'---']})
+    df_filter_row(df,exclude_collist=['c1'],symbol='---')
+    
+def df_filter_row(df,exclude_collist=[],symbol=''):
+    """
+    功能：删除df中的全部行，如果该行除去exclude_collist外其全部列的1值均为symbol
+    """
+    # 若为空直接返回
+    if len(df)==0:
+        return df
+    
+    # 找出需要判断的列列表
+    collist=list(df)
+    for e in exclude_collist:
+        collist.remove(e)
+    
+    # 逐行打是否为symbol标记
+    df2=df.copy()
+    df2['EmptyRow']=True    # 假定所有行都符合条件
+    for index,row in df2.iterrows():
+        for c in collist:
+            #if row[c] not in [symbol,' ',0]:
+            if row[c] not in [symbol]:
+                df2.loc[index,'EmptyRow']=False
+
+    # 删除符合条件的行                
+    df3=df2[df2['EmptyRow']==False]
+    df3.drop('EmptyRow',axis=1,inplace=True)
+    
+    return df3
+        
+        
+
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================
 

siat/financials2.py

@@ -133,7 +133,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             if isinstance(tickers,list): tickers=tickers[0]
             else:
                 print("  #Warning(fs_analysis_china): must be one ticker or first ticker in a list for",tickers)
-                return        
+                return  None      
 
         # 检查category
         category_list=['profile','officers','market_rates','dividend','stock_split','fin_rates','risk_general','risk_esg']
@@ -150,7 +150,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
         else:
             info=get_stock_profile(ticker,info_type=category)
             
-        return 
+        return info
     
     elif ('balance' in analysis_type1) or ('sheet' in analysis_type1) \
          or ('asset' in analysis_type1) or ('liability' in analysis_type1):
@@ -159,7 +159,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             if isinstance(tickers,list): tickers=tickers[0]
             else:
                 print("  #Warning(fs_analysis_china): must be one ticker or first ticker in a list for",tickers)
-                return 
+                return None
         
         # 分析资产负债表       
         fsdf=get_balance_sheet(symbol=tickers)
@@ -230,15 +230,19 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             collist=list(fsdf4)
             fsdf4['Item']=fsdf4.index
             fsdf5=fsdf4[['Item']+collist]   
+            fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
             
             alignlist=['left']+['right']*(len(list(fsdf5))-1)
-            print(fsdf5.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
+            print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
             
-            footnote1="*** Unit: "+currency+" billion for amount items, exchange's local accounting standards"
+            footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
             footnote2="*** Data source: Yahoo Finance, "+todaydt
             print('\n',footnote1,'\n',footnote2)   
+            
+            return fsdf6
         
-        return
+        else:
+            return fsdf2
     
     elif ('income' in analysis_type1) or ('cost' in analysis_type1) \
          or ('expense' in analysis_type1) or ('earning' in analysis_type1):
@@ -247,7 +251,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             if isinstance(tickers,list): tickers=tickers[0]
             else:
                 print("  #Warning(fs_analysis_china): must be one ticker or first ticker in a list for",tickers)
-                return    
+                return   None 
         
         # 分析利润表
         fsdf=get_income_statements(symbol=tickers)
@@ -297,16 +301,19 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             
             collist=list(fsdf4)
             fsdf4['Item']=fsdf4.index
-            fsdf5=fsdf4[['Item']+collist]   
+            fsdf5=fsdf4[['Item']+collist]  
+            fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
             
             alignlist=['left']+['right']*(len(list(fsdf5))-1)
-            print(fsdf5.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
+            print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
                 
-            footnote1="*** Unit: "+currency+" billion for amount items, exchange's local accounting standards"
+            footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
             footnote2="*** Data source: Yahoo Finance, "+todaydt
             print('\n',footnote1,'\n',footnote2)    
+            
+            return fsdf6
         
-        return
+        return fsdf2
     
     elif ('cash' in analysis_type1) or ('flow' in analysis_type1):
         # 股票需为单只股票，若为列表则仅取第一个        
@@ -314,7 +321,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             if isinstance(tickers,list): tickers=tickers[0]
             else:
                 print("  #Warning(fs_analysis_china): must be one ticker or first ticker in a list for",tickers)
-                return      
+                return None     
         
         # 分析现金流量表
         fsdf=get_cashflow_statements(symbol=tickers)
@@ -364,16 +371,19 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             
             collist=list(fsdf4)
             fsdf4['Item']=fsdf4.index
-            fsdf5=fsdf4[['Item']+collist]   
+            fsdf5=fsdf4[['Item']+collist] 
+            fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
             
             alignlist=['left']+['right']*(len(list(fsdf5))-1)
-            print(fsdf5.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
+            print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
                 
-            footnote1="*** Unit: "+currency+" billion for amount items, exchange's local accounting standards"
+            footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
             footnote2="*** Data source: Yahoo Finance, "+todaydt
             print('\n',footnote1,'\n',footnote2)     
             
-        return
+            return fsdf6
+            
+        return fsdf2
     
     elif ('summary' in analysis_type1):
         
@@ -463,15 +473,18 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 collist=list(fsdf4)
                 fsdf4['Item']=fsdf4.index
                 fsdf5=fsdf4[['Item']+collist]   
+                fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
                 
                 alignlist=['left']+['right']*(len(list(fsdf5))-1)
-                print(fsdf5.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
+                print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
                     
-                footnote1="*** Unit: "+currency+" billion for amount items, exchange's local accounting standards"
+                footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
                 footnote2="*** Data source: Yahoo Finance, "+todaydt
                 print('\n',footnote1,'\n',footnote2)     
+                
+                return fsdf6
 
-            return
+            return fsdf2
                 
         # 股票可为股票列表(多只股票对比)        
         if isinstance(tickers,list):
@@ -539,15 +552,18 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 collist=list(fsdf4)
                 fsdf4['Item']=fsdf4.index
                 fsdf5=fsdf4[['Item']+collist]   
+                fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
                 
                 alignlist=['left']+['right']*(len(list(fsdf5))-1)
-                print(fsdf5.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
+                print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
                     
-                footnote1="*** Unit: "+currency+" billion for amount items, exchange's local accounting standards"
+                footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
                 footnote2="*** Data source: Yahoo Finance, "+todaydt
                 print('\n',footnote1,'\n',footnote2)   
+                
+                return fsdf6
 
-        return        
+        return fsdf2     
     
     elif ('indicator' in analysis_type1):
         
@@ -635,15 +651,18 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 collist=list(fsdf4)
                 fsdf4['Item']=fsdf4.index
                 fsdf5=fsdf4[['Item']+collist]   
+                fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
                 
                 alignlist=['left']+['right']*(len(list(fsdf5))-1)
-                print(fsdf5.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
+                print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
                     
-                footnote1="*** Unit: "+currency+" billion for amount items, exchange's local accounting standards"
+                footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
                 footnote2="*** Data source: Yahoo Finance, "+todaydt
                 print('\n',footnote1,'\n',footnote2)      
+                
+                return fsdf6
 
-            return
+            return fsdf2
                 
         # 股票可为股票列表(多只股票对比)        
         if isinstance(tickers,list):
@@ -708,22 +727,25 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 collist=list(fsdf4)
                 fsdf4['Item']=fsdf4.index
                 fsdf5=fsdf4[['Item']+collist]   
+                fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
                 
                 alignlist=['left']+['right']*(len(list(fsdf5))-1)
-                print(fsdf5.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
+                print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))                
                     
-                footnote1="*** Unit: "+currency+" billion for amount items, exchange's local accounting standards"
+                footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
                 footnote2="*** Data source: Yahoo Finance, "+todaydt
-                print('\n',footnote1,'\n',footnote2)    
+                print('\n',footnote1,'\n',footnote2)  
+                
+                return fsdf6
 
-        return        
+        return fsdf2     
        
     
     elif ('dupont' in analysis_type1) and (('identity' in analysis_type1) or ('analysis' in analysis_type1)):
         # 股票需为股票列表        
         if not isinstance(tickers,list):
             print("  #Warning(fs_analysis_china): must be a ticker list for",tickers)
-            return        
+            return None    
             
         business_period=business_period.lower()
         fsdf=pd.DataFrame()
@@ -816,11 +838,11 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             footnote2="Data source: Yahoo Finance, "+todaydt
             print('\n',footnote1,'\b.',footnote2)               
         
-        return        
+        return  df2      
     
     else:   # analysis_type1
         print("  #Warning(fs_analysis): sorry, no idea on what to do for",analysis_type)
-    return
+    return None
 
 
 #==============================================================================

siat/financials_china.py

@@ -3704,34 +3704,44 @@ def get_fin_indicator_1ticker_china(ticker,fsdates):
     for index,row in dft5.iterrows():
         # 改变顺序要谨慎
         if ('每股' in row['指标']) and (row['选项'] == ''):
-            row['选项']='每股指标'
+            #row['选项']='每股指标'
+            dft5.loc[index,'选项']='每股指标'
             
         if ('周转' in row['指标']) and (row['选项'] == ''):
-            row['选项']='营运能力'
+            #row['选项']='营运能力'
+            dft5.loc[index,'选项']='营运能力'
             
         if ('应收' in row['指标']) and (row['选项'] == ''):
-            row['选项']='应收账款'            
+            #row['选项']='应收账款'  
+            dft5.loc[index,'选项']='应收账款'
             
         if ('预付' in row['指标']) and (row['选项'] == ''):
-            row['选项']='预付账款' 
+            #row['选项']='预付账款' 
+            dft5.loc[index,'选项']='预付账款'
             
         if str_contain_any_substr(row['指标'],debtstrlist) and (row['选项'] == ''):
-            row['选项']='偿债能力'      
+            #row['选项']='偿债能力'  
+            dft5.loc[index,'选项']='偿债能力'
             
         if ('现金' in row['指标']) and (row['选项'] == ''):
-            row['选项']='现金指标'             
+            #row['选项']='现金指标'  
+            dft5.loc[index,'选项']='现金指标'
             
         if ('亿元' in row['指标']) and (row['选项'] == ''):
-            row['选项']='规模指标'                
-            
+            #row['选项']='规模指标' 
+            dft5.loc[index,'选项']='规模指标'   
+        """    
         if ('亿元' in row['指标']) and (row['选项'] == ''):
-            row['选项']='规模指标'                 
-            
+            #row['选项']='规模指标'  
+            dft5.loc[index,'选项']='规模指标'                
+        """    
         if str_contain_any_substr(row['指标'],retstrlist) and (row['选项'] == ''):
-            row['选项']='利润回报'            
+            #row['选项']='利润回报' 
+            dft5.loc[index,'选项']='利润回报' 
             
         if (row['选项'] == ''):
-            row['选项']='其他指标'      
+            #row['选项']='其他指标'  
+            dft5.loc[index,'选项']='其他指标'
     
     return dft5
 
@@ -3784,6 +3794,14 @@ if __name__=='__main__':
     tickers=['000002.SZ','600048.SS','001979.SZ','600325.SS','000069.SZ','600383.SS','600895.SS','601155.SS']
     fidf=compare_fin_indicator_china(tickers,fsdates)
     
+    tickers='601615.SS'
+    fsdates=['2022-12-31',
+         '2021-12-31',
+         '2020-12-31',
+         '2019-12-31',
+         '2018-12-31',
+        ]
+    
 def compare_fin_indicator_china(tickers,fsdates):
     """
     功能：分类别显示财报摘要中的指标
@@ -3994,6 +4012,13 @@ def compare_fin_indicator_china(tickers,fsdates):
                '3. 固定资产净值率=(固定资产原值-累计折旧)/固定资产原值*100%，反映企业全部固定资产平均新旧程度 \n'+ \
                '4. 资本固定化比率=非流动资产/净资产*100%，若超过100%，说明固定资产资金投入超过自身能力，易造成财务状况恶化。 \n',
               }        
+    
+    # 标记选项类型
+    typedict_keys=list(typedict.keys())
+    for index,row in fsdf.iterrows():
+        for k in typedict_keys:
+            if row['指标'] in typedict[k]:
+                fsdf.loc[index,'选项']=k
         
     # 一只股票情形：多日期
     if len(tickers_found) == 1:
@@ -4004,6 +4029,7 @@ def compare_fin_indicator_china(tickers,fsdates):
         fsdf1=fsdf[fsdf['ticker']==ticker1]
         for ty in typelist:
             dft=fsdf1[fsdf1['选项']==ty]
+            #dft=fsdf1[fsdf1['选项'].apply(lambda x: x in typedict[ty])]
             #print(list(dft['指标']))
             
             # 自定义排序
@@ -4027,6 +4053,11 @@ def compare_fin_indicator_china(tickers,fsdates):
             print("\n***",ty+'：')
             colalign=['center','left']+['right']*(len(list(dft3)) - 1)
             print(dft3.to_markdown(tablefmt='Simple',index=True,colalign=colalign))
+            """
+            注意：若dft3为空，则会出现错误：list assignment index out of range
+            无论如何修改colalign都没用
+            """
+            
             print(notesdict[ty])
         
         return dft3

{siat-2.10.6.dist-info → siat-2.10.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 2.10.6
+Version: 2.10.12
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, Business School, BFSU

{siat-2.10.6.dist-info → siat-2.10.12.dist-info}/RECORD

@@ -1,4 +1,4 @@
-siat/__init__.py,sha256=Sz34mWF-AFyH1KAA4-N_n5xqNW5IOWX79mRg8yWauys,2083
+siat/__init__.py,sha256=WcOl_oq7p3eXhWXoRc82MO-QS5DVjXn8J-c5TFrPdrc,2112
 siat/allin.py,sha256=Myw0PYPpD-MPkinxj532RTJBZhqvp1KsvJS8s5EeO30,2390
 siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
 siat/assets_liquidity.py,sha256=WEdxeENumZZZ7sFmwjDeX9rClHXGGHbnlrL2NMkgqnw,28808
@@ -15,7 +15,7 @@ siat/bond_test.py,sha256=yUOFw7ddGU-kb1rJdnsjkJWziDNgUR7OLDA7F7Ub91A,5246
 siat/capm_beta.py,sha256=cqbmfM4mrq73Ub0bq5QjWJjmJHj9x7-dSqbmNxnEj7k,28946
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=YQAU7SmLzoUQv32z65DxrmAEFcnH82K-Usk5yiscA9w,77538
+siat/common.py,sha256=K5v9ULK35reQTH9V77_ac9oNBkYKX3bWbMRciJiRPmI,79072
 siat/compare_cross.py,sha256=-MZzxmX8_9oFZ7X0IcR51w87EWwssbitiw-BcmHMFzQ,26228
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -37,8 +37,8 @@ siat/financial_statements.py,sha256=UbV6ju4jrYaFOvhUgcEuclBBo9gkmqDngdr_92nsFX0,
 siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHYXb_w,716
 siat/financials.py,sha256=6gSwc2VzJy_cAbK2imXEl3Kldw3mmT2Gm54JbK7x35I,78743
 siat/financials2 - 副本.py,sha256=dKlNjIfKeoSy055fQ6E6TUj9HEoO5Ney9grD84J5kfk,14389
-siat/financials2.py,sha256=Ek80sKJOzVnxlfMbs2v3Cg_mpOXppkmALRpbiAnOCRA,35082
-siat/financials_china.py,sha256=6DUOXeJbmIkbV0xl56NvZApi-SEm50NEM1X0IyUrhI8,176521
+siat/financials2.py,sha256=sEfa_JTwIp0SsJLtOsTTxiJZXwArfr9hYlaIsBRxc8E,35965
+siat/financials_china.py,sha256=nUSPS4SDLP1RaOZF6uIvel8pFl3X_aBO_I0Opl1O8RI,177685
 siat/financials_china2.py,sha256=EWDuSHQc6TMeU8mXV_LyLLI3URBU8WQYLEZ3obXyB6E,71864
 siat/financials_china2_test.py,sha256=Erz5k4LyOplBBvYls2MypuqHpVNJ3daiLdyeJezNPu0,2722
 siat/financials_china2_test2.py,sha256=C8CuYTMHN4Mhp-sTu-Bmg0zMXRCaYV6ezGDoYartRYQ,3507
@@ -123,7 +123,7 @@ siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/valuation_china.py,sha256=SPJFU9J8WJhz_HOXgIAjoG8dZs1zSPS1BZxkjhA-D1w,52241
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=zB_Skk_tmzIR15l6oAW3am4HBGVIG-eZ8gJhCdXZ8Qw,14859
-siat-2.10.6.dist-info/METADATA,sha256=aNY8VPAGaWh8lTFjS67w-cMwa_zRAcPc41a0SneGrIg,1353
-siat-2.10.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-2.10.6.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-2.10.6.dist-info/RECORD,,
+siat-2.10.12.dist-info/METADATA,sha256=xmg78Xpf6IGBh5nuupO7-HCebsFLEPPf82OjjipMu7U,1354
+siat-2.10.12.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-2.10.12.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-2.10.12.dist-info/RECORD,,