siat 2.12.3__py3-none-any.whl → 2.12.4__py3-none-any.whl

siat/financial_statements.py

@@ -246,6 +246,9 @@ def get_income_statements(symbol):
     stmt.sort_values(by=['asOfDate','periodType'],inplace=True)
     #去掉重复记录: 保留年报数据项多，去掉数据项少的季报
     stmt.drop_duplicates(subset=['asOfDate'],keep='first',inplace=True)
+    
+    #把periodType中的TTM改成3M
+    stmt['periodType']=stmt['periodType'].apply(lambda x: '3M' if x=='TTM' else x)
 
     #字段缺失处理
     if 'InterestExpense' not in list(stmt):
@@ -353,6 +356,9 @@ def get_cashflow_statements(symbol):
     stmt.sort_values(by=['asOfDate','periodType'],inplace=True)
     #去掉重复记录: 保留年报数据项多，去掉数据项少的季报
     stmt.drop_duplicates(subset=['asOfDate'],keep='first',inplace=True)
+    
+    #把periodType中的TTM改成3M
+    stmt['periodType']=stmt['periodType'].apply(lambda x: '3M' if x=='TTM' else x)
 
     #字段缺失处理
     if 'CashDividendsPaid' not in list(stmt):
@@ -445,10 +451,12 @@ def get_financial_statements(ticker):
     
     #合并1：资产负债表+利润表
     import pandas as pd
-    fbs_fis=pd.merge(fbs,fis,on=['asOfDate','periodType'])
+    #fbs_fis=pd.merge(fbs,fis,on=['asOfDate','periodType'])
+    fbs_fis=pd.merge(fbs,fis,how='left',on=['asOfDate'],suffixes=('', '_y'))
     
     #合并2：+现金流量表
-    fbs_fis_fcf=pd.merge(fbs_fis,fcf,on=['asOfDate','periodType','NetIncome'])
+    #fbs_fis_fcf=pd.merge(fbs_fis,fcf,on=['asOfDate','periodType','NetIncome'])
+    fbs_fis_fcf=pd.merge(fbs_fis,fcf,how='left',on=['asOfDate'],suffixes=('', '_y'))
     
     fbs_fis_fcf['ticker']=ticker
     #将所有的nan替换为0

siat/financials.py

@@ -890,6 +890,8 @@ if __name__ == '__main__':
 if __name__ == '__main__':
     fsdf=get_financial_statements('AAPL')
     fst=fsdf.T  #查看科目名称更加方便
