Update app.py

app.py

@@ -44,21 +44,38 @@ def get_stock(ticker: str):
                 # 假设数据按时间升序排列，第0行是当前年，第1行是明年
                 # 注意：有时 yfinance 返回的顺序可能是反的，或者包含季度数据，
                 # 但 earnings_estimate 通常是年度数据且按时间排序。
-                
-                if len(est) > 0:
-                    eps_est_current = est.iloc[2]['avg']  # 当前财年
-                if len(est) > 1:
-                    eps_est_next = est.iloc[3]['avg']     # 下一财年
+                #eps_est_current = est.iloc[2]['avg']  # 当前财年
+                #eps_est_next = est.iloc[3]['avg']     # 下一财年
+
+                if '0Y' in est.index:
+                    eps_est_current = est.loc['0Y'].get('avg')
+                if '+1Y' in est.index:
+                    eps_est_next = est.loc['+1Y'].get('avg')
                     
             except Exception as e:
                 print(f"Error parsing dataframe: {e}")
 
         # 3. 如果从表格获取失败，使用 info 中的备用数据
-        #if eps_est_next is None and info:
-        #    eps_est_next = info.get('forwardEps')
+        if eps_est_next is None and info:
+            eps_est_next = info.get('forwardEps')
 
         if not info or len(info) < 5:
             return {"error": "No data found", "ticker": ticker}
+            
+        try:
+            ept = stock.eps_trend
+        except Exception:
+            ept = None
+
+        eps_current = None
+
+        if ept is not None and not ept.empty:
+            try:
+                if '0Y' in ept.index:
+                    eps_current = ept.loc['0Y'].get('Current Estimate') # 当前财年
+                    
+            except Exception as e:
+                print(f"Error parsing dataframe: {e}")
 
         return {
             "ticker": ticker.upper(),
@@ -67,7 +84,8 @@ def get_stock(ticker: str):
 
             "eps_est_avg_current_year": clean_num(eps_est_current),
             "eps_est_avg_next_year": clean_num(eps_est_next),
-            
+            "eps_avg_current_year": clean_num(eps_current),
+          
         }
     except Exception as e:
         return {"error": str(e)}