siat 3.10.24__py3-none-any.whl → 3.10.25__py3-none-any.whl

siat/security_prices.py

@@ -1571,24 +1571,24 @@ def get_dividend_yq(ticker,start,end,facecolor="papayawhip"):
         print(f"  No dividend info found for {ticker} during {start} to {end}")
         return None
         
-    div2['dividends']=div2['dividends'].apply(lambda x: round(x,4))
+    div2['dividends']=div2['dividends'].apply(lambda x: str(round(x,5)))
     div2['Close']=div2['Close'].apply(lambda x: round(x,2))
     div2['Adj Close']=div2['Adj Close'].apply(lambda x: round(x,2))
-    div2.rename(columns={"date":text_lang("除息日期","ex-Dividend Date"), \
-                         "dividends":text_lang("每股分红(本币，税前)","Dividend per Share (Pre-tax)"), \
+    div2.rename(columns={"date":text_lang("除息日期","Ex-Dividend"), \
+                         "dividends":text_lang("每股分红(本币，税前)","Div per Share (Pre-tax)"), \
                          "Close":text_lang("收盘价","Close Price"), \
-                         "Adj Close":text_lang("前复权价","Adjusted Close Price")}, \
+                         "Adj Close":text_lang("调整收盘价(前复权价)","Adjusted Close Price")}, \
                 inplace=True)
         
     titletxt=ticker_name(ticker,"stock")+": "+text_lang("股票分红历史","Stock Dividend History")
     import datetime
     todaydt = datetime.date.today()
-    footnote_cn=f"期间：{start}至{end}, 数据来源：雅虎, {todaydt}"
-    footnote_en=f"Period：{start} to {end}. Data source：Yahoo, {todaydt}"
+    footnote_cn=f"【注】期间：{start}至{end}, 数据来源：雅虎, {todaydt}"
+    footnote_en=f"[Note]Period：{start} to {end}. Data source：Yahoo, {todaydt}"
     footnote=text_lang(footnote_cn,footnote_en)
     df_display_CSS(div2,titletxt=titletxt,footnote=footnote,facecolor=facecolor,decimals=2, \
                        first_col_align='center',second_col_align='center', \
-                       last_col_align='right',other_col_align='center')
+                       last_col_align='center',other_col_align='center')
 
     
     return div2
@@ -1627,14 +1627,14 @@ def get_split_yq(ticker,start,end,facecolor="papayawhip"):
     div2.rename(columns={"date":text_lang("分拆日期","Split Date"), \
                          "splits":text_lang("分拆比例","Split Ratio"), \
                          "Close":text_lang("收盘价","Close Price"), \
-                         "Adj Close":text_lang("前复权价","Adjusted Close Price")}, \
+                         "Adj Close":text_lang("调整收盘价(前复权价)","Adjusted Close Price")}, \
                 inplace=True)
         
     titletxt=ticker_name(ticker,"stock")+": "+text_lang("股票分拆历史","Stock Split History")
     import datetime
     todaydt = datetime.date.today()
