siat 3.7.11__py3-none-any.whl → 3.7.20__py3-none-any.whl

siat/__init__.py

@@ -2,7 +2,7 @@
 """
 功能：一次性引入SIAT的所有模块
 作者：王德宏，北京外国语大学国际商学院
-版权：2021-2024(C) 仅限教学使用，商业使用需要授权
+版权：2021-2025(C) 仅限教学使用，商业使用需要授权
 联络：wdehong2000@163.com
 """
 
@@ -10,64 +10,11 @@
 #屏蔽所有警告性信息
 import warnings; warnings.filterwarnings('ignore')
 #==============================================================================
-try:
-    from siat.allin import *
-    success=True
-except:
-    print("  #Warning: failed to enable siat!")
-    import sys; version=sys.version
-    version_list=version.split('|')
-    python_version=version_list[0].strip()
-    python_version_list=python_version.split('.')
-    python_version2="{0}.{1}".format(python_version_list[0],python_version_list[1])
-    
-    if python_version2 < '3.11':
-        print("  Solution: your Python version is {0}, suggest upgrade to {1} or above".format(python_version2,'3.11'))
-    elif python_version2 < '3.12':
-        print("  Solution: your Python version is {0}, suggest upgrade to {1} or above".format(python_version2,'3.12'))
-    else:
-        print("  Solution: your Python version is {}, suggest upgrade to the newest one".format(python_version2))
-    
-    success=False
+from siat.allin import *
 
-if success:
-    #==============================================================================
-    #同一命令行多个输出，主要用于Jupyter Notebook
-    from IPython.core.interactiveshell import InteractiveShell
-    InteractiveShell.ast_node_interactivity='all'
-    #==============================================================================
-    # 检查是否存在新版本
-    check_newer_version=False
-    
-    try:
-        import pkg_resources
-        current_version=pkg_resources.get_distribution("siat").version
-        current_list=current_version.split('.')
-        print("Successfully enabled siat version",current_version)
-    
-        if check_newer_version:
-            import luddite
-            latest_version=luddite.get_version_pypi("siat")
-            latest_list=latest_version.split('.')
-            
-            newest=True
-            for i in range(3):
-                #print(i)
-                if int(current_list[i]) < int(latest_list[i]):
-                    newest=False
-            
-            if not newest:
-                #print("The latest version of siat is",latest_version,'\n')
-                print("There is a newer version of siat",latest_version,'\n')
-                print("*** How to upgrade siat?")
-                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:
-        print("  #Warning: plugin went unexpected with either {0} or {1}".format("pkg_resources","luddite"))
-        print("  Solution: please re-run. If problem remains, contact the author of siat for help")
-        #pass
-    
+import pkg_resources
+current_version=pkg_resources.get_distribution("siat").version
+current_list=current_version.split('.')
+print("Successfully enabled siat v{}".format(current_version))
 
 #==============================================================================

siat/__init__.py.backup_20250214.py

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+"""
+功能：一次性引入SIAT的所有模块
+作者：王德宏，北京外国语大学国际商学院
+版权：2021-2024(C) 仅限教学使用，商业使用需要授权
+联络：wdehong2000@163.com
+"""
+
+#==============================================================================
+#屏蔽所有警告性信息
+import warnings; warnings.filterwarnings('ignore')
+#==============================================================================
+try:
+    from siat.allin import *
+    success=True
+except:
+    print("  #Warning: failed to enable siat!")
+    import sys; version=sys.version
+    version_list=version.split('|')
+    python_version=version_list[0].strip()
+    python_version_list=python_version.split('.')
+    python_version2="{0}.{1}".format(python_version_list[0],python_version_list[1])
+    
+    if python_version2 < '3.11':
+        print("  Solution: your Python version is {0}, suggest upgrade to {1} or above".format(python_version2,'3.11'))
+    elif python_version2 < '3.12':
+        print("  Solution: your Python version is {0}, suggest upgrade to {1} or above".format(python_version2,'3.12'))
+    else:
+        print("  Solution: your Python version is {}, suggest upgrade to the newest one".format(python_version2))
+    
+    success=False
+
+if success:
+    #==============================================================================
+    #同一命令行多个输出，主要用于Jupyter Notebook
+    from IPython.core.interactiveshell import InteractiveShell
+    InteractiveShell.ast_node_interactivity='all'
+    #==============================================================================
+    # 检查是否存在新版本
+    check_newer_version=False
+    
+    try:
+        import pkg_resources
+        current_version=pkg_resources.get_distribution("siat").version
+        current_list=current_version.split('.')
+        print("Successfully enabled siat version",current_version)
+    
+        if check_newer_version:
+            import luddite
+            latest_version=luddite.get_version_pypi("siat")
+            latest_list=latest_version.split('.')
+            
+            newest=True
+            for i in range(3):
+                #print(i)
+                if int(current_list[i]) < int(latest_list[i]):
+                    newest=False
+            
+            if not newest:
+                #print("The latest version of siat is",latest_version,'\n')
+                print("There is a newer version of siat",latest_version,'\n')
+                print("*** How to upgrade siat?")
+                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:
+        print("  #Warning: plugin went unexpected with either {0} or {1}".format("pkg_resources","luddite"))
+        print("  Solution: please re-run. If problem remains, contact the author of siat for help")
+        #pass
+    
+
+#==============================================================================

siat/barrons_scraping_test.py

@@ -102,7 +102,10 @@ def query_stock_symbol(self):
 
     # Check for two different Barron's URLs
     url = 'http://www.barrons.com/quote/stock/us/xnas/%s' % (self.symbol)
-    page = requests.get(url)
+    headers = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    }    
+    page = requests.get(url,headers=headers)
     if page.status_code == 404:
         url = 'http://www.barrons.com/quote/stock/us/xnys/%s?mod=DNH_S' % (self.symbol)
 
@@ -159,7 +162,10 @@ def query_stock_symbol(self):
     """
     # Check for two different Barron's URLs
     url = 'http://www.barrons.com/quote/stock/us/xnas/%s' % (self.symbol)
-    page = requests.get(url)
+    headers = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    }    
+    page = requests.get(url,headers=headers)
     if page.status_code == 404:
         url = 'http://www.barrons.com/quote/stock/us/xnys/%s?mod=DNH_S' % (self.symbol)    
     """

siat/common.py

@@ -4,7 +4,7 @@
 所属工具包：证券投资分析工具SIAT 
 SIAT：Security Investment Analysis Tool
 创建日期：2019年7月16日
-最新修订日期：2020年3月28日
+最新修订日期：2025年2月15日
 作者：王德宏 (WANG Dehong, Peter)
 作者单位：北京外国语大学国际商学院
 作者邮件：wdehong2000@163.com
