siat 3.4.2__py3-none-any.whl → 3.4.3__py3-none-any.whl

siat/__init__.py

@@ -23,7 +23,7 @@ try:
     import pkg_resources
     current_version=pkg_resources.get_distribution("siat").version
     current_list=current_version.split('.')
-    print("Successfully imported siat version",current_version)
+    print("Successfully enabled siat version",current_version)
 
     if check_newer_version:
         import luddite
@@ -38,11 +38,11 @@ try:
         
         if not newest:
             #print("The latest version of siat is",latest_version,'\n')
-            print("Now there is a newer version of siat",latest_version,'\n')
+            print("There is a newer version of siat",latest_version,'\n')
             print("*** How to upgrade siat?")
-            print("Upgrade directly from official source? use command: upgrade_siat()")
-            print("Upgrade from Tsinghua? use command: upgrade_siat(alternative='tsinghua')")
-            print("Upgrade from Alibaba? use command: upgrade_siat(alternative='alibaba')")
+            print("Upgrade from official website? Command: upgrade_siat()")
+            print("Upgrade from Tsinghua? Command: upgrade_siat(alternative='tsinghua')")
+            print("Upgrade from Alibaba? Command: upgrade_siat(alternative='alibaba')")
     
 except:
     pass

siat/financials_china.py

@@ -56,6 +56,8 @@ if __name__=='__main__':
     ticker='601398.SS'
     ticker='600791.SS'
     
+    ticker="601375.SS"
+    
     akfs=get_fin_stmt_ak(ticker)
     
 def get_fin_stmt_ak(ticker):
@@ -218,16 +220,35 @@ def get_fin_stmt_ak(ticker):
         fs4['预收款项']=fs4['预收账款']
     
     if not ('实收资本(或股本)' in fslist):
-        fs4['实收资本(或股本)']=fs4['股本']
+        if '股本' in fslist:
+            fs4['实收资本(或股本)']=fs4['股本']
+        if '实收资本净额' in fslist:
+            fs4['实收资本(或股本)']=fs4['实收资本净额']
+            
     
     if not ('流动资产合计' in fslist):
-        fs4['流动资产合计']=fs4['资产总计']-fs4['固定资产合计']-fs4['无形资产']-fs4['商誉']-fs4['递延税款借项']-fs4['其他资产']
+        if '其他资产' in fslist:
+            fs4['流动资产合计']=fs4['资产总计']-fs4['固定资产合计']-fs4['无形资产']-fs4['商誉']-fs4['递延税款借项']-fs4['其他资产']
+        else:
+            fs4['流动资产合计']=fs4['资产总计']-fs4['固定资产合计']-fs4['无形资产']-fs4['商誉']-fs4['递延税款借项']
 
     if not ('速动资产合计' in fslist):
+        if not('存货' in fslist) and ('存货净额' in fslist):
+            fs4['存货']=fs4['存货净额']
+        
         fs4['速动资产合计']=fs4['流动资产合计']-fs4['存货']
 
     if not ('流动负债合计' in fslist):
-        fs4['流动负债合计']=fs4['负债合计']-fs4['应付债券']-fs4['递延所得税负债']-fs4['其他负债']
+        if not ('应付债券' in fslist) and ('应付债券款' in fslist):
+            fs4['应付债券']=fs4['应付债券款']
+            
+        if not ('递延所得税负债' in fslist) and ('递延税款贷项' in fslist):
+            fs4['递延所得税负债']=fs4['递延税款贷项'] 
+            
+        if '其他负债' in fslist:
+            fs4['流动负债合计']=fs4['负债合计']-fs4['应付债券']-fs4['递延所得税负债']-fs4['其他负债']
+        else:
+            fs4['流动负债合计']=fs4['负债合计']-fs4['应付债券']-fs4['递延所得税负债']
 
     #银行利润表
     if not ('营业总收入' in fslist):

siat/financials_china2.py

