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

siat/common.py

@@ -4786,12 +4786,13 @@ def ttest(sample1,sample2):
 
 
 
-async def convert_jupyter_to_pdf(notebook_path, output_pdf_path, size="A4"):
+async def jupyter2pdf(notebook_path, output_pdf_path, size="A3"):
     """
     将 Jupyter Notebook 转换为 PDF 文件
     参数:
-        notebook_path (str): Jupyter Notebook 文件路径（.ipynb 文件）
-        output_pdf_path (str): 输出的 PDF 文件路径
+        notebook_path (str): Jupyter Notebook文件（.ipynb文件，含路径）
+        output_pdf_path (str): 输出的PDF文件（含路径）
+        size：PDF页面大小，默认"A3"幅面，支持"A4"幅面
         
     返回:
         None
@@ -4800,6 +4801,10 @@ async def convert_jupyter_to_pdf(notebook_path, output_pdf_path, size="A4"):
     await convert_notebook_to_pdf(notebook_path, output_pdf_path)
     注意3：notebook_path和output_pdf_path中可以带路径
     """
+    size=size.upper()
+    if not size in ['A4','A3','letter']:
+        size='A3'
+    
     import os
     from nbconvert import HTMLExporter
     from playwright.async_api import async_playwright
@@ -4811,7 +4816,7 @@ async def convert_jupyter_to_pdf(notebook_path, output_pdf_path, size="A4"):
         html_exporter = HTMLExporter()
         try:
             html_content, _ = html_exporter.from_filename(notebook_path)
-            print("Start to convert ipynb file to pdf in {}, ...".format(size))
+            print("Start to convert ipynb file to pdf in {} size, ...".format(size))
 
         except:
             print("File not found for {}".format(notebook_path))
@@ -4830,7 +4835,7 @@ async def convert_jupyter_to_pdf(notebook_path, output_pdf_path, size="A4"):
             await page.pdf(path=output_pdf_path, format=size)
             await browser.close()
 
-        print(f"PDF file generated as {output_pdf_path}")
+        print(f"PDF created as {output_pdf_path}")
 
     except Exception as e:
         print(f"Conversion failed: {e}")

siat/translate.py

@@ -1270,6 +1270,7 @@ def codetranslate0(code):
         ["HG=F",'COMEX铜矿石期货'],["CL=F",'NYM原油期货'],
         ["NG=F",'NYM天然气期货'],["MTF=F",'NYM煤炭期货'],
         ["GC=F",'COMEX黄金期货'],["MGC=F",'COMEX微型黄金期货'],
+        ["SGC=F",'上海黄金期货'],
         ["6B=F",'CME英镑兑美元期货'],
         ["S=F",'CBT大豆期货'],["C=F",'CBT玉米期货'],
         ["ES=F",'CME标普500指数期货'],["YM=F",'CBT道指期货'],
@@ -2050,6 +2051,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'],
         ["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'], 

siat/yf_name.py

@@ -508,8 +508,8 @@ def filter_stock_name(original_name):
                  ' PL S A',' PL SA',' AG', \
                  ' SCIENCE & TECHNOLOGY',' HIGH-TECH',' HIGH TECHNOLOGY', \
                      
-                 ' APR',    
-                     
+                 ' APR',' MAY',' JUN',' JUL',' AUG',' SEP',' SEPT',' OCT',' NOV',' DEC',    
+                 ' JAN',' FEB',' MAR',    
                      
                 ]
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.7.21
+Version: 3.7.22
 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.21.dist-info → siat-3.7.22.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=Fk794V57LTXPcQfEFc579u56Lq9ffhJhKGaG7ANhcws,175777
+siat/common.py,sha256=u5Q24UXX6jstkemvo-owK5v3akNNHyrRuwXjjQwJsjk,175935
 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
@@ -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=ESiwyQX_eGxdoBlGxFdJpgJfOx9NdSvBww4Ck7d9kto,251537
+siat/translate.py,sha256=YXHl0NBnfW9mIcir-B0HKusE-tUY39J_xZP8pObpCc0,251612
 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=ueaMUifnQ3cE3jc1s84mPDLjT9EOuyx8lnY7AFe_YHQ,21165
-siat-3.7.21.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.7.21.dist-info/METADATA,sha256=QX6HIgpLmiCwCAl0mTeY5p4rzwUo4gXXRj2eZ2P-AVs,8117
-siat-3.7.21.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.7.21.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.7.21.dist-info/RECORD,,
+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,,