PyPI - siat - Versions diffs - 3.0.25__py3-none-any.whl → 3.0.35__py3-none-any.whl - Mend

siat 3.0.25py3-none-any.whl → 3.0.35py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

siat/common.py +32 -8
siat/financials2.py +92 -65
siat/financials_china.py +117 -115
siat/financials_china2.py +138 -72
siat/sector_china.py +7 -6
{siat-3.0.25.dist-info → siat-3.0.35.dist-info}/METADATA +1 -1
{siat-3.0.25.dist-info → siat-3.0.35.dist-info}/RECORD +9 -9
{siat-3.0.25.dist-info → siat-3.0.35.dist-info}/WHEEL +0 -0
{siat-3.0.25.dist-info → siat-3.0.35.dist-info}/top_level.txt +0 -0

siat/common.py CHANGED Viewed

@@ -1613,7 +1613,7 @@ if __name__=='__main__':
 def print_progress_percent2(current,total_list,steps=5,leading_blanks=4):
     """
-    功能：打印进度百分比
+    功能：打印进度百分比，注意需要放在循环体的开始处，不能放在循环体的末尾！
     current：当前完成
     total：需要完成的列表
     steps：分成几个进度点显示
@@ -1643,7 +1643,7 @@ def print_progress_percent2(current,total_list,steps=5,leading_blanks=4):
             pct=pct_list[pos]
             if pct=="100%":
-                print("100% completing")
+                print("100% completing last job ...")
             else:
                 print(pct,end=' ')
@@ -1729,12 +1729,22 @@ def printInLine_md(aList,numberPerLine=5,colalign='left'):
         groupedList=groupedList+[tmpList]
     #装入df
-    cols=[' ']*numberPerLine
+    #cols=[' ']*numberPerLine
+    cols=[i+1 for i in range(numberPerLine)]
     import pandas as pd
     df=pd.DataFrame(groupedList,columns=cols)
+    """
     alignlist=[colalign]*numberPerLine
     print(df.to_markdown(index=False,tablefmt='plain',colalign=alignlist))
+    """
+    df_display_CSS(df,titletxt='',footnote='',facecolor='papayawhip',decimals=2, \
+                       first_col_align='left',second_col_align='left', \
+                       last_col_align='left',other_col_align='left', \
+                       titile_font_size='18px',heading_font_size='17px', \
+                       data_font_size='17px')
     return
 #==============================================================================
@@ -3759,7 +3769,7 @@ if __name__=='__main__':
     upgrade_siat()
 def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
-                              'yfinance','yahooquery','urllib3','twine'], \
+                 'yfinance','yahooquery','urllib3','tabulate','twine','mplfinance'], \
                  pipcmd="pip install --upgrade"):
     """
     功能：一次性升级siat及其相关插件
@@ -3798,16 +3808,30 @@ def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
     #逐个升级插件
     import subprocess
+    fail_list=[]
     for m in module_list:
+        #print("Upgrading",m,"... ...",end='')
+        print_progress_percent2(m,module_list,steps=5,leading_blanks=2)
         cmdstr1=cmdstr+m
         #print(cmdstr1)
         #proc=subprocess.run(cmdstr1.split(' '),stdout=subprocess.PIPE)
         proc=subprocess.run(cmdstr1.split(' '))
         rcode=proc.returncode
-        if rcode==0: result='successfully upgraded:-)'
-        else: result='failed to upgrade, try alternative method:-('
-        print("    Module:",m,'\b,',result)
+        if rcode !=0: fail_list=fail_list+[m]
+        """
+        if rcode==0: result='done✓'
+        else: result='FAILed❌, try again manually'
+        print(result)
+        """
+    if len(fail_list) == 0:
+        print("  All specified modules are successfully upgraded!")
+    else:
+        print("  All specified modules are successfully upgraded except",end='')
+        print_list(fail_list,leading_blanks=1)
     return
 #==============================================================================
 #==============================================================================

siat/financials2.py CHANGED Viewed

