siat 3.7.7__py3-none-any.whl → 3.7.8__py3-none-any.whl

siat/allin.py

@@ -41,6 +41,9 @@ from siat.financials import *
 # 财务分析：雅虎源
 from siat.financials2 import *
 
+# 财务报表：雅虎源
+from siat.fin_stmt2_yahoo import *
+
 # 财务分析：中国
 from siat.financials_china import *
 

siat/common.py

@@ -4171,6 +4171,77 @@ def firstLetterUpper(text):
 
     return utext
 
+
+#==============================================================================
+if __name__ == '__main__':
+    long_text = "Hello, this is a test string."
+    short_text = "test strng"
+     
+    similar_substring, similarity = find_similar_substring(long_text, short_text)
+    if similarity:
+        print(f"Similar substring found: {similar_substring}, Similarity: {similarity}")
+    else:
+        print("No similar substring found.")
+
+ 
+def find_similar_substring(long_string, short_string, threshold=0.7):
+    """
+    
+    功能：判断一个字符串中是否存在与另一个字符串相似度较高的子串
+    注意：尚未测试
+    """
+    
+    import difflib
+    
+    # 使用SequenceMatcher比较字符串
+    matcher = difflib.SequenceMatcher(None, long_string, short_string)
+    
+    # 遍历所有可能的子串长度
+    for size in range(len(short_string), len(long_string) + 1):
+        for start in range(0, len(long_string) - size + 1):
+            # 获取子串并计算相似度
+            substring = long_string[start:start + size]
+            similarity = matcher.ratio()
+            
+            # 如果相似度超过阈值，返回子串
+            if similarity > threshold:
+                return substring, similarity
+    
+    # 如果没有找到相似度较高的子串，返回None
+    return None, None   
+
+    
+#==============================================================================
+if __name__ == '__main__':
+    str1 = "kitten"
+    str2 = "sitting"
+    
+    string_similarity(str1,str2)
+    
+
+def string_similarity(str1,str2,ignore_cases=True):
+    """
+    
+    功能：计算两个字符串的文本相似度
+    """
+    import difflib
+    
+    if ignore_cases:
+        string1=str1.lower()
+        string2=str2.lower()
+    else:
+        string1=str1
+        string2=str2
+    
+    # 创建SequenceMatcher对象
+    matcher = difflib.SequenceMatcher(None, string1, string2)
+    
+    # 计算相似度
+    similarity = matcher.ratio()
+    #print(f"SequenceMatcher Similarity: {similarity:.2f}")
+
+    return similarity
+
 #==============================================================================
 if __name__ == '__main__':
     string = "HeLLo, Welcome to this New WorLd!"
