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

siat/common.py

@@ -4962,10 +4962,9 @@ async def jupyter2pdf2(notebook_dir, 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'
+    output_pdf_path1=notebook_dir+sep+notebook_file1+' A4.pdf'
+    output_pdf_path2=notebook_dir+sep+notebook_file1+' A3.pdf'
     
-    import os,sys
     from nbconvert import HTMLExporter
     
     """
@@ -5053,6 +5052,140 @@ if __name__ == '__main__':
     notebook_file = "Session 1 全球证券市场-简化版.ipynb"  
     #await jupyter2pdf2(notebook_dir, notebook_file)
     # 注意：上面的await命令会导致编译失败，测试后要注释掉
+
+#==============================================================================
+
+
+async def jupyter2pdf3(notebook_path):
+    """
+    ===========================================================================
+    将 Jupyter Notebook 转换为 PDF 文件，异步方式。
+    主要参数:
+    notebook_path: Jupyter Notebook文件的完整路径，包括所在的目录和文件名
+        获取方法：在Jupyter Notebook中执行下列命令(仅在交互环境中工作)
+            notebook_path=globals().get("__session__")
+    输出：
+        同时生成A4和A3两种幅面的pdf文件，由使用者自行挑选一个效果最好的。        
+    返回:
+        None
+        
+    注意1：如果指令异常，可能还要执行python -m playwright install
+    注意2：调用本函数的格式是异步await开头，例如：
+    await jupyter2pdf3(notebook_path)
+    """
+    DEBUG=False
+    
+    import os,sys
+    # 分离目录和文件名
+    notebook_dir, notebook_file = os.path.split(notebook_path)
+    
+    if DEBUG:
+        print("目录路径：", notebook_dir)    # 输出：/Users/peterwang/Documents/project
+        print("文件名：", notebook_file)     # 输出：data.csv
+        
+        # 如果还想拆出文件名和扩展名
+        name_only, ext = os.path.splitext(notebook_file)
+        print("文件名（不含扩展名）：", name_only)  # 输出：data
+        print("扩展名：", ext)                       # 输出：.csv
+    
+    # 路径分割符号
+    if ('/' in notebook_dir) and not ('\\' in notebook_dir):
+        sep='/'
+    else:
+        sep='\\'
+    
+    #import os; sep=os.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'
+    
+    from nbconvert import HTMLExporter
+    
+    """
+    import nest_asyncio
+    nest_asyncio.apply()  # 修复 Notebook 的事件循环问题
+    """
+    
+    try:
+        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("  [Solution] execute the command before re-run: playwright install")
+        return
+    
+    html_file = ""
+    
+    try:
+        # 导出 Notebook 为 HTML
+        html_exporter = HTMLExporter()
+        try:
+            html_content, _ = html_exporter.from_filename(notebook_path)
+            print(f"Converting {notebook_file} to pdf ...")
+
+        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)}")
+            
+            # 避免加载html文件超时，用于macOS
+            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_path2, format='A3')
+            
+            await browser.close()
+        """
+        with sync_playwright() as p:
+            browser = p.chromium.launch()
+            page = browser.new_page()
+            page.goto(f"file://{os.path.abspath(html_file)}")
+            
+            # 避免加载html文件超时，用于macOS
+            if not sys.platform.startswith('win'):
+                page.wait_for_selector(".jp-Notebook", state="visible", timeout=60000)  # 等待笔记本主体出现
+            
+            page.pdf(path=output_pdf_path1, format='A4')
+            page.pdf(path=output_pdf_path2, format='A3')
+            
+            browser.close()
+        """
+        
+        print(f"2 PDFs created in {notebook_dir}")
+
+    except Exception as e:
+        if str(e)=='':
+            e="because of issues in your playwright or Python environment"
+        print(f"PDF conversion failed {e}")
+        return
+    
+    finally:
+        if html_file == "":
+            return
+        # 删除临时 HTML 文件
+        elif os.path.exists(html_file):
+            os.remove(html_file)    
+    
+    return
     
 #==============================================================================
 if __name__ == '__main__':

siat/grafix.py

@@ -365,7 +365,7 @@ def plot_line(df0,colname,collabel,ylabeltxt,titletxt,footnote,datatag=False, \
         #av=str(round(av,2)) if av < 100 else str(int(av))
         #av=str(int(av)) if abs(av) >= 100 else str(round(av,2)) if abs(av) >= 10 else str(round(av,3))
         avstr=str(int(av)) if abs(av) >= 100 else str(round(av,2)) if abs(av) >= 10 else str(round(av,3))
-        plt.axhline(y=av,ls="dashed",c="blueviolet",linewidth=2,label=text_lang("本期间均值","Periodic mean")+avstr)
+        plt.axhline(y=av,ls="dashed",c="blueviolet",linewidth=2,label=text_lang("本期间均值","Periodic mean ")+avstr)
         #footnote=footnote + "，均值"+av
         #footnote=text_lang("注：期间均值","Note: Periodic mean ")+av+"; "+footnote
     

siat/market_china.py

@@ -1009,7 +1009,7 @@ def market_detail_china2(category='price',
         ft4=heading+text_lang("☆涨速：平均每分钟股价变化率，表示股价变化速度\n","*Changing speed(涨速): rate of changes per minute\n")
         ft5=heading+text_lang("☆5分钟涨跌：最新5分钟内股价的涨跌幅度\n","*5 min up-down(5分钟涨跌): changes recent 5 minutes\n")
         ft6=heading+text_lang("☆振幅：最高最低价差绝对值/昨收，表示股价变化活跃程度\n","*Amplitude(振幅): (High - Low)/Prev Close\n")
-        ft7=heading+text_lang("☆涨跌幅：(最新价-昨收)/昨收，表示相对昨日的变化程度\n","*Change%(涨跌幅): (Current Price/Prev Close - 1\n")
+        ft7=heading+text_lang("☆涨跌幅：(最新价-昨收)/昨收，表示相对昨日的变化程度\n","*Change%(涨跌幅): (Current Price/Prev Close) - 1\n")
         ft8=heading+text_lang("☆涨跌额：最新价-昨收，表示相对昨日的变化金额\n","*Change(涨跌额): Current Price - Prev Close\n")
         
         ft9=heading+text_lang("☆使用实时数据，不同日期/每天不同时刻统计的结果可能不同\n","*Based on real-time data, vary with time\n")