@@ -210,8 +210,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             fsdf4.replace(0,'---',inplace=True)
-            titletxt="\n***** "+ticker_name(tickers)+": BALANCE SHEET"+' *****\n'
-            print(titletxt)
+            #titletxt="\n***** "+ticker_name(tickers)+": BALANCE SHEET"+' *****\n'
+            titletxt=ticker_name(tickers,'stock')+": BALANCE SHEET"
+            #print(titletxt)
             """
             tablefmt_list=["plain","simple","github","grid","simple_grid","rounded_grid", \
                            "heavy_grid","mixed_grid","double_grid","fancy_grid","outline", \
@@ -239,13 +240,17 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
             fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType'],ascending=True)
+            """
             alignlist=['left']+['right']*(len(list(fsdf5))-1)
             print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))
+            """
-            footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
-            footnote2="*** Data source: Yahoo Finance, "+todaydt
-            print('\n',footnote1,'\n',footnote2)
+            footnote1="Amount unit: "+currency+" billion, exchange's local accounting standards"
+            footnote2="Data source: Yahoo Finance, "+str(todaydt)
+            footnote='Note:\n'+footnote1+'\n'+footnote2
+            #print('\n',footnote1,'\n',footnote2)
+            df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote, \
+                           titile_font_size='14px',heading_font_size='13px',data_font_size='13px')
             return fsdf6
@@ -307,8 +312,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             fsdf4.replace(0,'---',inplace=True)
-            titletxt="\n***** "+ticker_name(tickers)+": INCOME STATEMENTS"+' *****\n'
-            print(titletxt)
+            #titletxt="\n***** "+ticker_name(tickers)+": INCOME STATEMENTS"+' *****\n'
+            titletxt=ticker_name(tickers,'stock')+": INCOME STATEMENTS"
+            #print(titletxt)
             collist=list(fsdf4)
             fsdf4['Item']=fsdf4.index
@@ -316,13 +322,16 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
             fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType'],ascending=True)
+            """
             alignlist=['left']+['right']*(len(list(fsdf5))-1)
             print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))
-            footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
-            footnote2="*** Data source: Yahoo Finance, "+todaydt
-            print('\n',footnote1,'\n',footnote2)
+            """
+            footnote1="Amount unit: "+currency+" billion, exchange's local accounting standards"
+            footnote2="Data source: Yahoo Finance, "+str(todaydt)
+            footnote='Note:\n'+footnote1+'\n'+footnote2
+            #print('\n',footnote1,'\n',footnote2)
+            df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote, \
+                           titile_font_size='14px',heading_font_size='13px',data_font_size='13px')
             return fsdf6
@@ -382,8 +391,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             fsdf4.replace(0,'---',inplace=True)
-            titletxt="\n***** "+ticker_name(tickers)+": CASHFLOW STATEMENTS"+' *****\n'
-            print(titletxt)
+            #titletxt="\n***** "+ticker_name(tickers)+": CASHFLOW STATEMENTS"+' *****\n'
+            titletxt=ticker_name(tickers,'stock')+": CASHFLOW STATEMENTS"
+            #print(titletxt)
             collist=list(fsdf4)
             fsdf4['Item']=fsdf4.index
@@ -391,14 +401,16 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
             fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType'],ascending=True)
+            """
             alignlist=['left']+['right']*(len(list(fsdf5))-1)
             print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))
-            footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
-            footnote2="*** Data source: Yahoo Finance, "+todaydt
-            print('\n',footnote1,'\n',footnote2)
+            """
+            footnote1="Amount unit: "+currency+" billion, exchange's local accounting standards"
+            footnote2="Data source: Yahoo Finance, "+str(todaydt)
+            footnote='Note:\n'+footnote1+'\n'+footnote2
+            #print('\n',footnote1,'\n',footnote2)
+            df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote, \
+                           titile_font_size='14px',heading_font_size='13px',data_font_size='13px')
             return fsdf6
         return fsdf2
@@ -488,8 +500,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf4.replace(0,'---',inplace=True)
-                titletxt="\n***** "+ticker_name(tickers)+": FINANCIAL STATEMENT SUMMARY"+' *****\n'
-                print(titletxt)
+                #titletxt="\n***** "+ticker_name(tickers)+": FINANCIAL STATEMENT SUMMARY"+' *****\n'
+                titletxt=ticker_name(tickers,'stock')+": FINANCIAL STATEMENT SUMMARY"
+                #print(titletxt)
                 collist=list(fsdf4)
                 fsdf4['Item']=fsdf4.index
@@ -497,15 +510,17 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
                 fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType'],ascending=True)
+                """
                 alignlist=['left']+['right']*(len(list(fsdf5))-1)
                 print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))