@@ -4181,7 +4252,7 @@ if __name__ == '__main__':
 def contains_any(string, words):
     """
     
-    功能：测试字符串string中是否含有字符串列表words中的任意一个元素
+    功能：测试字符串string中是否含有字符串列表words中的任意一个元素，忽略字母大小写
     参数：
     string：字符串，大小写不限
     words：字符串列表，大小写不限
@@ -4208,6 +4279,183 @@ def contains_any(string, words):
     #检查字符串new_string是否包含列表new_words_list中的任何元素
     return any((word in new_string) for word in new_words_list)    
 
+#==============================================================================
+if __name__ == '__main__':
+    string = "HeLLo, Welcome to this New WorLd!"
+    words = ["Hello", "World"]
+    words = ["Hello", "World","the"]
+
+    contains_all(string, words)
+
+def contains_all(string, words):
+    """
+    
+    功能：测试字符串string中是否含有字符串列表words中的全部元素，忽略字母大小写
+    参数：
+    string：字符串，大小写不限
+    words：字符串列表，大小写不限
+    注意：为避免大小写字母的影响，比较前需要先将两边的字母全部小写化
+    """
+    
+    result=True
+    for w in words:
+        if not contains_any(string,w):
+            result=False
+            break
+        
+    return result
+
+
+#==============================================================================
+if __name__ == '__main__':
+    alist = ["CurrentDebt",
+            "CurrentDebtAndCapitalLeaseObligation",
+            "CurrentDeferredLiabilities",
+            "CurrentLiabilities",
+            "OtherCurrentBorrowings",
+            "OtherCurrentLiabilities",
+            "OtherNonCurrentLiabilities",
+            "TotalNonCurrentLiabilitiesNetMinorityInterest"]
+
+    alist = [
+            "CurrentDebtAndCapitalLeaseObligation",
+            "CurrentDeferredLiabilities",
+            "CurrentLiabilities",
+            "OtherCurrentBorrowings",
+            "OtherCurrentLiabilities",
+            "OtherNonCurrentLiabilities",
+            "TotalNonCurrentLiabilitiesNetMinorityInterest"]
+    
+    item_words = ["Current", "Debt"]
+    item_words = ["Current", "Liabilities"]
+    
+    perfect_match=True
+
+    list_contains_all(alist, item_words)
+
+def list_contains_all(alist, item_words,perfect_match=True):
+    """
+    
+    功能：测试列表alist中是否有元素含有字符串列表item_words中的全部元素，忽略字母大小写
+    参数：
+    alist：字符串列表，大小写不限
+    item_words：字符串列表，大小写不限
+    注意：为避免大小写字母的影响，比较前需要先将两边的字母全部小写化
+    返回值：
+        若列表alist中有多个元素含有字符串列表item_words中的全部元素，返回相似度最高的元素
+        若无则返回False
+    """
+    DEBUG=False
+    
+    #将item_words合成为一个字符串，以便比较相似度
+    words=''
+    for w in item_words:
+        words=words+w
+    if DEBUG:
+        print(f"  DEBUG: item_words={item_words}, words={words}")
+    
+    result=False
+    best_similarity=0
+    for e in alist:
+        similarity=0
+        
+        if DEBUG:
+            print(f"  DEBUG: e={e}")
+            
+        if perfect_match: #要求e精确含有item_words中的每个元素
+            if contains_all(e,item_words):
+                similarity=string_similarity(e,words)
+        else:
+            similarity=string_similarity(e,words)
+            
+        if DEBUG:
+            print(f"  DEBUG: item_words={item_words}, e={e}, similarity={similarity}")
+        
+        if similarity > best_similarity:
+            best_similarity=similarity
+            result=e
+                
+        
+    return result,best_similarity
+
+if __name__ == '__main__':
+    alist = ["CurrentDebt",
+            "CurrentDebtAndCapitalLeaseObligation",
+            "CurrentDeferredLiabilities",
+            "CurrentLiabilities",
+            "OtherCurrentBorrowings",
+            "OtherCurrentLiabilities",
+            "OtherNonCurrentLiabilities",
+            "TotalNonCurrentLiabilitiesNetMinorityInterest"]
+
+    alist = [
+            "CurrentDebtAndCapitalLeaseObligation",
+            "CurrentDeferredLiabilities",
+            "CurrentLiabilities",
+            "OtherCurrentBorrowings",
+            "OtherCurrentLiabilities",
+            "OtherNonCurrentLiabilities",
+            "TotalNonCurrentLiabilitiesNetMinorityInterest"]
+    
+    item_words_list=[["Current","Debt"],["Current","Liabilities"]]
+    item_words_list=[["Current","Liabilibities"],["Current","Debt"]]
+    
+    list_contains_all_list(alist, item_words_list)
+    
+def list_contains_all_list(alist, item_words_list):
+    """
+    
+    功能：测试列表alist中是否有元素含有字符串列表组中item_words_list各个item_words中的全部元素，忽略字母大小写
+    参数：
+    alist：字符串列表，大小写不限
+    item_words_list：字符串列表组，大小写不限。第1个为最佳字符串列表，后面可跟多个替代最佳字符串列表
+    注意：为避免大小写字母的影响，比较前需要先将两边的字母全部小写化
+    返回值：
+        若列表alist中有多个元素含有字符串列表item_words中的全部元素，返回相似度最高的元素
+        若出现多个最高相似度相同的，则返回第一个
+        若无则返回False
+    """
+    DEBUG=False
+    
+    best_result=False
+    best_similarity=0
+    
+    for iwords in item_words_list:
+        result,similarity=list_contains_all(alist, iwords,perfect_match=False)
+        if DEBUG:
+            print("  DEBUG: iwords={0}, alist={1}".format(iwords,alist))
+            #print("  DEBUG: result={0}, similarity={1}".format(result,similarity))
+            print('')
+            print(f"  DEBUG: result={result}, similarity={similarity:.2f}")
+        
+        if similarity > best_similarity:
+            best_similarity=similarity
+            best_result=result
+        
+    return best_result
+
+
+#==============================================================================
+if __name__ == '__main__':
+    max_sleep=30
+
+    sleep_random(max_sleep)
+
+def sleep_random(max_sleep=30):
+    """
+    
+    功能：随机挂起秒数，以防被数据源封堵IP地址，适用于连续抓取同种信息时。
+    参数：
+    max_sleep：最大挂起秒数，默认30秒。随机挂起1-30秒。
+    """
+    
+    import time; import random
+    
+    random_int=random.randint(1,max_sleep)
+    time.sleep(random_int)
+
+    return
+    
 #==============================================================================
 if __name__ == '__main__':
     s = "Hello, 世界! This is a test string with symbols #$%^&*()."

siat/fin_stmt2_yahoo.py

@@ -0,0 +1,839 @@
+# -*- coding: utf-8 -*-
+"""
+本模块功能：上市公司的财务报表分析，数据层
+特点1：科目项目不采用字符串匹配方法，采用contains_any和contains_all匹配方法！
+特点2：以苹果财报的项目名称为基准！其他股票的财报项目名称若不同则转换为苹果财报的名称
+所属工具包：证券投资分析工具SIAT 
+SIAT：Security Investment Analysis Tool
+创建日期：2024年11月28日
+最新修订日期：2024年11月28日
+作者：王德宏 (WANG Dehong, Peter)
+作者单位：北京外国语大学国际商学院
+版权所有：王德宏
+用途限制：仅限研究与教学使用，不可商用！商用需要额外授权。
+特别声明：作者不对使用本工具进行证券投资导致的任何损益负责！
+"""
+
+#==============================================================================
+#关闭所有警告
+import warnings; warnings.filterwarnings('ignore')
+
+from siat.common import *
+import pandas as pd
+import numpy as np
+#==============================================================================
+#本模块使用yahooquery插件
+#==============================================================================
+if __name__=='__main__':
+    symbol='AAPL' #以其财报项目名称作为基准
+    
+    symbol='JD'
+    symbol='INTL' 
+    symbol='MSFT'
+    symbol='600519.SS'
+    symbol='00700.HK'
+    
+    symbol='601398.SS'
+    symbol='601328.SS'
+    
+    max_count=3
+    max_sleep=30
+    
+    report_type="balance sheet"
+    printout=True
+    
+    bsdf_raw=get_1statement_yahoo2(symbol,report_type="balance sheet",fix_entry=False)
+    bsdf_fix=get_1statement_yahoo2(symbol,report_type="balance sheet",fix_entry=True)
+    
+    isdf_raw=get_1statement_yahoo2(symbol,report_type="income statement",fix_entry=False)
+
+    
+    cfsdf_raw=get_1statement_yahoo2(symbol,report_type="cash flow",fix_entry=False)
+
+
+
+def get_1statement_yahoo2(symbol,report_type="balance sheet", \
+                          report_period="all", \
+                          max_count=3,max_sleep=30, \
+                          fix_entry=True,printout=False):
+    """
+    功能：获取雅虎财经上一只股票所有的年度和季度资产负债表，采用contains匹配法
+    
+    参数：
+    symbol：股票代码，五位港股需要转换为四位
+    report_type：需要抓取的财报类型，默认资产负债表"balance sheet"
+    report_period：财报期间，默认年报+季报all，可选单纯年报(annual)或单纯季报(quarterly)
+    max_count：抓取失败时的总尝试次数，默认3
+    max_sleep=30：抓取失败时再次尝试间隔的随机秒数最大值
+    fix_entry：是否对重点科目进行检查和填充，默认是True
+    printout：是否打印赚取到的财报，默认否False
+    
+    返回值：成功时返回df，失败时返回None
+    """
+    report_type=report_type.lower()
+    if 'balance' in report_type:
+        report_type="balance sheet"
+    elif 'income' in report_type:
+        report_type="income statement"
+    else:
+        report_type="cash flow statement"
+    print(f"  Retrieving {report_type} of {symbol} ... ...")
+    
+    symbol=symbol.upper()
+    result,prefix,suffix=split_prefix_suffix(symbol)
+    #处理港股代码：五位变四位
+    if result & (suffix=='HK'):
+        if len(prefix)==5:
+            symbol=symbol[1:]
+    
+    #=====抓取财务报告==========================================================
+    from yahooquery import Ticker
+    #问题：如何判断无效的symbol?
+    try:
+        stock = Ticker(symbol)    
+    except:
+        print("  #Warning(get_1statement_yahoo2): Yahoo Finance currently unaccessable")
+        return None
+    
+    if contains_any(report_period,['all','annual']):
+        #获取近5年年报，最多尝试max_count次
+        for c in range(max_count):
+            if report_type=="balance sheet":
+                stmta=stock.balance_sheet()  # Defaults to Annual
+            elif report_type=="income statement":
+                stmta=stock.income_statement()
+            else:
+                stmta=stock.cash_flow()
+                
+            #若抓取成功则直接结束
+            if isinstance(stmta,pd.DataFrame): break
+        
+            #若能够访问雅虎则挂起一会儿再尝试访问，否则结束
+            if test_yahoo_finance():
+                sleep_random(max_sleep)
+            else: break
+    
+        #获取信息失败，判断原因        
+        if not isinstance(stmta,pd.DataFrame):
+            if test_yahoo_finance():
+                print("  #Warning(get_1statement_yahoo2): {} not found for annual reports".format(symbol))
+            else:
+                print("  #Warning(get_1statement_yahoo2): sorry, Yahoo Finance currently unaccessable")
+            return None
+    else:
+        stmta=None
+
+    if contains_any(report_period,['all','quarterly']):
+        #获取近7个季度报，注意含其中跨过的年报，与年报合并时需要去重！
+        for c in range(max_count):
+            if report_type=="balance sheet":
+                stmtq=stock.balance_sheet(frequency="q")  # Defaults to Annual
+            elif report_type=="income statement":
+                stmtq=stock.income_statement(frequency="q")
+            else:
+                stmtq=stock.cash_flow(frequency="q")
+            
+            if isinstance(stmtq,pd.DataFrame): break
+            else:
+                sleep_random(max_sleep)
+        
+            #前面已经判断过雅虎是否能够访问以及symbol是否存在，此处无需再判断
+    else:
+        stmtq=None
+    
+    #合并年度和季度报表
+    if not (stmta is None) and not (stmtq is None):
+        stmt=pd.concat([stmta,stmtq])
+    elif not (stmta is None):
+        stmt=stmta
+    elif not (stmtq is None):
+        stmt=stmtq        
+    else:
+        print("  #Error(get_1statement_yahoo2): retrieved no periodic reports for",symbol)
+        return None    
+
+    #合并后排序+去重
+    stmt.sort_values(by=['asOfDate','periodType'],inplace=True)
+    #去掉重复记录: 保留年报数据项多，去掉数据项少的季报
+    stmt.drop_duplicates(subset=['asOfDate'],keep='first',inplace=True)
+    
+    
+    #=====关键字段检查与缺失替代处理=============================================
+    if fix_entry:
+        
+        if report_type=="balance sheet":
+            #检查和填补资产负债表科目
+            stmt=check_fill_bs_yahoo(stmt)
+        elif report_type=="income statement":
+            #检查和填补利润表科目
+            stmt=check_fill_is_yahoo(stmt)
+        else:
+            #检查和填补现金流量表科目
+            stmt=check_fill_cfs_yahoo(stmt)
+
+    #字段再排序
+    stmt_cols=list(stmt)
+    head_cols=['asOfDate','periodType','currencyCode'] #不参与排序的字段
+    for c in head_cols:
+        stmt_cols.remove(c)
+    stmt_cols.sort()
+    stmt_cols=head_cols+stmt_cols
+    stmt=stmt[stmt_cols]
+    
+    #总检查：总资产=总负债+总权益是否成立
+    #stmt['TA-TL-TE']=stmt['TotalAssets']-stmt['TotalLiabilities']-stmt['TotalEquity']
+    
+    #是否打印供检查
+    if printout:
+        print_stmt_yahoo2(stmt,title_prefix=report_type.title())
+    
+    return stmt    
+    
+
+#==============================================================================
+if __name__=='__main__':
+    symbol="AAPL"
+    
+    from yahooquery import Ticker
+    stock = Ticker(symbol)
+    stmt=stock.balance_sheet()
+    
+    df=check_fill_bs_yahoo(stmt)
+
+def check_fill_bs_yahoo(stmt):
+    """
+    
+    功能：检查和填补雅虎抓取到的资产负债表部分科目
+    科目基准：苹果财报科目
+    
+    输入：雅虎抓取到的原始资产负债表
+    输出：经过检查的资产负债表，缺失科目可不断填充
+    
+    注意：单纯在资产负债表内填充缺失项比较勉强
+    抓取单表后可暂不填充，在在三表合成后综合填充！！！
+    """
+    #=====资产部分
+    #应收账款
+    entry_item='AccountsReceivable' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["accounts","receivable"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["receivables"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+        
+    
+    #存货
+    entry_item='Inventory' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["inventory"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+    
+    
+    #=====负债部分
+    #流动（有息）债务CurrentDebt：可替代科目-流动负债
+    entry_item='CurrentDebt' #主项科目
+    entry_words=["current","debt"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    #entry_alternatives=[["current","liabilities"],["current","borrowing"],["current","obligation"]]
+    entry_alternatives=[["current","liabilities"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+
+        
+    #流动负债（有息债务+应付）
+    entry_item='CurrentLiabilities' #主项科目
+    entry_words=["current","liabilities"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["current","debt"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+    
+
+    #应付账款
+    entry_item='AccountsPayable' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["accounts","payable"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["payables"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+
+        
+    #总（有息）债务
+    entry_item='TotalDebt' #主项科目
+    #entry_item in stmt_cols
+    entry_words=["total","debt"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["total","liabilities"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+        
+        
+    #总负债
+    entry_item='TotalLiabilities' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["total","liabilities"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["total","debt"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+
+    
+    #=====权益部分        
+    #权益总额
+    entry_item='TotalEquity' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["total","equity"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["stock","holder","quity"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+
+
+    return stmt
+
+#==============================================================================
+if __name__=='__main__':
+    from yahooquery import Ticker
+    stock = Ticker("AAPL")
+    stmt=stock.income_statement()
+    
+    df=check_fill_is_yahoo(stmt)
+
+def check_fill_is_yahoo(stmt):
+    """
+    
+    功能：检查和填补雅虎抓取到的利润表部分科目
+    输入：雅虎抓取到的原始利润表
+    输出：经过检查的利润表，缺失科目可不断填充
+    
+    注意：单纯在利润表内填充缺失项比较勉强，可在三表合成后综合填充！！！
+    """
+
+    #=====收入部分
+    #成本与费用
+    #利息费用
+    entry_item='InterestExpense' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["interest","expense"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["interest","expense","operating"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+        
+    #收入成本
+    entry_item='CostOfRevenue' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["cost","revenue"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["reconciled","cost","revenue"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+        
+    #营业成本
+    entry_item='OperatingExpense' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["operating","expense"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["cost","revenue"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+        
+    #折旧与摊销
+    entry_item='Depreciation' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["depreciation"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["reconciled","depreciation"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+    
+    #收入与利润    
+    #营业收入
+    entry_item='OperatingRevenue' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["operating","revenue"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["total","revenue"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+        
+    #营业利润
+    entry_item='OperatingIncome' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["operating","income"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+        
+    empty = stmt[entry_item].isna().all()
+    if empty:
+        stmt[entry_item]=stmt['OperatingRevenue']-stmt['OperatingExpense']
+    
+    #EBITDA
+    entry_item='EBITDA' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["ebitda"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+    
+    #EBIT
+    entry_item='EBIT' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["ebitda"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+    empty = stmt[entry_item].isna().all()
+    if empty:
+        stmt[entry_item]=stmt['EBITDA']+stmt['Depreciation']
+    
+    #毛利润
+    entry_item='GrossProfit' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["gross","profit"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["operating","income"],["pretax","income"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+        
+    empty = stmt[entry_item].isna().all()
+    if empty:
+        stmt[entry_item]=stmt['OperatingRevenue']-stmt['OperatingExpense']
+        
+        empty = stmt[entry_item].isna().all()
+        if empty:
+            stmt[entry_item]=stmt['EBITDA']
+        
+    
+    return stmt
+
+#==============================================================================
+if __name__=='__main__':
+    from yahooquery import Ticker
+    stock = Ticker("AAPL")
+    stmt=stock.cash_flow()
+    
+    df=check_fill_cfs_yahoo(stmt)
+    
+def check_fill_cfs_yahoo(stmt):
+    """
+    
+    功能：检查和填补雅虎抓取到的现金流量表部分科目
+    输入：雅虎抓取到的原始现金流量表
+    输出：经过检查的现金流量表，缺失科目可不断填充
+    
+    注意：单纯在现金流量表内填充缺失项比较勉强，可在三表合成后综合填充！！！
+    """
+    
+    #现金股利支付
+    entry_item='CashDividendsPaid' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["cash","dividends","paid"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["common","stock","dividend","paid"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+    
+    #融资活动现金流
+    entry_item='CashFlowFromFinancingActivities' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["cash","flow","from","financing","activities"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["cash","flow","from","continuing","financing","activities"],["financing","cash","flow"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+    
+    #投资活动现金流
+    entry_item='CashFlowFromInvestingActivities' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["cash","flow","from","investing","activities"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["cash","flow","from","continuing","investing","activities"],["investing","cash","flow"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+    
+    #经营活动现金流
+    entry_item='CashFlowFromOperatingActivities' #主项科目
+    #entry_item in list(stmt)
+    entry_words=["cash","flow","from","operating","activities"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["cash","flow","from","continuing","operating","activities"],["operating","cash","flow"]]
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+
+    return stmt
+#==============================================================================
+if __name__=='__main__':
+    from yahooquery import Ticker
+    stock = Ticker("AAPL")
+    stmt=stock.cash_flow()
+    
+    title_prefix="Cash Flow Statement"
+    
+    print_stmt_yahoo2(stmt,title_prefix)
+    
+def print_stmt_yahoo2(stmt,title_prefix):
+    """
+    
+    功能：打印雅虎抓取的财报
+    """
+    
+    stmtprt1=stmt.copy()
+    
+    if 'ticker' in list(stmtprt1):
+        symbol=stmtprt1['ticker'][0]
+        del stmtprt1['ticker']
+    else:
+        symbol=stmtprt1.index[0]
+    
+    stmtprt1['reportDate']=stmtprt1['asOfDate'].apply(lambda x: x.strftime("%y-%m-%d"))
+    stmtprt1.set_index('reportDate',inplace=True)
+    del stmtprt1['asOfDate']
+    
+    currencyCode=stmtprt1['currencyCode'].values[0]
+    del stmtprt1['currencyCode']
+    
+    cols1=list(stmtprt1)
+    cols1.remove('periodType')
+    million=1000000
+    for c in cols1:
+        stmtprt1[c]=stmtprt1[c].apply(lambda x: round(x/million,2))
+    
+    stmtprt2=stmtprt1.T
+    cols=list(stmtprt2)
+    cols.sort(reverse=True)
+    stmtprt2=stmtprt2[cols]
+    stmtprt2['Item']=stmtprt2.index
+    stmtprt2=stmtprt2[['Item']+cols]
+    
+    titletxt=f"{symbol}: {title_prefix}, in {currencyCode} millions"
+    footnote="Note: 12M indicates annual report, 3M quaterly reports"
+    df_display_CSS(stmtprt2,titletxt=titletxt,footnote=footnote, \
+                   facecolor='papayawhip',decimals=2, \
+                   first_col_align='left',second_col_align='right', \
+                   last_col_align='right',other_col_align='right', \
+                   titile_font_size='15px',heading_font_size='11px', \
+                   data_font_size='11px',footnote_font_size='13px')
+
+    return
+
+#==============================================================================
+if __name__ == '__main__':
+    entry_item='CurrentDebt' #主项科目
+    entry_words=["current","debt"] #主项科目的关键词，忽略字母大小写
+    #可替代科目组的关键词列表组
+    entry_alternatives=[["current","liabilities"],["current","borrowing"],["current","obligation"]]
+
+    entry_item in list(stmt)
+    stmt=check_fill_entry(stmt,entry_item,entry_words,entry_alternatives)
+    stmt[entry_item]
+
+def check_fill_entry(stmt,entry_item,entry_words,entry_alternatives):
+    """
+
+    功能：检查抓取的原始财报文件stmt中的科目entry_item
+    若不存在则使用可替代科目。
+    若存在但全为空，则使用可替代科目填充。
+    若可替代科目也不存在，则赋值为全空。
+    
+    参数：
+    stmt：赚取到的原始财报df
+    entry_item：需要处理的科目
+    entry_words：需处理科目的关键词列表
+    entry_alternatives：可替代科目的关键词组列表
+    
+    返回值：更新后的财报df
+    """    
+    
+    #合成所有的关键词列表组
+    entry_options=[entry_words]+entry_alternatives
+    
+    #按照相似度匹配
+    stmt_cols=list(stmt)
+    entry_name=list_contains_all_list(stmt_cols,entry_options)
+    
+    if entry_name: #找到
+        if entry_name != entry_item: #找到但不同名
+            #若科目名称不同则映射该名称
+            stmt[entry_item]=stmt[entry_name]
+            #del stmt[entry_name] #删除替代项目名称
+        else: #找到同名
+            #检查该科目是否全为空
+            empty = stmt[entry_item].isna().all()
+            if empty:
+                entry_name_alternative=list_contains_all_list(stmt_cols,entry_alternatives)
+                stmt[entry_item]=stmt[entry_name_alternative]
+    else: #主项未找到，可替代科目也未找到
+        stmt[entry_item]=np.nan
+
+    return stmt
+
+#==============================================================================
+#==============================================================================
+if __name__=='__main__':
+    ticker='AAPL' 
+    ticker='00700.HK' 
+    
+    report_period="all"
+    max_count=3; max_sleep=30
+    pre_fix_entry=False; post_fix_entry=True
+    pre_printout=False; printout=True
+    
+    fsdf=get_financial_statements2_yahoo(ticker)
+
+def get_financial_statements2_yahoo(ticker, \
+                                    report_period="all", \
+                                    max_count=3,max_sleep=30, \
+                                    pre_fix_entry=False,post_fix_entry=True, \
+                                    pre_printout=False,printout=False):
+    """
+    功能：获取雅虎财经上一只股票所有的年度和季度财务报表
+    """
+    
+    # 变换港股代码5位-->4位
+    result,prefix,suffix=split_prefix_suffix(ticker)
+    if result & (suffix=='HK'):
+        if len(prefix)==5:
+            ticker=ticker[1:]
+    
+    print(f"  Searching for financial statements of {ticker} ... ...")
+    
+    #获取资产负债表
+    df_bs=get_1statement_yahoo2(ticker,report_type="balance sheet", \
+                              report_period=report_period, \
+                              max_count=max_count,max_sleep=max_sleep, \
+                              fix_entry=pre_fix_entry, \
+                              printout=pre_printout)
+    
+    
+    #获取利润表
+    df_is=get_1statement_yahoo2(ticker,report_type="income statement", \
+                              report_period=report_period, \
+                              max_count=max_count,max_sleep=max_sleep, \
+                              fix_entry=pre_fix_entry, \
+                              printout=pre_printout)
+    
+    
+    #获取现金流量表
+    df_cfs=get_1statement_yahoo2(ticker,report_type="cash flow statement", \
+                              report_period=report_period, \
+                              max_count=max_count,max_sleep=max_sleep, \
+                              fix_entry=pre_fix_entry, \
+                              printout=pre_printout)
+    
+    #=====三表合并
+    #合并1：资产负债表+利润表
+    head_cols=['asOfDate','periodType','currencyCode']
+    df_bs_is=pd.merge(df_bs,df_is,on=head_cols)
+    
+    #合并2：+现金流量表
+    df=pd.merge(df_bs_is,df_cfs,on=head_cols)
+    df['ticker']=ticker
+    
+    #合成后填充缺失项
+    if post_fix_entry:
+        df1=check_fill_fs_yahoo(df)
+    else:
+        df1=df
+        
+    print(f"  Successfully retrieved financial statements of {ticker}")    
+    
+    if printout:
+        df2=df1.copy()
+        df2.replace(0,np.nan,inplace=True)
+        title_prefix="Comprehensive Financial Statement"
+        print_stmt_yahoo2(df2,title_prefix)
+    
+    return df1    
+    
+#==============================================================================
+if __name__=='__main__':
+    from yahooquery import Ticker
+    stock = Ticker("AAPL")
+    stmt=stock.cash_flow()
+    
+    df=check_fill_cfs_yahoo(stmt)
+    
+def check_fill_fs_yahoo(stmt):
+    """
+    
+    功能：检查和填补雅虎抓取到的三张表合成后缺失项
+    输入：雅虎抓取到的三张表合成
+    输出：经过检查的三张表合成，缺失科目可不断填充
+    
+    注意：单纯在资产负债表/利润表/现金流量表内填充缺失项比较勉强，可在三表合成后综合填充
+    """
+    df=stmt.copy()
+    #为计算方便，将所有的nan替换为0
+    df.fillna(0,inplace=True)
+    
+    
+    
+    
+    
+    
+    
+    
+    return df
+
+
+
+"""
+最终获得的表结构：
+['asOfDate',
+ 'periodType',
+ 
+ 'AccountsPayable(应付账款)',
+ 'AccountsReceivable(应收账款)',
+ 'AccumulatedDepreciation（累计折旧）',
+ 'AdditionalPaidInCapital（资本公积，资本溢价，附加资本；paid-in capital：实收资本；缴入资本）',
+ 'AllowanceForDoubtfulAccountsReceivable（备抵应收呆帐）',
+ 'AvailableForSaleSecurities（可供出售金融资产；trading securities: 交易性金融资产）',
+ 'BuildingsAndImprovements（建筑物改良）',
+ 'CapitalStock（股本）',
+ 'CashAndCashEquivalents（现金及现金等价物）',
+ 'CashCashEquivalentsAndShortTermInvestments（现金、现金等价物及短期投资）',
+ 'CashEquivalents（现金等价物）',
+ 'CashFinancial（？）',
+ 'CommonStock（普通股）',
+ 'CommonStockEquity（普通股权益？）',
+ 'ConstructionInProgress（在建工程）',
+ 'CurrentAssets（流动资产）',
+ 'CurrentLiabilities（流动负债）',
+ 'DividendsPayable（应付股利）',
+ 'FinishedGoods（制成品）',
+ 'GoodwillAndOtherIntangibleAssets（商誉及其他无形资产）',
+ 'GrossAccountsReceivable（应收账款总额）',
+ 'GrossPPE（固定资产总额）',
+ 'InventoriesAdjustmentsAllowances（存货调整备抵）',
+ 'Inventory（存货）',
+ 'InvestedCapital（投入资本）',
+ 'InvestmentinFinancialAssets（金融资产投资？）',
+ 'LandAndImprovements（土地改良）',
+ 'MachineryFurnitureEquipment（机械家具设备？）',
+ 'MinorityInterest（少数股东损益？）',
+ 'NetPPE（固定资产净值）',
+ 'NetTangibleAssets（有形资产净值）',
+ 'NonCurrentDeferredAssets（非流动递延资产）',
+ 'NonCurrentDeferredTaxesAssets（非流动递延税项资产？）',
+ 'NonCurrentDeferredTaxesLiabilities（非流动递延税金负债？）',
+ 'OrdinarySharesNumber（普通股数量？）',
+ 'OtherCurrentAssets（其他流动资产）',
+ 'OtherCurrentLiabilities（其他流动负债）',
+ 'OtherEquityInterest（其他股权）',
+ 'OtherIntangibleAssets（其他有形资产）',
+ 'OtherNonCurrentAssets（其他非流动资产）',
+ 'OtherPayable（其它应付款）',
+ 'OtherProperties（？）',
+ 'OtherReceivables（其他应收款）',
+ 'Payables（应付款项）',
+ 'PrepaidAssets（预付资产；预付费用）',
+ 'Properties（财产？）',
+ 'RawMaterials（原材料）',
+ 'RetainedEarnings（留存收益）',
+ 'ShareIssued（股票发行）',
+ 'StockholdersEquity（股东权益）',
+ 'TangibleBookValue（有形资产账面价值）',
+ 'TotalAssets（总资产）',
+ 'TotalCapitalization（资本总额？）',
+ 'TotalEquityGrossMinorityInterest（少数股东权益总额）',
+ 'TotalLiabilitiesNetMinorityInterest（？）',
+ 'TotalNonCurrentAssets（非流动资产总额）',
+ 'TotalNonCurrentLiabilitiesNetMinorityInterest（？）',
+ 'TotalTaxPayable（应缴税款总额）',
+ 'TradeandOtherPayablesNonCurrent（？）',
+ 'WorkInProcess（在制品）',
+ 'WorkingCapital（营运资本）',
+ 'Amortization（摊销）',
+ 
+ 'BasicAverageShares（未稀释的平均股数？）',
+ 'BasicEPS（ 基本每股收益，指属于普通股股东的当期净利润，除以发行在外普通股的加权平均数，可按存在月数加权）',
+ 'CostOfRevenue（主营业务成本，营收成本）',
+ 'DepreciationAndAmortizationInIncomeStatement（损益表中的折旧和摊销）',
+ 'DepreciationIncomeStatement（损益表中的折旧）',
+ 'DilutedAverageShares（稀释后平均股数？）',
+ 'DilutedEPS（考虑了可转换债券和股票期权可能行权对于流通在外股数的影响）',
+ 'EBIT（息税前利润）',
+ 'EBITDA（未计利息、税项、折旧及摊销前的利润）',
+ 'GeneralAndAdministrativeExpense（一般管理费用）',
+ 'GrossProfit（营业毛利）',
+ 'ImpairmentOfCapitalAssets（资本资产减值）',
+ 'InterestExpense（利息费用）',
+ 'InterestExpenseNonOperating（非经营性利息费用）',
+ 'InterestIncome（利息收益）',
+ 'InterestIncomeNonOperating（非经营性利息收入）',
+ 'MinorityInterests（少数股东权益）',
+ 'NetIncome（净利润）',
+ 'NetIncomeCommonStockholders（归属于普通股股东的净利润，用于计算EPS和PE）',
+ 'NetIncomeContinuousOperations（扣非后净利润）',
+ 'NetIncomeFromContinuingAndDiscontinuedOperation（来自持续经营和停止经营业务的净收入）',
+ 'NetIncomeFromContinuingOperationNetMinorityInterest（不归属少数股东的扣非后净利润？）',
+ 'NetIncomeIncludingNoncontrollingInterests（包括非控股权的净收入？）',
+ 'NetInterestIncome（净利息收入）',
+ 'NetNonOperatingInterestIncomeExpense（？）',
+ 'NormalizedEBITDA（调整后EBITDA？）',
+ 'NormalizedIncome（调整后利润？）',
+ 'OperatingExpense（营业费用）',
+ 'OperatingIncome（营业利润）',
+ 'OperatingRevenue（营业收入）',
+ 'OtherNonOperatingIncomeExpenses（其他营业外收入支出？）',
+ 'OtherOperatingExpenses（其它营业费用）',
+ 'OtherSpecialCharges（其他特殊费用）',
+ 'OtherunderPreferredStockDividend（优先股股利下的其他项目）',
+ 'PretaxIncome（税前利润）',
+ 'ReconciledCostOfRevenue（对账后的经营收入成本？）',
+ 'ReconciledDepreciation（对账后的折旧）',
+ 'RentAndLandingFees（租金及土地费用？）',
+ 'RentExpenseSupplemental（补充租金费用？）',
+ 'ResearchAndDevelopment（研发费用）',
+ 'SellingAndMarketingExpense（销售和市场营销费用）',
+ 'SellingGeneralAndAdministration（销售及一般管理费用）',
+ 'SpecialIncomeCharges（特殊收入的手续费）',
+ 'TaxEffectOfUnusualItems（非常项目的税收影响）',
+ 'TaxProvision（税金？）',
+ 'TaxRateForCalcs（计算用的税率）',
+ 'TotalExpenses（总费用）',
+ 'TotalOperatingIncomeAsReported（报告的总营业利润）',
+ 'TotalOtherFinanceCost（其他财务成本合计）',
+ 'TotalRevenue（总收入）',
+ 'TotalUnusualItems（非经常性项目总计）',
+ 'TotalUnusualItemsExcludingGoodwill（不包括商誉的非经常项目合计）',
+ 'WriteOff（冲销？）',
+ 
+ 'BeginningCashPosition（期初现金头寸）',
+ 'CapitalExpenditure（资本支出）',
+ 'CashDividendsPaid（现金股利支付）',
+ 'ChangeInCashSupplementalAsReported（现金补充变更报告？）',
+ 'ChangeInInventory（存货变化）',
+ 'ChangeInWorkingCapital（营运资本的变动额）',
+ 'DepreciationAndAmortization（折旧摊销）',
+ 'EndCashPosition（期末现金头寸）',
+ 'FreeCashFlow（自有现金流）',
+ 'InvestingCashFlow（投资现金流）',
+ 'NetOtherFinancingCharges（其他融资费用净额）',
+ 'NetOtherInvestingChanges（其他投资变动净额）',
+ 'OperatingCashFlow（营运现金流）',
+ 'OtherNonCashItems（其他非现金项目）'
+ ]
+"""
+
+#==============================================================================
+if __name__ == '__main__':
+    fsdf=get_financial_statements('601398.SS')
+    account_entry='TotalAssets'
+    
+    fsdf1=fs_entry_begin(fsdf,account_entry='TotalAssets',suffix='_begin')
+
+def fs_entry_begin(fsdf,account_entry='TotalAssets',suffix='_begin'):
+    """
+    功能：以上年年报期末科目数值作为本期年报和季报的期初，仅适用于雅虎财报！
+    """
+    import pandas as pd
+    import numpy as np
+    #获取年报日期
+    ar_mm_dd=pd.to_datetime(fsdf[fsdf['periodType']=='12M']['asOfDate'].values[0]).strftime("%Y-%m-%d")[-5:]
+    
+    fsdf['asOfDate_pd']=fsdf['asOfDate'].apply(lambda x: pd.to_datetime(x))
+    fsdf['Date_y4']=fsdf['asOfDate'].apply(lambda x: pd.to_datetime(x).strftime("%Y"))
+    fsdf['Date_begin_pd']=fsdf['Date_y4'].apply(lambda x: pd.to_datetime(str(int(x)-1)+'-'+ar_mm_dd))
+    
+    asOfDate_pd_list=list(fsdf['asOfDate_pd'])
+    entry_begin=lambda x: fsdf[fsdf['asOfDate_pd']==x][account_entry].values[0] if x in asOfDate_pd_list else np.nan
+    fsdf[account_entry+suffix]=fsdf['Date_begin_pd'].apply(entry_begin)
+    
+    fsdf.drop(['asOfDate_pd','Date_y4','Date_begin_pd'],axis=1,inplace=True)
+    
+    return fsdf
+
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================

siat/stock.py

@@ -2654,10 +2654,10 @@ def stock_dividend(ticker,start="L3Y",end="today",facecolor='whitesmoke',fontcol
     try:
         div=stock.dividends
     except:
-        print("  #Error(stock_dividend): no div info found for",ticker)
+        print("  #Error(stock_dividend): no dividend information found for",ticker)
         return None    
     if len(div)==0:
-        print("  #Warning(stock_dividend): no div info found for",ticker)
+        print("  #Warning(stock_dividend): no dividend information found for",ticker)
         return None      
 
     # 去掉时区信息，避免合并中的日期时区冲突问题
@@ -2795,10 +2795,10 @@ def stock_split(ticker,start="L10Y",end="today",facecolor='whitesmoke',fontcolor
     try:
         div=stock.splits
     except:
-        print("  #Error(stock_split): no split info found for",ticker)
+        print("  #Error(stock_split): no split information found for",ticker)
         return None    
     if len(div)==0:
-        print("  #Warning(stock_split): no split info found for",ticker)
+        print("  #Warning(stock_split): no split information found for",ticker)
         return None      
 
     # 去掉时区信息，避免合并中的日期时区冲突问题
@@ -2810,7 +2810,7 @@ def stock_split(ticker,start="L10Y",end="today",facecolor='whitesmoke',fontcolor
     div1=div[div.index >= startdt]
     div2=div1[div1.index <= enddt]
     if len(div2)==0:
-        print("  #Warning(stock_split): no split info in period",fromdate,todate)
+        print("  #Warning(stock_split): no split information in period",fromdate,todate)
         return None          
     
     #对齐打印

siat/valuation.py

@@ -1177,9 +1177,10 @@ def security_valuation(tickers,indicators,start,end, \
         
 #==============================================================================
 if __name__=='__main__':
-    df=security_trend(baijiu_stocks,indicator='PE',start='MRY',graph=False) 
+    bank_big=find_peers_china('国有大型银行Ⅱ',top=25)
+    df=security_trend(bank_big,indicator='PE',start='MRY',graph=False) 
     indicator='PE'
-    base=''
+    base='601398.SS'
     
     
 def print_valuation(df,indicator='PE',base='',facecolor='whitesmoke'):
@@ -1189,14 +1190,15 @@ def print_valuation(df,indicator='PE',base='',facecolor='whitesmoke'):
     try:
         df1=df[indicator]
     except:
-        print("  #Warning: current dataframe does not support indicator",indicator)
+        print(f"  #Warning(print_valuation): unsupported indicator {indicator} in current dataframe")
         return
     
     collist=list(df1)
     base=base.upper()
+    base=ticker_name(base)
     if not (base in collist):
         """
