siat 3.10.125__py3-none-any.whl → 3.10.126__py3-none-any.whl

siat/common.py

@@ -4937,7 +4937,7 @@ async def jupyter2pdf2(notebook_dir, notebook_file):
         None
         
     注意1：如果指令异常，可能还要执行python -m playwright install
-    注意2：调用本函数的格式是异步await开头
+    注意2：调用本函数的格式是异步await开头，例如：
     await jupyter2pdf2(notebook_dir, notebook_file)
     """
     
@@ -4992,6 +4992,9 @@ async def jupyter2pdf2(notebook_dir, notebook_file):
             page = await browser.new_page()
             await page.goto(f"file://{os.path.abspath(html_file)}")
             
+            # 避免加载html文件超时，用于macOS
+            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')
             
@@ -5000,7 +5003,7 @@ async def jupyter2pdf2(notebook_dir, notebook_file):
         print(f"2 PDF created in the same directory, pick 1 you think best")
 
     except Exception as e:
-        print(f"Conversion failed because {e}")
+        print(f"PDF conversion failed because {e}")
         return
     
     finally:
@@ -5019,6 +5022,107 @@ if __name__ == '__main__':
     notebook_file = "Session 1 全球证券市场-简化版.ipynb"  
     #await jupyter2pdf2(notebook_dir, notebook_file)
     # 注意：上面的await命令会导致编译失败，测试后要注释掉
+    
+#==============================================================================
+async def jupyter2pdf3(notebook_file):
+    """
+    ===========================================================================
+    将 Jupyter Notebook 转换为 PDF 文件，异步方式。
+    主要参数:
+    notebook_file (str): Jupyter Notebook文件名，不含目录
+    
+    输出：
+        同时生成A4和A3两种幅面的pdf文件，由使用者自行挑选一个效果最好的。        
+    返回:
+        None
+        
+    注意1：如果指令异常，可能还要执行python -m playwright install
+    注意2：调用本函数的格式是异步await开头，例如：
+    await jupyter2pdf3(notebook_file)
+    
+    注意：目前无法正确获得ipynb文件的所在目录，使用使用！！！
+    """
+    # 获得路径
+    import os
+    notebook_dir=os.getcwd()
+    # 注意：上述指令无法获取当前Jupyter文件的目录
+    
+    # 路径分割符号
+    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'
+    
+    from nbconvert import HTMLExporter
+    
+    try:
+        from playwright.async_api import async_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("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__':
+    # 替换为你想转存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/stock.py

@@ -1546,8 +1546,11 @@ if __name__ =="__main__":
     tickers='AAPL'
     measures=['Close','Adj Close']   
     
+    tickers=['000001.SS','^DJI']
+    measures='Close'
+    
     fromdate='2024-5-1'
-    todate='2024-5-30'
+    todate='2025-6-23'
     adjust=''
     twinx=False
     loc1='best'
@@ -1556,6 +1559,10 @@ if __name__ =="__main__":
     source='auto'
     ticker_type='auto'
     facecolor='whitesmoke'
+    
+    attention_value=''; attention_value_area=''
+    attention_point=''; attention_point_area=''
+    
 
 def compare_security(tickers,measures,fromdate,todate, \
                      adjust='', \
@@ -1609,7 +1616,8 @@ def compare_security(tickers,measures,fromdate,todate, \
     measure_num = 0
     if isinstance(measures,str): 
         measure_num = 1
-        measure1 = measures
+        #measure1 = measures
+        measure1 = measure2 = measures
     #如果measures是一个列表
     if isinstance(measures,list): 
         measure_num = len(measures)

{siat-3.10.125.dist-info → siat-3.10.126.dist-info}/METADATA

@@ -1,226 +1,234 @@
-Metadata-Version: 2.1
-Name: siat
-Version: 3.10.125
-Summary: Securities Investment Analysis Tools (siat)
-Home-page: https://pypi.org/project/siat/
-Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
-Author-email: wdehong2000@163.com
-License: Copyright (C) WANG Dehong, 2025. For educational purpose only!
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: pandas-datareader
-Requires-Dist: yfinance
-Requires-Dist: tqdm
-Requires-Dist: plotly-express
-Requires-Dist: akshare
-Requires-Dist: urllib3
-Requires-Dist: mplfinance
-Requires-Dist: statsmodels
-Requires-Dist: yahoo-earnings-calendar
-Requires-Dist: pypinyin
-Requires-Dist: seaborn
-Requires-Dist: numpy
-Requires-Dist: scipy
-Requires-Dist: pandas
-Requires-Dist: scikit-learn
-Requires-Dist: baostock
-Requires-Dist: pyproject.toml
-Requires-Dist: pathlib
-Requires-Dist: ruamel-yaml
-Requires-Dist: prettytable
-Requires-Dist: graphviz
-Requires-Dist: luddite
-Requires-Dist: pendulum
-Requires-Dist: itables
-Requires-Dist: py-trans
-Requires-Dist: bottleneck
-Requires-Dist: translate
-Requires-Dist: translators
-Requires-Dist: nbconvert
-Requires-Dist: ipywidgets ==8.1.6
-Requires-Dist: yahooquery ==2.3.7
-Requires-Dist: alpha-vantage
-Requires-Dist: tiingo[pandas]
-Requires-Dist: playwright
-
-
-# What is siat?
-siat is a Python 3 plug-in for security investment analysis, primarily designed for teaching and learning purposes in universities for undergraduate and postgraduate programs.
-
-siat is recommended to run in Jupyter Notebook or Jupyter Lab, and most of its results are in the forms of figures and/or tables.
-# Version naming
-Version structure: X.Y.Z
-
-X is the major version for architecture upgrade only.
-Y is the functional version for functional enhancements.
-Z is the minor version just for bug fixing.
-
-# Quick examples of using siat
-
-
-```python
-# Enable siat
-from siat import *
-```
-
-
-```python
-# Set language to English, default is Chinese
-set_language("English")
-```
-
-## Example 1: Apple stock price for the recent month
-
-
-```python
-# Simple way: show Apple's stock price in recent month
-apple=security_trend("AAPL")
-```
-You may expect more information, such as price trend in a recent year (MRY), with the high/low point, current price and average price, like below:
-
-```python
-apple=security_trend("AAPL", start="MRY",
-                     mark_top=True, mark_bottom=True, mark_end=True,
-                     average_value=True)
-```
-
-## Example 2: Comparing Price changes among Apple, Microsoft and NVidia 
-You may expect compare the price changes for the recent quarter (MRQ) for the three stocks.
-
-Since there is a major stock split for NVidia in 2024 by 1:10, it is necessary to use adjusted prices (Adj Close) to compare these stock prices.
-
-```python
-comp=security_trend(['AAPL','MSFT','NVDA'], 
-                    start='MRQ', 
-                    indicator='Adj Close', 
-                    preprocess='scaling', #use scaling drawing method to avoid loss of details
-                    mark_top=True, mark_bottom=True, 
-                    annotate=True, annotate_value=True)
-```
-
-## Example 4: Bollinger band for Apple in the recent quarter
-
-
-```python
-# security_technical only supports 4 popular technical indicators: MACD, Bollinger, KDJ and RSI. 
-apple=security_technical("AAPL",
-                         technical="Bollinger",
-                         start="MRQ",
-                         facecolor="white",
-                         loc1="upper left", loc2="lower right")
-```
-
-## Example 5: CCI for Apple in recent quarter
-
-
-```python
-# security_technical2 supports up to 14 popular technical indicators.
-# security_technical2 uses a simplied drawing method (Dehong graph) to avoid trypophobia [藢tr瑟p蓹u'f蓹蕣bj蓹]
-apple=security_technical2("AAPL",
-                         technical="CCI",
-                         start="MRM",
-                         loc1="upper left", loc2="lower right")
-```
-
-# What security products does siat support?
-1. Public company profile:  world-wide
-2. Stock & stock market index: world-wide
-3. Stock valuation: primarily in China (mainland and HK) and the U.S.
-4. Stock option chain: primarily in the U.S.
-5. Bond: primarily in China and the U.S.
-6. Markowitz portfolio: with all the supported stocks and bonds
-7. Fund: primarily in China and the U.S.
-8. Futures: primarily in China and the U.S.
-9. Options: primarily in China and the U.S.
-10. Digital currency:  world-wide (some may be restricted by data sources)
-11. Balance sheet: in China (full function) and world-wide (basic function)
-12. Income statement: in China mainland (full function) and world-wide (basic function)
-13. Cash flow statement: in China mainland (full function) and world-wide (basic function)
-14. DuPont Identity: world-wide
-15. Sector trend and valuation: primarily in China
-# What analytical methods does siat support?
-1. Trend analysis
-2. Panel comparation
-3. Return analysis: rolling returns, holding period returns
-4. Risk analysis: rolling volatility, holding period volatility, LPSD
-5. Technical analysis: more than 15 indicators
-6. Risk-adjusted return: Sharpe ratio, Sortino ratio, Treynor ratio, Jensen alpha
-7. Portfolio optimization: four risk-adjusted returns
-8. CAPM beta trend
-9. Beta adjustments: simple adjustment, Scholes-Williams, Dimson
-10. Beta leverage: Hamada Model
-11. Fama-French three-factor model
-12. Fama-French-Carhart four-factor model
-13. Fama-French five-factor model
-14. Future pricing
-15. Option pricing: European style, American style, with/without dividends
-16. VaR & ES: variance-covariance, historic simulation, Monte Carlo, multiple periods
-17. Liquidity risk: Roll spread, Amihud, Pastor-Stambaugh
-18. ESG: basic functions
-# Do I have to download data first before using siat?
-NO!
-siat will search the internet data sources for all the required data during analysis.
-The main data sources siat uses:
-1. Yahoo Finance
-2. Sina Finance
-3. East Money
-4. Stooq (Polish)
-5. FRED
-6. OECD
-7. IMF
-8. Shanghai Stock Exchange
-9. Shenzhen Stock Exchange
-10. Hong Kong Stock Exchange
-11. Beijing Stock Exchange
-12. Tokyo Stock Exchange
-13. London Stock Exchange
-14. New York Stock Exchange
-15. NASDAQ
-16. Sustainalytics
-
-Thanks the above websites for their valuable data!
-# How to install siat?
-The author strongly recommends using siat together with Jupyter Notebook or Jupyter Lab in Anaconda.
-In order to install siat for the very first time, open a Jupyter Notebook, and type in the following command:
-
-!pip install siat
-
-If the above method does not work, something might be wrong in your Python path settings. Try to open an Anaconda Prompt in Windows or a Terminal App in Mac or Linux, and type in the following command:
-
-pip install siat
-# How to upgrade siat?
-In Jupyter Notebook or Jupyter Lab:
-
-upgrade_siat()
-
-If you suffer from slow internet connection (often in campus classrooms with many students), try to use alternative sources, such as:
-
-upgrade_siat(alternative="tsinghua")
-
-upgrade_siat(alternative="alibaba")
-
-If the above methods do not work for your environment, you have to goto the traditional ways to use command-line script, such as:
-
-pip install --upgrade siat
-
-*** For users in China
-The pypi mirror websites may provide siat installing and upgrading in a much faster speed in the following commands: taking aliyun as an example
-
-pip install siat -i https://mirrors.aliyun.com/pypi/simple/
-
-pip install --upgrade siat https://mirrors.aliyun.com/pypi/simple/
-
-*** Warning
-1. The pip command itself may need upgrade as well.
-2. The pip command sometimes may have conflicts with some vpn programs.
-If in this case, try quit vpn program first, and try again. 
-# Are there more detailed case studies on using siat?
-YES!
-
-There are hundreds of video case studies in the author's channel (most in Chinese, some in English).
-
-https://space.bilibili.com/284812153
-
-Welcome to follow the channel!
-# How to report a bug or look for help?
-Write to the author, Prof. WANG Dehong, wdehong2000@163.com
+Metadata-Version: 2.4
+Name: siat
+Version: 3.10.126
+Summary: Securities Investment Analysis Tools (siat)
+Home-page: https://pypi.org/project/siat/
+Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University
+Author-email: wdehong2000@163.com
+License: Copyright (C) WANG Dehong, 2025. For educational purpose only!
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: pandas_datareader
+Requires-Dist: yfinance
+Requires-Dist: tqdm
+Requires-Dist: plotly_express
+Requires-Dist: akshare
+Requires-Dist: urllib3
+Requires-Dist: mplfinance
+Requires-Dist: statsmodels
+Requires-Dist: yahoo_earnings_calendar
+Requires-Dist: pypinyin
+Requires-Dist: seaborn
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: pandas
+Requires-Dist: scikit-learn
+Requires-Dist: baostock
+Requires-Dist: pyproject.toml
+Requires-Dist: pathlib
+Requires-Dist: ruamel-yaml
+Requires-Dist: prettytable
+Requires-Dist: graphviz
+Requires-Dist: luddite
+Requires-Dist: pendulum
+Requires-Dist: itables
+Requires-Dist: py_trans
+Requires-Dist: bottleneck
+Requires-Dist: translate
+Requires-Dist: translators
+Requires-Dist: nbconvert
+Requires-Dist: ipywidgets==8.1.6
+Requires-Dist: yahooquery==2.3.7
+Requires-Dist: alpha_vantage
+Requires-Dist: tiingo[pandas]
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
+
+
+# What is siat?
+siat is a Python 3 plug-in for security investment analysis, primarily designed for teaching and learning purposes in universities for undergraduate and postgraduate programs.
+
+siat is recommended to run in Jupyter Notebook or Jupyter Lab, and most of its results are in the forms of figures and/or tables.
+# Version naming
+Version structure: X.Y.Z
+
+X is the major version for architecture upgrade only.
+Y is the functional version for functional enhancements.
+Z is the minor version just for bug fixing.
+
+# Quick examples of using siat
+
+
+```python
+# Enable siat
+from siat import *
+```
+
+
+```python
+# Set language to English, default is Chinese
+set_language("English")
+```
+
+## Example 1: Apple stock price for the recent month
+
+
+```python
+# Simple way: show Apple's stock price in recent month
+apple=security_trend("AAPL")
+```
+You may expect more information, such as price trend in a recent year (MRY), with the high/low point, current price and average price, like below:
+
+```python
+apple=security_trend("AAPL", start="MRY",
+                     mark_top=True, mark_bottom=True, mark_end=True,
+                     average_value=True)
+```
+
+## Example 2: Comparing Price changes among Apple, Microsoft and NVidia 
+You may expect compare the price changes for the recent quarter (MRQ) for the three stocks.
+
+Since there is a major stock split for NVidia in 2024 by 1:10, it is necessary to use adjusted prices (Adj Close) to compare these stock prices.
+
+```python
+comp=security_trend(['AAPL','MSFT','NVDA'], 
+                    start='MRQ', 
+                    indicator='Adj Close', 
+                    preprocess='scaling', #use scaling drawing method to avoid loss of details
+                    mark_top=True, mark_bottom=True, 
+                    annotate=True, annotate_value=True)
+```
+
+## Example 4: Bollinger band for Apple in the recent quarter
+
+
+```python
+# security_technical only supports 4 popular technical indicators: MACD, Bollinger, KDJ and RSI. 
+apple=security_technical("AAPL",
+                         technical="Bollinger",
+                         start="MRQ",
+                         facecolor="white",
+                         loc1="upper left", loc2="lower right")
+```
+
+## Example 5: CCI for Apple in recent quarter
+
+
+```python
+# security_technical2 supports up to 14 popular technical indicators.
+# security_technical2 uses a simplied drawing method (Dehong graph) to avoid trypophobia [ˌtrɪpəu'fəʊbjə]
+apple=security_technical2("AAPL",
+                         technical="CCI",
+                         start="MRM",
+                         loc1="upper left", loc2="lower right")
+```
+
+# What security products does siat support?
+1. Public company profile:  world-wide
+2. Stock & stock market index: world-wide
+3. Stock valuation: primarily in China (mainland and HK) and the U.S.
+4. Stock option chain: primarily in the U.S.
+5. Bond: primarily in China and the U.S.
+6. Markowitz portfolio: with all the supported stocks and bonds
+7. Fund: primarily in China and the U.S.
+8. Futures: primarily in China and the U.S.
+9. Options: primarily in China and the U.S.
+10. Digital currency:  world-wide (some may be restricted by data sources)
+11. Balance sheet: in China (full function) and world-wide (basic function)
+12. Income statement: in China mainland (full function) and world-wide (basic function)
+13. Cash flow statement: in China mainland (full function) and world-wide (basic function)
+14. DuPont Identity: world-wide
+15. Sector trend and valuation: primarily in China
+# What analytical methods does siat support?
+1. Trend analysis
+2. Panel comparation
+3. Return analysis: rolling returns, holding period returns
+4. Risk analysis: rolling volatility, holding period volatility, LPSD
+5. Technical analysis: more than 15 indicators
+6. Risk-adjusted return: Sharpe ratio, Sortino ratio, Treynor ratio, Jensen alpha
+7. Portfolio optimization: four risk-adjusted returns
+8. CAPM beta trend
+9. Beta adjustments: simple adjustment, Scholes-Williams, Dimson
+10. Beta leverage: Hamada Model
+11. Fama-French three-factor model
+12. Fama-French-Carhart four-factor model
+13. Fama-French five-factor model
+14. Future pricing
+15. Option pricing: European style, American style, with/without dividends
+16. VaR & ES: variance-covariance, historic simulation, Monte Carlo, multiple periods
+17. Liquidity risk: Roll spread, Amihud, Pastor-Stambaugh
+18. ESG: basic functions
+# Do I have to download data first before using siat?
+NO!
+siat will search the internet data sources for all the required data during analysis.
+The main data sources siat uses:
+1. Yahoo Finance
+2. Sina Finance
+3. East Money
+4. Stooq (Polish)
+5. FRED
+6. OECD
+7. IMF
+8. Shanghai Stock Exchange
+9. Shenzhen Stock Exchange
+10. Hong Kong Stock Exchange
+11. Beijing Stock Exchange
+12. Tokyo Stock Exchange
+13. London Stock Exchange
+14. New York Stock Exchange
+15. NASDAQ
+16. Sustainalytics
+
+Thanks the above websites for their valuable data!
+# How to install siat?
+The author strongly recommends using siat together with Jupyter Notebook or Jupyter Lab in Anaconda.
+In order to install siat for the very first time, open a Jupyter Notebook, and type in the following command:
+
+!pip install siat
+
+If the above method does not work, something might be wrong in your Python path settings. Try to open an Anaconda Prompt in Windows or a Terminal App in Mac or Linux, and type in the following command:
+
+pip install siat
+# How to upgrade siat?
+In Jupyter Notebook or Jupyter Lab:
+
+upgrade_siat()
+
+If you suffer from slow internet connection (often in campus classrooms with many students), try to use alternative sources, such as:
+
+upgrade_siat(alternative="tsinghua")
+
+upgrade_siat(alternative="alibaba")
+
+If the above methods do not work for your environment, you have to goto the traditional ways to use command-line script, such as:
+
+pip install --upgrade siat
+
+*** For users in China
+The pypi mirror websites may provide siat installing and upgrading in a much faster speed in the following commands: taking aliyun as an example
+
+pip install siat -i https://mirrors.aliyun.com/pypi/simple/
+
+pip install --upgrade siat https://mirrors.aliyun.com/pypi/simple/
+
+*** Warning
+1. The pip command itself may need upgrade as well.
+2. The pip command sometimes may have conflicts with some vpn programs.
+If in this case, try quit vpn program first, and try again. 
+# Are there more detailed case studies on using siat?
+YES!
+
+There are hundreds of video case studies in the author's channel (most in Chinese, some in English).
+
+https://space.bilibili.com/284812153
+
+Welcome to follow the channel!
+# How to report a bug or look for help?
+Write to the author, Prof. WANG Dehong, wdehong2000@163.com