+    
+    fsdf=get_financial_statements('3333.HK')
 
 def calc_fin_rates(fsdf):
     """

siat/financials2.py

@@ -87,6 +87,8 @@ if __name__=='__main__':
     fs_analysis(tickers,fsdates,analysis_type='profile',category='business',business_period='annual')
     fs_analysis(tickers,fsdates,analysis_type='profile',category='valuation')
     fs_analysis(tickers,fsdates,analysis_type='profile',category='financial')
+    
+    tickers='03333.HK'; analysis_type='financial indicator'
 
 def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 category='profile',business_period='annual', \
@@ -674,6 +676,10 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 with HiddenPrints():
                     dftmp=get_financial_rates(t)
                 
+                if dftmp is None:
+                    print("  #Warning(fs_analysis): none of financial indicators found for stock",t)
+                    continue
+                
                 if business_period=='recent':
                     dftmp2=dftmp.tail(1)
                 elif business_period=='annual':
@@ -683,8 +689,19 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 else:
                     dftmp2=dftmp.tail(1)
                 
-                dftmp2=pd.DataFrame(dftmp2)
-                fsdf=pd.concat([fsdf,dftmp2])
+                #dftmp2=pd.DataFrame(dftmp2)
+                #dftmp2['ticker1']=dftmp2['ticker']
+                #dftmp2.set_index('ticker1',inplace=True)
+                
+                #删除重复的列名，若存在重复列会出现错误InvalidIndexError: Reindexing only valid with uniquely valued Index objects
+                dftmp2t=dftmp2.T
+                dftmp2t.drop_duplicates(keep='first',inplace=True)
+                dftmp3=dftmp2t.T
+                
+                if fsdf is None:
+                    fsdf=dftmp3
+                else:
+                    fsdf=pd.concat([fsdf,dftmp3],ignore_index=True)
             
             # 变换年报/季报
             fsdf['periodType']=fsdf['periodType'].apply(lambda x: 'Annual' if x=='12M' else 'Quarterly')

{siat-2.12.3.dist-info → siat-2.12.4.dist-info}/METADATA

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

{siat-2.12.3.dist-info → siat-2.12.4.dist-info}/RECORD

@@ -33,11 +33,11 @@ siat/exchange_bond_china.pickle,sha256=78r6E3vPFZlCYPcmS1asgVbe0FGAxsCWaw8ek42Sd
 siat/fama_french.py,sha256=tNtr0WRyPxDbgN6Nu_ZnDtVC-RIiQfh6w0JiPjevWa0,47538
 siat/fama_french_test.py,sha256=M4O23lBKsJxhWHRluwCb3l7HSEn3OFTjzGMpehcevRg,4678
 siat/financial_base.py,sha256=j961-1YS9qBl6LmOzI4gCOpdTmk0d1JgNXMzLmV-lrs,41062
-siat/financial_statements.py,sha256=feuNmtAo63i6IrTSAhSiolaw04JiFCJUWSWABixA69I,23509
+siat/financial_statements.py,sha256=su_9CYUZVuhmv6gmYYhjQuJ_kAzGMuqi-9j72DwjGlc,23929
 siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHYXb_w,716
-siat/financials.py,sha256=6gSwc2VzJy_cAbK2imXEl3Kldw3mmT2Gm54JbK7x35I,78743
+siat/financials.py,sha256=GPWJhLC47yRwY4gWUAJcLNxDuiEejkXq-zTBrUlTHn0,78795
 siat/financials2 - 副本.py,sha256=dKlNjIfKeoSy055fQ6E6TUj9HEoO5Ney9grD84J5kfk,14389
-siat/financials2.py,sha256=K1TMWyAqbgYnLJT5LtXso_1H3ae8qRjVNXNJycmHD6Q,35952
+siat/financials2.py,sha256=t6fJQkISM7FXYCj-UM0cHzHcWL7tZwhoxDBfnK9HsRE,36752
 siat/financials_china.py,sha256=nUSPS4SDLP1RaOZF6uIvel8pFl3X_aBO_I0Opl1O8RI,177685
 siat/financials_china2.py,sha256=12wgmTz1iV7N3IKm6Z0b6_punUzlkBMQ8I8yqvBsScU,73675
 siat/financials_china2_test.py,sha256=Erz5k4LyOplBBvYls2MypuqHpVNJ3daiLdyeJezNPu0,2722
@@ -124,7 +124,7 @@ siat/valuation.py,sha256=3VKrO9b9xY9dOJGGuF0ZhytzB5d2pCx3kO3TtMml7mo,44025
 siat/valuation_china.py,sha256=oEQRrktJNHiOG1mJSQN1aSSQAQrwrg-ppIHyNVjMjNg,67603
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=zB_Skk_tmzIR15l6oAW3am4HBGVIG-eZ8gJhCdXZ8Qw,14859
-siat-2.12.3.dist-info/METADATA,sha256=RIArV_5zea1u8rckrg5XHosA_cpXuiLuQwfz-N-x8yA,1378
-siat-2.12.3.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-2.12.3.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-2.12.3.dist-info/RECORD,,
+siat-2.12.4.dist-info/METADATA,sha256=6NhKLQQ9tjw3I5LJ6gaqMwIcceEDWkh4DWUM5tXCnDg,1378
+siat-2.12.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-2.12.4.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-2.12.4.dist-info/RECORD,,