siat 3.8.46__py3-none-any.whl → 3.8.48__py3-none-any.whl

siat/financials_china.py

@@ -3606,7 +3606,8 @@ if __name__=='__main__':
 def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke',font_size='16px'):
     """
     功能：分类别显示财报摘要中的指标
-    """        
+    """  
+    DEBUG=False      
     
     # 检查股票列表
     if isinstance(tickers,str):
@@ -3796,7 +3797,13 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke',font_size='
             """
             titletxt1=titletxt+'，'+ty
             
-            df_display_CSS(df=dft2,titletxt=titletxt1,footnote=notesdict[ty], \
+            if DEBUG:
+                if ty == "每股指标":
+                    print(dft2['指标'])
+                    display(dft2)
+            dft4=dft2.dropna(subset=['指标'])
+
+            df_display_CSS(df=dft4,titletxt=titletxt1,footnote=notesdict[ty], \
                            facecolor=facecolor,decimals=2, \
                    titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                    data_font_size=data_font_size)
@@ -3851,8 +3858,9 @@ def compare_fin_summary_china(tickers,fsdates,facecolor='whitesmoke',font_size='
             print(notesdict[ty])
             """
             titletxt1=titletxt+'，'+ty
+            dft4=dft2.dropna(subset=['指标'])
             
-            df_display_CSS(df=dft2,titletxt=titletxt1,footnote=notesdict[ty], \
+            df_display_CSS(df=dft4,titletxt=titletxt1,footnote=notesdict[ty], \
                            facecolor=facecolor,decimals=2, \
                    titile_font_size=titile_font_size,heading_font_size=heading_font_size, \
                    data_font_size=data_font_size)
@@ -4129,7 +4137,8 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip',font_size
               '利润回报': [
               '销售毛利率(%)','主营业务利润率(%)','营业利润率(%)','销售净利率(%)','成本费用利润率(%)',  
               '主营业务成本率(%)','三项费用比重(%)',
-              '主营利润比重(%)','非主营比重(%)','固定资产比重(%)',
+              #'主营利润比重(%)','非主营比重(%)','固定资产比重(%)',
+              '主营利润比重(%)','固定资产比重(%)',
               '总资产利润率(%)','总资产净利润率(%)','资产报酬率(%)',
               '净资产收益率(%)','加权净资产收益率(%)','净资产报酬率(%)','投资收益率(%)','股本报酬率(%)','股息发放率(%)',
               '总资产增长率(%)','净资产增长率(%)','主营业务收入增长率(%)','净利润增长率(%)',
@@ -4193,7 +4202,7 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip',font_size
                '营业利润率=营业利润/营业(总)收入*100%，营业利润=主营业务利润+其他业务利润-期间费用+其他损益 \n'+ \
                '其他业务利润=其他业务收入-其它业务支出-其他业务税金及附加，期间费用=销售费用+管理费用+财务费用 \n'+ \
                '其他损益=-资产减值损失+公允价值变动损益(损失为负数)+投资损益(损失为负数)+资产处置损益(损失为负数) \n'+ \
-               '利润总额=营业利润+营业外收入-营业外支出 \n'+ \
+               '利润总额=主营营业利润+非主营营业利润+投资损益+营业外收入支出净额 \n'+ \
                '销售净利率=净利润率=净利润/营业(总)收入*100%，净利润=利润总额-所得税费用 \n'+ \
                '成本费用利润率=利润总额/成本费用总额*100%，成本费用总额=营业(总)成本+营业税金及附加+期间费用+资产减值损失 \n'+ \
                '主营业务收入成本率=主营业务成本/主营业务收入*100% \n'+ \
@@ -4322,6 +4331,7 @@ def compare_fin_indicator_china(tickers,fsdates,facecolor='papayawhip',font_size
             无论如何修改colalign都没用
             """
             titletxt1=titletxt+'，'+ty
+            
             df_display_CSS(df=dft3,titletxt=titletxt1,footnote=notesdict[ty], \
                            facecolor=facecolor,decimals=2, \
                    titile_font_size=titile_font_size,heading_font_size=heading_font_size, \

siat/stock.py

@@ -127,7 +127,7 @@ def get_profile(ticker):
         dic=tp.info
     except:
         print(f"  #Error(get_profile): failed to retrieve info for {ticker}")
-        print("  Solution: upgrade yfinance if already accessible to Yahoo")
+        print("  Solution: need access to Yahoo")
         return None    
 
     if dic is None:

{siat-3.8.46.dist-info → siat-3.8.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: siat
-Version: 3.8.46
+Version: 3.8.48
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
@@ -37,9 +37,9 @@ Requires-Dist: bottleneck
 Requires-Dist: translate
 Requires-Dist: translators
 Requires-Dist: nbconvert
-Requires-Dist: ipywidgets
+Requires-Dist: ipywidgets==8.1.6
 Requires-Dist: playwright
-Requires-Dist: yahooquery
+Requires-Dist: yahooquery==2.3.7
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{siat-3.8.46.dist-info → siat-3.8.48.dist-info}/RECORD

@@ -45,7 +45,7 @@ siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHY
 siat/financials.py,sha256=hcXcwozYhfMtW6cTE2bDp5R80-IEKAyUHFO6mJ87GXQ,86267
 siat/financials2 - 副本.py,sha256=dKlNjIfKeoSy055fQ6E6TUj9HEoO5Ney9grD84J5kfk,14389
 siat/financials2.py,sha256=YF-A-5iSTzLXTFI0sDGju4_6T87wWC9IlFd4fSXbJXw,50805
-siat/financials_china.py,sha256=EoniZSm8MumdWVn3mMiXU7dU9ePHGO27y1MWNeD3Jjc,192083
+siat/financials_china.py,sha256=iHF3lEESTK9DLWLBHFpyxn3S_dO2sNBE89xqaVYpNCw,192459
 siat/financials_china2.py,sha256=VvkzkjZeH84zwypR7ReldgJeZ7jnNw0qkzebvWMPm10,94956
 siat/financials_china2_test.py,sha256=Erz5k4LyOplBBvYls2MypuqHpVNJ3daiLdyeJezNPu0,2722
 siat/financials_china2_test2.py,sha256=C8CuYTMHN4Mhp-sTu-Bmg0zMXRCaYV6ezGDoYartRYQ,3507
@@ -109,7 +109,7 @@ siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmW
 siat/security_trend2.py,sha256=8-Z-PWaX8fjnyAyfxEp3qXdVllgDpRISOASKEn7Zeoc,30706
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=zzxRzklawWjBqcx0_eExpD0bsKyXHoc-Z66ibKuk-pA,159887
+siat/stock.py,sha256=itQquZpB8B086nmzzGadppGKsTE6Y7aGizhamGIXs0I,159860
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=85Ggb21E2mrCYMdSSTTrkoyyLGXMK2V-BtlweHomSRg,93460
@@ -144,8 +144,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.8.46.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.8.46.dist-info/METADATA,sha256=FHPs9tsOGjGEOmSZrdpb8iXvPR4WzbL3GSDPpGrZhEA,8321
-siat-3.8.46.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-siat-3.8.46.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.8.46.dist-info/RECORD,,
+siat-3.8.48.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.8.48.dist-info/METADATA,sha256=dvMkCPc4aEw3Msl0BeSKOOaLDHSglS26AXleOlmktTk,8335
+siat-3.8.48.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+siat-3.8.48.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.8.48.dist-info/RECORD,,