@@ -3483,8 +3483,11 @@ def test_website(url):
     功能：测试一个网址是否可访问
     """
     import requests
+    headers = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    }
     try:
-        response = requests.get(url)
+        response = requests.get(url,headers=headers)
         if response.status_code == 200:
             #print(f"{url} is accessible.")
             return True
@@ -4780,6 +4783,72 @@ def ttest(sample1,sample2):
     return round(p_value,4)
 
 #==============================================================================
+
+
+
+async def convert_jupyter_to_pdf(notebook_path, output_pdf_path, size="A4"):
+    """
+    将 Jupyter Notebook 转换为 PDF 文件
+    参数:
+        notebook_path (str): Jupyter Notebook 文件路径（.ipynb 文件）
+        output_pdf_path (str): 输出的 PDF 文件路径
+        
+    返回:
+        None
+    注意1：pip install playwright之后可能还要执行playwright install
+    注意2：调用本函数的格式是异步await开头
+    await convert_notebook_to_pdf(notebook_path, output_pdf_path)
+    注意3：notebook_path和output_pdf_path中可以带路径
+    """
+    import os
+    from nbconvert import HTMLExporter
+    from playwright.async_api import async_playwright
+    
+    html_file = ""
+    
+    try:
+        # 导出 Notebook 为 HTML
+        html_exporter = HTMLExporter()
+        try:
+            html_content, _ = html_exporter.from_filename(notebook_path)
+            print("Start to convert ipynb file to pdf in {}, ...".format(size))
+
+        except:
+            print("File not found for {}".format(notebook_path))
+            return
+        
+        # 创建临时 HTML 文件
+        html_file = "temp_notebook.html"
+        with open(html_file, "w", encoding="utf-8") as f:
+            f.write(html_content)
+
+        # 使用 Playwright 打开 HTML 并保存为 PDF
+        async with async_playwright() as p:
+            browser = await p.chromium.launch()
+            page = await browser.new_page()
+            await page.goto(f"file://{os.path.abspath(html_file)}")
+            await page.pdf(path=output_pdf_path, format=size)
+            await browser.close()
+
+        print(f"PDF file generated as {output_pdf_path}")
+
+    except Exception as e:
+        print(f"Conversion failed: {e}")
+        return
+    
+    finally:
+        if html_file == "":
+            return
+        # 删除临时 HTML 文件
+        elif os.path.exists(html_file):
+            os.remove(html_file)    
+    
+if __name__ == '__main__':
+    # 定义 Notebook 路径和输出 PDF 路径
+    notebook_path = r"S:\SIA\机工社版本\脚本测试\证券投资分析-第一章案例Python脚本-检测2.ipynb"  # 替换为你的 Notebook 文件路径
+    output_pdf_path = "E:/output_notebook.pdf"  # 替换为你想保存的 PDF 文件路径
+    #await convert_notebook_to_pdf(notebook_path, output_pdf_path)
+
 #==============================================================================
 #==============================================================================
 #==============================================================================

siat/cryptocurrency.py

@@ -38,8 +38,12 @@ plt.rcParams['axes.unicode_minus'] = False
 #定义爬虫函数：抓取交易所信息
 def fetchCrypto_Exchange(fsym,tsym,top=5):
     urlprefix="https://min-api.cryptocompare.com/data/top/exchanges/full?fsym="
-    url      = urlprefix + fsym + "&tsym=" + tsym       
-    response = requests.get(url)
+    url      = urlprefix + fsym + "&tsym=" + tsym     
+    headers = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    }    
+    
+    response = requests.get(url,headers=headers)
     soup     = BeautifulSoup(response.content, "html.parser")
     dic      = json.loads(soup.prettify())
 
@@ -90,14 +94,19 @@ def fetchCrypto_Price_byExchange(fsym, tsym, exchange):
  
     timestamp_today = datetime.today().timestamp()
     curr_timestamp = timestamp_today
- 
+    
+    headers = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    } 
+    
     for j in range(2):
         df = pd.DataFrame(columns=cols)
         urlprefix="https://min-api.cryptocompare.com/data/histoday?fsym="
         url = urlprefix + fsym + \
               "&tsym=" + tsym + "&toTs=" + str(int(curr_timestamp)) + \
               "&limit=2000" + "&e=" + exchange
-        response = requests.get(url)
+              
+        response = requests.get(url,headers=headers)
         soup = BeautifulSoup(response.content, "html.parser")
         dic = json.loads(soup.prettify())        
         if len(dic['Data']) < 1:

siat/economy.py

@@ -216,7 +216,7 @@ def economy_trend(start,end,scope='China',factor='GDP',datatag=False,power=0, \
 
     #绘图
     ylabeltxt=ectranslate(factor)
-    titletxt=ectranslate(list(ds['name'])[0])+'变化趋势：'+ectranslate(scope)
+    titletxt=ectranslate(list(ds['name'])[0])+'走势：'+ectranslate(scope)
     
     import datetime
     today=datetime.date.today()
@@ -453,7 +453,7 @@ def compare_economy(tickers,measures,fromdate,todate,power=0,twinx=False, \
                 yline=100 #绘制y=100的水平线
         
         if lang == 'Chinese':
-            titletxt=ectranslate(list(df1['name'])[0])+'趋势对比：'+ \
+            titletxt=ectranslate(list(df1['name'])[0])+'走势对比：'+ \
                 '\n'+ectranslate(ticker1)+' vs '+ectranslate(ticker2)
         else:
             titletxt=list(df1['name'])[0]+', Trend Comparison'+ \

siat/financial_base.py

@@ -38,7 +38,10 @@ class YahooFin():
     def make_request(self, url):
         """Makes a GET request"""
         import requests
-        return requests.get(url)
+        headers = {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+        }        
+        return requests.get(url,headers=headers)
 
     def get_data(self):
       """Returns a json object from a GET request"""

siat/grafix.py

@@ -136,6 +136,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     注意1：需要日期类型作为df索引
     注意2：date_freq不为False时，必须设置date_range=True，否则无法完成日期设置！
     """
+    import pandas as pd
     
     #空值判断
     if len(df0) ==0:
@@ -214,7 +215,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
                 #y1=round(y+high_low*0.01,2)
                 y1=y+high_low*0.01
                 #s='%.0f' if y >= 100 else '%.2f'
