siat 3.7.4__py3-none-any.whl → 3.7.6__py3-none-any.whl

siat/common.py

@@ -3827,7 +3827,8 @@ if __name__=='__main__':
 def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
                  'yfinance','yahooquery','urllib3','tabulate','twine', \
                  'mplfinance','openpyxl','pip','bottleneck','ipywidgets'], \
-                 pipcmd="python -m pip install --upgrade --user",alternative=""):
+                 pipcmd="python -m pip install --upgrade --user", \
+                 mirror="aliyun"):
     """
     功能：一次性升级siat及其相关插件
     
@@ -3839,7 +3840,8 @@ def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
     DEBUG=False
     
     print("Upgrading siat and related modules, please wait ... ...")
-    
+    alternative=mirror
+
     #获取系统目录
     import sys
     syspath=sys.path
@@ -3930,7 +3932,7 @@ def upgrade_siat(module_list=['siat','akshare','pandas','pandas_datareader', \
         if 'pip' in fail_list:
             print("Upgrading for pip, in Anaconda Prompt (Windows) or Terminal (Mac):")
             print("  python -m pip install --upgrade --user pip")
-        
+    print("Please RESTART Python kernel to enforce the upgraded modules!")    
     return
 
 def df_index_timezone_remove(df):
@@ -4171,14 +4173,58 @@ def firstLetterUpper(text):
 
 #==============================================================================
 if __name__ == '__main__':
-    string = "Hello, Welcome to this New World!"
+    string = "HeLLo, Welcome to this New WorLd!"
     words = ["Hello", "World"]
 
     contains_any(string, words)
 
 def contains_any(string, words):
-    # 定义一个函数，检查字符串string是否包含列表words中的任何元素
-    return any(word in string for word in words)    
+    """
+    
+    功能：测试字符串string中是否含有字符串列表words中的任意一个元素
+    参数：
+    string：字符串，大小写不限
+    words：字符串列表，大小写不限
+    注意：为避免大小写字母的影响，比较前需要先将两边的字母全部小写化
+    """
+    #将字符串列表中的元素小写，避免大小写差异导致比较失败
+    if not isinstance(words,list):
+        words_list=[words]
+    else:
+        words_list=words
+    new_words=words_list.copy() #不改变原列表的内容
+    
+    new_words_list=[]
+    for w in new_words:
+        if isinstance(w,str):
+            new_words_list=new_words_list+[w.lower()]
+        else: continue #过滤列表中非字符串的元素
+        
+    if isinstance(string,str):
+        new_string=string.lower()
+    else:
+        return False
+    
+    #检查字符串new_string是否包含列表new_words_list中的任何元素
+    return any((word in new_string) for word in new_words_list)    
+
+#==============================================================================
+if __name__ == '__main__':
+    s = "Hello, 世界! This is a test string with symbols #$%^&*()."
+
+    cleaned_s = remove_symbols(s)
+ 
+def remove_symbols(s):
+    """
+     
+    功能：删除字符串中除字母、数字和汉字外的所有符号
+    """
+    import re
+    # 正则表达式匹配字母、数字和汉字
+    pattern = re.compile(r'[^\w\u4e00-\u9fa5]')
+    # 使用sub()函数将所有不匹配的符号替换为空字符
+    return pattern.sub('', s)
+
 
 #==============================================================================
 if __name__ == '__main__':

siat/financial_statements.py

@@ -22,6 +22,7 @@ import pandas as pd
 #本模块使用yahooquery插件
 #==============================================================================
 if __name__=='__main__':
+    symbol='JD'
     symbol='INTL' 
     symbol='MSFT'
     symbol='600519.SS'
@@ -36,7 +37,7 @@ def get_balance_sheet(symbol):
     """
     功能：获取雅虎财经上一只股票所有的年度和季度资产负债表
     """
-    print("  Searching for balance info of",symbol,"\b, please wait...")
+    print("  Searching for balance info of {}, please wait...".format(symbol))
     
     result,prefix,suffix=split_prefix_suffix(symbol)
     if result & (suffix=='HK'):

siat/financials.py

@@ -77,7 +77,7 @@ def compare_history(tickers,items, \
     twinx=False：单纵轴
     """
     #检查power的范围是否合理
-    if not (power in range(0,10)):
+    if not (power in range(0,80)):
         print("  #Error(compare_history): invalid parameter, power =",power)
         return None
     
@@ -1157,17 +1157,21 @@ def get_financial_rates(ticker):
 #####以上的指标为时间序列；以下的指标为非时间序列，类似于快照信息
 #==============================================================================
 if __name__=='__main__':
+    symbol='JD'
     symbol='AAPL'
     symbol='BABA'
     symbol='2883.HK'
     symbol='EBAY'
+    
+    stock_info(symbol)
 
 def stock_info(symbol):
     """
     功能：返回静态信息
     """
     DEBUG=False
