siat 2.12.4__py3-none-any.whl → 2.12.6__py3-none-any.whl

siat/allin.py

@@ -112,6 +112,6 @@ from siat.compare_cross import *
 
 # 股票技术分析
 from siat.stock_technical import *
-
-
+# 2FA: Google Authenticator
+from siat.google_authenticator import *
 

siat/financial_statements.py

@@ -259,7 +259,10 @@ def get_income_statements(symbol):
     # 服务型企业无此项
     if 'CostOfRevenue' not in list(stmt):
         stmt['CostOfRevenue']=0
-    
+        
+    if 'OperatingExpense' not in list(stmt):
+        stmt['OperatingExpense']=stmt['CostOfRevenue']
+        
     # 服务型企业
     if 'OperatingIncome' not in list(stmt):
         stmt['OperatingIncome']=stmt['OperatingRevenue']-stmt['OperatingExpense']

siat/financials.py

@@ -970,7 +970,8 @@ def calc_fin_rates(fsdf):
     fs['Total Asset Growth']=fs['TotalAssets'].pct_change()
     #固定资产成新率：平均固定资产净值 / 平均固定资产原值。又称“固定资产净值率”或“有用系数”
     #fs['PPE Residual']=fs['avgNetPPE']/fs['avgGrossPPE']
-    fs['PPE Residual']=fs['NetPPE']/fs['GrossPPE']
+    if ('NetPPE' in list(fs)) and ('GrossPPE' in list(fs)):
+        fs['PPE Residual']=fs['NetPPE']/fs['GrossPPE']
     
     #其他指标
     #盈利能力指标

siat/financials2.py

@@ -506,10 +506,23 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                     dftmp2=dftmp[dftmp['periodType']=='3M'].tail(1)
                 else:
                     dftmp2=dftmp.tail(1)
-                
+                    
+                """
                 dftmp2=pd.DataFrame(dftmp2)
                 fsdf=pd.concat([fsdf,dftmp2])
-            
+                """
+                #删除重复的列名，若存在重复列会出现错误InvalidIndexError: Reindexing
+                dftmp2t=dftmp2.T
+                dftmp2t['item']=dftmp2t.index
+                dftmp2t.drop_duplicates(keep='first',inplace=True)
+                dftmp2t.drop(columns=['item'],inplace=True)
+                dftmp3=dftmp2t.T
+                
+                if fsdf is None:
+                    fsdf=dftmp3
+                else:
+                    fsdf=pd.concat([fsdf,dftmp3],ignore_index=True)                
+                
             # 变换年报/季报
             fsdf['periodType']=fsdf['periodType'].apply(lambda x: 'Annual' if x=='12M' else 'Quarterly')
             fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
@@ -695,7 +708,9 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 
                 #删除重复的列名，若存在重复列会出现错误InvalidIndexError: Reindexing only valid with uniquely valued Index objects
                 dftmp2t=dftmp2.T
+                dftmp2t['item']=dftmp2t.index
                 dftmp2t.drop_duplicates(keep='first',inplace=True)
+                dftmp2t.drop(columns=['item'],inplace=True)
                 dftmp3=dftmp2t.T
                 
                 if fsdf is None:
@@ -780,12 +795,27 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             else:
                 dftmp2=dftmp.tail(1)
             
+            """
             dftmp2=pd.DataFrame(dftmp2)
             fsdf=pd.concat([fsdf,dftmp2])      
-
+            """
+            #删除重复的列名，若存在重复列会出现错误InvalidIndexError: Reindexing
+            dftmp2t=dftmp2.T
+            dftmp2t['item']=dftmp2t.index
+            dftmp2t.drop_duplicates(keep='first',inplace=True)
+            dftmp2t.drop(columns=['item'],inplace=True)
+            dftmp3=dftmp2t.T
+            
+            if fsdf is None:
+                fsdf=dftmp3
+            else:
+                fsdf=pd.concat([fsdf,dftmp3],ignore_index=True)            
+            
         # 多只股票的杜邦分析对比  
         fsdf['periodType']=fsdf['periodType'].apply(lambda x: 'Annual' if x=='12M' else 'Quarterly')
         fsdf['Company']=fsdf['ticker'].apply(lambda x: codetranslate(x))
+        
+        
         collist=['Company','periodType','endDate','Profit Margin','Total Asset Turnover','Equity Multiplier','Return on Equity']
         df=fsdf[collist]
         ticker='Company'