-        print("  #Warning: invalid item",base,"for current dataframe")
+        print("  #Warning(print_valuation): invalid item",base,"for current dataframe")
         print("  Valid items in current dataframe:\n",collist)
         return
         """
@@ -1256,7 +1258,8 @@ def print_valuation(df,indicator='PE',base='',facecolor='whitesmoke'):
     #df4=df3[['序号','证券名称',col_mean,col_mean_rel,'均值对比',col_latest_date,col_latest_rel,'对比@'+col_latest_date]]
     df4=df3[['证券名称',col_mean,'均值排名',col_latest_date,'排名@'+col_latest_date,col_mean_rel,col_latest_rel,'均值对比','对比@'+col_latest_date]]
     
-    titletxt="*** 估值对比："+indicator+"，降序排列"
+    #titletxt="估值对比："+ectranslate(indicator)+"，降序排列"
+    titletxt="估值对比：{0}({1})，降序排列".format(ectranslate(indicator),indicator)
     """
     print("\n",titletxt,'\n')
     alignlist=['left','right','center','right','center']+['right']*(len(list(df4))-5)
@@ -1273,16 +1276,17 @@ def print_valuation(df,indicator='PE',base='',facecolor='whitesmoke'):
     #设置列数值对齐
     dispf=dispt.set_properties(**{'text-align':'center'})
     #设置前景背景颜色
