siat 3.10.133__py3-none-any.whl → 3.11.1__py3-none-any.whl

siat/allin.py

@@ -135,3 +135,11 @@ from siat.luchy_draw import *
 # 搜索全球上市公司的英文名称，需要访问雅虎
 from siat.yf_name import *
 
+# Save to PDF：实验中
+from siat.save2pdf import *
+
+# Save to docx：实验中
+from siat.save2docx import *
+
+
+

siat/capm_beta2.py

@@ -341,7 +341,7 @@ def compare_mticker_1beta(ticker,start,end, \
                             attention_point='',attention_point_area='', \
                          axhline_value=1,axhline_label='零线', \
                              band_area='', \
-                         graph=True,facecolor='whitesmoke',loc='best', \
+                         graph=True,facecolor='whitesmoke',loc='best',power=0, \
                          annotate=False,annotate_value=False, \
                          mark_top=False,mark_bottom=False, \
                          mark_start=False,mark_end=False, \
@@ -451,7 +451,7 @@ def compare_mticker_1beta(ticker,start,end, \
                    annotate=annotate,annotate_value=annotate, \
                    mark_top=mark_top,mark_bottom=mark_bottom, \
                    mark_start=mark_start,mark_end=mark_end, \
-                   facecolor=facecolor,loc=loc,precision=4)
+                   facecolor=facecolor,loc=loc,precision=4,power=power)
  
     return df
 