-    #print("...Searching for information of",symbol,"\b, please wait...")
+    if DEBUG:
+        print("  DEBUG: in stock_info, symbol={}".format(symbol))
     
     from yahooquery import Ticker
     stock = Ticker(symbol)
@@ -1616,6 +1620,7 @@ if __name__=='__main__':
 
 #==============================================================================
 if __name__=='__main__':
+    ticker='01810.HK'
     ticker='AAPL'
     info_type='fin_rates' 
 
@@ -1637,6 +1642,10 @@ def get_stock_profile(ticker,info_type='basic',graph=True):
         print("  Supported info_type:\n",typelist)
         return None
 
+    #改变港股代码，去掉前导的0或8
+    if '.HK' in ticker.upper():
+        ticker=ticker[-7:]
+
     info=stock_info(ticker)
     if not graph: return info
     

siat/financials2.py

@@ -21,6 +21,7 @@ from siat.common import *
 from siat.translate import *
 from siat.financial_statements import *
 from siat.financials import *
+from siat.stock import *
 from siat.grafix import *
 #==============================================================================
 import matplotlib.pyplot as plt
@@ -61,8 +62,17 @@ if czxt in ['linux']: #website Jupyter
 plt.rcParams['axes.unicode_minus'] = False 
 #==============================================================================
 if __name__=='__main__':
+    #测试1
+    tickers="JD"
+    analysis_type='Balance Sheet'
+    fsdates='2023-12-31'
+    
+    font_size='16px'
+    business_period='annual'
+    
+    
     tickers=["JD","00700.HK",'BABA','09999.HK']
-    fsdates='2022-12-31'
+    fsdates='2023-12-31'
     
     analysis_type='Balance Sheet'
     analysis_type='Income Statement'
@@ -92,8 +102,10 @@ if __name__=='__main__':
 
 def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 category='profile',business_period='annual', \