-    dispf2=dispf.set_properties(**{'background-color':facecolor,'color':fontcolor})
+    #dispf2=dispf.set_properties(**{'background-color':facecolor,'color':fontcolor})
+    dispf2=dispf.set_properties(**{'background-color':facecolor})
 
     from IPython.display import display
     display(dispf2)
     
-    print(" ")
+    #print(" ")
     if diff > 0:
         print("【注】未列出"+str(diff)+"只估值为非正数的证券："+str(diff_list))
     import datetime; todaydt = datetime.date.today()
-    footnote="*** 期间："+col_start_date+"至"+col_latest_date+"。数据来源: baidu/stooq/funddb/swhysc，"+str(todaydt)
+    footnote="估值期间："+col_start_date+"至"+col_latest_date+"，数据来源: baidu/stooq/funddb/swhysc，"+str(todaydt)
     print(footnote)   
 
     return

{siat-3.7.7.dist-info → siat-3.7.8.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 siat/__init__ -20240701.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
 siat/__init__.py,sha256=pIo4CV3lNPKIhitmhIh_6aAfZrmzQWGNDcEnvZ7GXoc,3216
-siat/allin.py,sha256=JLuxVmxtlOTDelnfulK6rPoFTIhzTNe5_GShXCiKGZY,2904
+siat/allin.py,sha256=x1QC29PUBUYiA6IAbQKbRvtxIEUOBx8dy5k7zh1ABT4,2970
 siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
 siat/assets_liquidity.py,sha256=o_UZdLs693uNWPEQB2OzxDH0mdWimOmq4qe_vx1pue0,28987
 siat/assets_liquidity_test.py,sha256=UWk6HIUlizU7LQZ890fGx8LwU1jMMrIZswg8cFUJWZ8,1285
@@ -18,7 +18,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=-ZYYp1HK7SkfTR3vBKZ0QVC4Q_tbST2O4MGbX_V77J0,32031
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=08Gb287rbVIAFdLilHPg3DJHLCCIhM95rJ-zhuZpudc,164861
+siat/common.py,sha256=crRasPR7t5G1t95hm9JWmIob9d-iYASA4GEW5bKVhWw,173203
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -36,6 +36,7 @@ siat/event_study.py,sha256=Q_AdnJzxxL6udCjn5LP6rdhOngsDRWPu5udFkK1CJZw,32223
 siat/exchange_bond_china.pickle,sha256=zDqdPrFacQ0nqjP_SuF6Yy87EgijIRsFvFroW7FAYYY,1265092
 siat/fama_french.py,sha256=aUTC-67t_CEPbLk4u79woW_zfZ7OCP6Fo4z5EdWCSkQ,48051
 siat/fama_french_test.py,sha256=M4O23lBKsJxhWHRluwCb3l7HSEn3OFTjzGMpehcevRg,4678
+siat/fin_stmt2_yahoo.py,sha256=q4oNv-Wc30Kyuq_lRB0ZMINd33pusxQ3H2BecoFATqo,34297
 siat/financial_base.py,sha256=5u298_1OSlgLnDmhXxqvo4WgMM0JKSa_4jBYF-Ilx38,41097
 siat/financial_statements.py,sha256=xx0SMpFqAMKm6cj8uYeG2RpJE6G-RoJ3NWa33UyaVMk,25414
 siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHYXb_w,716
@@ -106,7 +107,7 @@ siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmW
 siat/security_trend2.py,sha256=mamJtFAbXC1orGgMEmp0taPk-yUqWm-jdGf64bjhn2Q,29756
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=Eq8dVs9CxT1vS1BEsFQ4xCff3aXBucbT5OPW-WidNcA,158613
+siat/stock.py,sha256=AO_ntNoinjXpzzs4eA1iMlsqGFoN1KvgHV6Z_ECVy-M,158658
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=vm_BslG0gJm4R0-O5bNtENkMMfDP-u1TYKCKzLH9Nkk,93460
@@ -136,13 +137,13 @@ siat/translate.py,sha256=aAWk9museEsdxDstXjEy_SXiEzvKD_6fDi0W4TrBiwI,241364
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/translate_241003_keep.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
-siat/valuation.py,sha256=o5FsEBkYGCgyEg2m9oF3_KdTzUxPIsEeJCYtsTDZ8OE,50514
+siat/valuation.py,sha256=DF-THR8AOPFtbMG58g9coqrfnzeBIhX3PW7ZhU6WbEo,50821
 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.7.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.7.7.dist-info/METADATA,sha256=4VE1VSyUItSI2OgG2CW5PSJ4PS7C9xZRhSt8TizioV8,8009
-siat-3.7.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.7.7.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.7.7.dist-info/RECORD,,
+siat-3.7.8.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.7.8.dist-info/METADATA,sha256=eDkDeMALXeeUIhn3YcgdI7vzLy2P4qCAR8ErzLuv5p4,8009
+siat-3.7.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.7.8.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.7.8.dist-info/RECORD,,