siat 3.10.130__py3-none-any.whl → 3.10.132__py3-none-any.whl

siat/common.py

@@ -4923,6 +4923,11 @@ if __name__ == '__main__':
     # 注意：上面的await命令会导致编译失败，测试后要注释掉
 
 #==============================================================================
+if __name__ == '__main__':
+    # 定义 Notebook 路径和输出 PDF 路径
+    notebook_dir = r"E:\北外工作-25春\SICA-BFSU\Session 2"  # 替换为你的 Notebook 文件路径
+    notebook_file= r"Session 2-Market index v3en"  # 替换为你想保存的 PDF 文件路径
+    
 async def jupyter2pdf2(notebook_dir, notebook_file):
     """
     ===========================================================================
@@ -4947,6 +4952,8 @@ async def jupyter2pdf2(notebook_dir, notebook_file):
     else:
         sep='\\'
     
+    #import os; sep=os.sep
+    
     # ipynb文件的完整路径
     if ('.ipynb' in notebook_file):
         notebook_file1=notebook_file.replace('.ipynb','')
@@ -4955,14 +4962,19 @@ 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
     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")
@@ -4993,17 +5005,35 @@ async def jupyter2pdf2(notebook_dir, notebook_file):
             await page.goto(f"file://{os.path.abspath(html_file)}")
             
             # 避免加载html文件超时，用于macOS
-            page.wait_for_selector(".jp-Notebook", state="visible", timeout=60000)  # 等待笔记本主体出现
+            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()
-
-        print(f"2 PDF created in the same directory, pick 1 you think best")
+        """
+        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 the same directory, pick 1 you think best")
 
     except Exception as e:
-        print(f"PDF conversion failed because {e}")
+        if str(e)=='':
+            e="because of issues in your playwright or Python environment"
+        print(f"PDF conversion failed {e}")
         return
     
     finally:
@@ -5022,15 +5052,18 @@ if __name__ == '__main__':
     notebook_file = "Session 1 全球证券市场-简化版.ipynb"  
     #await jupyter2pdf2(notebook_dir, notebook_file)
     # 注意：上面的await命令会导致编译失败，测试后要注释掉
-    
+
 #==============================================================================
-async def jupyter2pdf3(notebook_file):
+
+
+async def jupyter2pdf3(notebook_path):
     """
     ===========================================================================
     将 Jupyter Notebook 转换为 PDF 文件，异步方式。
     主要参数:
-    notebook_file (str): Jupyter Notebook文件名，不含目录
-    
+    notebook_path: Jupyter Notebook文件的完整路径，包括所在的目录和文件名
+        获取方法：在Jupyter Notebook中执行下列命令(仅在交互环境中工作)
+            notebook_path=globals().get("__session__")
     输出：
         同时生成A4和A3两种幅面的pdf文件，由使用者自行挑选一个效果最好的。        
     返回:
@@ -5038,14 +5071,22 @@ async def jupyter2pdf3(notebook_file):
         
     注意1：如果指令异常，可能还要执行python -m playwright install
     注意2：调用本函数的格式是异步await开头，例如：
-    await jupyter2pdf3(notebook_file)
-    
-    注意：目前无法正确获得ipynb文件的所在目录，使用使用！！！
+    await jupyter2pdf3(notebook_path)
     """
-    # 获得路径
-    import os
-    notebook_dir=os.getcwd()
-    # 注意：上述指令无法获取当前Jupyter文件的目录
+    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):
@@ -5053,6 +5094,8 @@ async def jupyter2pdf3(notebook_file):
     else:
         sep='\\'
     
+    #import os; sep=os.sep
+    
     # ipynb文件的完整路径
     if ('.ipynb' in notebook_file):
         notebook_file1=notebook_file.replace('.ipynb','')
@@ -5061,13 +5104,19 @@ async def jupyter2pdf3(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'
     
     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")
@@ -5080,7 +5129,7 @@ async def jupyter2pdf3(notebook_file):
         html_exporter = HTMLExporter()
         try:
             html_content, _ = html_exporter.from_filename(notebook_path)
-            print("Converting notebook file to pdf in both A4 and A3 sizes ...")
+            print(f"Converting {notebook_file} to pdf ...")
 
         except:
             print("File not found for {}".format(notebook_path))
@@ -5097,15 +5146,36 @@ async def jupyter2pdf3(notebook_file):
             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()
-
-        print(f"2 PDF created in the same directory, pick 1 you think best")
+        """
+        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:
-        print(f"Conversion failed because {e}")
+        if str(e)=='':
+            e="because of issues in your playwright or Python environment"
+        print(f"PDF conversion failed {e}")
         return
     
     finally:
@@ -5117,12 +5187,6 @@ async def jupyter2pdf3(notebook_file):
     
     return
     
-if __name__ == '__main__':
-    # 替换为你想转存PDF的Notebook文件名
-    file = "Session 1 全球证券市场-简化版.ipynb"  
-    #await jupyter2pdf3(file)
-    # 注意：上面的await命令会导致编译失败，测试后要注释掉
-    
 #==============================================================================
 if __name__ == '__main__':
     df=security_trend("600519.SS",indicator=['Close','Open','High','Low'],graph=False)

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

@@ -442,6 +442,12 @@ def market_detail_exchange_china(exchange='SSE',category='price'):
     except:
         print("  #Error(market_detail_exchange_china): info unavailable for",exchange,"\b, try again later")
         return None
+    
+    # 检查东方财富抓取限制
+    if len(df0) <= 100:
+        print("  #Warning(market_detail_exchange_china): web scraping restricted to 100 records by data source")
+        print("  Solution: upgrade akshare (pip install akshare --upgrade), restart Python kernel, run again")
+        return None
         
     #DEBUG
     #print("  Check1:",len(df0))
@@ -1003,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")