siat 3.7.22__py3-none-any.whl → 3.7.24__py3-none-any.whl

siat/common.py

@@ -4848,12 +4848,104 @@ async def jupyter2pdf(notebook_path, output_pdf_path, size="A3"):
         elif os.path.exists(html_file):
             os.remove(html_file)    
     
+    return
+    
 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)
+    #await jupyter2pdf(notebook_path, output_pdf_path)
+    # 注意：上面的await命令会导致编译失败，测试后要注释掉
+
+#==============================================================================
+async def jupyter2pdf2(notebook_dir, notebook_file):
+    """
+    将 Jupyter Notebook 转换为 PDF 文件
+    参数:
+        notebook_dir (str): Jupyter Notebook文件所在的目录，不含文件名
+        notebook_file (str): Jupyter Notebook文件名
+    输出：
+        同时生成A4和A3两种幅面的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中可以带路径
+    """
+    
+    # 路径分割符号
+    if ('/' in notebook_dir) and not ('\\' in notebook_dir):
+        sep='/'
+    else:
+        sep='\\'
+    
+    # ipynb文件的完整路径
+    if ('.ipynb' in notebook_file):
+        notebook_file1=notebook_file.replace('.ipynb','')
+    else:
+        notebook_file1=notebook_file
+    notebook_path=notebook_dir+sep+notebook_file1+'.ipynb'
+    
+    # pdf文件的完整路径        
+    output_pdf_path1=notebook_dir+sep+notebook_file1+'A4.pdf'
+    output_pdf_path2=notebook_dir+sep+notebook_file1+'A3.pdf'
+    
+    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("Converting notebook file to pdf in both A4 and A3 sizes ...")
 
+        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_path1, format='A4')
+            await page.pdf(path=output_pdf_path2, format='A3')
+            
+            await browser.close()
+
+        print(f"2 PDF created in the same directory, pick 1 you think best")
+
+    except Exception as e:
+        print(f"Conversion failed because {e}")
+        return
+    
+    finally:
+        if html_file == "":
+            return
+        # 删除临时 HTML 文件
+        elif os.path.exists(html_file):
+            os.remove(html_file)    
+    
+    return
+    
+if __name__ == '__main__':
+    # 替换为你的Notebook文件路径
+    notebook_dir = r"S:\北外工作-25春\周4.财经与生活附校\Session 1"  
+    # 替换为你想转存PDF的Notebook文件名
+    notebook_file = "Session 1 全球证券市场-简化版.ipynb"  
+    #await jupyter2pdf2(notebook_dir, notebook_file)
+    # 注意：上面的await命令会导致编译失败，测试后要注释掉
 #==============================================================================
 #==============================================================================
 #==============================================================================

siat/security_price2.py

@@ -65,6 +65,13 @@ if __name__=='__main__':
     fill=False
     fill=True
     
+    # 新测试组
+    ticker="XAUUSD"
+    fromdate='2024-5-1'; todate='2024-5-20'
+    ticker_type='auto';source='auto'
+    adjust='';fill=False
+    
+    
     price,found=get_price_1ticker(ticker=ticker,fromdate=fromdate,todate=todate, \
                                   ticker_type=ticker_type)
     

siat/security_prices.py

@@ -553,7 +553,9 @@ if __name__=='__main__':
     ticker='TRBNCN.M'
     ticker='RSAYCN.M'
     
-    ticker='GC.F'
+    ticker='GC.F'   #无法下载
+    ticker='XAUCNY' #一盎司黄金的现货人民币价格
+    ticker='XAUUSD' #一盎司黄金的现货美元价格
     
     ticker=['AAPL','MSFT']
     
@@ -1366,6 +1368,8 @@ if __name__=='__main__':
     ticker='AAPL'
     ticker='GC=F'
     
+    ticker='XAUUSD'
+    
     ticker=['AAPL','MSFT']
     ticker=['0700.HK','600519.SS']
     ticker=['AAPL','MSFT','0700.HK','600519.SS']

siat/security_trend2.py

