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

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/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('\n')
+        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.5.dist-info}/METADATA

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

@@ -42,8 +42,8 @@ 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=Pgi-CTl7ZT_RxHt70N7wBjMQ_UUAqZFClLh6GpcK0MQ,191709
-siat/financials_china2.py,sha256=tUvWZhUORrZ0EuCVVkJifbO-8d_hXUyA73OPmOX1CL0,92862
+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
@@ -109,7 +109,7 @@ siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuY
 siat/stock.py,sha256=sDYEXGE9XYnzRYzxv1AUJqMqAu6ISZx7skiu82L1Z7Y,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=zzi3JvzkfPG7ldX_ykkiQOe1iMpB3pnejfxuT7mg5oM,93462
 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.5.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.7.5.dist-info/METADATA,sha256=P8JImZGTi4f_S8g00nK3hIfsnKoE6EQMlRcc1Tb94ws,8009
+siat-3.7.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.7.5.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.7.5.dist-info/RECORD,,