@@ -138,7 +138,9 @@ def get_fin_stmt_ak_multi(tickers,fsdates):
         
         if not ('所得税费用' in entry_list) and ('减:所得税' in entry_list):
             dfs['所得税费用']=dfs['减:所得税']
-        dfs['实际所得税率%']=dfs.apply(lambda x:round(x['所得税费用']/x['利润总额']*100,2),axis=1)
+        if '所得税费用' in list(dfs):
+            dfs['实际所得税率%']=dfs.apply(lambda x:round(x['所得税费用']/x['利润总额']*100,2),axis=1)
+            
         dfs['净利润率%']=dfs.apply(lambda x:round(x['净利润']/x['营业总收入']*100,2),axis=1)
         
         #dfs['流通股股数']=dfs.apply(lambda x:round(x['净利润']/x['基本每股收益'],0),axis=1)
@@ -1345,7 +1347,7 @@ def asset_liab_structure_china(tickers,fsdates,facecolor='papayawhip',font_size=
     print("  Conducting asset-liability analysis ...")
     print("  Focus on:",ticker_name(comparator,'stock'))
     #print("  Comparee  :",ticker_name(comparee))
-    print("  Peers   :",end='')
+    print("  Peers:",end='')
     if comparee != []:
         print_list(ticker_name(comparee,'stock'))
     else:
@@ -1586,7 +1588,7 @@ def income_cost_structure_china(tickers,fsdates,facecolor='papayawhip',font_size
     print("  Conducting income-cost analysis ...")
     print("  Focus on:",ticker_name(comparator,'stock'))
     #print("  Comparee  :",ticker_name(comparee))
-    print("  Peers   :",end='')
+    print("  Peers:",end='')
     if comparee != []:
         print_list(ticker_name(comparee,'stock'))
     else:
@@ -1794,7 +1796,7 @@ def cash_flow_structure_china(tickers,fsdates,facecolor='papayawhip',font_size='
     comparee=tickers[1:]
     print("  Conducting cash flow analysis ...")
     print("  Focus on:",ticker_name(comparator,'stock'))
-    print("  Peers   :",end='')
+    print("  Peers:",end='')
     if comparee != []:
         print_list(ticker_name(comparee,'stock'))
     else:

siat/market_china.py

@@ -975,9 +975,13 @@ def market_detail_china2(category='price',
     nowstr0=str(dt.datetime.now())
     nowstr=nowstr0[:19]
     
+    #检查语言环境
+    lang=check_language()
+    
     # 前置空格个数
     heading=' '*1
-    df.rename(columns={'项目':'Item','上海证券交易所':'Shanghai SE','深圳证券交易所':'Shenzhen SE','北京证券交易所':'Beijing SE'},inplace=True)
+    if lang == "English":
+        df.rename(columns={'项目':'Item','上海证券交易所':'Shanghai SE','深圳证券交易所':'Shenzhen SE','北京证券交易所':'Beijing SE'},inplace=True)
     
     if category1=='PRICE':
         titletxt=text_lang("中国三大股票交易所横向对比：股价与涨跌","China Stock Exchanges: Differences in Price")
@@ -997,19 +1001,20 @@ def market_detail_china2(category='price',
         
         footnote=ft0+ft1+ft2+ft3+ft4+ft5+ft6+ft7+ft8+ft9+ft10
         
-        itme_list=['Tradeable stocks',
-         'Stock Price Level',
-         '.....Prev close mean',
-         '.....Today open mean',
-         '.....Current price mean',
-         'Stock Price Up-down',
-         '.....Current change%',
-         '.....Last 5 min change%',
-         'Today vs. Prev',
-         '.....Amplitude%',
-         '.....Change% mean',
-         '.....Change mean(RMB)']
-        df['Item']=itme_list
+        if lang == "English":
+            itme_list=['Tradeable stocks',
+             'Stock Price Level',
+             '.....Prev close mean',
+             '.....Today open mean',
+             '.....Current price mean',
+             'Stock Price Up-down',
+             '.....Current change%',
+             '.....Last 5 min change%',
+             'Today vs. Prev',
+             '.....Amplitude%',
+             '.....Change% mean',
+             '.....Change mean(RMB)']
+            df['Item']=itme_list
         
         df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            first_col_align='left',second_col_align='right', \
@@ -1035,14 +1040,15 @@ def market_detail_china2(category='price',
         
         footnote=ft0+ft1+ft2+ft3+ft4+ft5+ft6 + ft9+ft10
         
-        itme_list=['Tradeable stocks',
-         'Volume Level Today',
-         '.....Volume mean(million)',
-         '.....Amount mean(100 millions)',
-         '.....Turnover rate mean %',
-         'Today vs. Prev',
-         '.....Volume ratio(times)']
-        df['Item']=itme_list        
+        if lang == "English":
+            itme_list=['Tradeable stocks',
+             'Volume Level Today',
+             '.....Volume mean(million)',
+             '.....Amount mean(100 millions)',
+             '.....Turnover rate mean %',
+             'Today vs. Prev',
+             '.....Volume ratio(times)']
+            df['Item']=itme_list        
         
         df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            first_col_align='left',second_col_align='right', \
@@ -1066,18 +1072,19 @@ def market_detail_china2(category='price',
 
         footnote=ft0+ft1+ft2+ft3+ft4 + ft9+ft10
         
-        itme_list=['Tradeable stocks',
-         'MRQ Investment Return',
-         '.....MRQ change% mean',
-         '.....MRQ change% median',
-         '.....MRQ change% std',
-         '.....MRQ rising stock%',
-         'YTD Investment Return',
-         '.....YTD change% mean',
-         '.....YTD change% median',
-         '.....YTD change% std',
-         '.....YTD rising stock%']
-        df['Item']=itme_list 
+        if lang == "English":
+            itme_list=['Tradeable stocks',
+             'MRQ Investment Return',
+             '.....MRQ change% mean',
+             '.....MRQ change% median',
+             '.....MRQ change% std',
+             '.....MRQ rising stock%',
+             'YTD Investment Return',
+             '.....YTD change% mean',
+             '.....YTD change% median',
+             '.....YTD change% std',
+             '.....YTD rising stock%']
+            df['Item']=itme_list 
         
         df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \
                            first_col_align='left',second_col_align='right', \
@@ -1102,28 +1109,29 @@ def market_detail_china2(category='price',
         
         footnote=ft0+ft1+ft2+ft3+ft4+ft5 + ft9+ft10
         
-        itme_list=['Tradeable stocks',
-         'Total Market Cap (TMC)',
-         '.....Whole Market TMC(trillion)',
-         '.....Stock TMC mean(billion)',
-         '.....Stock TMC median(billion)',
-         '.....Stock TMC std/mean',
-         'Outstanding Market Cap (OMC)',
-         '.....Whole Market OMC(trillion)',
-         '.....Whole Market outstanding %',
-         '.....Stock OMC mean(billion)',
-         '.....Stock OMC median(billion)',
-         '.....Stock OMC std/mean',
-         'Valuation: P/E',
-         '.....Stock P/E mean',
-         '.....Stock P/E median',
-         '.....Stock P/E std/mean',
-         'Valuation: P/B',
-         '.....Stock P/B mean',
-         '.....Stock P/B median',
-         '.....Stock P/B std/mean']
-
-        df['Item']=itme_list 
+        if lang == "English":
+            itme_list=['Tradeable stocks',
+             'Total Market Cap (TMC)',
+             '.....Whole Market TMC(trillion)',
+             '.....Stock TMC mean(billion)',
+             '.....Stock TMC median(billion)',
+             '.....Stock TMC std/mean',
+             'Outstanding Market Cap (OMC)',
+             '.....Whole Market OMC(trillion)',
+             '.....Whole Market outstanding %',
+             '.....Stock OMC mean(billion)',
+             '.....Stock OMC median(billion)',
+             '.....Stock OMC std/mean',
+             'Valuation: P/E',
+             '.....Stock P/E mean',
+             '.....Stock P/E median',
+             '.....Stock P/E std/mean',
+             'Valuation: P/B',
+             '.....Stock P/B mean',
+             '.....Stock P/B median',
+             '.....Stock P/B std/mean']
+    
+            df['Item']=itme_list 
 
         
         df_display_CSS(df,titletxt=titletxt,footnote=footnote,facecolor=facecolor, \

siat/stock.py

@@ -474,10 +474,10 @@ def stock_price(ticker,fromdate,todate,adj=False, \
         lang=check_language()
         if lang == 'English':
             titletxt=texttranslate("Security Price Trend：")+tickername
-            footnote=texttranslate("Source: sina/stooq/yahoo，")+str(today)
+            footnote=texttranslate("Data source: Sina/Stooq/Yahoo/EM, ")+str(today)
         else:
             titletxt=texttranslate("证券价格走势图：")+tickername
-            footnote=texttranslate("数据来源：新浪/东方财富/stooq/yahoo，")+str(today)
+            footnote=texttranslate("数据来源：Sina/EM/Stooq/Yahoo，")+str(today)
         
         pricetype='Close'
         import pandas as pd
@@ -706,7 +706,7 @@ def security_indicator(ticker,indicator, \
     titletxt1=text_lang("证券趋势分析：","Security Trend: ")
     titletxt=titletxt1+ticker_name(ticker,ticker_type=ticker_type)
     import datetime; todaydt = datetime.date.today()
-    sourcetxt=text_lang("数据来源：新浪/东方财富/stooq/雅虎财经，","Data source: Sina/EM/Stooq/Yahoo, ")
+    sourcetxt=text_lang("数据来源：Sina/EM/Stooq/Yahoo，","Data source: Sina/EM/Stooq/Yahoo, ")
     footnote=sourcetxt+str(todaydt)
     collabel=ectranslate(indicator)
     
@@ -995,7 +995,7 @@ def stock_price_volatility(ticker,fromdate,todate,type="Weekly Price Volatility"
 
     titletxt=texttranslate("证券价格波动风险走势图：")+ticker_name(ticker)
     import datetime; today = datetime.date.today()
-    footnote=texttranslate("数据来源：新浪/东方财富/stooq，")+str(today)
+    footnote=texttranslate("数据来源：Sina/EM/Stooq/Yahoo，")+str(today)
     collabel=ectranslate(type)
     ylabeltxt=ectranslate(type)
     pltdf=erdf[erdf.index >= fromdate]
@@ -1111,7 +1111,7 @@ def stock_ret_volatility(ticker,fromdate,todate,type="Weekly Ret Volatility%",da
 
     titletxt=texttranslate("证券收益率波动风险走势图：")+ticker_name(ticker)
     import datetime; today = datetime.date.today()
-    footnote=texttranslate("数据来源：新浪/东方财富/stooq，")+str(today)
+    footnote=texttranslate("数据来源：Sina/EM/Stooq/Yahoo，")+str(today)
     collabel=ectranslate(type)
     ylabeltxt=ectranslate(type)
     pltdf=erdf[erdf.index >= fromdate]
@@ -1230,7 +1230,7 @@ def ret_lpsd(ticker,fromdate,todate,type="Weekly Ret Volatility%",datatag=False,
 
     titletxt=texttranslate("证券收益率波动损失风险走势图：")+ticker_name(ticker)
     import datetime; today = datetime.date.today()
-    footnote=texttranslate("数据来源：新浪/东方财富/stooq，")+str(today)
+    footnote=texttranslate("数据来源：Sina/EM/Stooq/Yahoo，")+str(today)
     collabel=ectranslate(type)
     ylabeltxt=ectranslate(type)
     pltdf=erdf[erdf.index >= fromdate]

{siat-3.4.2.dist-info → siat-3.4.3.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 siat/__init__ -20240701.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
-siat/__init__.py,sha256=NJn2HSa0cdet21YFoJs5nafHgrM3H3J3wdtFYi1KzfM,2065
+siat/__init__.py,sha256=sJP_LlLfNAssg5ZCPxxkVMi2v6h5x3WcSco3KBN5CsE,2040
 siat/allin.py,sha256=mGm28SxvGGiNAsg6RleiqgyFQvrpgQZERYqpPkdDzPw,2851
 siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
 siat/assets_liquidity.py,sha256=o_UZdLs693uNWPEQB2OzxDH0mdWimOmq4qe_vx1pue0,28987
@@ -41,8 +41,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=CJHMZAWwE0dTYqCL_ffgpbt_UkuJ26InAM0j7CpLGUg,190406
-siat/financials_china2.py,sha256=8qOHl617G_54GlqVJIUfXCitJy0pkEDRil30tpkuHJ0,92665
+siat/financials_china.py,sha256=BkfY8A3YH2_NRyqIwGZ3MA1dq75VGhMaTqE0SAlbYrk,191413
+siat/financials_china2.py,sha256=UgLKLoRbWkKLdpQYBN6pkK55DLoBRdEFminkUuU56qI,92718
 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
@@ -66,7 +66,7 @@ siat/holding_risk.py,sha256=G3wpaewAKF9CwEqRpr4khyuDu9SU2EGyQUHdk7cmHOA,30693
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
 siat/local_debug_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/luchy_draw.py,sha256=8Ue-NKnvSVqINPY1eXat0NJat5MR-gex_K62aOYFdmA,20486
-siat/market_china.py,sha256=EOO-RvdnzJThTrgNHWW3TlWhx4k4rfdjbooOnQsYdQU,50299
+siat/market_china.py,sha256=W39wwOG9qr0-NQuOXH8gIKEyA6OiThiju8KHOV-G73o,50732
 siat/markowitz.py,sha256=DsfS6vG9TAfdJP4GgN-CCArujPi84XjD23CWbxaA2o4,97627
 siat/markowitz2-20240620.py,sha256=irZAPnjaatFsKQmFRMENP-cO6bEUl2narYtkU5NKTWI,108019
 siat/markowitz2.py,sha256=LK2pDEtE5PUmBtCHmCcRs8FlPqZKmhFXiuLIL4JeQa8,121991
@@ -105,7 +105,7 @@ siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmW
 siat/security_trend2.py,sha256=lUMab8HilXIUPo_z9ZkztMiZ5kf3jAbbCwPPkYbQ1TI,25288
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=uubLm3Qd1N02FI6nBnB9CvQrY_rJV8RfQI-_4zxIfog,152436
+siat/stock.py,sha256=ouP2nnjYqgzAol0ljQHnnMPfG63U0NrEdME75w2J_ps,152394
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=zyUyghIrkkkYWlHRRP7Hoblxzfp-jrck60pTJpwMahg,91553
@@ -139,7 +139,7 @@ siat/valuation_china.py,sha256=EkZQaVkoBjM0c4MCNbaX-bMnlG0e3FXeaWczZDnkptU,67784
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=H1EM8YYXA8nQHIqsJlso0I3HKPiJLT3QujO4gRVQXWs,13945
-siat-3.4.2.dist-info/METADATA,sha256=f_VyzH3bJZHoBhz45fW6KnNGf2wyC6QYP5XKgSEBUQQ,7309
-siat-3.4.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-3.4.2.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.4.2.dist-info/RECORD,,
+siat-3.4.3.dist-info/METADATA,sha256=BdluGvWZfaW-u4lZ4vOXaiYFqvURkobsftROJxS5Fh8,7309
+siat-3.4.3.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+siat-3.4.3.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.4.3.dist-info/RECORD,,

{siat-3.4.2.dist-info → siat-3.4.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any