Update app.py

app.py

@@ -132,32 +132,33 @@ class FinancialAnalyzer:
             metrics = {}
             
             # 1. Gross Profit Margin Ratio
+            # 1. Gross Profit Margin
             revenue = self.get_nested_value(income_data, "Revenue", "Total Net Revenue", "2025")
-            cogs = self.get_nested_value(income_data, "Operating Expenses", "Cost of Goods Sold", "2025")
+            cogs = self.get_nested_value(income_data, "Cost and Gross Profit", "Cost of Goods Sold", "2025")
             gross_profit = revenue - cogs
             metrics['gross_profit_margin'] = (gross_profit / revenue) * 100 if revenue != 0 else 0
 
             # 2. Current Ratio
-            current_assets = self.get_nested_value(balance_data, "Assets", "Total Current Assets", "2025")
-            current_liabilities = self.get_nested_value(balance_data, "Liabilities", "Total Current Liabilities", "2025")
+            current_assets = self.get_nested_value(balance_data, "Key Totals", "Total_Current_Assets", "2025")
+            current_liabilities = self.get_nested_value(balance_data, "Key Totals", "Total_Current_Liabilities", "2025")
             metrics['current_ratio'] = current_assets / current_liabilities if current_liabilities != 0 else 0
 
             # 3. Debt Ratio
-            total_liabilities = self.get_nested_value(balance_data, "Liabilities", "Total Liabilities", "2025")
-            total_assets = self.get_nested_value(balance_data, "Assets", "Total Assets", "2025")
+            total_liabilities = self.get_nested_value(balance_data, "Key Totals", "Total_Liabilities", "2025")
+            total_assets = self.get_nested_value(balance_data, "Key Totals", "Total_Assets", "2025")
             metrics['debt_ratio'] = (total_liabilities / total_assets) * 100 if total_assets != 0 else 0
 
             # 4. Sustainable Growth Rate (SGR)
-            net_income = self.get_nested_value(income_data, "Net Income", "Total Net Income", "2025")
-            equity = self.get_nested_value(balance_data, "Equity", "Total Shareholders Equity", "2025")
-            dividends = self.get_nested_value(income_data, "Dividends", "Dividends Paid", "2025")
-            
+            net_income = self.get_nested_value(income_data, "Profit Summary", "Net Earnings", "2025")
+            equity = self.get_nested_value(balance_data, "Key Totals", "Total_Shareholders_Equity", "2025")
+            dividends = self.get_nested_value(income_data, "Profit Summary", "Dividends Paid", "2025")
+        
             roe = (net_income / equity) * 100 if equity != 0 else 0
             retention_ratio = (net_income - dividends) / net_income if net_income != 0 else 0
             metrics['sgr'] = roe * retention_ratio / 100 if roe != 0 else 0
 
             # 5. Accounts Receivable Turnover
-            accounts_receivable = self.get_nested_value(balance_data, "Assets", "Accounts Receivable", "2025")
+            accounts_receivable = self.get_nested_value(balance_data, "Balance Sheet Data 2021-2025", "Accounts_Receivable", "2025")
             metrics['ar_turnover'] = revenue / accounts_receivable if accounts_receivable != 0 else 0
 
             # 6. Return on Equity (ROE)
@@ -167,16 +168,20 @@ class FinancialAnalyzer:
             metrics['net_profit_margin'] = (net_income / revenue) * 100 if revenue != 0 else 0
 
             # 8. Retained Earnings Ratio
-            retained_earnings = self.get_nested_value(balance_data, "Equity", "Retained Earnings", "2025")
+            retained_earnings = self.get_nested_value(balance_data, "Balance Sheet Data 2021-2025", "Retained_Earnings", "2025")
             metrics['retained_earnings_ratio'] = (retained_earnings / total_assets) * 100 if total_assets != 0 else 0
 
-            # Additional YoY metrics
+            # 9. Revenue Growth (YoY)
             revenue_2024 = self.get_nested_value(income_data, "Revenue", "Total Net Revenue", "2024")
             metrics['revenue_growth'] = ((revenue / revenue_2024) - 1) * 100 if revenue_2024 != 0 else 0
 
+            # 10. Revenue CAGR (2021-2025)
+            revenue_2021 = self.get_nested_value(income_data, "Revenue", "Total Net Revenue", "2021")
+            metrics['revenue_cagr'] = ((revenue / revenue_2021) ** (1 / 4) - 1) * 100 if revenue_2021 != 0 else 0
+
             return metrics
         except Exception as e:
-            print(f"Error calculating metrics: {str(e)}")
+            print(f"Error calculating metrics: {e}")
             return {}