@@ -185,6 +185,10 @@ def security_trend(ticker,indicator='Close',adjust='', \
     attention_value参数：绘图时绘制一条水平线，用以强调一个阈值。默认不绘制。
     average_value参数：开关打开时，绘图时绘制一条均值线，仅适用于绘制单条曲线。默认关闭。
     
+    attention_point：绘制横轴竖线，可为单个横轴点或列表，默认不绘制
+    attention_point_area：为两个横轴点的列表，其间区域着色，默认不绘制。
+    可与attention_point配合使用。
+    
     kline参数：开关打开时，绘制一条K线图，仅适用于单只股票。默认关闭。
     kline_demo参数：与kline开关同时打开时，绘制一条K线图原理演示图，仅适用于单只股票。
     mav参数：仅当kline开关打开时有效，用于指定K线图中单条或多条移动平均线的天数。

siat/stock.py

@@ -625,6 +625,19 @@ if __name__ =="__main__":
     ticker_type='auto'
     facecolor='whitesmoke'    
     
+    # 测试组6
+    ticker='XAUUSD'
+    indicator='Close'
+    fromdate='2024-5-1'; todate='2024-5-20'
+    zeroline=False
+    attention_value='';attention_value_area=''
+    attention_point='';attention_point_area=''
+    average_value=False
+    datatag=False;power=0;graph=True;source='auto'
+    mark_top=True;mark_bottom=True;mark_end=True
+    ticker_type='auto';facecolor='whitesmoke';loc='best'
+   
+    
     df=security_indicator(ticker,indicator,fromdate,todate,ticker_type=ticker_type)
 
 def security_indicator(ticker,indicator, \

siat/translate.py

@@ -1224,6 +1224,7 @@ def codetranslate0(code):
         
         ["SPY",'SPDR标普500ETF'],['SPYD','SPDR标普500股利优先ETF'],
         ["SPYG",'SPDR标普500成长优先ETF'],['SPYV','SPDR标普500价值优先ETF'],
+        ["GLD",'SPDR黄金ETF'],
         ["VOO",'Vanguard标普500ETF'],['VOOG','Vanguard标普500成长优先ETF'],
         ["VOOV",'Vanguard标普500价值优先ETF'],['IVV','iShares标普500ETF'],        
         ["DGT",'SPDR Global Dow ETF'],['ICF','iShares C&S REIT ETF'], 
@@ -1702,6 +1703,8 @@ def codetranslate0(code):
         ['^NYICDX','ICE美元指数'],['DX-Y.NYB','ICE美元指数'],
         ['EUR_I','STOOQ欧元指数'],
         
+        ['XAUUSD','1盎司黄金现货兑美元'],['XAUCNY','1盎司黄金现货兑人民币'],
+        
         #经济体基准利率
         ['INRTAU.M','澳大利亚基准利率'],
         ['INRTBR.M','巴西基准利率'],
@@ -2051,7 +2054,7 @@ def codetranslate1(code):
         
         ["SPY",'SPDR SP500 ETF'],['SPYD','SPDR SP500 Div ETF'],
         ["SPYG",'SPDR SP500 Growth ETF'],['SPYV','SPDR SP500 Value ETF'],
-        ["GLD",'SPDR黄金ETF'],
+        ["GLD",'SPDR Gold Shares ETF'],
         ["VOO",'Vanguard SP500 ETF'],['VOOG','Vanguard SP500 Growth ETF'],
         ["VOOV",'Vanguard SP500 Value ETF'],['IVV','iShares SP500 ETF'],        
         ["DGT",'SPDR Global Dow ETF'],['ICF','iShares C&S REIT ETF'], 
@@ -2186,6 +2189,8 @@ def codetranslate1(code):
         ['U11.SI','UOB(SI)'],['C6L.SI','Singapore Airlines(SI)'],['CC3.SI','Starhub(SI)'],
         ['S08.SI','Singpost(SI)'],['F34.SI','WILMAR(SI)'],['C31.SI','CapitaLand(SI)'],  
         
+        ['XAUUSD','Gold(ozt)->USD'],['XAUCNY','Gold(ozt)->RMB'],
+
         
         ], columns=['code','codename'])
     
@@ -3398,6 +3403,7 @@ def ticker1_name(ticker,ticker_type='auto'):
 #==============================================================================
 if __name__=='__main__':
     ticker='600519.SS' #股票
+    ticker='XAUUSD'    #一盎司黄金的美元价格
     ticker={'Market':('US','^SPX','中概教培组合'),'EDU':0.5,'TAL':0.3,'TEDU':0.2}
     pf={'Market':('US','^SPX','中概教培组合'),'EDU':0.5,'TAL':0.3,'TEDU':0.2}
     ticker=['600519.SS','sh018003',pf]

siat/yf_name.py