-                s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.4f' 
+                s='%.1f' if abs(y) >= 100 else '%.2f' if abs(y) >= 1 else '%.4f' 
                 plt.text(x,y1,s % y,ha='right',va='bottom',color='red')
                 """
                 s='%.0f' if y >= 100 else '%.2f'
@@ -229,7 +230,8 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
                 #y1=round(y-high_low*0.055,2) #标记位置对应y1的底部
                 y1=y-high_low*0.050 #标记位置对应y1的底部
                 #s='%.0f' if y >= 100 else '%.2f'
-                s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.4f'
+                #s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.4f'
+                s='%.1f' if abs(y) >= 100 else '%.2f' if abs(y) >= 1 else '%.4f'
                 #plt.text(x,y1,s % y,ha='center',va='bottom',color='seagreen')
                 plt.text(x,y1,s % y,ha='right',va='bottom',color='seagreen')
                 plt.scatter(x,y, color='seagreen',marker='8',s=70)
@@ -365,7 +367,9 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     plt.xlabel(footnote,fontsize=xlabel_txt_size,ha='center')
     plt.title(titletxt,fontweight='bold',fontsize=title_txt_size)
     
-    plt.legend(loc=loc,fontsize=legend_txt_size)
+    if haveLegend:
+        plt.legend(loc=loc,fontsize=legend_txt_size)
+        
     plt.show()
     plt.close()
     
@@ -773,7 +777,9 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
     返回值：无
     注意：需要日期类型作为df索引
     """
-
+    import pandas as pd
+    DEBUG=False
+    
     #插值平滑
     try:
         df01x=df01[[colname1]].astype('float')