-                footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
-                footnote2="*** ROx/EM/turnover rates are based on periodic mean, others on end-term"
-                footnote3="*** Data source: Yahoo Finance, "+todaydt
-                print('\n',footnote1,'\n',footnote2,'\n',footnote3)
+                """
+                footnote1="Amount unit: "+currency+" billion, exchange's local accounting standards"
+                footnote2="ROx/EM/turnover rates are based on periodic mean, others on end-term"
+                footnote3="Data source: Yahoo Finance, "+todaydt
+                footnote='Note:\n'+footnote1+'\n'+footnote2+'\n'+footnote3
+                #print('\n',footnote1,'\n',footnote2,'\n',footnote3)
+                df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote, \
+                               titile_font_size='14px',heading_font_size='13px',data_font_size='13px')
                 return fsdf6
             return fsdf2
@@ -586,8 +601,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf4.replace(0,'---',inplace=True)
-                titletxt="\n***** PEER COMPARISON OF FINANCIAL STATEMENT SUMMARY *****\n"
-                print(titletxt)
+                #titletxt="\n***** PEER COMPARISON OF FINANCIAL STATEMENT SUMMARY *****\n"
+                titletxt="FINANCIAL STATEMENT SUMMARY: PEER COMPARISON"
+                #print(titletxt)
                 collist=list(fsdf4)
                 fsdf4['Item']=fsdf4.index
@@ -595,15 +611,17 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
                 fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType','reportDate','currencyCode'],ascending=True)
+                """
                 alignlist=['left']+['right']*(len(list(fsdf5))-1)
                 print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))
-                footnote1="*** Amount unit: billion, based on exchange's local accounting standards"
-                footnote2="*** ROx/EM/turnover rates are based on periodic mean, others on end-term"
-                footnote3="*** Data source: Yahoo Finance, "+todaydt
-                print('\n',footnote1,'\n',footnote2,'\n',footnote3)
+                """
+                footnote1="Amount unit: billion, based on exchange's local accounting standards"
+                footnote2="ROx/EM/turnover rates are based on periodic mean, others on end-term"
+                footnote3="Data source: Yahoo Finance, "+str(todaydt)
+                footnote='Note:\n'+footnote1+'\n'+footnote2+'\n'+footnote3
+                #print('\n',footnote1,'\n',footnote2,'\n',footnote3)
+                df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote, \
+                               titile_font_size='14px',heading_font_size='13px',data_font_size='13px')
                 return fsdf6
         return fsdf2
@@ -691,8 +709,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf4.replace(0,'---',inplace=True)
-                titletxt="\n***** "+ticker_name(tickers)+": FINANCIAL INDICATORS"+' *****\n'
-                print(titletxt)
+                #titletxt="\n***** "+ticker_name(tickers)+": FINANCIAL INDICATORS"+' *****\n'
+                titletxt=ticker_name(tickers,'stock')+": FINANCIAL INDICATORS"
+                #print(titletxt)
                 collist=list(fsdf4)
                 fsdf4['Item']=fsdf4.index
@@ -700,15 +719,17 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
                 fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType'],ascending=True)
+                """
                 alignlist=['left']+['right']*(len(list(fsdf5))-1)
                 print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))