-                scale1=10,scale2=10,sort='PM',
-                printout=True,facecolor='papayawhip',font_size='16px'
+                scale1=10,scale2=10,dupont_sort='PM',
+                printout=True, \
+                entry_sort=False, \
+                facecolor='papayawhip',font_size='16px'
                 ):
     """
     功能：tickers为股票列表，fsdates为财报日期，可为单个日期或日期列表
@@ -130,36 +142,54 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
     
     #确定表格字体大小
     titile_font_size=font_size
-    heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'
+    heading_font_size=data_font_size=str(int(font_size.replace('px',''))-3)+'px'
     
     # 基于analysis_type1的类型分别处理
-    if ('profile' in analysis_type1):
+    #if ('profile' in analysis_type1):
+    if contains_any(analysis_type1,['profile']):
         # 股票需为单只股票，若为列表则仅取第一个        
         if not isinstance(tickers,str):
             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)
+                print("  #Warning(fs_analysis_china): {} must be one ticker or ticker list".format(tickers))
                 return  None      
 
         # 检查category
-        category_list=['profile','officers','market_rates','dividend','stock_split','fin_rates','risk_general','risk_esg']
-        if category not in category_list:
-            print("  Unsupported category:",category,"\b. Supported categories as follows:")
-            print_list(category_list,leading_blanks=2)
+        #category_list=['profile','officers','market_rates','dividend','split','fin_rates','risk_general','risk_esg']
+        category_list=['profile','officers','market rates','dividend','split','financial rates','general risk','esg']
         
-        if category == 'profile':
-            info=get_stock_profile(ticker)
-        elif category == 'dividend':
-            info=stock_dividend(ticker,fromdate='1990-1-1',todate=todaydt)
-        elif category == 'stock_split':    
-            info=stock_split(ticker,fromdate='1990-1-1',todate=todaydt)
+        #if category == 'profile':
+        if contains_any(category,['profile']):
+            info=get_stock_profile(tickers)
+        #elif category == 'dividend':
+        elif contains_any(category,['dividend']):
+            #info=stock_dividend(tickers,start='1990-1-1',end=todaydt)
+            info=stock_dividend(tickers)
+        #elif category == 'stock_split':    
+        elif contains_any(category,['split']):
+            #info=stock_split(tickers,start='1990-1-1',end=todaydt)
+            info=stock_split(tickers)
+        elif contains_any(category,['market']):
+            category='market_rates'
+            info=get_stock_profile(tickers,info_type=category)
+        elif contains_any(category,['financial']):
+            category='fin_rates'
+            info=get_stock_profile(tickers,info_type=category)
+            
+        elif contains_any(category,['risk']):
+            category='risk_general'
+            info=get_stock_profile(tickers,info_type=category)
+        elif contains_any(category,['esg']):
+            category='risk_esg'
+            info=get_stock_profile(tickers,info_type=category)
         else:
-            info=get_stock_profile(ticker,info_type=category)
+            print("  Unsupported category {}, supported categories:".format(category))
+            print_list(category_list,leading_blanks=2)
             
         return info
-    
-    elif ('balance' in analysis_type1) or ('sheet' in analysis_type1) \
-         or ('asset' in analysis_type1) or ('liability' in analysis_type1):
+    #elif ('balance' in analysis_type1) or ('sheet' in analysis_type1) or ('asset' in analysis_type1) or ('liability' in analysis_type1):
+    #elif contains_any(analysis_type1,['balance','sheet','asset','liability']):
+    elif contains_any(analysis_type1,['balance','sheet','asset','liability']):
         # 股票需为单只股票，若为列表则仅取第一个        
         if not isinstance(tickers,str):
             if isinstance(tickers,list): tickers=tickers[0]
@@ -261,9 +291,8 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
         
         else:
             return fsdf2
-    
-    elif ('income' in analysis_type1) or ('cost' in analysis_type1) \
-         or ('expense' in analysis_type1) or ('earning' in analysis_type1):
+    #elif ('income' in analysis_type1) or ('cost' in analysis_type1) or ('expense' in analysis_type1) or ('earnings' in analysis_type1):
+    elif contains_any(analysis_type1,['income','revenue','cost','expense','earnings']):
         # 股票需为单只股票，若为列表则仅取第一个        
         if not isinstance(tickers,str):
             if isinstance(tickers,list): tickers=tickers[0]
@@ -342,8 +371,8 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             return fsdf6
         
         return fsdf2
-    
-    elif ('cash' in analysis_type1) or ('flow' in analysis_type1):
+    #elif ('cash' in analysis_type1) or ('flow' in analysis_type1):
+    elif contains_any(analysis_type1,['cash','flow']):
         # 股票需为单只股票，若为列表则仅取第一个        
         if not isinstance(tickers,str):
             if isinstance(tickers,list): tickers=tickers[0]
@@ -421,9 +450,8 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             return fsdf6
             
         return fsdf2
-    
-    elif ('summary' in analysis_type1):
-        
+    #elif ('summary' in analysis_type1):
+    elif contains_any(analysis_type1,['summary']):
         itemlist1=[
             #资产负债表
             'CashAndCashEquivalents','AccountsReceivable','Inventory', \
@@ -634,9 +662,8 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 return fsdf6
 
         return fsdf2     
-    
-    elif ('indicator' in analysis_type1):
-        
+    #elif ('indicator' in analysis_type1):
+    elif contains_any(analysis_type1,['indicator']):
         itemlist=[
             #短期偿债能力
             'Current Ratio','Quick Ratio','Cash Ratio','Cash Flow Ratio', \
@@ -847,8 +874,8 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
 
         return fsdf2     
        
-    
-    elif ('dupont' in analysis_type1) and (('identity' in analysis_type1) or ('analysis' in analysis_type1)):
+    #elif ('dupont' in analysis_type1) and (('identity' in analysis_type1) or ('analysis' in analysis_type1)):
+    elif contains_any(analysis_type1,['dupont','identity']):
         # 股票需为股票列表        
         if not isinstance(tickers,list):
             print("  #Warning(fs_analysis_china): must be a ticker list for",tickers)
@@ -903,11 +930,11 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
         name4='Return on Equity'
         name5='endDate'     
         
-        if sort=='PM':
+        if dupont_sort=='PM':
             df.sort_values(name1,ascending=False,inplace=True)
-        elif sort=='TAT':
+        elif dupont_sort=='TAT':
             df.sort_values(name2,ascending=False,inplace=True)
-        elif sort=='EM':
+        elif dupont_sort=='EM':
             df.sort_values(name3,ascending=False,inplace=True)
         else:
             df.sort_values(name1,ascending=False,inplace=True)        

siat/financials_china.py

@@ -3872,6 +3872,9 @@ def get_fin_indicator_1ticker_china(ticker,fsdates):
 
     import pandas as pd
     # 过滤财报日期
+    if isinstance(fsdates,str):
+        fsdates=[fsdates]
+        
     fsdates2=[]
     for d in fsdates:
         d1=pd.to_datetime(d)
@@ -3886,6 +3889,8 @@ def get_fin_indicator_1ticker_china(ticker,fsdates):
     _,t1,_=split_prefix_suffix(ticker)
     try:
         dft=ak.stock_financial_analysis_indicator(t1)
+        dft['日期']=dft['日期'].apply(lambda x: x.strftime("%Y-%m-%d"))
+        dft.sort_values(by=['日期'],ascending=False,inplace=True)
     except:
         print("  #Error(get_fin_summary_1ticker_china): no fin stmts found or info source unavailable for",ticker)
         return None        

siat/financials_china2.py

@@ -1987,7 +1987,7 @@ def fs_analysis_china(tickers,fsdates=[],analysis_type='balance sheet', \
         基本信息(默认)：profile
         股东信息：shareholder
         历史分红：dividend
-        主营业务：business
+        主营业务：business，目前无法获取数据！
         市场估值：valuation
         财务概况：financial    
     

siat/sector_china.py

@@ -2909,7 +2909,7 @@ def find_peers_china(industry='',top=20,rank=20,sw_level='2'):
             return tickerlist
         else:
             print("  #Warning(find_peers_china): failed in retrieving component stocks for Shenwan industry",industry)
-            print("  Possible solution: upgrade akshare. if still fail, reportto the author of siat for help")
+            print("  Possible solution: upgrade akshare. if still fail, report to the author of siat for help")
             return []
         
 #==============================================================================

siat/stock.py

@@ -2620,7 +2620,7 @@ if __name__ =="__main__":
     todate="2022-9-26" 
 
 
-def security_dividend(ticker,start="L3Y",end="today",facecolor='whitesmoke',fontcolor='black'):
+def security_dividend(ticker,start="L5Y",end="today",facecolor='whitesmoke',fontcolor='black'):
     """
     功能：套壳函数stock_dividend
     """ 

siat/stock_china.py

@@ -673,7 +673,7 @@ def price_direction_knn(ticker,df,ndays=1,diff=0.01,min_score=0.9,votes=100,max_
         decision='='
         decision_text='FLAT'
 
-    if not printout: return decision,today_close,today
+    if not printout: return decision,today_close,stoday
 
     print("  Model voting for stock price after "+str(ndays)+" trading days: Higher("+str(zhang)+'), Lower('+str(die)+')')
     print("  "+ticker_name(ticker,'stock')+': previously closed '+str(known_close)+' @ '+str(known_day))
@@ -949,7 +949,7 @@ def price_price_knn(ticker,df,ndays=1,max_neighbours=10,max_RS=20,printout=True)
     import numpy as np
     if np.isnan(decision): decision='?'
     
-    if not printout: return decision,decision_score,today_close,today
+    if not printout: return decision,decision_score,today_close,stoday
 
     print("  Model poll for stock price after "+str(ndays)+" trading days:",decision)
     print("  Last close price: "+ticker_name(ticker,'stock')+', closed '+str(known_close)+', '+str(known_day))
@@ -1128,11 +1128,19 @@ def stock_profile_china(ticker,category='profile', \
     DEBUG=False
     
     #检查是否A股
-    _,_,suffix=split_prefix_suffix(ticker)
+    _,prefix,suffix=split_prefix_suffix(ticker)
     if not (suffix.upper() in ['SS','SZ','BJ']):
         print("  #Warning(stock_profile_china): not a stock in China for",ticker)
         return
     
+    if suffix.upper() in ['SS','SH']:
+        sx='SH'
+    elif suffix.upper() in ['SZ']:
+        sx='SZ'
+    else:
+        sx='BJ'
+    sxticker=sx+prefix
+    
     categorylist=['profile','business','shareholder','financial','dividend','valuation']
     if not (category in categorylist):
         print("  #Error(stock_detail_china): unsupported category",category)
@@ -1144,7 +1152,7 @@ def stock_profile_china(ticker,category='profile', \
     from datetime import datetime
     
     import datetime as dt
-    today=dt.date.today()
+    stoday=str(dt.date.today())
     
     yi=100000000.0
     yiyuan_name='(亿元)'
@@ -1156,6 +1164,7 @@ def stock_profile_china(ticker,category='profile', \
     #确定表格字体大小
     titile_font_size=font_size
     heading_font_size=data_font_size=str(int(font_size.replace('px',''))-1)+'px'
+    heading_font_size_small=data_font_size_small=str(int(font_size.replace('px',''))-3)+'px'
 
     import akshare as ak
     # 个股基本信息======================================================================================
@@ -1248,12 +1257,13 @@ def stock_profile_china(ticker,category='profile', \
             print('\n数据来源：巨潮资讯,',str(today))
         """
         titletxt1=titletxt+"：基本信息"
