siat 3.7.23__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_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/yf_name.py

@@ -657,6 +657,8 @@ 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   
  
 #==============================================================================

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.7.23
+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.23.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
@@ -105,7 +105,7 @@ siat/security_prices.py,sha256=HoCZ7YPrQYZHgKC-LyXFeeBCTfRc3EMMEiEg52SVv2w,10907
 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=JT_sq-9B8A25fzTh7rSj5-NnO2IlGbI_7O47ZZu9Dk0,159068
@@ -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=_WhJmon5KbTw3yR54bfTkiAhkP6GenuCcQ2Vmx5El2I,24025
-siat-3.7.23.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.7.23.dist-info/METADATA,sha256=wdVz2LprfX0smE-JCetYAgGRH0pV0XnavkRyUK02uz4,8117
-siat-3.7.23.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.7.23.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.7.23.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,,