@@ -372,13 +372,17 @@ def ticker_info1(ticker,info="all",test_access=True,print_title=True):
 
 if __name__=='__main__':
     ticker="SGC=F"
-    yahoo_name1(ticker)
+    ticker="XAUUSD"
+    short_name=False;add_suffix=True;maxlen=80
+    
+    yahoo_name1y(ticker)
     
-def yahoo_name1(ticker,short_name=False,add_suffix=True,maxlen=80):
+def yahoo_name1y(ticker,short_name=False,add_suffix=True,maxlen=80):
     """
     功能：从雅虎财经取得全球证券名称，仅限英文。需要去掉常用词，如Corporation
     优点：对未定义的证券代码也可给出英文名称，即使在中文语言环境中
-    现存问题：需要访问雅虎，且耗时稍长
+    现存问题：需要访问雅虎，且耗时稍长；当ticker不存在时会提示一大堆错误信息
+    仅作备用
     """
     
     #测试雅虎
@@ -391,9 +395,20 @@ def yahoo_name1(ticker,short_name=False,add_suffix=True,maxlen=80):
     
     import yfinance as yf
     ticker_info = yf.Ticker(ticker1)
-    
+
+    import os, sys
+    class HiddenPrints:
+        def __enter__(self):
+            self._original_stdout = sys.stdout
+            sys.stdout = open(os.devnull, 'w')
+
+        def __exit__(self, exc_type, exc_val, exc_tb):
+            sys.stdout.close()
+            sys.stdout = self._original_stdout
+
     try:
-        t_info=ticker_info.info
+        with HiddenPrints():
+            t_info=ticker_info.info
     except:
         pass
         return ticker
@@ -408,7 +423,12 @@ def yahoo_name1(ticker,short_name=False,add_suffix=True,maxlen=80):
             try:
                 t_name0=t_info['longName']
             except:
-                t_name0=t_info['shortName']
+                try:
+                    t_name0=t_info['shortName']
+                except:
+                    pass
+                    return ticker
+
                 
             if len(t_name0) > maxlen:
                 t_name0=t_info['shortName']
