Upload 2 files

edgar_client.py

@@ -669,9 +669,6 @@ class EdgarDataClient:
                 "operating_cash_flow": ["NetCashProvidedByUsedInOperatingActivities", "NetCashProvidedUsedInOperatingActivities", "NetCashFlowsFromUsedInOperatingActivities", "CashFlowsFromUsedInOperatingActivities"],
             }
             
-            # Store result
-            result = {"period": period}
-            
             # Determine target form types to search
             if 'Q' in period:
                 # Quarterly data, mainly search 10-Q (20-F usually doesn't have quarterly reports)
@@ -686,6 +683,17 @@ class EdgarDataClient:
                 year = int(period)
                 quarter = None
             
+            # Store result with consolidated meta and sources (added for de-duplication)
+            result = {
+                "period": period,
+                "meta": {
+                    "year": year,
+                    "quarter": quarter,
+                    "is_20f_filer": False  # will set below
+                },
+                "sources": {}
+            }
+            
             # Detect if company uses 20-F (foreign filer)
             is_20f_filer = False
             all_filings = self.get_company_filings(cik)
@@ -693,6 +701,8 @@ class EdgarDataClient:
                 form_types_used = set(f.get('form_type', '') for f in all_filings[:20])
                 if '20-F' in form_types_used and '10-K' not in form_types_used:
                     is_20f_filer = True
+            # Reflect in meta
+            result["meta"]["is_20f_filer"] = is_20f_filer
             
             # Get company filings to find accession number and primary document
             filings = self.get_company_filings(cik, form_types=target_forms)
@@ -855,17 +865,28 @@ class EdgarDataClient:
                                     
                                     # Generate complete source URL
                                     if primary_document:
-                                        result["source_url"] = f"https://www.sec.gov/Archives/edgar/data/{cik}/{accession_number}/{primary_document}"
+                                        url = f"https://www.sec.gov/Archives/edgar/data/{cik}/{accession_number}/{primary_document}"
                                     else:
-                                        result["source_url"] = f"https://www.sec.gov/cgi-bin/browse-edgar?action=getcompany&CIK={cik}&type={form_type}&dateb=&owner=exclude&count=100"
+                                        url = f"https://www.sec.gov/cgi-bin/browse-edgar?action=getcompany&CIK={cik}&type={form_type}&dateb=&owner=exclude&count=100"
                                 else:
                                     # Fallback to company browse page if filing not found
-                                    result["source_url"] = f"https://www.sec.gov/cgi-bin/browse-edgar?action=getcompany&CIK={cik}&type={form_type}&dateb=&owner=exclude&count=100"
+                                    url = f"https://www.sec.gov/cgi-bin/browse-edgar?action=getcompany&CIK={cik}&type={form_type}&dateb=&owner=exclude&count=100"
+                                
+                                # Backward compatible: only set once to avoid later overwrites
+                                if "source_url" not in result:
+                                    result["source_url"] = url
+                                    result["source_form"] = form_type
+                                    result["data_source"] = data_source
                                 
-                                result["source_form"] = form_type
-                                result["data_source"] = data_source
+                                # Consolidated per-metric source info
+                                result["sources"][metric_key] = {
+                                    "url": url,
+                                    "form": form_type,
+                                    "data_source": data_source,
+                                    "filed": matched_entry.get("filed", "")
+                                }
                                 
-                                # Add detailed information
+                                # Add detailed information (kept for compatibility)
                                 result[f"{metric_key}_details"] = {
                                     "tag": metric_tag,
                                     "form": matched_entry.get("form", ""),

financial_analyzer.py

@@ -75,6 +75,10 @@ class FinancialAnalyzer:
                 # Fast path succeeded, now get detailed info
                 company_info = self.edgar_client.get_company_info(cik)
                 if company_info:
+                    # Ensure 'ticker' exists alongside 'tickers' for compatibility
+                    if "ticker" not in company_info:
+                        tks = company_info.get("tickers") or []
+                        company_info["ticker"] = tks[0] if tks else None
                     return company_info
                 else:
                     # Fallback to basic info if detailed fetch fails
@@ -82,6 +86,7 @@ class FinancialAnalyzer:
                         "cik": basic_info['cik'],
                         "name": basic_info['name'],
                         "tickers": [basic_info['ticker']] if basic_info.get('ticker') else [],
+                        "ticker": basic_info.get('ticker'),
                         "_source": "basic_cik_lookup"
                     }
             else:
@@ -106,6 +111,7 @@ class FinancialAnalyzer:
                     "cik": basic_info['cik'],
                     "name": basic_info['name'],
                     "tickers": [basic_info['ticker']] if basic_info.get('ticker') else [],
+                    "ticker": basic_info.get('ticker'),
                     "ein": None,  # Not available in basic search
                     "fiscal_year_end": None,  # Not available in basic search
                     "sic_description": None,  # Not available in basic search
@@ -128,6 +134,7 @@ class FinancialAnalyzer:
                 "cik": basic_info['cik'],
                 "name": basic_info['name'],
                 "tickers": [basic_info['ticker']] if basic_info.get('ticker') else [],
+                "ticker": basic_info.get('ticker'),
                 "ein": None,
                 "fiscal_year_end": None,
                 "sic_description": None,
@@ -139,6 +146,10 @@ class FinancialAnalyzer:
         company_info = self.edgar_client.get_company_info(basic_info['cik'])
         
         if company_info:
+            # Ensure 'ticker' exists alongside 'tickers' for compatibility
+            if "ticker" not in company_info:
+                tks = company_info.get("tickers") or []
+                company_info["ticker"] = tks[0] if tks else None
             return company_info
         else:
             # Fallback to basic info if detailed fetch fails
@@ -146,6 +157,7 @@ class FinancialAnalyzer:
                 "cik": basic_info['cik'],
                 "name": basic_info['name'],
                 "tickers": [basic_info['ticker']] if basic_info.get('ticker') else [],
+                "ticker": basic_info.get('ticker'),
                 "_source": "basic_search_fallback"
             }