-    footnote_cn=f"期间：{start}至{end}, 数据来源：雅虎, {todaydt}"
-    footnote_en=f"Period：{start} to {end}. Data source：Yahoo, {todaydt}"
+    footnote_cn=f"【注】期间：{start}至{end}, 数据来源：雅虎, {todaydt}"
+    footnote_en=f"[Note]Period：{start} to {end}. Data source：Yahoo, {todaydt}"
     footnote=text_lang(footnote_cn,footnote_en)
     df_display_CSS(div2,titletxt=titletxt,footnote=footnote,facecolor=facecolor,decimals=2, \
                        first_col_align='center',second_col_align='center', \

siat/stock_china.py

@@ -1432,7 +1432,7 @@ def stock_profile_china(ticker,category='profile', \
             print(titletxt)
             print("  #Warning(stock_profile_china): dividend info not found for stock",ticker)
             """
-            print(f"  {tickername}：{start}后未找到分红信息")
+            print(f"  {tickername}：no dividend info found after {start}")
             return
         
         if len(df3)==0:
@@ -1441,7 +1441,7 @@ def stock_profile_china(ticker,category='profile', \
             print(titletxt)
             print("  No dividend record found for stock",ticker)
             """
-            print(f"  {tickername}：{start}后未找到分红信息")
+            print(f"  {tickername}：no dividend info found after {start}")
             return
     
         # 整理信息
@@ -1460,9 +1460,9 @@ def stock_profile_china(ticker,category='profile', \
         dftmp4=dftmp3[dftmp3['公告日期'] >= startpd.date()]
         
         if len(dftmp4) == 0:      
-            print(f"  {tickername}：{start}后未找到分红信息")
+            print(f"  {tickername}：no dividend info found after {start}")
         else:
-            titletxt=ticker_name(ticker,'stock')+'：分红历史'
+            titletxt=ticker_name(ticker,'stock')+': '+text_lang('分红历史','Dividend History')
             """
             if prettytab:
                 pandas2prettytable(dftmp3,titletxt,firstColSpecial=False,leftColAlign='l',otherColAlign='c',tabborder=tabborder)
@@ -1473,7 +1473,16 @@ 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(stoday)
+            footnotecn='【注】送股/转增：股数/10股，派息(元，税前)/10股，数据来源：新浪财经，'+str(stoday)
+            footnoteen='[Note]Stock div/capitalization/cash div(RMB, pre-tax) per 10 shares, data source: Sina Finance, '+str(stoday)
+            footnote=text_lang(footnotecn,footnoteen)
+            
+            if check_language() == 'English':
+                dftmp4.rename(columns={'公告日期':'Disclosure','送股':'Stock Div', \
+                                       '转增':'Capitalization','派息':'Cash Div', \
+                                       '股权登记日':'Record','除权除息日':'Ex-Dividend', \
+                                       '红股上市日':'Stock Div Listing'},inplace=True)
+            
             df_display_CSS(df=dftmp4,titletxt=titletxt,footnote=footnote, \
                            first_col_align='center',second_col_align='center', \
                            last_col_align='center',other_col_align='center', \
@@ -1483,7 +1492,7 @@ def stock_profile_china(ticker,category='profile', \
                            data_font_size=data_font_size)
             
         # 配股
-        titletxt=ticker_name(ticker,'stock')+'：配股历史'
+        titletxt=ticker_name(ticker,'stock')+': '+text_lang('配股历史','Rights Issue History')
         try:
             df3p=ak.stock_history_dividend_detail(symbol=ticker1, indicator="配股")
         except:
@@ -1526,8 +1535,17 @@ def stock_profile_china(ticker,category='profile', \
                 print(dftmp3.to_markdown(tablefmt='Simple',index=False,colalign=alignlist))
                 print('【注】配股方案：每10股的配股数，配股价格为元。数据来源：新浪财经,',str(today))
             """
-            footnote='【注】配股方案：每10股的配股数，配股价格为元。数据来源：新浪财经，'+str(stoday)
-            df_display_CSS(df=dftmp3,titletxt=titletxt,footnote=footnote, \
+            footnotecn='【注】配股方案：每10股的配股数，配股价格为元。数据来源：新浪财经，'+str(stoday)
+            footnoteen='Rights issue ratio: per 10 shares, subscription price in RMB, data source: Sina Finance, '+str(stoday)
+            footnote=text_lang(footnotecn,footnoteen)
+            
+            if check_language() == 'English':
+                dftmp4.rename(columns={'公告日期':'Disclosure','配股方案':'Rights Issue Ratio', \
+                                       '配股价格':'Subscription Price','股权登记日':'Record', \
+                                       '除权日':'Ex-Rights','缴款起始日':'Subscription Start', \
+                                       '缴款终止日':'Subscription End','配股上市日':'Rights Listing'},inplace=True)
+            
+            df_display_CSS(df=dftmp4,titletxt=titletxt,footnote=footnote, \
                            first_col_align='center',second_col_align='center', \
                            last_col_align='center',other_col_align='center', \
 

{siat-3.10.24.dist-info → siat-3.10.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.10.24
+Version: 3.10.25
 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.10.24.dist-info → siat-3.10.25.dist-info}/RECORD

@@ -103,7 +103,7 @@ siat/sector_china.py,sha256=9zjdORWx5ia_gUezidhOKWmCnVDwWcnnjjugHudelaQ,157411
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=uC-wA6w3IlA9ZOJYINqIB7LexCbrnnqTkHTPuCSCwpo,27697
-siat/security_prices.py,sha256=C5fhNlkZF3EmDgc5V8saqWYSa6SLdJs1Ax7NQoBR_cg,116618
+siat/security_prices.py,sha256=CQOl0vb7Bzpj_Zc6d2newqpYoO4KG_H5Cbt6D0OrHR4,116678
 siat/security_prices_test.py,sha256=OEphoJ87NPKoNow1QA8EU_5MUYrJF-qKoWKNapVfZNI,10779
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
 siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmWBPk,24854
@@ -113,7 +113,7 @@ siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuY
 siat/stock.py,sha256=iSObjGX9D8HwVnqQZkpz-spzolqkUYBYWo9ylg37RLg,160210
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
-siat/stock_china.py,sha256=WeHhZ7GlsKdkfkBoaXrk3hCmK6PmHjNcdJKUN2S2xEE,94967
+siat/stock_china.py,sha256=vHIc2UuXIGRkRvyL4fjTaNAoyFaq022p9FxPah6dscI,96399
 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
@@ -145,8 +145,8 @@ siat/valuation_china.py,sha256=eSKIDckyjG8QkENlW_OKkqbQHno8pzDcomBO9iGNJVM,83079
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=laNKMTZ9hdenGX3IZ7G0a2RLBKEWtUQJFY9CWuk_fp8,24058
-siat-3.10.24.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.10.24.dist-info/METADATA,sha256=SAbYZhLq09GVuxGheLXjWBJWUWUkHkzFWrqr5lJ53IE,8222
-siat-3.10.24.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.10.24.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.10.24.dist-info/RECORD,,
+siat-3.10.25.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.10.25.dist-info/METADATA,sha256=8zLTAuDSMWnx-3RecjWbBGR39G-BFva0o-i4xxHoZ5w,8222
+siat-3.10.25.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.10.25.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.10.25.dist-info/RECORD,,