-                footnote1="*** Amount unit: "+currency+" billion, exchange's local accounting standards"
-                footnote2="*** ROx/EM/turnover rates are based on periodic mean, others on end-term"
-                footnote3="*** Data source: Yahoo Finance, "+todaydt
-                print('\n',footnote1,'\n',footnote2,'\n',footnote3)
+                """
+                footnote1="Amount unit: "+currency+" billion, exchange's local accounting standards"
+                footnote2="ROx/EM/turnover rates are based on periodic mean, others on end-term"
+                footnote3="Data source: Yahoo Finance, "+str(todaydt)
+                footnote='Note:\n'+footnote1+'\n'+footnote2+'\n'+footnote3
+                #print('\n',footnote1,'\n',footnote2,'\n',footnote3)
+                df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote, \
+                               titile_font_size='14px',heading_font_size='13px',data_font_size='13px')
                 return fsdf6
             return fsdf2
@@ -790,8 +811,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf4.replace(0,'---',inplace=True)
-                titletxt="\n***** PEER COMPARISON OF FINANCIAL INDICATORS *****\n"
-                print(titletxt)
+                #titletxt="\n***** PEER COMPARISON OF FINANCIAL INDICATORS *****\n"
+                titletxt="FINANCIAL INDICATORS: PEER COMPARISON"
+                #print(titletxt)
                 collist=list(fsdf4)
                 fsdf4['Item']=fsdf4.index
@@ -799,15 +821,17 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 fsdf6=df_filter_row(fsdf5,exclude_collist=['Item'],symbol='---')
                 fsdf6=df_sort_priority_list(fsdf6,sort_column='Item',priorityList=['periodType','reportDate','currencyCode'],ascending=True)
+                """
                 alignlist=['left']+['right']*(len(list(fsdf5))-1)
                 print(fsdf6.to_markdown(tablefmt='plain',index=False,colalign=alignlist))
-                footnote1="*** Amount unit: billion, based on exchange's local accounting standards"
-                footnote2="*** ROx/EM/turnover rates are based on periodic mean, others on end-term"
-                footnote3="*** Data source: Yahoo Finance, "+todaydt
-                print('\n',footnote1,'\n',footnote2,'\n',footnote3)
+                """
+                footnote1="Amount unit: billion, based on exchange's local accounting standards"
+                footnote2="ROx/EM/turnover rates are based on periodic mean, others on end-term"
+                footnote3="Data source: Yahoo Finance, "+str(todaydt)
+                footnote='Note:\n'+footnote1+'\n'+footnote2+'\n'+footnote3
+                #print('\n',footnote1,'\n',footnote2,'\n',footnote3)
+                df_display_CSS(fsdf6,titletxt=titletxt,footnote=footnote, \
+                               titile_font_size='14px',heading_font_size='13px',data_font_size='13px')
                 return fsdf6
         return fsdf2
@@ -914,8 +938,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
         plt.show()
         if printout:
-            title_txt="\n***** Dupont Identity Fact Sheet *****\n"
-            print(title_txt)
+            #title_txt="\n***** Dupont Identity Fact Sheet *****\n"
+            titletxt="Dupont Identity Fact Sheet"
+            #print(titletxt)
             # 保留四位小数
             collist=list(df)
@@ -927,14 +952,16 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             for d in list(df):
                 df[d]=df[d].apply(lambda x: round(x,5) if isinstance(x,float) else x)
+            """
             alignlist=['left']+['right']*(len(list(df))-1)
             print(df.to_markdown(tablefmt='plain',index=False,colalign=alignlist))
-            footnote1="*** Based on exchange's local accounting standards, EM/TAT are on periodic mean"
-            footnote2="Data source: Yahoo Finance, "+todaydt
-            print('\n',footnote1,'\b.',footnote2)
+            """
+            footnote1="Based on exchange's local accounting standards, EM/TAT are on periodic mean"
+            footnote2="Data source: Yahoo Finance, "+str(todaydt)
+            footnote='Note:\n'+footnote1+'\n'+footnote2
+            #print('\n',footnote1,'\b.',footnote2)
+            df_display_CSS(df,titletxt=titletxt,footnote=footnote, \
+                           titile_font_size='14px',heading_font_size='13px',data_font_size='13px')
         return  df2
     else:   # analysis_type1

siat 3.0.25__py3-none-any.whl → 3.0.35__py3-none-any.whl

siat 3.0.25py3-none-any.whl → 3.0.35py3-none-any.whl