@youhaozhao/cninfo-mcp 1.0.2 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youhaozhao/cninfo-mcp",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "MCP Server for querying and downloading Chinese listed companies' annual reports from CNINFO (巨潮资讯网)",
   "keywords": [
     "mcp",
@@ -20,7 +20,7 @@
     "url": "https://github.com/youhaozhao/cninfo_mcp/issues"
   },
   "bin": {
-    "cninfo-mcp": "./bin/cninfo-mcp.js"
+    "cninfo-mcp": "bin/cninfo-mcp.js"
   },
   "scripts": {
     "postinstall": "node scripts/install-python-deps.js",

package/python/mcp_server.py

@@ -12,20 +12,23 @@ from typing import Optional
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 
 from mcp.server import FastMCP
-from spider import query_annual_reports, download_annual_reports, saving_path
+from spider import (
+    query_annual_reports,
+    download_annual_reports,
+    query_prospectus,
+    download_prospectus,
+    saving_path,
+)
 
 # Create MCP server
 mcp = FastMCP(
     name="cninfo-server",
-    instructions="CNINFO annual reports server - Query and download Chinese listed companies' annual reports from cninfo.com.cn"
+    instructions="CNINFO annual reports server - Query and download Chinese listed companies' annual reports from cninfo.com.cn",
 )
 
 
 @mcp.tool()
-def query_annual_reports_tool(
-    stock_code: str,
-    year: Optional[int] = None
-) -> dict:
+def query_annual_reports_tool(stock_code: str, year: Optional[int] = None) -> dict:
     """
     Query annual reports for a Chinese listed company
 
@@ -46,57 +49,59 @@ def query_annual_reports_tool(
 
         if not reports:
             return {
-                'success': False,
-                'stock_code': stock_code,
-                'year': year,
-                'count': 0,
-                'reports': [],
-                'message': f'No annual reports found for stock {stock_code}' + (f' in year {year}' if year else '')
+                "success": False,
+                "stock_code": stock_code,
+                "year": year,
+                "count": 0,
+                "reports": [],
+                "message": f"No annual reports found for stock {stock_code}"
+                + (f" in year {year}" if year else ""),
             }
 
         # Extract relevant information
         report_details = []
         for report in reports:
-            report_details.append({
-                'announcementTitle': report.get('announcementTitle', ''),
-                'announcementTime': report.get('announcementTime', ''),
-                'secCode': report.get('secCode', ''),
-                'secName': report.get('secName', ''),
-                'adjunctUrl': report.get('adjunctUrl', '')
-            })
+            report_details.append(
+                {
+                    "announcementTitle": report.get("announcementTitle", ""),
+                    "announcementTime": report.get("announcementTime", ""),
+                    "secCode": report.get("secCode", ""),
+                    "secName": report.get("secName", ""),
+                    "adjunctUrl": report.get("adjunctUrl", ""),
+                }
+            )
 
         return {
-            'success': True,
-            'stock_code': stock_code,
-            'year': year,
-            'count': len(reports),
-            'reports': report_details,
-            'message': f'Found {len(reports)} annual report(s)' + (f' for year {year}' if year else '')
+            "success": True,
+            "stock_code": stock_code,
+            "year": year,
+            "count": len(reports),
+            "reports": report_details,
+            "message": f"Found {len(reports)} annual report(s)"
+            + (f" for year {year}" if year else ""),
         }
 
     except Exception as e:
         return {
-            'success': False,
-            'stock_code': stock_code,
-            'year': year,
-            'count': 0,
-            'reports': [],
-            'error': str(e),
-            'message': f'Error querying annual reports: {str(e)}'
+            "success": False,
+            "stock_code": stock_code,
+            "year": year,
+            "count": 0,
+            "reports": [],
+            "error": str(e),
+            "message": f"Error querying annual reports: {str(e)}",
         }
 
 
 @mcp.tool()
-def download_annual_reports_tool(
-    stock_code: str,
-    year: Optional[int] = None
-) -> dict:
+def download_annual_reports_tool(stock_code: str, year: Optional[int] = None, save_path: Optional[str] = None) -> dict:
     """
     Download annual reports for a Chinese listed company
 
     Args:
         stock_code: Stock code (e.g., '000888' for 峨眉山, '688777' for 中科德芯)
         year: Optional year to filter (e.g., 2024). If not provided, downloads all available years
+        save_path: Optional directory to save files (e.g., '/Users/me/reports'). Defaults to pdf/ in package directory
 
     Returns:
         Dictionary containing:
@@ -108,26 +113,118 @@ def download_annual_reports_tool(
         - message: Status message
     """
     try:
-        # Ensure download directory exists
-        os.makedirs(saving_path, exist_ok=True)
+        output_dir = save_path or saving_path
+        os.makedirs(output_dir, exist_ok=True)
+
+        result = download_annual_reports(stock_code, year, save_path=output_dir)
+        result["stock_code"] = stock_code
+        result["year"] = year
+
+        return result
+
+    except Exception as e:
+        return {
+            "success": False,
+            "stock_code": stock_code,
+            "year": year,
+            "downloaded": 0,
+            "path": save_path or saving_path,
+            "error": str(e),
+            "message": f"Error downloading annual reports: {str(e)}",
+        }
+
+
+@mcp.tool()
+def query_prospectus_tool(stock_code: str) -> dict:
+    """
+    Query prospectus documents for a Chinese listed company
+
+    Args:
+        stock_code: Stock code (e.g., '000888' for 峨眉山, '688777' for 中科德芯)
+
+    Returns:
+        Dictionary containing:
+        - success: Boolean indicating if the query was successful
+        - stock_code: The queried stock code
+        - count: Number of documents found
+        - reports: List of document details (announcementTitle, announcementTime, secCode, secName)
+    """
+    try:
+        reports = query_prospectus(stock_code)
+
+        if not reports:
+            return {
+                "success": False,
+                "stock_code": stock_code,
+                "count": 0,
+                "reports": [],
+                "message": f"No prospectus found for stock {stock_code}",
+            }
 
-        result = download_annual_reports(stock_code, year)
+        report_details = [
+            {
+                "announcementTitle": r.get("announcementTitle", ""),
+                "announcementTime": r.get("announcementTime", ""),
+                "secCode": r.get("secCode", ""),
+                "secName": r.get("secName", ""),
+                "adjunctUrl": r.get("adjunctUrl", ""),
+            }
+            for r in reports
+        ]
+
+        return {
+            "success": True,
+            "stock_code": stock_code,
+            "count": len(reports),
+            "reports": report_details,
+            "message": f"Found {len(reports)} prospectus document(s)",
+        }
+
+    except Exception as e:
+        return {
+            "success": False,
+            "stock_code": stock_code,
+            "count": 0,
+            "reports": [],
+            "error": str(e),
+            "message": f"Error querying prospectus: {str(e)}",
+        }
+
+
+@mcp.tool()
+def download_prospectus_tool(stock_code: str, save_path: Optional[str] = None) -> dict:
+    """
+    Download prospectus documents for a Chinese listed company
+
+    Args:
+        stock_code: Stock code (e.g., '000888' for 峨眉山, '688777' for 中科德芯)
+        save_path: Optional directory to save files (e.g., '/Users/me/reports'). Defaults to pdf/ in package directory
+
+    Returns:
+        Dictionary containing:
+        - success: Boolean indicating if download was successful
+        - stock_code: The stock code
+        - downloaded: Number of files downloaded
+        - path: Directory where files were saved
+        - message: Status message
+    """
+    try:
+        output_dir = save_path or saving_path
+        os.makedirs(output_dir, exist_ok=True)
 
-        # Add path information
-        result['stock_code'] = stock_code
-        result['year'] = year
+        result = download_prospectus(stock_code, save_path=output_dir)
+        result["stock_code"] = stock_code
 
         return result
 
     except Exception as e:
         return {
-            'success': False,
-            'stock_code': stock_code,
-            'year': year,
-            'downloaded': 0,
-            'path': saving_path,
-            'error': str(e),
-            'message': f'Error downloading annual reports: {str(e)}'
+            "success": False,
+            "stock_code": stock_code,
+            "downloaded": 0,
+            "path": save_path or saving_path,
+            "error": str(e),
+            "message": f"Error downloading prospectus: {str(e)}",
         }
 
 
@@ -151,9 +248,9 @@ def get_annual_reports_list(stock_code: str) -> str:
         output = [f"Annual Reports for {stock_code}:", "=" * 60]
 
         for report in reports:
-            title = report.get('announcementTitle', 'N/A')
-            time = report.get('announcementTime', 'N/A')
-            name = report.get('secName', 'N/A')
+            title = report.get("announcementTitle", "N/A")
+            time = report.get("announcementTime", "N/A")
+            name = report.get("secName", "N/A")
             output.append(f"\n📄 {title}")
             output.append(f"   Company: {name}")
             output.append(f"   Date: {time}")

package/python/spider.py

@@ -1,17 +1,18 @@
 """
-    downloads:
-    公开招股书（招股说明书/招股意向书）
-    《年度报告》 16 17 18
+downloads:
+公开招股书（招股说明书/招股意向书）
 """
+
 import os
 import random
 import time
+
 import requests
 
-download_path = 'https://static.cninfo.com.cn/'
+download_path = "https://static.cninfo.com.cn/"
 # 使用脚本所在目录的相对路径
-_saving_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'pdf')
-saving_path = _saving_path + '/'
+_saving_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "pdf")
+saving_path = _saving_path + "/"
 
 User_Agent = [
     "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Win64; x64; Trident/5.0; .NET CLR 3.5.30729; .NET CLR 3.0.30729; .NET CLR 2.0.50727; Media Center PC 6.0)",
@@ -20,163 +21,170 @@ User_Agent = [
     "Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN) AppleWebKit/523.15 (KHTML, like Gecko, Safari/419.3) Arora/0.3 (Change: 287 c9dfb30)",
     "Mozilla/5.0 (X11; U; Linux; en-US) AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.6",
     "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.2pre) Gecko/20070215 K-Ninja/2.1.1",
-    "Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9) Gecko/20080705 Firefox/3.0 Kapiko/3.0"
+    "Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9) Gecko/20080705 Firefox/3.0 Kapiko/3.0",
 ]
 
 
-headers = {'Accept': 'application/json, text/javascript, */*; q=0.01',
-           "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
-           "Accept-Encoding": "gzip, deflate",
-           "Accept-Language": "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,zh-HK;q=0.6,zh-TW;q=0.5",
-           'Host': 'www.cninfo.com.cn',
-           'Origin': 'http://www.cninfo.com.cn',
-           'Referer': 'http://www.cninfo.com.cn/new/commonUrl?url=disclosure/list/notice',
-           'X-Requested-With': 'XMLHttpRequest'
-           }
-
-
+headers = {
+    "Accept": "application/json, text/javascript, */*; q=0.01",
+    "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
+    "Accept-Encoding": "gzip, deflate",
+    "Accept-Language": "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,zh-HK;q=0.6,zh-TW;q=0.5",
+    "Host": "www.cninfo.com.cn",
+    "Origin": "http://www.cninfo.com.cn",
+    "Referer": "http://www.cninfo.com.cn/new/commonUrl?url=disclosure/list/notice",
+    "X-Requested-With": "XMLHttpRequest",
+}
 
 
 # 深市 年度报告
 def szseAnnual(page, stock):
-    query_path = 'http://www.cninfo.com.cn/new/hisAnnouncement/query'
-    headers['User-Agent'] = random.choice(User_Agent)  # 定义User_Agent
-    query = {'pageNum': page,  # 页码
-             'pageSize': 30,
-             'tabName': 'fulltext',
-             'column': 'szse',  # 深交所
-             'stock': '',
-             'searchkey': stock,  # 使用searchkey查询股票代码或公司名
-             'secid': '',
-             'plate': 'sz',
-             'category': 'category_ndbg_szsh',  # 年度报告
-             'trade': '',
-             'seDate': '2020-01-01~2026-02-15'  # 时间区间
-             }
+    query_path = "http://www.cninfo.com.cn/new/hisAnnouncement/query"
+    headers["User-Agent"] = random.choice(User_Agent)  # 定义User_Agent
+    query = {
+        "pageNum": page,  # 页码
+        "pageSize": 30,
+        "tabName": "fulltext",
+        "column": "szse",  # 深交所
+        "stock": "",
+        "searchkey": stock,  # 使用searchkey查询股票代码或公司名
+        "secid": "",
+        "plate": "sz",
+        "category": "category_ndbg_szsh",  # 年度报告
+        "trade": "",
+        "seDate": "2020-01-01~2026-02-15",  # 时间区间
+    }
 
     namelist = requests.post(query_path, headers=headers, data=query)
     result = namelist.json()
-    if result and 'announcements' in result and result['announcements']:
-        return result['announcements']
+    if result and "announcements" in result and result["announcements"]:
+        return result["announcements"]
     return []
 
 
 # 沪市 年度报告
 def sseAnnual(page, stock):
-    query_path = 'http://www.cninfo.com.cn/new/hisAnnouncement/query'
-    headers['User-Agent'] = random.choice(User_Agent)  # 定义User_Agent
-    query = {'pageNum': page,  # 页码
-             'pageSize': 30,
-             'tabName': 'fulltext',
-             'column': 'sse',
-             'stock': '',
-             'searchkey': stock,  # 使用searchkey查询股票代码或公司名
-             'secid': '',
-             'plate': 'sh',
-             'category': 'category_ndbg_szsh',  # 年度报告
-             'trade': '',
-             'seDate': '2020-01-01~2026-02-15'  # 时间区间
-             }
+    query_path = "http://www.cninfo.com.cn/new/hisAnnouncement/query"
+    headers["User-Agent"] = random.choice(User_Agent)  # 定义User_Agent
+    query = {
+        "pageNum": page,  # 页码
+        "pageSize": 30,
+        "tabName": "fulltext",
+        "column": "sse",
+        "stock": "",
+        "searchkey": stock,  # 使用searchkey查询股票代码或公司名
+        "secid": "",
+        "plate": "sh",
+        "category": "category_ndbg_szsh",  # 年度报告
+        "trade": "",
+        "seDate": "2020-01-01~2026-02-15",  # 时间区间
+    }
 
     namelist = requests.post(query_path, headers=headers, data=query)
     result = namelist.json()
-    if result and 'announcements' in result and result['announcements']:
-        return result['announcements']
+    if result and "announcements" in result and result["announcements"]:
+        return result["announcements"]
     return []
 
 
 # 深市 招股
 def szseStock(page, stock):
-    query_path = 'http://www.cninfo.com.cn/new/hisAnnouncement/query'
-    headers['User-Agent'] = random.choice(User_Agent)  # 定义User_Agent
-    query = {'pageNum': page,  # 页码
-             'pageSize': 30,
-             'tabName': 'fulltext',
-             'column': 'szse',
-             'stock': '',
-             'searchkey': stock + ' 招股',  # 组合搜索：股票代码 + 招股
-             'secid': '',
-             'plate': 'sz',
-             'category': '',
-             'trade': '',
-             'seDate': '2015-01-01~2026-02-15'  # 时间区间
-             }
+    query_path = "http://www.cninfo.com.cn/new/hisAnnouncement/query"
+    headers["User-Agent"] = random.choice(User_Agent)  # 定义User_Agent
+    query = {
+        "pageNum": page,  # 页码
+        "pageSize": 30,
+        "tabName": "fulltext",
+        "column": "szse",
+        "stock": "",
+        "searchkey": stock + " 招股",  # 组合搜索：股票代码 + 招股
+        "secid": "",
+        "plate": "sz",
+        "category": "",
+        "trade": "",
+        "seDate": "2015-01-01~2026-02-15",  # 时间区间
+    }
 
     namelist = requests.post(query_path, headers=headers, data=query)
     result = namelist.json()
-    if result and 'announcements' in result and result['announcements']:
-        return result['announcements']
+    if result and "announcements" in result and result["announcements"]:
+        return result["announcements"]
     return []
 
 
 # 沪市 招股
 def sseStock(page, stock):
-    query_path = 'http://www.cninfo.com.cn/new/hisAnnouncement/query'
-    headers['User-Agent'] = random.choice(User_Agent)  # 定义User_Agent
-    query = {'pageNum': page,  # 页码
-             'pageSize': 30,
-             'tabName': 'fulltext',
-             'column': 'sse',
-             'stock': '',
-             'searchkey': stock + ' 招股',  # 组合搜索：股票代码 + 招股
-             'secid': '',
-             'plate': 'sh',
-             'category': '',
-             'trade': '',
-             'seDate': '2015-01-01~2026-02-15'  # 时间区间
-             }
+    query_path = "http://www.cninfo.com.cn/new/hisAnnouncement/query"
+    headers["User-Agent"] = random.choice(User_Agent)  # 定义User_Agent
+    query = {
+        "pageNum": page,  # 页码
+        "pageSize": 30,
+        "tabName": "fulltext",
+        "column": "sse",
+        "stock": "",
+        "searchkey": stock + " 招股",  # 组合搜索：股票代码 + 招股
+        "secid": "",
+        "plate": "sh",
+        "category": "",
+        "trade": "",
+        "seDate": "2015-01-01~2026-02-15",  # 时间区间
+    }
 
     namelist = requests.post(query_path, headers=headers, data=query)
     result = namelist.json()
-    if result and 'announcements' in result and result['announcements']:
-        return result['announcements']
+    if result and "announcements" in result and result["announcements"]:
+        return result["announcements"]
     return []
 
 
 # download PDF
-def Download(single_page, year_filter=None):
+def Download(single_page, year_filter=None, save_path=None):
     """
     Download PDF files from announcement list
 
     Args:
         single_page: List of announcement dictionaries
         year_filter: Optional year to filter (e.g., 2024). If None, downloads all years
+        save_path: Optional custom directory to save files. Defaults to saving_path
     """
     if single_page is None:
         return
 
-    headers = {'Accept': 'application/json, text/javascript, */*; q=0.01',
-               "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
-               "Accept-Encoding": "gzip, deflate",
-               "Accept-Language": "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,zh-HK;q=0.6,zh-TW;q=0.5",
-               'Host': 'www.cninfo.com.cn',
-               'Origin': 'http://www.cninfo.com.cn'
-               }
+    headers = {
+        "Accept": "application/json, text/javascript, */*; q=0.01",
+        "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
+        "Accept-Encoding": "gzip, deflate",
+        "Accept-Language": "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,zh-HK;q=0.6,zh-TW;q=0.5",
+        "Host": "www.cninfo.com.cn",
+        "Origin": "http://www.cninfo.com.cn",
+    }
 
     # Build allowed list dynamically based on year_filter
     allowed_list = []
     if year_filter:
         allowed_list = [
-            f'{year_filter}年年度报告（更新后）',
-            f'{year_filter}年年度报告',
+            f"{year_filter}年年度报告（更新后）",
+            f"{year_filter}年年度报告",
         ]
     else:
         # Default: all years from 2016-2025
         for year in range(2016, 2026):
-            allowed_list.append(f'{year}年年度报告（更新后）')
-            allowed_list.append(f'{year}年年度报告')
+            allowed_list.append(f"{year}年年度报告（更新后）")
+            allowed_list.append(f"{year}年年度报告")
 
     allowed_list_2 = [
-        '招股书',
-        '招股说明书',
-        '招股意向书',
+        "招股书",
+        "招股说明书",
+        "招股意向书",
     ]
 
+    output_dir = (save_path or saving_path).rstrip("/") + "/"
+
     for i in single_page:
-        title = i['announcementTitle']
+        title = i["announcementTitle"]
 
         # 跳过确认意见等非正式报告
-        if '确认意见' in title or '取消' in title:
+        if "确认意见" in title or "取消" in title:
             continue
 
         # 检查标题是否包含允许的文本
@@ -194,20 +202,27 @@ def Download(single_page, year_filter=None):
 
         if allowed:
             download = download_path + i["adjunctUrl"]
-            name = i["secCode"] + '_' + i['secName'] + '_' + i['announcementTitle'] + '.pdf'
-            if '*' in name:
-                name = name.replace('*', '')
-            file_path = saving_path + name
+            name = (
+                i["secCode"]
+                + "_"
+                + i["secName"]
+                + "_"
+                + i["announcementTitle"]
+                + ".pdf"
+            )
+            if "*" in name:
+                name = name.replace("*", "")
+            file_path = output_dir + name
 
             # 显示下载进度
             print(f"  ↓ {name}")
 
             # 确保目录存在
-            os.makedirs(os.path.dirname(file_path), exist_ok=True)
+            os.makedirs(output_dir, exist_ok=True)
 
             time.sleep(random.random() * 2)
 
-            headers['User-Agent'] = random.choice(User_Agent)
+            headers["User-Agent"] = random.choice(User_Agent)
             r = requests.get(download)
 
             f = open(file_path, "wb")
@@ -219,6 +234,70 @@ def Download(single_page, year_filter=None):
     return True
 
 
+def query_prospectus(stock_code):
+    """
+    Query prospectus documents (招股书/招股说明书/招股意向书) for a specific stock code
+
+    Args:
+        stock_code: Stock code (e.g., '000888', '688777')
+
+    Returns:
+        List of announcement dictionaries
+    """
+    all_announcements = []
+
+    try:
+        announcements_sse = sseStock(1, stock_code)
+        all_announcements.extend(announcements_sse)
+    except Exception as e:
+        print(f"Error querying SSE prospectus: {e}")
+
+    try:
+        announcements_szse = szseStock(1, stock_code)
+        all_announcements.extend(announcements_szse)
+    except Exception as e:
+        print(f"Error querying SZSE prospectus: {e}")
+
+    prospectus_keywords = ["招股书", "招股说明书", "招股意向书"]
+    filtered = [
+        a for a in all_announcements
+        if any(kw in a.get("announcementTitle", "") for kw in prospectus_keywords)
+    ]
+
+    return filtered
+
+
+def download_prospectus(stock_code, save_path=None):
+    """
+    Download prospectus documents for a specific stock code
+
+    Args:
+        stock_code: Stock code (e.g., '000888', '688777')
+        save_path: Optional custom directory to save files
+
+    Returns:
+        Dictionary with status and message
+    """
+    announcements = query_prospectus(stock_code)
+
+    if not announcements:
+        return {
+            "success": False,
+            "message": f"No prospectus found for stock {stock_code}",
+            "downloaded": 0,
+        }
+
+    output_dir = save_path or saving_path
+    result = Download(announcements, save_path=output_dir)
+
+    return {
+        "success": result,
+        "message": f"Downloaded prospectus for {stock_code}",
+        "downloaded": len(announcements),
+        "path": output_dir,
+    }
+
+
 def query_annual_reports(stock_code, year=None):
     """
     Query annual reports for a specific stock code
@@ -251,20 +330,21 @@ def query_annual_reports(stock_code, year=None):
         year_str = str(year)
         filtered = []
         for announcement in all_announcements:
-            if year_str in announcement.get('announcementTitle', ''):
+            if year_str in announcement.get("announcementTitle", ""):
                 filtered.append(announcement)
         all_announcements = filtered
 
     return all_announcements
 
 
-def download_annual_reports(stock_code, year=None):
+def download_annual_reports(stock_code, year=None, save_path=None):
     """
     Download annual reports for a specific stock code
 
     Args:
         stock_code: Stock code (e.g., '000888', '688777')
         year: Optional year filter (e.g., 2024). If None, downloads all years
+        save_path: Optional custom directory to save files
 
     Returns:
         Dictionary with status and message
@@ -273,19 +353,21 @@ def download_annual_reports(stock_code, year=None):
 
     if not announcements:
         return {
-            'success': False,
-            'message': f'No annual reports found for stock {stock_code}' + (f' in year {year}' if year else ''),
-            'downloaded': 0
+            "success": False,
+            "message": f"No annual reports found for stock {stock_code}"
+            + (f" in year {year}" if year else ""),
+            "downloaded": 0,
         }
 
-    # Download PDFs
-    result = Download(announcements, year_filter=year)
+    output_dir = save_path or saving_path
+    result = Download(announcements, year_filter=year, save_path=output_dir)
 
     return {
-        'success': result,
-        'message': f'Downloaded reports for {stock_code}' + (f' year {year}' if year else ''),
-        'downloaded': len(announcements),
-        'path': saving_path
+        "success": result,
+        "message": f"Downloaded reports for {stock_code}"
+        + (f" year {year}" if year else ""),
+        "downloaded": len(announcements),
+        "path": output_dir,
     }
 
 
@@ -297,19 +379,19 @@ def Run(page_number, stock):
         annual_report_ = sseAnnual(page_number, stock)
         stock_report_ = sseStock(page_number, stock)
     except Exception:
-        print(page_number, 'page error, retrying')
+        print(page_number, "page error, retrying")
         try:
             annual_report = szseAnnual(page_number, stock)
         except Exception:
-            print(page_number, 'page error')
+            print(page_number, "page error")
     Download(annual_report)
     Download(stock_report)
     Download(annual_report_)
     Download(stock_report_)
 
 
-if __name__ == '__main__':
-    with open('company_id.txt') as file:
+if __name__ == "__main__":
+    with open("company_id.txt") as file:
         lines = file.readlines()
         for line in lines:
             stock = line