-        footnote='数据来源：巨潮资讯，'+str(today)
+        footnote='数据来源：巨潮资讯，'+str(stoday)
         df_display_CSS(df=dftmp15,titletxt=titletxt1,footnote=footnote, \
                        facecolor=facecolor,decimals=2,last_col_align='left', \
                        titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                        data_font_size=data_font_size)        
         
+        print(' ')
         print("*****",titletxt+"：业务范围")
         longtext=df6.iloc[0]["主营业务"]
         print_sentence(longtext,mid_symbol=['；','。'])
@@ -1268,20 +1278,20 @@ def stock_profile_china(ticker,category='profile', \
 
     # 主营业务信息查询=============================================================================
     # 主营业务仅在年报/中报中公布，一三季报中无此信息
+    import numpy as np
     if category == 'business':
         try:
-            df2=ak.stock_zygc_ym(symbol=ticker1)  
+            df2=ak.stock_zygc_em(symbol=sxticker)  
         except:
-            print("  #Warning(stock_profile_china): business info not found for",ticker)
+            print("  #Warning(stock_profile_china): fetching business info failed for",ticker)
             return
         
-        df2['分类']=df2['分类'].apply(lambda x: '***合计' if x=='合计' else x)
-    
+        df2['分类类型']=df2['分类类型'].apply(lambda x: '按业务分类' if x in [np.nan,None] else x)
+        df2['报告日期']=df2['报告日期'].apply(lambda x: x.strftime("%Y-%m-%d"))
         # 整理信息
-        df2['报告年度']=df2['报告期'].apply(lambda x: x[:4])
-        df2['报告类别']=df2['报告期'].apply(lambda x: x[-2:])
-        df2['报告月日']=df2['报告类别'].apply(lambda x: '12-31' if x=='年度' else '06-30' if x=='中期' else '12-31')
-        df2['报告日期']=df2['报告年度']+'-'+df2['报告月日']
+        df2['报告年度']=df2['报告日期'].apply(lambda x: x[:4])
+        df2['报告月日']=df2['报告日期'].apply(lambda x: x[-5:])
+        df2['报告类别']=df2['报告月日'].apply(lambda x: '年度' if x=='12-31' else '中期' if x=='06-30' else '季度')
         
         if business_period in ['annual','recent']:
             if business_period == 'annual':    #最近一期年报
@@ -1290,14 +1300,14 @@ def stock_profile_china(ticker,category='profile', \
             if business_period == 'recent':    #最近一期年报/中报
                 df2a=df2.copy(deep=True)
 
-            period=df2a.head(1)['报告期'][0]
+            period=df2a.head(1)['报告日期'][0]
         else:   #具体中报或年报日期
             result,business_period1=check_date2(business_period)
             if result:
                 df2a=df2[df2['报告日期']==business_period1].copy(deep=True)
                 if len(df2a) > 0:
                     df2a.reset_index(drop=True,inplace=True)
-                    period=df2a.head(1)['报告期'][0]
+                    period=df2a.head(1)['报告日期'][0]
                 else:
                     print("  #Warning(stock_profile_china): invalid business period for",business_period)
                     print("  Valid business_period: annual, recent, or an valid mid-term/annual report date, eg 2022-12-31 or 2022-6-30")
@@ -1307,13 +1317,23 @@ def stock_profile_china(ticker,category='profile', \
                 print("  Valid business_period: annual, recent, or an valid mid-term/annual report date, eg 2022-12-31 or 2022-6-30")
                 return
             
-        dftmp=df2[df2['报告期']==period]
-        
-        cols1=['分类方向','分类','营业收入','营业收入-占主营收入比','营业成本','营业成本-占主营成本比','毛利率']
-        cols2=['分类方向','分类','营业收入-同比增长','营业成本-同比增长','毛利率','毛利率-同比增长']
-        
-        dftmp1=dftmp[cols1]        
-        titletxt1=ticker_name(ticker,'stock')+'：主营业务构成，'+period
+        dftmp=df2[df2['报告日期']==period]
+        cols1=['主营构成','主营收入','收入比例','主营成本','成本比例','主营利润','利润比例','毛利率']
+        #cols2=['分类方向','分类','营业收入-同比增长','营业成本-同比增长','毛利率','毛利率-同比增长']
+        
+        for c in cols1:
+            if c in ['主营收入','主营成本','主营利润']:
+                dftmp[c]=dftmp[c].apply(lambda x: round(x/yi,2))
+            if c in ['收入比例','成本比例','利润比例','毛利率']:
+                dftmp[c]=dftmp[c].apply(lambda x: round(x*100,2))
+                dftmp.rename(columns={c:c+'%'},inplace=True)
+        
+        cols1p=['主营构成','主营收入','收入比例%','主营成本','成本比例%','主营利润','利润比例%','毛利率%']
+        dftmp1a=dftmp[dftmp['分类类型']=='按业务分类'][cols1p]        
+        dftmp1b=dftmp[dftmp['分类类型']=='按地区分类'][cols1p]        
+        
+        titletxt1a=ticker_name(ticker,'stock')+'：主营业务构成，按业务分类，单位：亿元，'+period
+        titletxt1b=ticker_name(ticker,'stock')+'：主营业务构成，按地区分类，单位：亿元，'+period
         """
         if prettytab:
             pandas2prettytable(dftmp1,titletxt1,firstColSpecial=True,leftColAlign='l',otherColAlign='c',tabborder=tabborder)
@@ -1323,15 +1343,23 @@ def stock_profile_china(ticker,category='profile', \
             print(dftmp1.to_markdown(tablefmt='Simple',index=False,colalign=['left','left','right','right','right','right','right']))
             print('\n数据来源：益盟-F10,',str(today))
         """
-        footnote='数据来源：益盟-F10，'+str(today)
-        df_display_CSS(df=dftmp1,titletxt=titletxt1,footnote=footnote, \
-                       first_col_align='left',second_col_align='left', \
+        footnote=''
+        df_display_CSS(df=dftmp1a,titletxt=titletxt1a,footnote=footnote, \
+                       first_col_align='left',second_col_align='right', \
                            facecolor=facecolor,decimals=2, \
                            titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                            data_font_size=data_font_size)
-        
-        dftmp2=dftmp[cols2]        
-        titletxt2=ticker_name(ticker,'stock')+'：主营业务增长，'+period
+
+        print('')
+        footnote='数据来源：东方财富，'+str(stoday)
+        df_display_CSS(df=dftmp1b,titletxt=titletxt1b,footnote=footnote, \
+                       first_col_align='left',second_col_align='right', \
+                           facecolor=facecolor,decimals=2, \
+                           titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
+                           data_font_size=data_font_size)
+
+        #dftmp2=dftmp[cols2]        
+        #titletxt2=ticker_name(ticker,'stock')+'：主营业务增长，'+period
         """
         if prettytab:
             pandas2prettytable(dftmp2,titletxt2,firstColSpecial=True,leftColAlign='l',otherColAlign='c',tabborder=tabborder)
@@ -1341,12 +1369,13 @@ def stock_profile_china(ticker,category='profile', \
             print(dftmp2.to_markdown(tablefmt='Simple',index=False,colalign=['left','left','right','right','right','right']))
             print('\n数据来源：益盟-F10,',str(today))
         """
+        """
         df_display_CSS(df=dftmp2,titletxt=titletxt2,footnote=footnote, \
                        first_col_align='left',second_col_align='left', \
                            facecolor=facecolor,decimals=2, \
                            titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                            data_font_size=data_font_size)
-        
+        """
     # 历史分红信息查询=============================================================================
     """
     if category == 'dividend':
@@ -1427,7 +1456,7 @@ def stock_profile_china(ticker,category='profile', \
             print(dftmp3.to_markdown(tablefmt='Simple',index=False,colalign=alignlist))
             print('【注】送股/转增：股数/10股，派息：元(税前)/10股，数据来源：新浪财经,',str(today))
         """
-        footnote='【注】送股/转增：股数/10股，派息：元(税前)/10股，数据来源：新浪财经，'+str(today)
+        footnote='【注】送股/转增：股数/10股，派息：元(税前)/10股，数据来源：新浪财经，'+str(stoday)
         df_display_CSS(df=dftmp3,titletxt=titletxt,footnote=footnote, \
                        facecolor=facecolor,decimals=2, \
                        titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
@@ -1465,7 +1494,7 @@ def stock_profile_china(ticker,category='profile', \
             print(dftmp3.to_markdown(tablefmt='Simple',index=False,colalign=alignlist))
             print('【注】配股方案：每10股的配股数，配股价格为元。数据来源：新浪财经,',str(today))
         """
-        footnote='【注】配股方案：每10股的配股数，配股价格为元。数据来源：新浪财经，'+str(today)
+        footnote='【注】配股方案：每10股的配股数，配股价格为元。数据来源：新浪财经，'+str(stoday)
         df_display_CSS(df=dftmp3,titletxt=titletxt,footnote=footnote, \
                        facecolor=facecolor,decimals=2, \
                        titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
@@ -1557,7 +1586,7 @@ def stock_profile_china(ticker,category='profile', \
             print(dftmp1.to_markdown(tablefmt='Simple',index=False,colalign=['center','left','left','right']))
             print('\n数据来源：新浪财经,',str(today))
         """
-        footnote='数据来源：新浪财经，'+str(today)
+        footnote='数据来源：新浪财经，'+str(stoday)
         df_display_CSS(df=dftmp1,titletxt=titletxt,footnote=footnote, \
                        first_col_align='center',second_col_align='left', \
                        facecolor=facecolor,decimals=2, \
@@ -1598,7 +1627,7 @@ def stock_profile_china(ticker,category='profile', \
         titletxt=ticker_name(ticker,'stock')+'：估值与市值'
         import datetime as dt
         today=dt.date.today()
-        footnote3="数据来源：乐咕乐股，"+str(today)
+        footnote3="数据来源：乐咕乐股，"+str(stoday)
         
         # 计算市盈率的均值，中位数、最大最小值
         #va='pe'; va_name="市盈率"
@@ -1715,7 +1744,11 @@ def stock_profile_china(ticker,category='profile', \
     if any(s in category for s in ['financial','healthy']):
         
         try:
-            df7=ak.stock_financial_analysis_indicator(symbol=ticker1)  
+            df7=ak.stock_financial_analysis_indicator(symbol=ticker1) 
+            #其中的日期为datetime.date object类型
+            df7['日期']=df7['日期'].apply(lambda x: x.strftime("%Y-%m-%d"))
+            #降序排列
+            df7.sort_values(by=['日期'],ascending=False,inplace=True)
         except:
             print("  #Warning(stock_detail_china):financial info not found for",ticker)
             return
@@ -1760,11 +1793,11 @@ def stock_profile_china(ticker,category='profile', \
             print(dftmp1.to_markdown(tablefmt='Simple',index=False,colalign=colalignList))
             print('\n数据来源：新浪财经,',str(today))
         """
-        footnote='数据来源：新浪财经，'+str(today)
+        footnote='数据来源：新浪财经，'+str(stoday)
         df_display_CSS(df=dftmp1,titletxt=titletxt,footnote=footnote, \
                        facecolor=facecolor,decimals=2, \
-                       titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
-                       data_font_size=data_font_size)        
+                       titile_font_size=titile_font_size,heading_font_size=heading_font_size_small, \
+                       data_font_size=data_font_size_small)        
         
         """
         加权平均每股收益：
@@ -1818,8 +1851,8 @@ def stock_profile_china(ticker,category='profile', \
         """
         df_display_CSS(df=dftmp1,titletxt=titletxt,footnote=footnote, \
                        facecolor=facecolor,decimals=2, \
-                       titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
-                       data_font_size=data_font_size)        
+                       titile_font_size=titile_font_size,heading_font_size=heading_font_size_small, \
+                       data_font_size=data_font_size_small)        
 
         
         """
@@ -1864,8 +1897,8 @@ def stock_profile_china(ticker,category='profile', \
         """
         df_display_CSS(df=dftmp2,titletxt=titletxt,footnote=footnote, \
                        facecolor=facecolor,decimals=2, \
-                       titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
-                       data_font_size=data_font_size)        
+                       titile_font_size=titile_font_size,heading_font_size=heading_font_size_small, \
+                       data_font_size=data_font_size_small)        
 
         
         """
@@ -1905,8 +1938,8 @@ def stock_profile_china(ticker,category='profile', \
         """
         df_display_CSS(df=dftmp1,titletxt=titletxt,footnote=footnote, \
                        facecolor=facecolor,decimals=2, \
-                       titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
-                       data_font_size=data_font_size)        
+                       titile_font_size=titile_font_size,heading_font_size=heading_font_size_small, \
+                       data_font_size=data_font_size_small)        
 
         
         titletxt=ticker_name(ticker,'stock')+"：主要财务信息，资产负债分析"
@@ -1948,8 +1981,8 @@ def stock_profile_china(ticker,category='profile', \
         """
         df_display_CSS(df=dftmp1,titletxt=titletxt,footnote=footnote, \
                        facecolor=facecolor,decimals=2, \
-                       titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
-                       data_font_size=data_font_size)        
+                       titile_font_size=titile_font_size,heading_font_size=heading_font_size_small, \
+                       data_font_size=data_font_size_small)        
 
         
         """
@@ -1995,8 +2028,8 @@ def stock_profile_china(ticker,category='profile', \
         """
         df_display_CSS(df=dftmp1,titletxt=titletxt,footnote=footnote, \
                        facecolor=facecolor,decimals=2, \
-                       titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
-                       data_font_size=data_font_size)        
+                       titile_font_size=titile_font_size,heading_font_size=heading_font_size_small, \
+                       data_font_size=data_font_size_small)        
 
         """
         资产的经营现金流量回报率是经营活动产生的现金流量净额/总资产,是体现企业收现能力的指标之一。

{siat-3.7.4.dist-info → siat-3.7.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.7.4
+Version: 3.7.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.7.4.dist-info → siat-3.7.6.dist-info}/RECORD

@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=-ZYYp1HK7SkfTR3vBKZ0QVC4Q_tbST2O4MGbX_V77J0,32031
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=2Y51NN6n4FhkNXDRFnV9xPE2Z7XcjqcqaWtZLRaDmgQ,163283
+siat/common.py,sha256=08Gb287rbVIAFdLilHPg3DJHLCCIhM95rJ-zhuZpudc,164861
 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
@@ -37,13 +37,13 @@ siat/exchange_bond_china.pickle,sha256=zDqdPrFacQ0nqjP_SuF6Yy87EgijIRsFvFroW7FAY
 siat/fama_french.py,sha256=aUTC-67t_CEPbLk4u79woW_zfZ7OCP6Fo4z5EdWCSkQ,48051
 siat/fama_french_test.py,sha256=M4O23lBKsJxhWHRluwCb3l7HSEn3OFTjzGMpehcevRg,4678
 siat/financial_base.py,sha256=5u298_1OSlgLnDmhXxqvo4WgMM0JKSa_4jBYF-Ilx38,41097
-siat/financial_statements.py,sha256=Ek18eKHflxZ01evOIwnfH1KZ_M2g8Vr8SxkL1om-K7U,25391
+siat/financial_statements.py,sha256=xx0SMpFqAMKm6cj8uYeG2RpJE6G-RoJ3NWa33UyaVMk,25414
 siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHYXb_w,716
-siat/financials.py,sha256=mbEZSNeHMMFcnPUryQWvdmNlWQvpnOG9eItgS7IVw3k,80458
+siat/financials.py,sha256=6WOWYift3MpKkNBnvnBFASXy9nKKC6DzAr8rg2XyNtw,80646
 siat/financials2 - 副本.py,sha256=dKlNjIfKeoSy055fQ6E6TUj9HEoO5Ney9grD84J5kfk,14389
-siat/financials2.py,sha256=7mnsTncKsgwFu8PP4refh5C5iMIO9P0KOMSF87ZyncY,45736
-siat/financials_china.py,sha256=Pgi-CTl7ZT_RxHt70N7wBjMQ_UUAqZFClLh6GpcK0MQ,191709
-siat/financials_china2.py,sha256=tUvWZhUORrZ0EuCVVkJifbO-8d_hXUyA73OPmOX1CL0,92862
+siat/financials2.py,sha256=A6gjqbdNVgA0hloglhPlDR82mHjb3rSskD-s0T8LKg0,47289
+siat/financials_china.py,sha256=Y9QHyJKDgVbkb5L1f65BAiNxLIDmasRUN9_ju4Yby_c,191925
+siat/financials_china2.py,sha256=NZzpS1eCaxEClOhh8dvfdn88NhIULqeb9E0GUDUiG4U,92892
 siat/financials_china2_test.py,sha256=Erz5k4LyOplBBvYls2MypuqHpVNJ3daiLdyeJezNPu0,2722
 siat/financials_china2_test2.py,sha256=C8CuYTMHN4Mhp-sTu-Bmg0zMXRCaYV6ezGDoYartRYQ,3507
 siat/financials_china2_test3.py,sha256=UXYSA80DNSPRhHpovc2MA9JkpILWMAQaRatbWCHBNPs,3118
@@ -95,7 +95,7 @@ siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
 siat/risk_free_rate.py,sha256=ZMr4cHikPvXvywr54gGqiI3Nvb69am6tq3zj2hwzANE,12384
 siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4285
-siat/sector_china.py,sha256=MX1pzqvHvmWD9qGAe8lnUoCXSWjwnjBK8HhAbijTirI,150761
+siat/sector_china.py,sha256=Mxx5Zd5qvhLdwutedwoPRoXlAopTsPww4rRhOgpRmb8,150762
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=FkX-EeqS5Gqm2kIKnDqrqSk_nvG3BbL3Eu4eEmw1OEY,26379
@@ -106,10 +106,10 @@ siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmW
 siat/security_trend2.py,sha256=mamJtFAbXC1orGgMEmp0taPk-yUqWm-jdGf64bjhn2Q,29756
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=sDYEXGE9XYnzRYzxv1AUJqMqAu6ISZx7skiu82L1Z7Y,158613
+siat/stock.py,sha256=Eq8dVs9CxT1vS1BEsFQ4xCff3aXBucbT5OPW-WidNcA,158613
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
-siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
+siat/stock_china.py,sha256=vm_BslG0gJm4R0-O5bNtENkMMfDP-u1TYKCKzLH9Nkk,93460
 siat/stock_china_test.py,sha256=eO4HWsSvc6qezl0LndjtL24lViEyrBjH_sx2c2Y2Q2M,1294
 siat/stock_info.pickle,sha256=XqcFwQrXoBXAzZnE6rnfpI7zETXZS2usqzsx2ff7MEg,1319005
 siat/stock_info_test.py,sha256=gfG3DbhDACbtD8wnv_R6zhj0t11XaC8NX8uLD9Qv3Fo,6122
@@ -141,8 +141,8 @@ siat/valuation_china.py,sha256=CVp1IwIsF3Om0J29RGkyxZLt4n9Ug-ua_RKhLwL9fUQ,69624
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=r0Q67cSMMlfebEkI9h9pdGlJCooEq7hw_3M5IUs4cSI,20081
-siat-3.7.4.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.7.4.dist-info/METADATA,sha256=Z5_tRV4Qco5cFw7n0OY1MUd17AVse6nzSrziWnY9PMI,8009
-siat-3.7.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.7.4.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.7.4.dist-info/RECORD,,
+siat-3.7.6.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.7.6.dist-info/METADATA,sha256=VBhwM1YCtzZwZbd51whrNXU_MA7CNw_-4bi2xzjDo5k,8009
+siat-3.7.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.7.6.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.7.6.dist-info/RECORD,,