Upload 2 files

EasyReportDataMCP/edgar_client.py

@@ -3,6 +3,7 @@
 import requests
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
+import urllib3
 try:
     from sec_edgar_api.EdgarClient import EdgarClient
 except ImportError:
@@ -15,6 +16,9 @@ from datetime import datetime, timedelta
 import re
 import difflib
 
+# Disable SSL warnings for better compatibility
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
 
 class EdgarDataClient:
     # Class-level cache for company_tickers.json (shared across instances)
@@ -65,9 +69,9 @@ class EdgarDataClient:
         # Configure requests session with connection pooling
         self.session = requests.Session()
         
-        # Configure retry strategy
+        # Configure retry strategy with enhanced retries for stability
         retry_strategy = Retry(
-            total=3,
+            total=5,  # Increased from 3 to 5 for better reliability
             backoff_factor=1,
             status_forcelist=[429, 500, 502, 503, 504],
             allowed_methods=["HEAD", "GET", "OPTIONS"]
@@ -83,8 +87,8 @@ class EdgarDataClient:
         self.session.mount("http://", adapter)
         self.session.mount("https://", adapter)
         
-        # Set default timeout
-        self.timeout = 30  # 30 seconds timeout
+        # Set default timeout with connection and read timeouts
+        self.timeout = (10, 30)  # (connect timeout, read timeout)
         
         # Initialize sec_edgar_api client with timeout wrapper
         if EdgarClient:
@@ -393,15 +397,25 @@ class EdgarDataClient:
             print("sec_edgar_api library not installed")
             return []
         
+        # ✅ 添加调试日志
+        print(f"[DEBUG] get_company_filings called with CIK: {cik}, form_types: {form_types}")
+        
         # Convert list to tuple for caching (lists are not hashable)
         if form_types and isinstance(form_types, list):
             form_types = tuple(form_types)
             
         try:
             self._rate_limit()
+            # ✅ 调试: 打印实际调用SEC API的CIK
+            print(f"[DEBUG] Calling SEC API get_submissions with CIK: {cik}")
+            
             # Get company submissions (now has timeout protection)
             submissions = self.edgar.get_submissions(cik=cik)
             
+            # ✅ 调试: 打印返回的基本信息
+            print(f"[DEBUG] Got submissions for: {submissions.get('name', 'Unknown')}")
+            print(f"[DEBUG] Available form types in recent filings: {set(submissions.get('filings', {}).get('recent', {}).get('form', [])[:20])}")
+            
             # Extract filing information
             filings = []
             recent = submissions.get("filings", {}).get("recent", {})
@@ -433,6 +447,11 @@ class EdgarDataClient:
                 
                 filings.append(filing)
             
+            # ✅ 调试: 打印过滤后的结果
+            print(f"[DEBUG] After filtering, found {len(filings)} filings matching form_types: {form_types}")
+            if len(filings) > 0:
+                print(f"[DEBUG] First filing: {filings[0]}")
+            
             return filings
         except TimeoutError as e:
             print(f"Timeout getting company filings for CIK {cik}: {e}")
@@ -544,16 +563,17 @@ class EdgarDataClient:
                     # Extract year from filing_date (format: YYYY-MM-DD)
                     file_year = int(filing_date[:4]) if len(filing_date) >= 4 else 0
                     
-                    # Store filing if it matches the period year
-                    if file_year == year:
-                        key = f"{form_type}_{file_year}"
-                        if key not in filings_map:
-                            filings_map[key] = {
-                                "accession_number": accession_number,
-                                "primary_document": primary_document,
-                                "form_type": form_type,
-                                "filing_date": filing_date
-                            }
+                    # ✅ FIXED: Remove year filter to keep all filings
+                    # 20-F forms are often filed in the year after the fiscal year
+                    # We'll match them later using fiscal year (fy) and filed date
+                    key = f"{form_type}_{file_year}"
+                    if key not in filings_map:
+                        filings_map[key] = {
+                            "accession_number": accession_number,
+                            "primary_document": primary_document,
+                            "form_type": form_type,
+                            "filing_date": filing_date
+                        }
             
             # Iterate through each financial metric
             for metric_key, metric_tags in financial_metrics.items():
@@ -650,11 +670,36 @@ class EdgarDataClient:
                                 # Get form and accession info
                                 form_type = matched_entry.get("form", "")
                                 accn_from_facts = matched_entry.get('accn', '').replace('-', '')
+                                filed_date = matched_entry.get('filed', '')
                                 
-                                # Try to get accession_number and primary_document from filings
+                                # ✅ ENHANCED: Multi-strategy filing lookup for 20-F and cross-year submissions
+                                filing_info = None
+                                
+                                # Strategy 1: Try matching by fiscal year (original logic)
                                 filing_key = f"{form_type}_{year}"
                                 filing_info = filings_map.get(filing_key)
                                 
+                                # Strategy 2: Try matching by filed year (for 20-F filed in next year)
+                                if not filing_info and filed_date:
+                                    filed_year = int(filed_date[:4]) if len(filed_date) >= 4 else 0
+                                    if filed_year > 0:
+                                        filing_key = f"{form_type}_{filed_year}"
+                                        filing_info = filings_map.get(filing_key)
+                                
+                                # Strategy 3: Try fiscal year + 1 (common for 20-F)
+                                if not filing_info:
+                                    filing_key = f"{form_type}_{year + 1}"
+                                    filing_info = filings_map.get(filing_key)
+                                
+                                # Strategy 4: Search all filings with matching form type and accession
+                                if not filing_info and accn_from_facts:
+                                    for key, finfo in filings_map.items():
+                                        if finfo["form_type"] == form_type:
+                                            filing_accn = finfo["accession_number"].replace('-', '')
+                                            if filing_accn == accn_from_facts:
+                                                filing_info = finfo
+                                                break
+                                
                                 if filing_info:
                                     # Use filing info from get_company_filings
                                     accession_number = filing_info["accession_number"].replace('-', '')

EasyReportDataMCP/mcp_server_fastmcp.py

@@ -213,15 +213,29 @@ def extract_financial_metrics(cik: str, years: int = 3) -> dict:
     if years < 1 or years > 10:
         return {"error": "Years parameter must be between 1 and 10"}
     
+    # ✅ 添加调试日志,查看实际CIK格式和查询结果
+    print(f"[DEBUG] extract_financial_metrics called with CIK: {cik}, type: {type(cik)}, years: {years}")
+    
     # Check if company has filings (use tuple for caching)
     filings_10k = edgar_client.get_company_filings(cik, ('10-K',))
     filings_20f = edgar_client.get_company_filings(cik, ('20-F',))
+    
+    # ✅ 打印查询结果
+    print(f"[DEBUG] Found {len(filings_10k)} 10-K filings, {len(filings_20f)} 20-F filings")
+    if len(filings_10k) > 0:
+        print(f"[DEBUG] Latest 10-K: {filings_10k[0]}")
+    if len(filings_20f) > 0:
+        print(f"[DEBUG] Latest 20-F: {filings_20f[0]}")
+    
     total_filings = len(filings_10k) + len(filings_20f)
     
     if total_filings == 0:
+        # ✅ 提供更详细的错误信息,帮助用户了解问题
         return {
-            "error": f"No annual filings found for CIK: {cik}",
-            "suggestion": "Please check if the CIK is correct"
+            "error": f"No 10-K or 20-F annual filings found for CIK: {cik}",
+            "suggestion": "This company might not have filed 10-K or 20-F forms yet. Please verify the CIK is correct.",
+            "note": "Some companies may use different filing forms or may be newly listed.",
+            "cik": cik
         }
     
     # Extract metrics
@@ -302,7 +316,13 @@ def get_latest_financial_data(cik: str) -> dict:
     if result and "period" in result:
         return result
     else:
-        return {"error": f"No latest financial data found for CIK: {cik}"}
+        # ✅ 提供更有帮助的错误信息
+        return {
+            "error": f"No latest financial data found for CIK: {cik}",
+            "suggestion": "The company may not have recent 10-K or 20-F filings, or the data format may not be supported.",
+            "note": "Try using a different CIK or check if the company has filed recent annual reports.",
+            "cik": cik
+        }
 
 
 @mcp.tool()
@@ -350,20 +370,13 @@ def advanced_search_company(company_input: str) -> dict:
 if __name__ == "__main__":
     import os
     
-    # Set port from environment (HF Space sets PORT=7860)
-    port = int(os.getenv("PORT", "7860"))
+    # ✅ Set port to 7861 for EasyReportDataMCP (MarketandStockMCP uses 7870)
+    port = int(os.getenv("PORT", "7861"))
     host = os.getenv("HOST", "0.0.0.0")
     
-    # Monkeypatch uvicorn.Config to use our port
-    import uvicorn
-    original_config_init = uvicorn.Config.__init__
-    
-    def patched_init(self, *args, **kwargs):
-        kwargs['host'] = host
-        kwargs['port'] = port
-        return original_config_init(self, *args, **kwargs)
-    
-    uvicorn.Config.__init__ = patched_init
+    print("▶️ Starting EasyReportDataMCP Server...")
+    print(f"📡 MCP server will listen on {host}:{port}")
+    print("✅ Available tools: advanced_search_company, get_latest_financial_data, extract_financial_metrics")
     
-    # Run FastMCP with HTTP transport (stateless mode)
-    mcp.run(transport="http")
+    # Run FastMCP with SSE transport (Server-Sent Events for chat_direct.py compatibility)
+    mcp.run(transport="sse", port=port)