@@ -801,6 +807,8 @@ def plot_line2_coaxial2(df01,ticker1,colname1,label1, \
     ax=plt.gca()    
     date_start=df1.index[0]
     date_end=df1.index[-1]
+    import pandas as pd
+    
     if date_range and not date_freq:
         ax.xaxis.set_major_formatter(mdate.DateFormatter(date_fmt))
         plt.xticks(pd.date_range(date_start,date_end))
@@ -1237,6 +1245,7 @@ def plot_line2_twinx2(df01,ticker1,colname1,label1, \
     返回值：无
     注意：需要日期类型作为df索引
     """
+    import pandas as pd
     #plt.rcParams['axes.grid']=False
 
     #插值平滑
@@ -1637,7 +1646,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     #y1=round(y+high_low*0.01,2)
                     y1=y+high_low*0.01
                     #s='%.0f' if y >= 100 else '%.2f'
-                    s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.4f'
+                    s='%.1f' if abs(y) >= 100 else '%.2f' if abs(y) >= 1 else '%.4f'
                     #plt.text(x,y1,s % y,ha='center',va='bottom',color='red')
                     plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='red',marker='8',s=70)
@@ -1648,7 +1657,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     #y1=round(y-high_low*0.055,2) #标记位置对应y1的底部
                     y1=y-high_low*0.050 #标记位置对应y1的底部
                     #s='%.0f' if y >= 100 else '%.2f'
-                    s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.4f'
+                    s='%.1f' if abs(y) >= 100 else '%.2f' if abs(y) >= 1 else '%.4f'
                     #plt.text(x,y1,s % y,ha='center',va='bottom',color='seagreen')
                     plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='seagreen',marker='8',s=70)
@@ -1847,6 +1856,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
     
     band_area=''：默认为空，否则为列表，第1个值为带状区域上边沿字段，第2个值为带状区域下边沿字段
     """
+    import pandas as pd
     DEBUG=False
     
     #空值判断
@@ -1952,7 +1962,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     #y1=round(y+high_low*0.01,2)
                     y1=y+high_low*0.01
                     #s='%.0f' if y >= 100 else '%.2f'
-                    s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.4f'
+                    s='%.1f' if abs(y) >= 100 else '%.2f' if abs(y) >= 1 else '%.4f'
                     #plt.text(x,y1,s % y,ha='center',va='bottom',color='red')
                     plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='red',marker='8',s=70)
@@ -1963,7 +1973,7 @@ def draw_lines2(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                     #y1=round(y-high_low*0.055,2) #标记位置对应y1的底部
                     y1=y-high_low*0.050 #标记位置对应y1的底部
                     #s='%.0f' if y >= 100 else '%.2f'
-                    s='%.2f' if abs(y) >= 100 else '%.2f' if abs(y) >= 10 else '%.4f'
+                    s='%.1f' if abs(y) >= 100 else '%.2f' if abs(y) >= 1 else '%.4f'
                     #plt.text(x,y1,s % y,ha='center',va='bottom',color='seagreen')
                     plt.text(x,y1,s % y,ha='right',va='bottom',color=last_line_color)
                     plt.scatter(x,y, color='seagreen',marker='8',s=70)
@@ -2272,6 +2282,8 @@ def plot_2lines(df01,colname1,label1, \
     
     返回值：无
     """
+    import pandas as pd
+    
     #空值判断
     if len(df01) ==0:
         print ("  #Warning(plot_2lines): no data to plot df01.")

siat/sector_china.py

@@ -38,8 +38,8 @@ def sector_list_china(indicator="新浪行业"):
     #检查选项是否支持
     indicatorlist=["新浪行业","概念","地域","行业","启明星行业"]
     if indicator not in indicatorlist:
-        print("#Error(sector_list_china): unsupported sectoring method",indicator)
-        print("Supported sectoring methods:",indicatorlist)
+        print("  #Error(sector_list_china): unsupported sectoring method",indicator)
+        print("  Supported sectoring methods:",indicatorlist)
         return None
     
     import akshare as ak
@@ -51,9 +51,11 @@ def sector_list_china(indicator="新浪行业"):
         df['label']=df['label'].apply(lambda x: x.strip())
         
     except:
-        print("  #Error(sector_list_china): data source tentatively unavailable for",indicator)
-        print("  Possible reason: data source is self-updating.")
-        print("  Solution: have a breath of fresh air and try later.")
+        print("  #Error(sector_list_china): data source unavailable for",indicator)
+        print("  Possible reason 1: data source is self-updating now.")
+        print("  Possible reason 2: need to upgrade akshare.")
+        print("  Possible reason 3: data source not reachable under vpn.")
+
         return None
     
     sectorlist=list(df['板块'])
@@ -592,7 +594,7 @@ def sector_position_sina(ticker,sector="new_dlhy",return_result=False):
 
 def sector_position_china(ticker,sector="new_dlhy"):
     """
-    功能：查找一只股票在板块内的百分数位置
+    功能：查找一只股票在板块内的分位数位置
     ticker：股票代码
     sector：板块代码
     """
@@ -3882,7 +3884,10 @@ def get_stock_industry_sw(ticker):
 
     ticker6=ticker[:6]    
     url=f"https://vip.stock.finance.sina.com.cn/corp/go.php/vCI_CorpOtherInfo/stockid/{ticker6}/menu_num/2.phtml"
-    response = requests.get(url)
+    headers = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    }    
+    response = requests.get(url,headers=headers)
     
     if response.status_code == 200:
         soup = BeautifulSoup(response.text, 'html.parser')

siat/security_price2.py

@@ -42,8 +42,10 @@ if __name__=='__main__':
     
     ticker='AAPL'
     
-    ticker="006257"
+    ticker='GC=F'
     
+    ticker="006257"
+    ticker_type='auto'
     
     fromdate='2024-5-1'; todate='2024-5-20'
     
@@ -164,7 +166,7 @@ def get_price_1ticker(ticker,fromdate,todate, \
             dft=get_price_yf(ticker1,fromdate,todate)
             found=df_have_data(dft) 
         
-            #数据源情形4：yahoo, pandas_datareader，需要访问yahoo，似乎不工作！
+            #数据源情形4：yahoo, pandas_datareader，需要访问yahoo，似乎不工作了！
             if found not in ['Found','Empty']:
                 dft=get_prices_yahoo(ticker1,fromdate,todate)
                 found=df_have_data(dft) 

siat/security_prices.py

@@ -553,6 +553,8 @@ if __name__=='__main__':
     ticker='TRBNCN.M'
     ticker='RSAYCN.M'
     
+    ticker='GC.F'
+    
     ticker=['AAPL','MSFT']
     
     start='2023-1-1'
@@ -1358,10 +1360,12 @@ def get_price_yf(ticker,start,end,threads=False):
 
 
 if __name__=='__main__':
-    start='2020-12-1'
-    end='2021-1-31'
+    start='2024-12-1'
+    end='2025-1-31'
     
     ticker='AAPL'
+    ticker='GC=F'
+    
     ticker=['AAPL','MSFT']
     ticker=['0700.HK','600519.SS']
     ticker=['AAPL','MSFT','0700.HK','600519.SS']

siat/stock.py

@@ -571,8 +571,6 @@ def all_calculate(pricedf,ticker1,fromdate,todate,ticker_type='auto'):
 if __name__ =="__main__":
     # 测试组1
     ticker='NVDA'
-    fromdate='2023-5-1'
-    todate='2023-6-16'
     indicator="Exp Ret%"
     indicator="Annual Ret Volatility%"
     
@@ -588,6 +586,7 @@ if __name__ =="__main__":
     todate='2023-9-17'
     indicator="Close"
     
+    # 公共参数
     datatag=False
     power=0
     graph=True
@@ -595,6 +594,7 @@ if __name__ =="__main__":
     zeroline=False
     average_value=False
     
+    # 其他测试
     ticker='600519.SS'; indicator='Exp Ret Volatility%'
     
     ticker='180202.SZ'

siat/stock_technical.py

@@ -4,7 +4,7 @@
 所属工具包：证券投资分析工具SIAT 
 SIAT：Security Investment Analysis Tool
 创建日期：2023年1月27日
-最新修订日期：2023年1月27日
+最新修订日期：2025年1月31日
 作者：王德宏 (WANG Dehong, Peter)
 作者单位：北京外国语大学国际商学院
 作者邮件：wdehong2000@163.com
@@ -2483,22 +2483,23 @@ if __name__ =="__main__":
     technical='Bollinger'
     indicator='PE'
 
-def security_technical(ticker,start='default',end='default', \
-             MA_days=[5,20],EMA_days=[5,20], \
-             MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
-                 
-             #RSI参数个数必须为3个，否则出错
-             RSI_days=[6,12,24],RSI_lines=[20,50,80], \
-             KDJ_days=[9,3,3],matypes=[0,0],KDJ_lines=[20,50,80], \
-             boll_days=20,boll_years=7, \
-             resample_freq='6H',smooth=True,linewidth=1.5, \
-             loc1='best',loc2='best', \
-             graph=['ALL'],printout=False, \
-             date_range=False,date_freq=False,annotate=False, \
-             technical=['MACD'],indicator='Close', \
-             ticker_type='auto',source='auto', \
-             price_line_color='red', \
-             facecolor='k'):
+def security_technical(ticker,technical=['MACD'],indicator='Close', \
+                       start='default',end='default', \
+                         MA_days=[5,20],EMA_days=[5,20], \
+                         MACD_fastperiod=12,MACD_slowperiod=26,MACD_signalperiod=9, \
+                             
+                         #RSI参数个数必须为3个，否则出错
+                         RSI_days=[6,12,24],RSI_lines=[20,50,80], \
+                         KDJ_days=[9,3,3],matypes=[0,0],KDJ_lines=[20,50,80], \
+                         boll_days=20,boll_years=7, \
+                             
+                         resample_freq='6H',smooth=True,linewidth=1.5, \
+                         loc1='best',loc2='best', \
+                         graph=['ALL'],printout=False, \
+                         date_range=False,date_freq=False,annotate=False, \
+                         ticker_type='auto',source='auto', \
+                         price_line_color='red', \
+                         facecolor='k'):
     
     """
     功能：技术分析中的MACD/RSI/KDJ/布林带，支持教学演示，支持参数调节。
@@ -2529,6 +2530,7 @@ def security_technical(ticker,start='default',end='default', \
         if t not in technical_list:
             print("  Warning(security_technical): unsupported technical pattern",t)
             print("  Supported patterns:",technical_list)
+            return None
     
     #检查布林带的指标
     if isinstance(indicator,str):
@@ -2544,6 +2546,7 @@ def security_technical(ticker,start='default',end='default', \
         if t not in indicator_list1:
             print("  Warning(security_technical): unsupported Bollinger indicator",t)
             print("  Supported Bollinger indicator:",indicator_list1) 
+            return None
     
     # 检查绘图种类
     if isinstance(graph,str):

siat/stooq.py

@@ -37,7 +37,8 @@ class StooqDailyReader(_DailyBaseReader):
     @property
     def url(self):
         """API URL"""
-        return "https://stooq.com/q/d/l/"
+        #return "https://stooq.com/q/d/l/"
+        return "https://stooq.com/q/d/?"
 
     def _get_params(self, symbol, country="US"):
         symbol_parts = symbol.split(".")

siat/translate.py

@@ -1474,61 +1474,61 @@ def codetranslate0(code):
         # 打开stooq.py中的函数def _get_params(self, symbol, country="US")
         # 在函数列表中加入一项"m"即可避免自动在ticker加上后缀.us的问题
         # 或者使用fix_package()函数自动修正
-        ['CPIYKR.M','韩国CPI(同比)'],
-        ['CPIYUK.M','英国CPI(同比)'],['CPIYDE.M','德国CPI(同比)'],
-        ['CPIYJP.M','日本CPI(同比)'],['CPIYCN.M','中国CPI(同比)'],
-        ['CPIYUS.M','美国CPI(同比)'],['CPIYPL.M','波兰CPI(同比)'],
-        ['CPIYFR.M','法国CPI(同比)'],['CPIYPH.M','菲律宾CPI(同比)'],
-        ['CPIYMY.M','马来西亚CPI(同比)'],['CPIYSG.M','新加坡CPI(同比)'],
-        ['CPIYAU.M','澳大利亚CPI(同比)'],['CPIYNZ.M','新西兰CPI(同比)'],
-        ['CPIYCA.M','加拿大CPI(同比)'],['CPIYMX.M','墨西哥CPI(同比)'],
-        ['CPIYBR.M','巴西CPI(同比)'],['CPIYSE.M','瑞典CPI(同比)'],
-        ['CPIYNO.M','挪威CPI(同比)'],['CPIYDK.M','丹麦CPI(同比)'],
-        ['CPIYIS.M','冰岛CPI(同比)'],['CPIYCH.M','瑞士CPI(同比)'],
-        ['CPIYNL.M','荷兰CPI(同比)'],['CPIYIT.M','意大利CPI(同比)'],
-        ['CPIYGR.M','希腊CPI(同比)'],['CPIYES.M','西班牙CPI(同比)'],
-        ['CPIYIE.M','爱尔兰CPI(同比)'],['CPIYAT.M','奥地利CPI(同比)'],
-        ['CPIYCZ.M','捷克CPI(同比)'],['CPIYSK.M','斯洛伐克CPI(同比)'],
-        ['CPIYRO.M','罗马尼亚CPI(同比)'],['CPIYHU.M','匈牙利CPI(同比)'],
-        
-
-        ['PPIYKR.M','韩国PPI(同比)'],['PPIYSK.M','斯洛伐克PPI(同比)'],
-        ['PPIYUK.M','英国PPI(同比)'],['PPIYDE.M','德国PPI(同比)'],
-        ['PPIYJP.M','日本PPI(同比)'],['PPIYCN.M','中国PPI(同比)'],
-        ['PPIYUS.M','美国PPI(同比)'],['PPIYPL.M','波兰PPI(同比)'],
-        
-        ['GDPYUS.M','美国GDP(同比)'],['GDPQUS.M','美国GDP(季度环比)'],
-        ['GDPYCN.M','中国GDP(同比)'],
-        ['GDPYSG.M','新加坡GDP(同比)'],['GDPQSG.M','新加坡GDP(季度环比)'],
-        ['GDPYDE.M','德国GDP(同比)'],['GDPQDE.M','德国GDP(季度环比)'],
-        ['GDPYAU.M','澳大利亚GDP(同比)'],['GDPQAU.M','澳大利亚GDP(季度环比)'],
-        ['GDPYJP.M','日本GDP(同比)'],['GDPQJP.M','日本GDP(季度环比)'],
-        ['GDPYUK.M','英国GDP(同比)'],['GDPQUK.M','英国GDP(季度环比)'],
-        ['GDPYMY.M','马来西亚GDP(同比)'],['GDPQMY.M','马来西亚GDP(季度环比)'],
-        ['GDPYKR.M','韩国GDP(同比)'],['GDPQKR.M','韩国GDP(季度环比)'],
-        ['GDPYTR.M','土耳其GDP(同比)'],['GDPQTR.M','土耳其GDP(季度环比)'],
-        ['GDPYNZ.M','新西兰GDP(同比)'],
-        ['GDPYIN.M','印度GDP(同比)'],
-        ['GDPYZA.M','南非GDP(同比)'],
-        ['GDPYMX.M','墨西哥GDP(同比)'],
-        ['GDPYBR.M','巴西GDP(同比)'],
-        ['GDPYIE.M','爱尔兰GDP(同比)'],
-        ['GDPYBE.M','比利时GDP(同比)'],
-        ['GDPYNL.M','荷兰GDP(同比)'],
-        ['GDPYPT.M','葡萄牙GDP(同比)'],
-        ['GDPYES.M','西班牙GDP(同比)'],
-        ['GDPYGR.M','希腊GDP(同比)'],
-        ['GDPYIT.M','意大利GDP(同比)'],
-        ['GDPYSE.M','瑞典GDP(同比)'],
-        ['GDPYIS.M','冰岛GDP(同比)'],
-        ['GDPYDK.M','丹麦GDP(同比)'],
-        ['GDPYPL.M','波兰GDP(同比)'],
-        ['GDPYCZ.M','捷克GDP(同比)'],
-        ['GDPYSK.M','斯洛伐克GDP(同比)'],
-        ['GDPYHU.M','匈牙利GDP(同比)'],['GDPYRO.M','罗马尼亚GDP(同比)'],
-        ['GDPYAT.M','奥地利GDP(同比)'],
-        ['GDPYCH.M','瑞士GDP(同比)'],
-        ['GDPQFR.M','法国GDP(季度环比)'],
+        ['CPIYKR.M','韩国CPI(同比增速%)'],
+        ['CPIYUK.M','英国CPI(同比增速%)'],['CPIYDE.M','德国CPI(同比增速%)'],
+        ['CPIYJP.M','日本CPI(同比增速%)'],['CPIYCN.M','中国CPI(同比增速%)'],
+        ['CPIYUS.M','美国CPI(同比增速%)'],['CPIYPL.M','波兰CPI(同比增速%)'],
+        ['CPIYFR.M','法国CPI(同比增速%)'],['CPIYPH.M','菲律宾CPI(同比增速%)'],
+        ['CPIYMY.M','马来西亚CPI(同比增速%)'],['CPIYSG.M','新加坡CPI(同比增速%)'],
+        ['CPIYAU.M','澳大利亚CPI(同比增速%)'],['CPIYNZ.M','新西兰CPI(同比增速%)'],
+        ['CPIYCA.M','加拿大CPI(同比增速%)'],['CPIYMX.M','墨西哥CPI(同比增速%)'],
+        ['CPIYBR.M','巴西CPI(同比增速%)'],['CPIYSE.M','瑞典CPI(同比增速%)'],
+        ['CPIYNO.M','挪威CPI(同比增速%)'],['CPIYDK.M','丹麦CPI(同比增速%)'],
+        ['CPIYIS.M','冰岛CPI(同比增速%)'],['CPIYCH.M','瑞士CPI(同比增速%)'],
+        ['CPIYNL.M','荷兰CPI(同比增速%)'],['CPIYIT.M','意大利CPI(同比增速%)'],
+        ['CPIYGR.M','希腊CPI(同比增速%)'],['CPIYES.M','西班牙CPI(同比增速%)'],
+        ['CPIYIE.M','爱尔兰CPI(同比增速%)'],['CPIYAT.M','奥地利CPI(同比增速%)'],
+        ['CPIYCZ.M','捷克CPI(同比增速%)'],['CPIYSK.M','斯洛伐克CPI(同比增速%)'],
+        ['CPIYRO.M','罗马尼亚CPI(同比增速%)'],['CPIYHU.M','匈牙利CPI(同比增速%)'],
+        
+
+        ['PPIYKR.M','韩国PPI(同比增速%)'],['PPIYSK.M','斯洛伐克PPI(同比增速%)'],
+        ['PPIYUK.M','英国PPI(同比增速%)'],['PPIYDE.M','德国PPI(同比增速%)'],
+        ['PPIYJP.M','日本PPI(同比增速%)'],['PPIYCN.M','中国PPI(同比增速%)'],
+        ['PPIYUS.M','美国PPI(同比增速%)'],['PPIYPL.M','波兰PPI(同比增速%)'],
+        
+        ['GDPYUS.M','美国GDP(同比增速%)'],['GDPQUS.M','美国GDP(季度环比增速%)'],
+        ['GDPYCN.M','中国GDP(同比增速%)'],
+        ['GDPYSG.M','新加坡GDP(同比增速%)'],['GDPQSG.M','新加坡GDP(季度环比增速%)'],
+        ['GDPYDE.M','德国GDP(同比增速%)'],['GDPQDE.M','德国GDP(季度环比增速%)'],
+        ['GDPYAU.M','澳大利亚GDP(同比增速%)'],['GDPQAU.M','澳大利亚GDP(季度环比增速%)'],
+        ['GDPYJP.M','日本GDP(同比增速%)'],['GDPQJP.M','日本GDP(季度环比增速%)'],
+        ['GDPYUK.M','英国GDP(同比增速%)'],['GDPQUK.M','英国GDP(季度环比增速%)'],
+        ['GDPYMY.M','马来西亚GDP(同比增速%)'],['GDPQMY.M','马来西亚GDP(季度环比增速%)'],
+        ['GDPYKR.M','韩国GDP(同比增速%)'],['GDPQKR.M','韩国GDP(季度环比增速%)'],
+        ['GDPYTR.M','土耳其GDP(同比增速%)'],['GDPQTR.M','土耳其GDP(季度环比增速%)'],
+        ['GDPYNZ.M','新西兰GDP(同比增速%)'],
+        ['GDPYIN.M','印度GDP(同比增速%)'],
+        ['GDPYZA.M','南非GDP(同比增速%)'],
+        ['GDPYMX.M','墨西哥GDP(同比增速%)'],
+        ['GDPYBR.M','巴西GDP(同比增速%)'],
+        ['GDPYIE.M','爱尔兰GDP(同比增速%)'],
+        ['GDPYBE.M','比利时GDP(同比增速%)'],
+        ['GDPYNL.M','荷兰GDP(同比增速%)'],
+        ['GDPYPT.M','葡萄牙GDP(同比增速%)'],
+        ['GDPYES.M','西班牙GDP(同比增速%)'],
+        ['GDPYGR.M','希腊GDP(同比增速%)'],
+        ['GDPYIT.M','意大利GDP(同比增速%)'],
+        ['GDPYSE.M','瑞典GDP(同比增速%)'],
+        ['GDPYIS.M','冰岛GDP(同比增速%)'],
+        ['GDPYDK.M','丹麦GDP(同比增速%)'],
+        ['GDPYPL.M','波兰GDP(同比增速%)'],
+        ['GDPYCZ.M','捷克GDP(同比增速%)'],
+        ['GDPYSK.M','斯洛伐克GDP(同比增速%)'],
+        ['GDPYHU.M','匈牙利GDP(同比增速%)'],['GDPYRO.M','罗马尼亚GDP(同比增速%)'],
+        ['GDPYAT.M','奥地利GDP(同比增速%)'],
+        ['GDPYCH.M','瑞士GDP(同比增速%)'],
+        ['GDPQFR.M','法国GDP(季度环比增速%)'],
         
         ['PMMNDE.M','德国PMI(制造业)'],['PMMNUS.M','美国PMI(制造业)'],
         ['PMMNEU.M','欧元区PMI(制造业)'],['PMMNFR.M','法国PMI(制造业)'],

siat/valuation.py

@@ -396,7 +396,7 @@ def get_index_valuation_funddb(ticker,indicators,start,end):
             with HiddenPrints():
                 dft=ak.index_value_hist_funddb(symbol=iname,indicator=t)
         except:
-            print("  #Error(get_industry_valuation_sw_zz): failed to retrieve info for industry",ticker)
+            print("  #Error(get_index_valuation_funddb): failed to retrieve info for industry",ticker)
             industry_list=list(ak.index_value_name_funddb()['指数名称'])
             industry_sw=[]
             industry_zz=[]

siat/yf_name.py

@@ -24,7 +24,7 @@ def test_yahoo_access():
     """
     功能：测试雅虎财经是否可达
     """
-    url="https://finance.yahoo.com"
+    url="https://finance.yahoo.com/"
     result=test_website(url)
     
     return result    
@@ -35,8 +35,11 @@ if __name__=='__main__':
     
 def test_website(url):
     import requests
+    headers = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    }
     try:
-        response = requests.get(url)
+        response = requests.get(url,headers=headers)
         if response.status_code == 200:
             #print(f"Website {url} is accessible")
             return True
@@ -366,6 +369,10 @@ def ticker_info1(ticker,info="all",test_access=True,print_title=True):
     
     return
         
+
+if __name__=='__main__':
+    ticker="SGC=F"
+    yahoo_name1(ticker)
     
 def yahoo_name1(ticker,short_name=False,add_suffix=True,maxlen=80):
     """
@@ -436,6 +443,7 @@ if __name__ == '__main__':
     stock_code='MSFT'
     
     stock_code='SWMCX'
+    stock_code='SGC=F'
     
     yahoo_name1_direct(stock_code)
 
@@ -450,9 +458,12 @@ def yahoo_name1_direct(stock_code,add_suffix=True):
     stock_code1=stock_code.upper()
     
     #抓取证券名称
+    headers = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    }   
     # https://finance.yahoo.com/quote/SWMCX/
     url = f"https://finance.yahoo.com/quote/{stock_code1}/"
-    response = requests.get(url)
+    response = requests.get(url,headers=headers)
     if response.status_code == 200:
         soup = BeautifulSoup(response.text, 'html.parser')
         soup_title=soup.title
@@ -476,6 +487,8 @@ if __name__=='__main__':
     original_name='Apple Inc'
     original_name='Schwab  US Mid-Cap Index'
     
+    original_name='Shanghai Gold (CNH) Futures,Apr'
+    
     filter_stock_name(original_name)
     
 def filter_stock_name(original_name):
@@ -493,7 +506,12 @@ def filter_stock_name(original_name):
                  ' CORP LTD',' CORP',' AB', \
                  ' GROUP CO','(GROUP)',' GROUP', \
                  ' PL S A',' PL SA',' AG', \
-                 ' SCIENCE & TECHNOLOGY',' HIGH-TECH',' HIGH TECHNOLOGY']
+                 ' SCIENCE & TECHNOLOGY',' HIGH-TECH',' HIGH TECHNOLOGY', \
+                     
+                 ' APR',    
+                     
+                     
+                ]
 
     #去掉逗号和句点
     name1=original_name.replace(',',' ')
@@ -510,6 +528,7 @@ def filter_stock_name(original_name):
     name6=name5.strip()
     
     name7=original_name[:len(name6)+1]
+    name7=name7.replace(',','').replace('.','')
     
     shorter_name=name7
     return shorter_name
@@ -528,6 +547,8 @@ if __name__ == '__main__':
     stock_code='1155.KL'
     stock_code='MSFT'
     
+    stock_code='GC.F'
+    
     stooq_name1(stock_code)
 
  
@@ -566,8 +587,11 @@ def stooq_name1(stock_code,add_suffix=True):
         stock_code1=stock_code1.replace('.pl','')
     
     #抓取证券名称
+    headers = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    }    
     url = f"https://stooq.com/q/?s={stock_code1}"
-    response = requests.get(url)
+    response = requests.get(url,headers=headers)
     if response.status_code == 200:
         soup = BeautifulSoup(response.text, 'html.parser')
         soup_title=soup.title
@@ -618,6 +642,8 @@ if __name__=='__main__':
     ticker='ULVR.L'
     ticker='KSL.AX'
     
+    ticker='SGC=F'
+    
     ticker='IBM'
     
     get_stock_name1_en(ticker)
@@ -660,8 +686,11 @@ def get_stock_name_china_sina(ticker):
     from bs4 import BeautifulSoup
 
     ticker6=ticker[:6]    
+    headers = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    }    
     url=f"https://vip.stock.finance.sina.com.cn/corp/go.php/vCI_CorpOtherInfo/stockid/{ticker6}/menu_num/2.phtml"
-    response = requests.get(url)
+    response = requests.get(url,headers=headers)
     
     if response.status_code == 200:
         soup = BeautifulSoup(response.text, 'html.parser')

{siat-3.7.11.dist-info → siat-3.7.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.7.11
+Version: 3.7.20
 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,6 +37,8 @@ Requires-Dist: py-trans
 Requires-Dist: bottleneck
 Requires-Dist: translate
 Requires-Dist: translators
+Requires-Dist: nbconvert
+Requires-Dist: playwright
 
 
 # What is siat?

{siat-3.7.11.dist-info → siat-3.7.20.dist-info}/RECORD

@@ -1,10 +1,11 @@
 siat/__init__ -20240701.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
-siat/__init__.py,sha256=pIo4CV3lNPKIhitmhIh_6aAfZrmzQWGNDcEnvZ7GXoc,3216
+siat/__init__.py,sha256=GalodR1ABKiirPw_VNH_jX1ZxapuiNkFBMTOQhoFBxw,786
+siat/__init__.py.backup_20250214.py,sha256=pIo4CV3lNPKIhitmhIh_6aAfZrmzQWGNDcEnvZ7GXoc,3216
 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
-siat/barrons_scraping_test.py,sha256=jSRVPxyYylcgG3fAsuqE-9WH3sDfJ3CdZUcU8VBVdoU,10110
+siat/barrons_scraping_test.py,sha256=v5IioDB7CselbpjOX68fNPQYgm2UH4SKnz_q_MA4qGY,10464
 siat/beta_adjustment.py,sha256=viJJE9O82SbA_VYuJtrs3HT0OWYhk4yvmoywskrAhaI,37287
 siat/beta_adjustment_china.py,sha256=QAVhTQxfV7NSakNPMfQtGMeRzEHVBC8JZQTqD5Owp2I,20802
 siat/beta_adjustment_test.py,sha256=nBhvQQfqxooCHjy5hL0a8V0ZC58BjuCZVFpqpWpHeF0,2467
@@ -18,17 +19,17 @@ 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=crRasPR7t5G1t95hm9JWmIob9d-iYASA4GEW5bKVhWw,173203
+siat/common.py,sha256=Fk794V57LTXPcQfEFc579u56Lq9ffhJhKGaG7ANhcws,175777
 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
 siat/concepts_kpl.py,sha256=SJ9UaJp5i79EXKZ3dPa_vBEoG_zgl1Ig5rZAm-ubgM4,4941
 siat/copyrights.py,sha256=YMLjZb328YpFMR-s_GUu0HBgeGce3pV7DgRut8S3I7w,690
-siat/cryptocurrency.py,sha256=IjQTzqTkdp19aS0PrD15nU3-tfCJHyzt0oBd5nWvwk8,27449
+siat/cryptocurrency.py,sha256=ImkP0Z3QsKNrHrA07mZM46RvGAWb36AD14cNaiv_pCg,27829
 siat/cryptocurrency_test.py,sha256=3AikTNJ7j-HwLGLIYEfyXZ3bLVuLeru9mwiwHQi2SdA,2669
 siat/derivative.py,sha256=qV8n09799eqLc26ojR6vN5n_X-xd7rGwdYjgq-wBih8,41483
 siat/economy-20230125.py,sha256=vxZZlPnLkh7SpGMVEPLwxjt0yYLSVmdZrO-s2NYLyoM,73848
-siat/economy.py,sha256=ijMAVA5ydghbQDgNDDdz8fz9NPd2eq90RzpJSRGWz5c,78638
+siat/economy.py,sha256=8mo6J5c73CD0hF2LmX89LaYeePwTjZgJ1CrNw13AIUA,78632
 siat/economy_test.py,sha256=6vjNlPz7W125pJb7simCddobSEp3jmLIMvVkLRZ7zW8,13339
 siat/esg.py,sha256=GMhaonIKtvOK83rhpQUH5aJt2OL3HQBSVfD__Yw-0oo,19040
 siat/esg_test.py,sha256=Z9m6GUt8O7oHZSEG9aDYpGdvvrv2AiRJdHTiU6jqmZ0,2944
@@ -37,7 +38,7 @@ siat/exchange_bond_china.pickle,sha256=zDqdPrFacQ0nqjP_SuF6Yy87EgijIRsFvFroW7FAY
 siat/fama_french.py,sha256=aUTC-67t_CEPbLk4u79woW_zfZ7OCP6Fo4z5EdWCSkQ,48051
 siat/fama_french_test.py,sha256=M4O23lBKsJxhWHRluwCb3l7HSEn3OFTjzGMpehcevRg,4678
 siat/fin_stmt2_yahoo.py,sha256=LGmspk0nKyz4X87MtcovZXUfMQkAvrWINuxR4HQ8PI8,41178
-siat/financial_base.py,sha256=5u298_1OSlgLnDmhXxqvo4WgMM0JKSa_4jBYF-Ilx38,41097
+siat/financial_base.py,sha256=A1rV7XQOVFpCXCV-T6Ge0QeF897hINiu0olN1XWeaFk,41287
 siat/financial_statements.py,sha256=xx0SMpFqAMKm6cj8uYeG2RpJE6G-RoJ3NWa33UyaVMk,25414
 siat/financial_statements_test.py,sha256=FLhx8JD-tVVWSBGux6AMz1jioXX4U4bp9DmgFHYXb_w,716
 siat/financials.py,sha256=6WOWYift3MpKkNBnvnBFASXy9nKKC6DzAr8rg2XyNtw,80646
@@ -62,7 +63,7 @@ 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=WH_-a-R-zyKhT4t4NM24gYZWKyvIexN9LfXVQf-1zxA,110166
+siat/grafix.py,sha256=OJ7FYYvnd9V3zvycg_BKF65InLnUhGwdVdkJciD_8pk,110461
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=G3wpaewAKF9CwEqRpr4khyuDu9SU2EGyQUHdk7cmHOA,30693
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
@@ -96,18 +97,18 @@ siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
 siat/risk_free_rate.py,sha256=IBuRqA2kppdZsW4D4fapW7vnM5HMEXOn95A5r9Pkwlo,12384
 siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4285
-siat/sector_china.py,sha256=Mxx5Zd5qvhLdwutedwoPRoXlAopTsPww4rRhOgpRmb8,150762
+siat/sector_china.py,sha256=QShFSaJMOydLKL-eCbUy_cWFnXnbdZW90lCUAp6B5lU,151007
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
-siat/security_price2.py,sha256=FkX-EeqS5Gqm2kIKnDqrqSk_nvG3BbL3Eu4eEmw1OEY,26379
-siat/security_prices.py,sha256=cIplEWi6TJEIDI6xANaVf0YrOb1CPqvxULGIShoGa2s,108859
+siat/security_price2.py,sha256=LYV478O4vizVNbM6WYlQvaQFq9kjh2ftljhuABGsjkU,26425
+siat/security_prices.py,sha256=ql1-7TC1w36a_2nKxeR45Cw0cKMl5o7yCl2M9QE3jx8,108909
 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
 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=AO_ntNoinjXpzzs4eA1iMlsqGFoN1KvgHV6Z_ECVy-M,158658
+siat/stock.py,sha256=aelzuy_mPBC0eBknjnRuBVYLZAjMw4ykvKWQXY_4K30,158649
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=85Ggb21E2mrCYMdSSTTrkoyyLGXMK2V-BtlweHomSRg,93460
@@ -119,9 +120,9 @@ siat/stock_prices_kneighbors.py,sha256=WfZvo5EyeBsm-T37zDj7Sl9dPSRq5Bx4JxIJ9IUum
 siat/stock_prices_linear.py,sha256=-OUKRr27L2aStQgJSlJOrJ4gay_G7P-m-7t7cU2Yoqk,13991
 siat/stock_profile.py,sha256=B3eIwzEmiCqiCaxIlhfdEPsQBoW1PFOe1hkiY3mVF6Y,26038
 siat/stock_technical-20240620.py,sha256=A4x18mZgYSA8SSiDz4u_O3gd5oVRgbI6JIiBfFY0tVw,116013
-siat/stock_technical.py,sha256=urnbFubwsYcl8dEPLM6DfdBmsia4xQ1rvM-71VZTM88,136050
+siat/stock_technical.py,sha256=VX6qSBotTOzXaX1XHyDz3KBYEHlaxcPdBIOacB8T9no,136309
 siat/stock_test.py,sha256=E9YJAvOw1VEGJSDI4IZuEjl0tGoisOIlN-g9UqA_IZE,19475
-siat/stooq.py,sha256=SiRnSUu92pfzIZQ8N4Yo-9VOVSwUSqQE0wqXhF-4y9g,2493
+siat/stooq.py,sha256=R6tHMIpPzWqemvo2PMQGdwDZuVyJ0dE2WoduvWYMEC4,2535
 siat/temp.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/test2_graphviz.py,sha256=05w2YJuIBH0LsJjdA60EFn7rL0vCo-CA6EVJEQOXNE4,16648
 siat/test_graphviz.py,sha256=CETKpDL8PnysS-PD3fHkeAgagUxjaUl0CsXPiadQySg,16999
@@ -133,17 +134,17 @@ 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=TJKbh9vU-ifEN1V9DnyojJ00qcT_fioooTAa8wrml_s,250970
+siat/translate.py,sha256=ESiwyQX_eGxdoBlGxFdJpgJfOx9NdSvBww4Ck7d9kto,251537
 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=XdfTivpr652hRnI6yaB9mpA0JlXFJphJsTqcw2_FnMM,50827
+siat/valuation.py,sha256=tSW5jyda3lChqBkdsbBGfdUeh9bCfjo6P93CjLif9eM,50825
 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.11.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.7.11.dist-info/METADATA,sha256=Ji1tVpOKlNrvvumMqw93iIak8lQ5CWZI_V9FZ1Fy94E,8064
-siat-3.7.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.7.11.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.7.11.dist-info/RECORD,,
+siat/yf_name.py,sha256=ueaMUifnQ3cE3jc1s84mPDLjT9EOuyx8lnY7AFe_YHQ,21165
+siat-3.7.20.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.7.20.dist-info/METADATA,sha256=wryMCRCTnDgsyFAJt1psDoKeHgipoPKOBtjnPqotZUg,8117
+siat-3.7.20.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.7.20.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.7.20.dist-info/RECORD,,