siat 3.11.5__py3-none-any.whl → 3.11.6__py3-none-any.whl

siat/save2docx.py

@@ -24,7 +24,7 @@ SIAT：Security Investment Analysis Tool
 #关闭所有警告
 import warnings; warnings.filterwarnings('ignore')
 
-import os
+import os,sys
 import errno
 import tempfile
 import subprocess
@@ -41,13 +41,15 @@ from docx.enum.text import WD_ALIGN_PARAGRAPH
 from docx.enum.table import WD_TABLE_ALIGNMENT
 from docx.text.paragraph import Paragraph
 
+import logging
+
 import contextlib
 import io
 
 import time
 from IPython.display import display, Javascript
 
-# —— 新增：Notebook 强制保存 —— 
+# —— 新增：Notebook 强制保存：貌似不管用 ——
 def _save_current_notebook():
     """
     在浏览器端触发一次保存：兼容 Classic Notebook、Lab 3.x/4.x。
@@ -154,9 +156,9 @@ def convert_ipynb_to_docx(ipynb_path, docx_path=None, page_size="A3"):
       5. 表格等分列宽居中；图像放大至页宽并居中
       6. 若目标 docx 正被打开，抛出提示“请先关闭文件”
     """
-    # 0. 强制保存当前 Notebook
+    # 0. 强制保存当前 Notebook，貌似不管用，需要手动保存当前的Notebook
     #print("Saving current ipynb ...")
-    _save_current_notebook()       
+    #_save_current_notebook()
     
     # ---- 1. 检查输入 & 输出路径 ----
     if not os.path.isfile(ipynb_path):
@@ -190,13 +192,20 @@ def convert_ipynb_to_docx(ipynb_path, docx_path=None, page_size="A3"):
     # ---- 4. Notebook → HTML（嵌入图像） ----
     exporter = HTMLExporter()
     exporter.embed_images = True
-    
+
+    # 关闭所有小于 CRITICAL 的日志
+    logging.disable(logging.CRITICAL)
+
     buf = io.StringIO()
-    # 屏蔽 stderr
+    # 屏蔽 stderr和stdout
     with contextlib.redirect_stderr(buf):
-        html_body, _ = exporter.from_notebook_node(nb)
+        with contextlib.redirect_stdout(buf):
+            html_body, _ = exporter.from_notebook_node(nb)
     html = f"<h1>{title}</h1>\n" + html_body
 