@@ -503,7 +523,7 @@ def filter_stock_name(original_name):
     remove_list=[' CORPORATION',' BERHAD',' BHD',' PLC',' INC',' AG ST',' NA O N', \
                  ' AKTIENGESELLSCHAFT','(PUBL)',' LLC', \
                  ' CO LTD',' CO LIMITED',' LTD',' LIMITED',' COMPANY',' INCORPORATED', \
-                 ' CORP LTD',' CORP',' AB', \
+                 ' CORP LTD',' CORP',' AB',' CO', \
                  ' GROUP CO','(GROUP)',' GROUP', \
                  ' PL S A',' PL SA',' AG', \
                  ' SCIENCE & TECHNOLOGY',' HIGH-TECH',' HIGH TECHNOLOGY', \
@@ -548,6 +568,7 @@ if __name__ == '__main__':
     stock_code='MSFT'
     
     stock_code='GC.F'
+    stock_code='XAUUSD'
     
     stooq_name1(stock_code)
 
@@ -605,7 +626,23 @@ def stooq_name1(stock_code,add_suffix=True):
     
     #未找到证券代码
     if t_name == 'Stooq':
-        return stock_code
+        
+        #尝试不加后缀'.us'
+        url = f"https://stooq.com/q/?s={stock_code}"
+        response = requests.get(url,headers=headers)
+        if response.status_code == 200:
+            soup = BeautifulSoup(response.text, 'html.parser')
+            soup_title=soup.title
+            soup_text=soup_title.text
+            soup_text_list=soup_text.split(' - ')
+            
+            t_name = soup_text_list[1].strip()
+        else:
+            pass
+            return stock_code
+        
+        if t_name == 'Stooq':
+            return stock_code
     
     #过滤名称中多余的尾部词汇
     t_name=filter_stock_name(t_name)
@@ -620,9 +657,67 @@ def stooq_name1(stock_code,add_suffix=True):
         if sid not in ['CN','US']:
             t_name=t_name+'('+sid+')'
     
+    t_name=t_name.strip()
+    
     return t_name   
  
 #==============================================================================
+#==============================================================================
+if __name__ == '__main__':
+    stock_code='AAPL'
+    stock_code='600519.SS'
+    stock_code='6758.T'
+    stock_code='6758.JP'
+    stock_code='ULVR.L'
+    stock_code='1155.KL'
+    stock_code='MSFT'
+    
+    stock_code='GC=F'
+    stock_code='XAUUSD'
+    
+    yahoo_name1(stock_code)
+
+ 
+def yahoo_name1(stock_code):
+    
+    import requests
+    from bs4 import BeautifulSoup
+    
+    stock_code1=stock_code.lower()
+    
+    #抓取证券名称
+    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://finance.yahoo.com/quote/{stock_code1}"
+    response = requests.get(url,headers=headers)
+    if response.status_code == 200:
+        soup = BeautifulSoup(response.text, 'html.parser')
+        soup_title=soup.title
+        soup_text=soup_title.text
+        
+        stock_code2=stock_code1.upper()
+        try:
+            pos=soup_text.index(stock_code2)
+        except:
+            pass
+            return stock_code
+        t_name = soup_text[:pos-1].strip()
+    else:
+        pass
+        return stock_code
+    
+    #过滤名称中多余的尾部词汇
+    t_name=filter_stock_name(t_name).strip()
+    t_name=filter_stock_name(t_name).strip()
+    
+    return t_name   
+ 
+#==============================================================================
+
+
+
+
 if __name__=='__main__':
     ticker='1155.KL'
     ticker='MSFT'
@@ -646,6 +741,9 @@ if __name__=='__main__':
     
     ticker='IBM'
     
+    ticker='XAUUSD'
+    short_name=False;add_suffix=True;maxlen=80
+    
     get_stock_name1_en(ticker)
 
 def get_stock_name1_en(ticker,short_name=False,add_suffix=True,maxlen=80):

{siat-3.7.22.dist-info → siat-3.7.24.dist-info}/METADATA

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

@@ -19,7 +19,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=u5Q24UXX6jstkemvo-owK5v3akNNHyrRuwXjjQwJsjk,175935
+siat/common.py,sha256=JZyGEXHevW6NovmfvrMCR5fwVovO8d_wRb7MLHFiBvM,179306
 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
@@ -100,15 +100,15 @@ siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4
 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=LYV478O4vizVNbM6WYlQvaQFq9kjh2ftljhuABGsjkU,26425
-siat/security_prices.py,sha256=ql1-7TC1w36a_2nKxeR45Cw0cKMl5o7yCl2M9QE3jx8,108909
+siat/security_price2.py,sha256=dYwvz9H-uWp-Gyc1g_MId9k8cITS6ZHmjW-Fc2ypp-0,26587
+siat/security_prices.py,sha256=HoCZ7YPrQYZHgKC-LyXFeeBCTfRc3EMMEiEg52SVv2w,109073
 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/security_trend2.py,sha256=TmfPG5RqT2nzJpYwBYCFrD-NC82uaz8MxbAMmGVdJzY,29995
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=aelzuy_mPBC0eBknjnRuBVYLZAjMw4ykvKWQXY_4K30,158649
+siat/stock.py,sha256=JT_sq-9B8A25fzTh7rSj5-NnO2IlGbI_7O47ZZu9Dk0,159068
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=85Ggb21E2mrCYMdSSTTrkoyyLGXMK2V-BtlweHomSRg,93460
@@ -134,7 +134,7 @@ 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=YXHl0NBnfW9mIcir-B0HKusE-tUY39J_xZP8pObpCc0,251612
+siat/translate.py,sha256=hZljXo8Wlee9DQPHnn6Pwt2shl1Ky-yuAIpmNDTdsHA,251884
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/translate_241003_keep.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
@@ -142,9 +142,9 @@ 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=yHUKjnflqI0RKVKOKlxR3o_ecQrSC8U5waLrOCgFN7I,21250
-siat-3.7.22.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.7.22.dist-info/METADATA,sha256=aRDquaNWM6rLqZ_Nsj26vRnCoNf6qmtfn84Qppb4VaY,8117
-siat-3.7.22.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.7.22.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.7.22.dist-info/RECORD,,
+siat/yf_name.py,sha256=laNKMTZ9hdenGX3IZ7G0a2RLBKEWtUQJFY9CWuk_fp8,24058
+siat-3.7.24.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.7.24.dist-info/METADATA,sha256=hBqKjbbQcLQQWREZYGZNHB5Ge5n1A-wdUI178kn2z6E,8117
+siat-3.7.24.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.7.24.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.7.24.dist-info/RECORD,,