@@ -786,7 +786,7 @@ def compare_beta_security(ticker,start,end, \
                             attention_value='',attention_value_area='', \
                             attention_point='',attention_point_area='', \
                                 band_area='', \
-                          graph=True,facecolor='whitesmoke', \
+                          graph=True,power=0,facecolor='whitesmoke', \
                           annotate=False,annotate_value=False, \
                           mark_top=False,mark_bottom=False, \
                           mark_start=False,mark_end=False, \
@@ -867,7 +867,7 @@ def compare_beta_security(ticker,start,end, \
                                 attention_value=attention_value,attention_value_area=attention_value_area, \
                                 attention_point=attention_point,attention_point_area=attention_point_area, \
                                     band_area=band_area, \
-                             graph=graph,facecolor=facecolor,loc=loc, \
+                             graph=graph,power=power,facecolor=facecolor,loc=loc, \
                              annotate=annotate,annotate_value=annotate, \
                              mark_top=mark_top,mark_bottom=mark_bottom, \
                              mark_start=mark_start,mark_end=mark_end, \

siat/common.py

@@ -5105,7 +5105,8 @@ async def jupyter2pdf3(notebook_path):
     
     # pdf文件的完整路径        
     output_pdf_path1=notebook_dir+sep+notebook_file1+' A4.pdf'
-    output_pdf_path2=notebook_dir+sep+notebook_file1+' A3.pdf'
+    #output_pdf_path2=notebook_dir+sep+notebook_file1+' A3.pdf'
+    output_pdf_path2=notebook_dir+sep+notebook_file1+'.pdf'
     
     from nbconvert import HTMLExporter
     
@@ -5118,7 +5119,7 @@ async def jupyter2pdf3(notebook_path):
         from playwright.async_api import async_playwright
         #from playwright.sync_api import sync_playwright
     except:
-        print("  #Warning(jupyter2pdf2): playwright seems not fully installed yet")
+        print("  #Warning(jupyter2pdf3): playwright seems not fully installed yet")
         print("  [Solution] execute the command before re-run: playwright install")
         return
     
@@ -5129,10 +5130,11 @@ async def jupyter2pdf3(notebook_path):
         html_exporter = HTMLExporter()
         try:
             html_content, _ = html_exporter.from_filename(notebook_path)
-            print(f"Converting {notebook_file} to pdf ...")
+            #print(f"Converting {notebook_file} to pdf ...")
+            print(f"Converting from {notebook_file} ...")
 
         except:
-            print("File not found for {}".format(notebook_path))
+            print("Source file not found from {}".format(notebook_path))
             return
         
         # 创建临时 HTML 文件
@@ -5150,7 +5152,7 @@ async def jupyter2pdf3(notebook_path):
             if not sys.platform.startswith('win'):
                 page.wait_for_selector(".jp-Notebook", state="visible", timeout=60000)  # 等待笔记本主体出现
             
-            await page.pdf(path=output_pdf_path1, format='A4')
+            #await page.pdf(path=output_pdf_path1, format='A4')
             await page.pdf(path=output_pdf_path2, format='A3')
             
             await browser.close()
@@ -5170,7 +5172,8 @@ async def jupyter2pdf3(notebook_path):
             browser.close()
         """
         
-        print(f"2 PDFs created in {notebook_dir}")
+        #print(f"2 PDFs created in {notebook_dir}")
+        print(f"PDF created in {notebook_dir}")
 
     except Exception as e:
         if str(e)=='':

siat/grafix.py

@@ -276,7 +276,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
             plt.axhline(y=hline,ls=":",c="black",linewidth=2,label='')
             haveLegend=False
     else:
-        #不在必要，被attention_value的逻辑替代
+        #不再必要，被attention_value的逻辑替代
         if isinstance(zeroline,float) or isinstance(zeroline,int):
             hline=zeroline
             plt.axhline(y=hline,ls=":",c="darkorange",linewidth=3,label=text_lang("关注值","Attention"))
@@ -373,7 +373,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
     #print("--Debug(plot_line): power=",power)
     if power > 0:
         trend_txt=text_lang('趋势线','Trend line')
-        
+        if power > 100: power=100
         try:
             #生成行号，借此将横轴的日期数量化，以便拟合
             df['id']=range(len(df))
@@ -383,6 +383,9 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
             parameter = np.polyfit(df.id, df[colname], power)
             f = np.poly1d(parameter)
             plt.plot(df.index, f(df.id),"r--", label=trend_txt,linewidth=1)
+            
+            
+            
             haveLegend=True
         except: 
             print("  #Warning(plot_line): failed to converge trend line, try a smaller power.")
@@ -484,6 +487,8 @@ def plot_line2(df1,ticker1,colname1,label1, \
         print("Going to plot_line2_coaxial")
         print("yline=",yline,"; xline=",xline)
     
+    if power > 100: power=100
+    
     #if not twinx:
     if twinx == True: # 双轴会图
         plot_line2_twinx(df1,ticker1,colname1,label1, \
@@ -579,6 +584,8 @@ def plot2_line2(df1,ticker1,colname1,label1, \
     if (len(df1) ==0) and (len(df2) ==0):
         return
     
+    if power > 100: power=100
+    
     if not twinx:            
         plot_line2_coaxial2(df1,ticker1,colname1,label1, \
                             df2,ticker2,colname2,label2, \
@@ -2176,7 +2183,7 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                ticker_type='auto',facecolor='whitesmoke', \
                    maxticks_enable=True,maxticks=15, \
                translate=False, \
-                   precision=2):
+                   precision=2,power=0):
     """
     函数功能：根据df的内容绘制折线图
     输入参数：
@@ -2308,8 +2315,22 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
             mark_end=False
             df_end=dfg.tail(1)
             # df_end[c]必须为数值类型，否则可能出错
+            if DEBUG:
+                print(f"=== c: {type(c)}, {c}")
+                print(f"=== df_end[c]: {type(df_end[c])}, {df_end[c]}")
+            
             y_end = df_end[c].min()    # 末端的y坐标
+            if not isinstance(y_end,float):
+                # 需要强制提取数值，因其可能为Series类型
+                print(f"=== y_end: {type(y_end)}, {y_end}")
+                y_end = y_end.iloc[0]
+                
             x_end = df_end[c].idxmin() # 末端值的x坐标 
+            import pandas as pd
+            if not isinstance(x_end,pd.Timestamp):
+                # 需要强制提取数值，因其可能为Series类型
+                print(f"=== x_end: {type(x_end)}, {x_end}")
+                x_end = x_end.iloc[0]
             
             if annotate_value: #在标记曲线名称的同时标记其末端数值
                 #y1=str(int(y_end)) if y_end >= 100 else str(round(y_end,2))
@@ -2386,7 +2407,37 @@ def draw_lines(df0,y_label,x_label,axhline_value,axhline_label,title_txt, \
                          xy=(x_end, y_end),
                          xytext=(x_end, y_end*0.998),fontsize=annotate_size,
                          color=last_line_color,ha='left',va='center')
-
+            
+        #绘制趋势线
+        if (power > 0) and (len(list(dfg)) == 1):
+            trend_txt=text_lang('趋势线','Trend line')
+            if power > 100: power=100
+            
+            try:
+                #生成行号，借此将横轴的日期数量化，以便拟合
+                dfg['id']=range(len(dfg))
+            
+                #设定多项式拟合，power为多项式次数
+                """
+                import numpy as np
+                parameter = np.polyfit(dfg.id, dfg[list(dfg)[0]], power)
+                f = np.poly1d(parameter)
+                plt.plot(dfg.index, f(dfg.id),"r--", label=trend_txt,linewidth=1)
+                """
+                from numpy.polynomial import Polynomial
+                x = dfg['id']
+                y = dfg[list(dfg)[0]]
+                p = Polynomial.fit(x, y, deg=power)
+                plt.plot(dfg.index, p(x), "r--", label=trend_txt, linewidth=1)
+
+            except Exception as e:
+                print(f"  #Warning(draw_lines): Polynomial.fit failed — {e}")
+
+            """
+            except: 
+                print(f"  #Warning(draw_lines): failed to converge trend line, try a smaller power.")        
+            """
+            
     #用于关注值的颜色列表
     atv_color_list=["lightgray","paleturquoise","wheat","khaki","lightsage","hotpink","mediumslateblue"]
     #用于关注点的颜色列表

siat/markowitz2.py

@@ -21,6 +21,7 @@ from siat.common import *
 from siat.translate import *
 from siat.security_prices import *
 from siat.security_price2 import *
+from siat.stock import *
 from siat.grafix import *
 #from siat.fama_french import *
 

siat/risk_adjusted_return2.py

@@ -813,7 +813,7 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
                              attention_point='',attention_point_area='', \
                                  band_area='', \
                          graph=True,loc1='best', \
-                         axhline_value=0,axhline_label='',facecolor='whitesmoke', \
+                         axhline_value=0,axhline_label='',power=0,facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.01, \
                          annotate=False,annotate_value=False, \
                          mark_top=False,mark_bottom=False, \
@@ -917,6 +917,10 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
         x_label=text_lang("数据来源: 综合新浪/EM/Stooq/Yahoo/SWHY，","Data source: Sina/Stooq/Yahoo, ")+str(todaydt)
         title_txt=text_lang("风险调整收益：","Risk-adjusted Return: ")+tname
 
+        # 英文环境下将label首字母大写
+        for c in list(df1):
+            df1.rename(columns={c:c.title()},inplace=True)
+            
         draw_lines(df1,y_label,x_label=footnotex, \
                    axhline_value=axhline_value,axhline_label=axhline_label, \
                    title_txt=title_txt,data_label=False, \
@@ -926,7 +930,7 @@ def compare_1ticker_mrar(ticker,start,end,rar=['sharpe','sortino','treynor','alp
                        band_area=band_area, \
                    mark_top=mark_top,mark_bottom=mark_bottom, \
                    mark_start=mark_start,mark_end=mark_end, \
-                   facecolor=facecolor,loc=loc1)
+                   facecolor=facecolor,loc=loc1,power=power)
             
     #制表
     recommenddf=pd.DataFrame()
@@ -1729,7 +1733,7 @@ def compare_rar_security(ticker,start,end='today',indicator='sharpe', \
                             attention_point='',attention_point_area='', \
                                 band_area='', \
                          graph=True,loc1='best', \
-                         axhline_value=0,axhline_label='',facecolor='whitesmoke', \
+                         axhline_value=0,axhline_label='',power=0,facecolor='whitesmoke', \
                          printout=False,sortby='tpw_mean',trailing=7,trend_threshhold=0.05, \
                          annotate=False,annotate_value=False, \
                          mark_top=False,mark_bottom=False, \
@@ -1878,7 +1882,7 @@ def compare_rar_security(ticker,start,end='today',indicator='sharpe', \
                                 attention_value=attention_value,attention_value_area=attention_value_area, \
                                 attention_point=attention_point,attention_point_area=attention_point_area, \
                              graph=graph,loc1=loc1, \
-                             axhline_value=axhline_value,axhline_label=axhline_label, \
+                             axhline_value=axhline_value,axhline_label=axhline_label,power=power, \
                              printout=printout,sortby=sortby, \
                              trailing=trailing,trend_threshhold=trend_threshhold, \
                              annotate=annotate,annotate_value=annotate, \

siat/save2docx.py

@@ -0,0 +1,345 @@
+# -*- coding: utf-8 -*-
+"""
+本模块功能：转换ipynb文件为docx，带有的目录，代码行加边框，图像适配页宽。
+注意：
+    需要安装pandoc并将其路径加入操作系统的PATH。
+    可在Anaconda Prompt或macOS Terminal下输入pandoc尝试，若未加入PATH则提示找不到。
+尚存问题：
+    1. 标题行未居中，且重复生成；
+    2. 目录页码不准确，需要手动更新；
+    3. 若docx文件已打开出错。
+所属工具包：证券投资分析工具SIAT 
+SIAT：Security Investment Analysis Tool
+创建日期：2025年7月8日
+最新修订日期：2025年7月8日
+作者：王德宏 (WANG Dehong, Peter)
+作者单位：北京外国语大学国际商学院
+作者邮件：wdehong2000@163.com
+版权所有：王德宏
+用途限制：仅限研究与教学使用。
+特别声明：作者不对使用本工具进行证券投资导致的任何损益负责！
+"""
+
+#==============================================================================
+
+import os
+import errno
+import tempfile
+import subprocess
+
+import nbformat
+from nbconvert import HTMLExporter
+import pypandoc
+
+from docx import Document
+from docx.oxml import OxmlElement
+from docx.oxml.ns import qn
+from docx.shared import Mm
+from docx.enum.text import WD_ALIGN_PARAGRAPH
+from docx.enum.table import WD_TABLE_ALIGNMENT
+from docx.text.paragraph import Paragraph
+
+# 预设纸张尺寸（单位：毫米）
+PAGE_SIZES = {"A4": (210, 297), "A3": (297, 420)}
+
+
+def _add_border_to_paragraph(paragraph):
+    """给 paragraph 添加四边单线边框"""
+    p = paragraph._p
+    pPr = p.get_or_add_pPr()
+    pBdr = OxmlElement('w:pBdr')
+    for edge in ('top', 'left', 'bottom', 'right'):
+        elm = OxmlElement(f'w:{edge}')
+        elm.set(qn('w:val'), 'single')
+        elm.set(qn('w:sz'), '4')
+        elm.set(qn('w:space'), '4')
+        elm.set(qn('w:color'), 'auto')
+        pBdr.append(elm)
+    pPr.append(pBdr)
+
+
+def _insert_native_toc(after_paragraph):
+    """
+    在 after_paragraph 之后插入一个 Word 原生 TOC 域，
+    支持更新标题和页码，涵盖级别 1–9。
+    """
+    # 构造 <w:p> 节点
+    toc_p = OxmlElement('w:p')
+
+    # 1) fldChar begin
+    r1 = OxmlElement('w:r')
+    fld_char_begin = OxmlElement('w:fldChar')
+    fld_char_begin.set(qn('w:fldCharType'), 'begin')
+    r1.append(fld_char_begin)
+    toc_p.append(r1)
+
+    # 2) instrText
+    r2 = OxmlElement('w:r')
+    instr = OxmlElement('w:instrText')
+    instr.set(qn('xml:space'), 'preserve')
+    instr.text = 'TOC \\o "1-9" \\h \\z \\u'
+    r2.append(instr)
+    toc_p.append(r2)
+
+    # 3) fldChar separate
+    r3 = OxmlElement('w:r')
+    fld_char_sep = OxmlElement('w:fldChar')
+    fld_char_sep.set(qn('w:fldCharType'), 'separate')
+    r3.append(fld_char_sep)
+    toc_p.append(r3)
+
+    # 4) 占位文本（可选）
+    r4 = OxmlElement('w:r')
+    t = OxmlElement('w:t')
+    t.text = '右击此处更新目录'
+    r4.append(t)
+    toc_p.append(r4)
+
+    # 5) fldChar end
+    r5 = OxmlElement('w:r')
+    fld_char_end = OxmlElement('w:fldChar')
+    fld_char_end.set(qn('w:fldCharType'), 'end')
+    r5.append(fld_char_end)
+    toc_p.append(r5)
+
+    # 插入
+    after_paragraph._p.addnext(toc_p)
+
+
+def convert_ipynb_to_docx(ipynb_path, docx_path=None, page_size="A3"):
+    """
+    将 .ipynb 转为 .docx，并实现：
+      1. 第一 Markdown 单元首行做文档标题
+      2. 在第2行插入可更新的 Word 原生 TOC（1–9 级）
+      3. 所有标题左对齐
+      4. 仅给原始 code 单元段落加边框（不含输出）
+      5. 表格等分列宽居中；图像放大至页宽并居中
+      6. 若目标 docx 正被打开，抛出提示“请先关闭文件”
+    """
+    # ---- 1. 检查输入 & 输出路径 ----
+    if not os.path.isfile(ipynb_path):
+        raise FileNotFoundError(f"找不到输入文件：{ipynb_path}")
+    if docx_path is None:
+        base, _ = os.path.splitext(ipynb_path)
+        docx_path = base + ".docx"
+
+    # ---- 2. 读取 Notebook，提取标题 & 收集 code 单元源码 ----
+    nb = nbformat.read(ipynb_path, as_version=4)
+    title = None
+    code_blocks = []
+    for cell in nb.cells:
+        if cell.cell_type == "markdown" and title is None:
+            lines = cell.source.strip().splitlines()
+            if lines:
+                title = lines[0].lstrip("# ").strip()
+                # 去除这行，避免后面重复
+                cell.source = "\n".join(lines[1:]).strip()
+        if cell.cell_type == "code":
+            code_blocks.append(cell.source.rstrip())
+    if not title:
+        title = os.path.splitext(os.path.basename(ipynb_path))[0]
+
+    # ---- 3. 确保 Pandoc 可用 ----
+    try:
+        pypandoc.get_pandoc_version()
+    except OSError:
+        pypandoc.download_pandoc()
+
+    # ---- 4. Notebook → HTML（嵌入图像） ----
+    exporter = HTMLExporter()
+    exporter.embed_images = True
+    html_body, _ = exporter.from_notebook_node(nb)
+    html = f"<h1>{title}</h1>\n" + html_body
+
+    # ---- 5. HTML → DOCX via Pandoc（或 subprocess fallback） ----
+    try:
+        pypandoc.convert_text(
+            html, to="docx", format="html",
+            outputfile=docx_path, encoding="utf-8"
+        )
+    except Exception:
+        # fallback 到外部 pandoc
+        with tempfile.NamedTemporaryFile("w", suffix=".html",
+                                         delete=False,
+                                         encoding="utf-8") as tmp:
+            tmp.write(html)
+            html_file = tmp.name
+        try:
+            try:
+                subprocess.run(
+                    ["pandoc", html_file, "-f", "html", "-t", "docx", "-o", docx_path],
+                    check=True, capture_output=True
+                )
+            except subprocess.CalledProcessError as e:
+                err = e.stderr.decode("utf-8", errors="ignore")
+                low = err.lower()
+                if "permission denied" in low or "could not open file" in low:
+                    raise PermissionError(
+                        f"无法写入 {docx_path}：文件可能已被打开，请先关闭后重试。"
+                    )
+                raise RuntimeError(f"Pandoc 转换失败：{err}")
+        finally:
+            os.remove(html_file)
+
+    # ---- 6. 后处理 DOCX ----
+    try:
+        doc = Document(docx_path)
+    except (PermissionError, OSError) as e:
+        if getattr(e, "errno", None) in (errno.EACCES, errno.EPERM):
+            raise PermissionError(
+                f"无法打开 {docx_path}：文件可能已被打开，请先关闭后重试。"
+            )
+        raise
+
+    # 6.1 页面尺寸 & 边距
+    sec = doc.sections[0]
+    if page_size.upper() in PAGE_SIZES:
+        w_mm, h_mm = PAGE_SIZES[page_size.upper()]
+        sec.page_width, sec.page_height = Mm(w_mm), Mm(h_mm)
+    for m in ("left_margin", "right_margin", "top_margin", "bottom_margin"):
+        setattr(sec, m, Mm(25.4))
+    avail_w = sec.page_width - sec.left_margin - sec.right_margin
+
+    # 6.2 第一段替换为标题，设为 Heading1，左对齐
+    p0 = doc.paragraphs[0]
+    p0.text = title
+    p0.style = doc.styles["Heading 1"]
+    p0.alignment = WD_ALIGN_PARAGRAPH.LEFT
+
+    # 6.3 在第2行插入 Word 本地 TOC
+    _insert_native_toc(p0)
+
+    # 6.4 强制 Word 打开时自动更新目录
+    try:
+        settings = doc.settings.element
+        upd = OxmlElement("w:updateFields")
+        upd.set(qn("w:val"), "true")
+        settings.append(upd)
+    except Exception:
+        pass  # 部分 python-docx 版本无此接口
+
+    # 6.5 所有标题左对齐
+    for p in doc.paragraphs:
+        if p.style.name.startswith("Heading"):
+            p.alignment = WD_ALIGN_PARAGRAPH.LEFT
+
+    # 6.6 仅给原始 code 单元对应段落加边框
+    for p in doc.paragraphs:
+        if "code" in p.style.name.lower():
+            txt = p.text.rstrip()
+            if any(txt == block for block in code_blocks):
+                _add_border_to_paragraph(p)
+
+    # 6.7 表格等分列宽并居中
+    for tbl in doc.tables:
+        tbl.alignment = WD_TABLE_ALIGNMENT.CENTER
+        tbl.allow_autofit = False
+        cols = len(tbl.columns) or 1
+        col_w = avail_w // cols
+        for col in tbl.columns:
+            for cell in col.cells:
+                cell.width = col_w
+
+    # 6.8 图像放大至页宽并居中
+    for shp in doc.inline_shapes:
+        ow, oh = shp.width, shp.height
+        fact = avail_w / ow
+        shp.width = avail_w
+        shp.height = int(oh * fact)
+        p_el = shp._inline.getparent().getparent()
+        Paragraph(p_el, doc).alignment = WD_ALIGN_PARAGRAPH.CENTER
+
+    # ---- 7. 保存并捕捉写入锁定 ----
+    try:
+        doc.save(docx_path)
+    except (PermissionError, OSError) as e:
+        if getattr(e, "errno", None) in (errno.EACCES, errno.EPERM):
+            raise PermissionError(
+                f"无法写入 {docx_path}：文件可能已被打开，请先关闭后重试。"
+            )
+        raise
+
+    return docx_path
+
+
+#==============================================================================
+import os
+import sys
+import psutil
+
+def is_file_opened(file_path: str) -> bool:
+    """
+    检测文件是否被其他程序打开（跨平台）
+    :param file_path: 文件路径
+    :return: True-被占用, False-未占用或不存在
+    """
+    # 检查文件是否存在
+    if not os.path.exists(file_path):
+        return False
+    
+    abs_path = os.path.abspath(file_path)  # 转为绝对路径
+    
+    # 方法1：异常捕获法（快速检测）
+    try:
+        with open(abs_path, "a") as f:  # 追加模式（不破坏内容）
+            pass
+        return False  # 成功打开说明未被占用
+    except (OSError, PermissionError):
+        pass  # 继续尝试其他方法
+    
+    # 方法2：进程扫描法（精确检测）
+    try:
+        for proc in psutil.process_iter(['pid', 'name', 'open_files']):
+            try:
+                open_files = proc.info.get('open_files')
+                if open_files and any(f.path == abs_path for f in open_files):
+                    return True
+            except (psutil.AccessDenied, psutil.NoSuchProcess):
+                continue
+    except NameError:  # psutil未安装
+        pass
+    
+    # 方法3：文件锁试探法（最终回退）
+    try:
+        if sys.platform == 'win32':
+            import msvcrt
+            with open(abs_path, "a") as f:
+                msvcrt.locking(f.fileno(), msvcrt.LK_NBLCK, 1)  # 非阻塞锁
+        else:
+            import fcntl
+            with open(abs_path, "a") as f:
+                fcntl.flock(f, fcntl.LOCK_EX | fcntl.LOCK_NB)  # 非阻塞独占锁
+        return False
+    except (OSError, BlockingIOError, ImportError):
+        return True  # 所有检测均失败视为占用
+    return False
+
+#==============================================================================
+
+def ipynb2docx(ipynb_path, page_size="A3"):
+    """
+    将 .ipynb 转为 .docx，特性：
+      1. Markdown 首行做文档标题
+      2. 在第 2 行插入全文 TOC（1–9 级）
+      3. 所有标题左对齐，保留原字号
+      4. 仅为“代码段”加边框，不影响输出
+      5. 表格均分列宽并居中
+      6. 图像放大至可用页宽并居中
+      7. 若目标文件已打开，捕获并提示“请先关闭文件”
+    """
+    base, _ = os.path.splitext(ipynb_path)
+    docx_path = base + ".docx"
+    
+    # 检测docx文件是否已被打开
+    if is_file_opened(docx_path):
+        print(f"Warning: {docx_path} occupied by other app, please close it and try again")
+        return
+    
+    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, TOC needs update manually in Microsoft Word")
+    print(f"And, title and some other things may need fine tuned as well")
+    
+    return
+    
+

siat/save2pdf.py

@@ -0,0 +1,145 @@
+# -*- 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 os
+import re
+import tempfile
+import asyncio
+
+import nest_asyncio
+import nbformat
+from nbconvert import HTMLExporter
+from playwright.async_api import async_playwright
+import fitz  # PyMuPDF
+
+nest_asyncio.apply()  # 使 asyncio.run 在 Notebook 中可用
+
+def ipynb2pdf(ipynb_path: str) -> str:
+    """
+    将 .ipynb 转为带可跳转目录书签的 PDF。
+    返回生成的 PDF 文件路径。
+    """
+    if not os.path.isfile(ipynb_path):
+        raise FileNotFoundError(f"找不到文件：{ipynb_path}")
+    output_pdf = ipynb_path[:-6] + ".pdf"
+
+    # 1. 读 notebook → 提取目录结构
+    nb = nbformat.read(ipynb_path, as_version=4)
+    toc = _extract_toc(nb)
+
+    # 2. nb → HTML
+    exporter = HTMLExporter()
+    html_body, _ = exporter.from_notebook_node(nb)
+
+    # 3. 临时写 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
+
+    # 4. Playwright 渲染 HTML → PDF
+    asyncio.run(_html_to_pdf(html_path, tmp_pdf))
+
+    # 5. PyMuPDF 添加书签
+    _add_bookmarks(tmp_pdf, output_pdf, toc)
+
+    # 6. 清理
+    os.unlink(html_path)
+    os.unlink(tmp_pdf)
+
+    from pathlib import Path
+    full_path = Path(output_pdf)
+    # 提取文件名
+    filename = full_path.name  # 'report.pdf'
+    # 提取路径
+    directory = full_path.parent  # PosixPath('/Users/peter/Documents')
+    
+    print(f"✅ {filename} is created with TOC")
+    print(f"✅ It is in {directory}")
+    
+    #return output_pdf
+    return
+
+async def _html_to_pdf(html_path: str, pdf_path: str):
+    async with async_playwright() as p:
+        browser = await p.chromium.launch()
+        page = await browser.new_page()
+        await page.goto(f"file://{html_path}")
+        await page.pdf(
+            path=pdf_path,
+            #format="A4",
+            format="A3",
+            print_background=True,
+            margin={"top":"20mm","bottom":"20mm","left":"20mm","right":"20mm"},
+        )
+        await browser.close()
+
+def _extract_toc(nb_node) -> list[tuple[int,str]]:
+    """
+    从每个 markdown 单元首行提取 # 级别和标题文本，
+    返回 [(level, title), …]
+    """
+    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]]):
+    """
+    用 PyMuPDF 打开临时 PDF，按 toc 列表查找页码，
+    然后用 set_toc() 批量写入书签。
+    """
+    doc = fitz.open(input_pdf)
+    outline = []
+    for level, title in toc:
+        page_num = 1
+        # 搜索标题出现在第几页（0-based → +1）
+        for i in range(doc.page_count):
+            if title in doc.load_page(i).get_text():
+                page_num = i + 1
+                break
+        outline.append([level, title, page_num])
+
+    # 批量设置目录书签
+    doc.set_toc(outline)
+    doc.save(output_pdf)
+
+# 使用示例（另起一个 cell 运行）：
+# ipynb = globals().get("__session__")
+# ipynb2pdf(ipynb)
+
+
+#==============================================================================
+
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================
+#==============================================================================

siat/security_prices.py

@@ -2489,12 +2489,14 @@ if __name__ =="__main__":
     vdf=rolling_ret_volatility(retdf, period) 
 
 #==============================================================================
-def expanding_ret_volatility(df0,basedate):
+def expanding_ret_volatility_x(df0,basedate):
     """
     功能：基于日收益率数据集，从起始日期basedate开始的收益率波动风险扩展窗口序列。
     输入：
     日收益率数据集df。
     输出：扩展调整收益率波动风险序列，按照日期升序排列。
+    
+    注意：可能存在计算错误，暂时废弃！！！
     """
     df0["Daily Ret"]=df0['Close'].pct_change()
     df0["Daily Adj Ret"]=df0['Adj Close'].pct_change()
@@ -2523,6 +2525,59 @@ def expanding_ret_volatility(df0,basedate):
     
     return df
 
+#==============================================================================
+def expanding_ret_volatility(df0,basedate,min_periods=1):
+    """
+    功能：基于日收益率数据集，从起始日期basedate开始的收益率波动风险扩展窗口序列。
+    输入：
+    日收益率数据集df。
+    输出：扩展调整收益率波动风险序列，按照日期升序排列。
+    
+    新算法：解决开始部分过度波动问题
+    """
+    collist=list(df0)
+
+    if not ("Daily Ret" in collist):
+        df0["Daily Ret"]=df0['Close'].pct_change()
+        #df0["Daily Ret"]=df0["Daily Ret"].fillna(method='bfill', axis=1)
+        df0["Daily Ret"]=df0["Daily Ret"].interpolate()
+
+    if not ("Daily Adj Ret" in collist):    
+        df0["Daily Adj Ret"]=df0['Adj Close'].pct_change()
+        #df0["Daily Adj Ret"]=df0["Daily Adj Ret"].fillna(method='bfill', axis=1)
+        df0["Daily Adj Ret"]=df0["Daily Adj Ret"].interpolate()
+    
+    import pandas as pd
+    basedate_pd=pd.to_datetime(basedate)
+    df=df0[df0.index >= basedate_pd]
+    
+    # 计算Exp Ret和Exp Adj Ret
+    if not ('Exp Ret' in collist):
+        df['Exp Ret'] = (1 + df['Daily Ret']).cumprod() - 1
+        df['Exp Ret%'] = df['Exp Ret'] * 100.0
+        
+    if not ('Exp Adj Ret' in collist):
+        df['Exp Adj Ret'] = (1 + df['Daily Adj Ret']).cumprod() - 1
+        df['Exp Adj Ret%'] = df['Exp Adj Ret'] * 100.0  
+        
+    #计算扩展窗口调整收益率波动风险：基于普通收益率
+    retname1="Exp Ret Volatility"
+    retname2="Exp Ret Volatility%"
+    #import numpy as np
+    
+    #df[retname1]=df["Exp Ret"].expanding(min_periods=min_periods).std(ddof=1)
+    df[retname1]=df["Exp Ret"].expanding().std(ddof=1)
+    df[retname2]=df[retname1]*100.0
+    
+    #计算扩展窗口调整收益率风险：基于调整收益率
+    retname3="Exp Adj Ret Volatility"
+    retname4="Exp Adj Ret Volatility%"
+    #df[retname3]=df["Exp Adj Ret"].expanding(min_periods=min_periods).std(ddof=1)
+    df[retname3]=df["Exp Adj Ret"].expanding().std(ddof=1)
+    df[retname4]=df[retname3]*100.0
+    
+    return df
+
 if __name__ =="__main__":
     basedate='2019-1-1'
     pricedf=get_price('000002.SZ','2018-1-1','2020-3-16')    
@@ -2564,6 +2619,16 @@ if __name__ =="__main__":
     df=get_price("000002.SZ","2020-1-1","2020-3-16")
     print(lpsd(df['Close']))
 
+import numpy as np
+
+def downside_std(returns, target_return=0):
+    """
+    功能：计算下偏标准差（下方风险）
+    注意：暂时弃用，因为容易引起float divided zero问题。
+    """
+    downside_diff = np.maximum(target_return - returns, 0)
+    return np.sqrt(np.mean(downside_diff ** 2))
+
 #==============================================================================
 def rolling_ret_lpsd(df, period="Weekly"):
     """
@@ -2589,6 +2654,7 @@ def rolling_ret_lpsd(df, period="Weekly"):
     retname2=retname1+'%'
     #import numpy as np
     df[retname1]=df[periodret].rolling(rollingnum,min_periods=1).apply(lambda x: lpsd(x))
+    #df[retname1]=df[periodret].rolling(rollingnum,min_periods=1).apply(downside_std, raw=True)
     df[retname2]=df[retname1]*100.0
     
     #计算滚动下偏标准差：基于调整收益率
@@ -2596,6 +2662,7 @@ def rolling_ret_lpsd(df, period="Weekly"):
     retname3=period+" Adj Ret LPSD"
     retname4=retname3+'%'
     df[retname3]=df[periodadjret].rolling(rollingnum,min_periods=1).apply(lambda x: lpsd(x))
+    #df[retname3]=df[periodadjret].rolling(rollingnum,min_periods=1).apply(downside_std, raw=True)
     df[retname4]=df[retname3]*100.0
     
     return df
@@ -2607,12 +2674,14 @@ if __name__ =="__main__":
     vdf=rolling_ret_lpsd(retdf, period) 
 
 #==============================================================================
-def expanding_ret_lpsd(df0,basedate):
+def expanding_ret_lpsd_x(df0,basedate,min_periods=1):
     """
     功能：基于日收益率数据集，从起始日期basedate开始的收益率损失风险扩展窗口序列。
     输入：
     日收益率数据集df。
     输出：扩展调整收益率波动风险序列，按照日期升序排列。
+    
+    注意：算法可能存在错误，暂时废弃！！！
     """
     df0["Daily Ret"]=df0['Close'].pct_change()
     df0["Daily Adj Ret"]=df0['Adj Close'].pct_change()
@@ -2626,7 +2695,7 @@ def expanding_ret_lpsd(df0,basedate):
     retname2=retname1+'%'
     import numpy as np
     #df[retname1]=df["Daily Ret"].expanding(min_periods=1).apply(lambda x: lpsd(x)*np.sqrt(len(x)))
-    df[retname1]=df["Daily Ret"].expanding(min_periods=1).apply(lambda x: lpsd(x))
+    df[retname1]=df["Daily Ret"].expanding(min_periods=min_periods).apply(lambda x: lpsd(x))
     #df[retname1]=df["Daily Ret"].expanding(min_periods=5).apply(lambda x: lpsd(x))
     df[retname2]=df[retname1]*100.0
     
@@ -2634,12 +2703,67 @@ def expanding_ret_lpsd(df0,basedate):
     retname3="Exp Adj Ret LPSD"
     retname4=retname3+'%'
     #df[retname3]=df["Daily Adj Ret"].expanding(min_periods=1).apply(lambda x: lpsd(x)*np.sqrt(len(x)))
-    df[retname3]=df["Daily Adj Ret"].expanding(min_periods=1).apply(lambda x: lpsd(x))
+    df[retname3]=df["Daily Adj Ret"].expanding(min_periods=min_periods).apply(lambda x: lpsd(x))
     #df[retname3]=df["Daily Adj Ret"].expanding(min_periods=5).apply(lambda x: lpsd(x))
     df[retname4]=df[retname3]*100.0
     
     return df
 
+#==============================================================================
+def expanding_ret_lpsd(df0,basedate,min_periods=1):
+    """
+    功能：基于日收益率数据集，从起始日期basedate开始的收益率损失风险扩展窗口序列。
+    输入：
+    日收益率数据集df。
+    输出：扩展调整收益率波动风险序列，按照日期升序排列。
+    
+    新算法：解决开始部分过度波动的诡异现象
+    """
+    collist=list(df0)
+    
+    if not ("Daily Ret" in collist):
+        df0["Daily Ret"]=df0['Close'].pct_change()
+        #df0["Daily Ret"]=df0["Daily Ret"].fillna(method='bfill', axis=1)
+        df0["Daily Ret"]=df0["Daily Ret"].interpolate()
+
+    if not ("Daily Adj Ret" in collist):
+        df0["Daily Adj Ret"]=df0['Adj Close'].pct_change()
+        #df0["Daily Adj Ret"]=df0["Daily Adj Ret"].fillna(method='bfill', axis=1)
+        df0["Daily Adj Ret"]=df0["Daily Adj Ret"].interpolate()
+    
+    import pandas as pd
+    basedate_pd=pd.to_datetime(basedate)
+    df=df0[df0.index >= basedate_pd]
+    
+    # 计算Exp Ret和Exp Adj Ret
+    if not ('Exp Ret' in collist):
+        df['Exp Ret'] = (1 + df['Daily Ret']).cumprod() - 1
+        df['Exp Ret%'] = df['Exp Ret'] * 100.0
+        
+    if not ('Exp Adj Ret' in collist):
+        df['Exp Adj Ret'] = (1 + df['Daily Adj Ret']).cumprod() - 1
+        df['Exp Adj Ret%'] = df['Exp Adj Ret'] * 100.0  
+    
+    #计算扩展窗口调整收益率下偏标准差：基于普通收益率
+    retname1="Exp Ret LPSD"
+    retname2=retname1+'%'
+    import numpy as np
+    #df[retname1]=df["Exp Ret"].expanding(min_periods=min_periods).apply(lambda x: lpsd(x))
+    df[retname1]=df["Exp Ret"].expanding().apply(lambda x: lpsd(x))
+    #df[retname1]=df["Exp Ret"].expanding().apply(downside_std, raw=True)
+    df[retname2]=df[retname1]*100.0
+    
+    #计算扩展窗口调整下偏标准差：基于调整收益率
+    retname3="Exp Adj Ret LPSD"
+    retname4=retname3+'%'
+    #df[retname3]=df["Exp Adj Ret"].expanding(min_periods=min_periods).apply(lambda x: lpsd(x))
+    df[retname3]=df["Exp Adj Ret"].expanding().apply(lambda x: lpsd(x))
+    #df[retname3]=df["Exp Adj Ret"].expanding().apply(downside_std, raw=True)
+    df[retname4]=df[retname3]*100.0
+    
+    return df
+
+
 if __name__ =="__main__":
     basedate='2019-1-1'
     pricedf=get_price('000002.SZ','2018-1-1','2020-3-16')    

siat/security_trend2.py

@@ -575,7 +575,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
                                      attention_value=attention_value,attention_value_area=attention_value_area, \
                                      attention_point=attention_point,attention_point_area=attention_point_area, \
                                          band_area=band_area, \
-                                 graph=graph,axhline_value=0,axhline_label='', \
+                                 graph=graph,axhline_value=0,axhline_label='',power=power, \
                                  loc1=loc1, \
                                  printout=printout, \
                                  sortby=sortby,trailing=trailing,trend_threshhold=trend_threshhold, \
@@ -599,7 +599,7 @@ def security_trend(ticker,indicator='Close',adjust='', \
                     attention_value=attention_value,attention_value_area=attention_value_area, \
                     attention_point=attention_point,attention_point_area=attention_point_area, \
                         band_area=band_area, \
-                graph=graph,facecolor=facecolor,loc=loc1, \
+                graph=graph,facecolor=facecolor,loc=loc1,power=power, \
                 annotate=annotate,annotate_value=annotate_value, \
                 mark_top=mark_top,mark_bottom=mark_bottom, \
                 mark_start=mark_start,mark_end=mark_end, \

siat/stock.py

@@ -566,13 +566,18 @@ def all_calculate(pricedf,ticker1,fromdate,todate,ticker_type='auto'):
     
     # 横向拼接合并
     result=pd.concat([df1a,df1b,df1c,df1d],axis=1,join='outer')
+    # 合并后产生的重复字段仅保留第一次出现的
+    result3 = result.loc[:, ~result.columns.duplicated(keep='first')]
+
     
     # 去掉重复的列，但要避免仅仅因为数值相同而去掉有用的列，比如误删'Close'列
+    """
     result1=result.T
     result1['item']=result1.index #在行中增加临时列名，避免误删
     result2=result1.drop_duplicates(subset=None,keep='first',ignore_index=False)
     result2.drop("item", axis=1, inplace=True) #去掉临时列名
     result3=result2.T
+    """
     
     return result3
 
@@ -649,7 +654,12 @@ if __name__ =="__main__":
     indicator='Close'
     fromdate='2025-1-1'; todate='2025-6-15'
     
-    zeroline=False
+    # 测试组9
+    ticker='JD'
+    indicator='Exp Ret%'
+    fromdate='2025-4-1'; todate='2025-6-30'
+    
+    zeroline=False; adjust=''
     attention_value='';attention_value_area=''
     attention_point='';attention_point_area=''
     average_value=False

{siat-3.10.133.dist-info → siat-3.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: siat
-Version: 3.10.133
+Version: 3.11.1
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
@@ -11,7 +11,7 @@ Project-URL: Homepage, https://pypi.org/project/siat/
 Keywords: investment,finance,technical analysis,siat
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: <3.13,>=3.12
+Requires-Python: <3.13,>=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pandas-datareader
@@ -48,6 +48,8 @@ Requires-Dist: tiingo[pandas]
 Requires-Dist: numpy <2
 Requires-Dist: playwright
 Requires-Dist: lxml ==4.9.4
+Requires-Dist: pymupdf
+Requires-Dist: pypandoc
 
 
 # What is siat?

{siat-3.10.133.dist-info → siat-3.11.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 siat/__init__.py,sha256=Y21NfAoDxQ3srK1tK-j8EQHzovAA4V_0ntqH8Sa_1E0,2236
-siat/allin.py,sha256=--32Bt2Mfg7l38w7X9cLJCdWtYRB3tTtVHnS9WnqKDI,3035
+siat/allin.py,sha256=afvsi6YSXnNUG1cjCqLVS3qfio-NuFNKlu-jVa3h0Rw,3157
 siat/assets_liquidity.py,sha256=OnE_DyTznIs_m76MtszIvPXFVIjvB4_X2D3Y2-hlVO8,33892
 siat/beta_adjustment.py,sha256=u_EZt3rEbvXDpqcJp_hUh9637P5vsrRHEfX6uG9Uin8,37292
 siat/beta_adjustment_china.py,sha256=z17bstK2WtlKKqUl6aCcP3Pv661PWgyWqAqGHGUH7Yk,20807
@@ -9,8 +9,8 @@ siat/bond_base.py,sha256=ClHJ5dzjoO9knGhX65Sbyk0i0uKQpmdKGUblR-wrXTs,37681
 siat/bond_china.py,sha256=WzUhjYYk8tsr3BDWLQcpuj9DqNxTzBSIi_wuAOZ48kY,3082
 siat/bond_zh_sina.py,sha256=26BohGcS120utwqg9dJvdGm5OkuNpNu5bco80uOuQpU,4423
 siat/capm_beta.py,sha256=t8-xr90II0JzbjsTOZNpRze_mKTvBRXjwN2o0N0tgD8,30521
-siat/capm_beta2.py,sha256=4g8pOFCwFrEpLx2NJbhL2nl_nrWaOwgbPCHx1G6P_tI,35949
-siat/common.py,sha256=PctlUcwb7MheTR-Ync-4hYWjPidsT9LufEsZXNJqbjw,193728
+siat/capm_beta2.py,sha256=S2x6PrWp_1FyzVmG2MVzCf7LlpfHHEJxroJH2b26DvQ,35989
+siat/common.py,sha256=GLNRbXP7uDA_pibWXJQ-St0o9ylhvRut0k9KpCQ70bI,193909
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/copyrights.py,sha256=YMLjZb328YpFMR-s_GUu0HBgeGce3pV7DgRut8S3I7w,690
 siat/cryptocurrency.py,sha256=QSc4jK9VFlqBWVu-0th1BIMt8wC-5R5sWky3EaNupy0,27940
@@ -32,12 +32,12 @@ siat/fund_china.pickle,sha256=x_nPPdwy7wzIhtZQOplgDyTSyyUdXy9lbNxWysq7N6k,243777
 siat/fund_china.py,sha256=U7bN8mOJ_4RBkxRzrR26LSj4YJyMNpRjBtrZNUH8JI4,138286
 siat/future_china.py,sha256=LORFv7AaaQHq9QBk9ZSVVOjmxY_YWyPVRdpDxfCJvdo,17828
 siat/google_authenticator.py,sha256=ZUbZR8OW0IAKDbcYtlqGqIpZdERpFor9NccFELxg9yI,1637
-siat/grafix.py,sha256=TvmbEAsdWKOJA5JK8xcwQz0vnoqq67AtGbRWbw-Vosk,145100
+siat/grafix.py,sha256=ftU220aS5e_kWHH-VxkDGzgXBwEXrndlQBefT5TJ_iM,147167
 siat/holding_risk.py,sha256=SCHVxRBEhseUrgMpsnvR9Pt6ns-V-voRl3hCuK1p5y4,31114
 siat/luchy_draw.py,sha256=8Ue-NKnvSVqINPY1eXat0NJat5MR-gex_K62aOYFdmA,20486
 siat/market_china.py,sha256=Ki9Kpq-fwA9F_uI_-0b2KS0ir1gkOwQfB5Yd_hCWSeg,51758
 siat/markowitz.py,sha256=PtQ_6rLyh5SEXyO7SCDyYChcgXl6ddcdgQ06HETjDVE,97990
-siat/markowitz2.py,sha256=elpZr1nsALlrdxbMPT7pBREpA6I5P7TL6qpuLmMKPA8,133215
+siat/markowitz2.py,sha256=XOQwwNRehVyjNO9ff9CIMq9mC2lDz1QZTWroVNBOGzQ,133241
 siat/markowitz2_20250704.py,sha256=x10MfBaWZ42xcmDAbPU02oOZ4J02QDB1nyVKX8QobiA,126468
 siat/markowitz2_20250705.py,sha256=jwDhQUvr5fcjA7scYbI8bJo-5zFPE4LyUsnK-hlqz90,133997
 siat/markowitz_simple.py,sha256=aJVvx669ngcCsqoQtA9kvFOQVjsuipYt2fyTc4yMItE,14286
@@ -47,15 +47,17 @@ siat/option_china.py,sha256=16I9_e7OG0ziHtBgwjp9ss2GEwPZGoCWYd_3KFJ9V5E,123631
 siat/option_pricing.py,sha256=gB5k-LQ3VOIdyllsW1xUtAT9Me2nTfl_kueysb1JmYE,74278
 siat/other_indexes.py,sha256=68MDpQOBuiCOC4w0HMqNDihudMOkK7qnvgLbtpeHyt0,14084
 siat/risk_adjusted_return.py,sha256=Q4ZRdTF57eNt4QCjeQ7uA8nG56Jls8f_QfJasZQEo0M,58748
-siat/risk_adjusted_return2.py,sha256=U1iKADTnWjywCkABPtr6tICYY8zmiLZyuENMLV0yMZk,87216
+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=0JWjE_kQ8ea_NymzfqgVtcb11vrpzOWPsKPhIL9YaxU,12258
+siat/save2pdf.py,sha256=o6FLEbGX1qjQtSmCuBGUTuzOCi_TH3f6yWGXc2L9knk,5075
 siat/sector_china.py,sha256=uLsDXdRBDVfgG6tnXWnQOTyDmyZfglVO9DRUYU2e3pk,157914
 siat/security_price2.py,sha256=DDiZ2dlv_TYPLhA8-gGb9i9xrl88r4rgSMEcxqQ6aU0,28065
-siat/security_prices.py,sha256=vbz85xjxMBFfipTcmF4ZnpOODnOKuEm4NfTKMi1C3OY,124171
+siat/security_prices.py,sha256=X3ip0q_m3OL3QRNRkr_lYQk-wsXLf6dWkFkyoZijhck,129368
 siat/security_trend.py,sha256=o0vpWdrJkmODCP94X-Bvn-w7efHhj9HpUYBHtLl55D0,17240
-siat/security_trend2.py,sha256=czagiFIU3A3ow_dMn_-xQYnzgSTOP5Ds38PtHC1uyP0,31762
-siat/stock.py,sha256=ufhC3CWfx6KEDgCSTSwplf1EAi8AIlKmy6kdkoBAkbE,161426
+siat/security_trend2.py,sha256=Z8AvyYFtZsJcmjkRbAyV7i3suRK3IYlQr6eTB_K_q-4,31786
+siat/stock.py,sha256=fJzj9zC0eCShsEbYG5H-fFBgmlbRVLwx09vn6uvrYso,161705
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=vHIc2UuXIGRkRvyL4fjTaNAoyFaq022p9FxPah6dscI,96399
@@ -71,8 +73,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.10.133.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.10.133.dist-info/METADATA,sha256=9y4HQxe8Jl1vjMqwkIDruTWGU6GMpHI49LDTHSeUW50,8538
-siat-3.10.133.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-siat-3.10.133.dist-info/top_level.txt,sha256=X5R8wrVviq8agwJFVRVDsufkuOJuit-1qAT_kXeptrY,17
-siat-3.10.133.dist-info/RECORD,,
+siat-3.11.1.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.11.1.dist-info/METADATA,sha256=hCgZFWX7IItZkrypnBYFGwCdBAZt6_DzmdlqWPge8UQ,8584
+siat-3.11.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+siat-3.11.1.dist-info/top_level.txt,sha256=X5R8wrVviq8agwJFVRVDsufkuOJuit-1qAT_kXeptrY,17
+siat-3.11.1.dist-info/RECORD,,