+    # 恢复日志
+    #logging.disable(logging.NOTSET)
+
     # ---- 5. HTML → DOCX via Pandoc（或 subprocess fallback） ----
     try:
         pypandoc.convert_text(
@@ -384,8 +393,11 @@ def ipynb2docx(ipynb_path, page_size="A3"):
     print(f"Converting to docx ...")
     
     result = convert_ipynb_to_docx(ipynb_path, docx_path=None, page_size=page_size)
-    print(f"{result} created with TOC in {page_size} size")
-    print(f"However, original title(s) and new TOC may need further adjustment")
+    dirpath, filename = os.path.split(result)
+
+    print(f"{filename} is created with TOC in {page_size} size")
+    print(f"It is in {dirpath}")
+    print(f"Note: may need further adjustments in formatting")
     
     return
     

siat/save2pdf-20250716.py

@@ -0,0 +1,173 @@
+# -*- coding: utf-8 -*-
+"""
+本模块功能：转换ipynb文件为pdf，带有可跳转的目录（目前一级标题定位还不准确，二级以下目录定位较准确，但已可用）
+所属工具包：证券投资分析工具SIAT 
+SIAT：Security Investment Analysis Tool
+创建日期：2025年7月8日
+最新修订日期：2025年7月8日
+作者：王德宏 (WANG Dehong, Peter)
+作者单位：北京外国语大学国际商学院
+作者邮件：wdehong2000@163.com
+版权所有：王德宏
+用途限制：仅限研究与教学使用。
+特别声明：作者不对使用本工具进行证券投资导致的任何损益负责！
+"""
+
+#==============================================================================
+
+# 首次运行前，请安装依赖：
+# !pip install nbformat nbconvert playwright pymupdf nest_asyncio
+# !playwright install
+
+#关闭所有警告
+import warnings; warnings.filterwarnings('ignore')
+
+# 能够在Python 3.13下运行了！
+import os
+import re
+import sys
+import time
+import tempfile
+import subprocess
+import nbformat
+from nbconvert import HTMLExporter
+import fitz                    # PyMuPDF
+from pathlib import Path
+import contextlib
+import io
+from IPython import get_ipython
+from ipykernel.zmqshell import ZMQInteractiveShell
+from nbformat.notebooknode import NotebookNode
+from playwright.sync_api import sync_playwright
+
+# ----------------------------------------------------------------
+# 1) 新增：把内存中的 NotebookNode 写到临时 .ipynb
+# ----------------------------------------------------------------
+def _dump_notebook_to_file(nb_node: NotebookNode) -> str:
+    """
+    把传进来的 NotebookNode（如 globals().get("__session__")）写到一个临时 .ipynb 文件，
+    返回该临时文件的路径。
+    """
+    tf = tempfile.NamedTemporaryFile(
+        suffix=".ipynb", delete=False, mode="w", encoding="utf-8"
+    )
+    nbformat.write(nb_node, tf)
+    tf.flush()
+    tf.close()
+    return tf.name
+
+# ----------------------------------------------------------------
+# 2) 主函数：接受文件路径或 NotebookNode
+# ----------------------------------------------------------------
+def ipynb2pdf(source, *, temp_cleanup: bool = True) -> str:
+    """
+    将 .ipynb 转为带书签的 PDF，返回最终 PDF 路径。
+    
+    参数 source:
+      - 如果是字符串，视为已有 .ipynb 文件的路径；
+      - 如果是 NotebookNode，就把它 dump 到临时 .ipynb，再做后续处理。
+    
+    temp_cleanup：是否清理临时 .ipynb 文件，默认为 True。
+    """
+    # —— 如果传进来的是 NotebookNode，先 dump 到临时文件 —— 
+    if isinstance(source, NotebookNode):
+        ipynb_path = _dump_notebook_to_file(source)
+        # 后面用完，最后再删
+        cleanup_ipynb = temp_cleanup
+    else:
+        ipynb_path = str(source)
+        cleanup_ipynb = False
+
+    if not os.path.isfile(ipynb_path):
+        raise FileNotFoundError(f"找不到文件：{ipynb_path}")
+    output_pdf = ipynb_path[:-6] + ".pdf"
+
+    print("Converting to PDF ...")
+
+    # 3. 读内存/磁盘中的 notebook，提取 TOC
+    nb = nbformat.read(ipynb_path, as_version=4)
+    toc = _extract_toc(nb)
+
+    # 4. 转 HTML，吞掉 alt‐text 警告
+    exporter = HTMLExporter()
+    buf = io.StringIO()
+    with contextlib.redirect_stdout(buf):
+        html_body, _ = exporter.from_notebook_node(nb)
+
+    # 5. 写临时 HTML / PDF
+    with tempfile.NamedTemporaryFile("w", suffix=".html", encoding="utf-8", delete=False) as th:
+        th.write(html_body)
+        html_path = th.name
+    with tempfile.NamedTemporaryFile(suffix=".pdf", delete=False) as tp:
+        tmp_pdf = tp.name
+
+    # 6. 子进程里用 Playwright 同步渲染 PDF
+    script = f"""
+import sys
+from playwright.sync_api import sync_playwright
+p = sync_playwright().start()
+b = p.chromium.launch()
+pg = b.new_page()
+pg.goto(r"file://{html_path}")
+pg.pdf(path=r"{tmp_pdf}", format="A3", print_background=True,
+       margin={{"top":"20mm","bottom":"20mm","left":"20mm","right":"20mm"}})
+b.close(); p.stop()
+"""
+    subprocess.run([sys.executable, "-c", script], check=True)
+
+    # 7. 用 PyMuPDF 加书签
+    _add_bookmarks(tmp_pdf, output_pdf, toc)
+
+    # 8. 清理临时文件
+    os.unlink(html_path)
+    os.unlink(tmp_pdf)
+    if cleanup_ipynb:
+        os.unlink(ipynb_path)
+
+    print(f"✅ {Path(output_pdf).name} created with TOC")
+    print(f"✅ in {Path(output_pdf).parent}")
+    return output_pdf
+
+# ----------------------------------------------------------------
+# 3) 工具函数：提取目录、写书签
+# ----------------------------------------------------------------
+def _extract_toc(nb_node) -> list[tuple[int, str]]:
+    toc = []
+    for cell in nb_node.cells:
+        if cell.cell_type != "markdown":
+            continue
+        first = cell.source.strip().splitlines()[0]
+        m = re.match(r"^(#{1,6})\s+(.*)", first)
+        if m:
+            toc.append((len(m.group(1)), m.group(2).strip()))
+    return toc
+
+def _add_bookmarks(input_pdf: str, output_pdf: str, toc: list[tuple[int, str]]):
+    doc = fitz.open(input_pdf)
+    outline = []
+    for level, title in toc:
+        pg = next(
+            (i+1 for i in range(doc.page_count)
+             if title in doc.load_page(i).get_text()),
+            1
+        )
+        outline.append([level, title, pg])
+    doc.set_toc(outline)
+    doc.save(output_pdf)
+
+
+# 使用示例（另起一个 cell 运行）：
+# ipynb = globals().get("__session__")
+# ipynb2pdf(ipynb)
+
+
+#==============================================================================
+
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================

siat/save2pdf.py

@@ -74,9 +74,9 @@ def ipynb2pdf(ipynb_path: str) -> str:
     将 .ipynb 转为带可跳转目录书签的 PDF。
     返回生成的 PDF 文件路径。
     """
-    # 0. 强制保存当前 Notebook
+    # 0. 强制保存当前 Notebook，貌似不管用，还是需要手动保存当前的Notebook
     #print("Saving current ipynb ...")
-    _save_current_notebook()    
+    #_save_current_notebook()
     
     if not os.path.isfile(ipynb_path):
         raise FileNotFoundError(f"找不到文件：{ipynb_path}")

{siat-3.11.5.dist-info → siat-3.11.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.11.5
+Version: 3.11.6
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
@@ -45,7 +45,7 @@ Requires-Dist: ipywidgets
 Requires-Dist: yahooquery
 Requires-Dist: alpha-vantage
 Requires-Dist: tiingo[pandas]
-Requires-Dist: numpy<2
+Requires-Dist: numpy <2
 Requires-Dist: playwright
 Requires-Dist: pymupdf
 Requires-Dist: pypandoc

{siat-3.11.5.dist-info → siat-3.11.6.dist-info}/RECORD

@@ -50,11 +50,12 @@ siat/risk_adjusted_return.py,sha256=Q4ZRdTF57eNt4QCjeQ7uA8nG56Jls8f_QfJasZQEo0M,
 siat/risk_adjusted_return2.py,sha256=gCtHhfGNlV1wHqU9gfHJ_n17wRSyTMxc7lS8jgZ-GQk,87409
 siat/risk_evaluation.py,sha256=xfgLSKlIWYmRJrIL4kn2k2hp9fyOMAzYGIhi9ImvKOw,88917
 siat/risk_free_rate.py,sha256=IBuRqA2kppdZsW4D4fapW7vnM5HMEXOn95A5r9Pkwlo,12384
-siat/save2docx.py,sha256=cqdbPUEAPQD5PcByawMecXhz9ih_lBsWFvfCzGPFDuE,13494
+siat/save2docx.py,sha256=MhgZamjMYPHIVxNDXP0XGKaYn5qEePdSqMSLQRWMH10,13855
+siat/save2pdf-20250716.py,sha256=BZ8h1YZFYFwCD15a2VcydMmMmfsbA-8WzeDJQr_or3g,6400
 siat/save2pdf-playwright-20250712.py,sha256=cB1L5lH2n6RfgubCLFR7a617OGnrtT9IQhWXWGncoFs,5114
 siat/save2pdf-playwright-20250714.py,sha256=WPdjT4kjXiAoWri-nyvNlPhvjmQlAHX80qmIT5GGYxs,6785
 siat/save2pdf-weasyprint-20250712.py,sha256=ZVZq5yT-grcmdY3qq8XXZ7OCDCGqvh66o2WfszoK9ws,4570
-siat/save2pdf.py,sha256=YGxFCO6oOBpcyNnJPEc_skdohevUC5Hw5EedeL0HMvI,6136
+siat/save2pdf.py,sha256=mBv3A_Ly9sx53VaGaMW-Hy4haeLuKo10Y2iMRVv1r70,6195
 siat/sector_china.py,sha256=uLsDXdRBDVfgG6tnXWnQOTyDmyZfglVO9DRUYU2e3pk,157914
 siat/security_price2.py,sha256=DDiZ2dlv_TYPLhA8-gGb9i9xrl88r4rgSMEcxqQ6aU0,28065
 siat/security_prices.py,sha256=X3ip0q_m3OL3QRNRkr_lYQk-wsXLf6dWkFkyoZijhck,129368
@@ -76,8 +77,8 @@ siat/valuation.py,sha256=xGizcKJZ3ADLWWHm2TFQub18FxiDv2doQwBwbEqyqz0,51980
 siat/valuation_china.py,sha256=eSKIDckyjG8QkENlW_OKkqbQHno8pzDcomBO9iGNJVM,83079
 siat/var_model_validation.py,sha256=loqziBYO2p0xkeWm3Rb1rJsDhbcgAZ5aR9rBLRwLU5E,17624
 siat/yf_name.py,sha256=laNKMTZ9hdenGX3IZ7G0a2RLBKEWtUQJFY9CWuk_fp8,24058
-siat-3.11.5.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.11.5.dist-info/METADATA,sha256=4sdqgT0GBYVj46u0O_SgiUepBptHRxxTGE9EoFaawg8,8587
-siat-3.11.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-siat-3.11.5.dist-info/top_level.txt,sha256=X5R8wrVviq8agwJFVRVDsufkuOJuit-1qAT_kXeptrY,17
-siat-3.11.5.dist-info/RECORD,,
+siat-3.11.6.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.11.6.dist-info/METADATA,sha256=xJppCaG6hxV_JMVxHQjN7jfiNQRAH4-wfdtZQWlHRxA,8588
+siat-3.11.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.11.6.dist-info/top_level.txt,sha256=X5R8wrVviq8agwJFVRVDsufkuOJuit-1qAT_kXeptrY,17
+siat-3.11.6.dist-info/RECORD,,

{siat-3.11.5.dist-info → siat-3.11.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any