siat/google_authenticator.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+"""
+本模块功能：模拟谷歌验证器，Google Authenticator
+基于电脑时间，以密钥为基准，生成6位数字动态口令
+"""
+
+import hmac, base64, struct, hashlib, time
+
+class CalGoogleCode():
+    """计算谷歌验证码（秘钥，生成6位验证码）"""
+
+    # 使用静态方法，调用这个方法时，不必对类进行实例化
+    @staticmethod
+    def cal_google_code(secret, current_time=int(time.time()) // 30):
+        """
+        :param secret:   16位谷歌秘钥
+        :param current_time:   时间（谷歌验证码是30s更新一次）
+        :return:  返回6位谷歌验证码
+        """
+        key = base64.b32decode(secret)
+        msg = struct.pack(">Q", current_time)
+        google_code = hmac.new(key, msg, hashlib.sha1).digest()
+        o = ord(chr(google_code[19])) & 15  # python3时，ord的参数必须为chr类型
+        google_code = (struct.unpack(">I", google_code[o:o + 4])[0] & 0x7fffffff) % 1000000
+        
+        return '%06d' % google_code  # 不足6位时，在前面补0
+
+def signin_binance():
+    secret_key = "HLAT4FZ6IDW53AYD"
+    print(CalGoogleCode.cal_google_code(secret_key))
+    
+    return
+
+def signin_pypi():
+    secret_key = "CYKOJC2LMKOKPD6VGI7CAHDWBP2AVB23"
+    print(CalGoogleCode.cal_google_code(secret_key))
+
+    return
+
+if __name__ == '__main__':
+    # For Binance
+    secret_key = "HLAT4FZ6IDW53AYD"
+    print(CalGoogleCode.cal_google_code(secret_key))
+    
+    # for PyPi
+    secret_key = "CYKOJC2LMKOKPD6VGI7CAHDWBP2AVB23"
+    print(CalGoogleCode.cal_google_code(secret_key))

siat/translate.py

@@ -678,7 +678,8 @@ def codetranslate_c(codelist):
                     name1=name
             elif suffix in ['HK']:
                 if not ('港股' in name):
-                    name1=name+'(港股)'            
+                    #name1=name+'(港股)'
+                    name1=name+'(港)'
             else:
                 name1=name
             namelist=namelist+[name1]
@@ -695,7 +696,8 @@ def codetranslate_c(codelist):
                 name1=name
         if suffix in ['HK']:
             if not ('港股' in name):
-                name1=name+'(港股)'            
+                #name1=name+'(港股)'
+                name1=name+'(港)'
         return name1
     else:
         return codelist
@@ -748,9 +750,9 @@ def codetranslate0(code):
         ['00005.HK','港股汇丰控股'],['02888.HK','港股渣打银行'],
         ['03988.HK','中国银行港股'],['BANK OF CHINA','中国银行'],
         
-        ['CICHY','中国建设银行美股'],['CICHF','中国建设银行美股'],
-        ['ACGBY','中国农业银行美股'],['ACGBF','中国农业银行美股'],
-        ['IDCBY','中国工商银行美股'],['IDCBF','中国工商银行美股'],
+        ['CICHY','建设银行美股'],['CICHF','建设银行美股'],
+        ['ACGBY','农业银行美股'],['ACGBF','农业银行美股'],
+        ['IDCBY','工商银行美股'],['IDCBF','工商银行美股'],
         ['BCMXY','交通银行美股'],
         
         ['BAC','美国银行'],['Bank of America Corporation','美国银行'],
@@ -775,7 +777,7 @@ def codetranslate0(code):
         ['00005.HK','港股汇丰控股'],['HSBC HOLDINGS','汇丰控股'],
         ['02888.HK','港股渣打银行'],['STANCHART','渣打银行'],  
         
-        ['UBSG.SW','瑞士瑞银'],        
+        ['UBSG.SW','瑞士瑞银'], ['IBN','印度IBN银行'], ['SCGLY','法国兴业银行'],       
 
         #股票：高科技
         ['AAPL','苹果'],['Apple','苹果'],['DELL','戴尔'],['IBM','国际商用机器'],

{siat-2.12.4.dist-info → siat-2.12.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 2.12.4
+Version: 2.12.6
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, Business School, BFSU

{siat-2.12.4.dist-info → siat-2.12.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 siat/__init__.py,sha256=2c0GKq4KaxA0vfdvMeyCPiNR6wODmH6CGj8n5UDOywY,2182
-siat/allin.py,sha256=fWa2wkTkMDNBJxMgVbQTQdKtilnCnlA9LfdlFK4ZYh4,2498
+siat/allin.py,sha256=IJeK_vZkiobVj2ukxRxADNrGXOu1B3TtAuMhqg1JGZ4,2564
 siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
 siat/assets_liquidity.py,sha256=WEdxeENumZZZ7sFmwjDeX9rClHXGGHbnlrL2NMkgqnw,28808
 siat/assets_liquidity_test.py,sha256=UWk6HIUlizU7LQZ890fGx8LwU1jMMrIZswg8cFUJWZ8,1285
@@ -33,11 +33,11 @@ siat/exchange_bond_china.pickle,sha256=78r6E3vPFZlCYPcmS1asgVbe0FGAxsCWaw8ek42Sd
 siat/fama_french.py,sha256=tNtr0WRyPxDbgN6Nu_ZnDtVC-RIiQfh6w0JiPjevWa0,47538
 siat/fama_french_test.py,sha256=M4O23lBKsJxhWHRluwCb3l7HSEn3OFTjzGMpehcevRg,4678
 siat/financial_base.py,sha256=j961-1YS9qBl6LmOzI4gCOpdTmk0d1JgNXMzLmV-lrs,41062
-siat/financial_statements.py,sha256=su_9CYUZVuhmv6gmYYhjQuJ_kAzGMuqi-9j72DwjGlc,23929
+siat/financial_statements.py,sha256=mdUk5nAoAgQuguPxqHay1xsEgXFi2HfPqJezAc4eet0,24045
 siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHYXb_w,716
-siat/financials.py,sha256=GPWJhLC47yRwY4gWUAJcLNxDuiEejkXq-zTBrUlTHn0,78795
+siat/financials.py,sha256=TyKthn5S1UC1QL01RkDvecc9PHAkp_P-mTJL1bzARhE,78860
 siat/financials2 - 副本.py,sha256=dKlNjIfKeoSy055fQ6E6TUj9HEoO5Ney9grD84J5kfk,14389
-siat/financials2.py,sha256=t6fJQkISM7FXYCj-UM0cHzHcWL7tZwhoxDBfnK9HsRE,36752
+siat/financials2.py,sha256=ReiQL7MLj68lNg6NMvKzUDl8NatSL_9ianFcbvZNX1Q,38012
 siat/financials_china.py,sha256=nUSPS4SDLP1RaOZF6uIvel8pFl3X_aBO_I0Opl1O8RI,177685
 siat/financials_china2.py,sha256=12wgmTz1iV7N3IKm6Z0b6_punUzlkBMQ8I8yqvBsScU,73675
 siat/financials_china2_test.py,sha256=Erz5k4LyOplBBvYls2MypuqHpVNJ3daiLdyeJezNPu0,2722
@@ -56,6 +56,7 @@ siat/fund_test.py,sha256=V4ADb8Gsp8gyeFTwcgRsJBpnUih_O-Q2V1ILc5oKjK8,1116
 siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
 siat/future_china_test.py,sha256=BrSzmDVaOHki6rntOtosmRn-6dkfOBuLulJNqh7MOpc,1163
 siat/global_index_test.py,sha256=hnFp3wqqzzL-kAP8mgxDZ54Bd5Ijf6ENi5YJlGBgcXw,2402
+siat/google_authenticator.py,sha256=ZUbZR8OW0IAKDbcYtlqGqIpZdERpFor9NccFELxg9yI,1637
 siat/grafix.py,sha256=ZeyZHtimAMTYoHlNoWvCi3vEvEzcARUsRg7a9LPfAXw,67596
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=Dh4zXEw-0hnbMNorbsRS142C8mUzq4NhFjYnauWu5tc,30548
@@ -118,13 +119,13 @@ siat/transaction_test.py,sha256=Z8g1LJCN4-mnUByXMUMoFmN0t105cbmsz2QmvSuIkbU,1858
 siat/translate-20230125.py,sha256=NPPSXhT38s5t9fzMvl_fvi4ckSB73ThLmZetVI-xGdU,117953
 siat/translate-20230206.py,sha256=-vtI125WyaJhmPotOpDAmclt_XnYVaWU9ByLWZ6FyYE,118133
 siat/translate-20230215.py,sha256=TJgtPE3n8IjljmZ4Pefy8dmHoNdFF-1zpML6BhA9FKE,121657
-siat/translate.py,sha256=z79RqvEFuq2rpISQr8F64qxT5AAZRzE7lrt9YOTxoyU,143088
+siat/translate.py,sha256=EbMGZ7V9YZLPy3WKxMgQeemqw-liUBSp7GSv4oyW5bY,143164
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
 siat/valuation.py,sha256=3VKrO9b9xY9dOJGGuF0ZhytzB5d2pCx3kO3TtMml7mo,44025
 siat/valuation_china.py,sha256=oEQRrktJNHiOG1mJSQN1aSSQAQrwrg-ppIHyNVjMjNg,67603
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=zB_Skk_tmzIR15l6oAW3am4HBGVIG-eZ8gJhCdXZ8Qw,14859
-siat-2.12.4.dist-info/METADATA,sha256=6NhKLQQ9tjw3I5LJ6gaqMwIcceEDWkh4DWUM5tXCnDg,1378
-siat-2.12.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-siat-2.12.4.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-2.12.4.dist-info/RECORD,,
+siat-2.12.6.dist-info/METADATA,sha256=hS1b0748mitbfvJBmBgQdIPv17hrVZc9bBfHCVBt-rY,1378
+siat-2.12.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+siat-2.12.6.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-2.12.6.dist-info/RECORD,,