tradingagents/agents/utils/technical_indicators_tools.py

@@ -20,4 +20,25 @@ def get_indicators(
     Returns:
         str: 一個格式化的數據框，包含指定股票代碼和指標的技術指標。
     """
-    return route_to_vendor("get_indicators", symbol, indicator, curr_date, look_back_days)
+    # 規範化指標名稱以匹配供應商的預期格式
+    indicator_lower = indicator.lower().strip()
+    
+    # 常見指標名稱映射
+    mapping = {
+        "sma50": "close_50_sma",
+        "sma200": "close_200_sma",
+        "ema10": "close_10_ema",
+        "bbands": "boll",
+        "bollinger": "boll",
+        "macd_signal": "macds",
+        "macd_hist": "macdh",
+    }
+    
+    # 如果在映射中，使用映射名稱
+    if indicator_lower in mapping:
+        normalized_indicator = mapping[indicator_lower]
+    # 如果已經是正確的格式（例如 rsi, macd, atr），則保持原樣（轉小寫）
+    else:
+        normalized_indicator = indicator_lower
+        
+    return route_to_vendor("get_indicators", symbol, normalized_indicator, curr_date, look_back_days)

tradingagents/dataflows/alpha_vantage_fundamentals.py

@@ -88,7 +88,7 @@ def get_fundamentals(ticker: str, curr_date: str = None, use_toon: bool = None)
         return response
 
 
-def get_balance_sheet(ticker: str, freq: str = "quarterly", curr_date: str = None) -> str:
+def get_balance_sheet(ticker: str, freq: str = "quarterly", curr_date: str = None, use_toon: bool = None) -> str:
     """
     使用 Alpha Vantage 檢索給定股票代碼的資產負債表數據。
 
@@ -96,10 +96,15 @@ def get_balance_sheet(ticker: str, freq: str = "quarterly", curr_date: str = Non
         ticker (str): 公司的股票代碼
         freq (str): 報告頻率：年度/季度 (預設為季度) - Alpha Vantage 未使用
         curr_date (str): 您正在交易的當前日期，格式為 yyyy-mm-dd (Alpha Vantage 未使用)
+        use_toon (bool): 是否使用toon格式（減少token消耗）。默認從環境變量讀取
 
     Returns:
-        str: 具有標準化欄位的資產負債表數據
+        str: 具有標準化欄位的資產負債表數據（JSON或toon格式）
     """
+    # 從環境變量或參數決定是否使用toon
+    if use_toon is None:
+        use_toon = os.getenv("USE_TOON_FORMAT", "true").lower() == "true"
+
     params = {
         "symbol": ticker,
     }
@@ -117,7 +122,17 @@ def get_balance_sheet(ticker: str, freq: str = "quarterly", curr_date: str = Non
             if "annualReports" in data and isinstance(data["annualReports"], list):
                 data["annualReports"] = data["annualReports"][:2]
             
-            return json.dumps(data, ensure_ascii=False, indent=2)
+            # 使用toon格式或JSON格式返回
+            if use_toon:
+                try:
+                    from tradingagents.utils.toon_converter import convert_json_to_toon
+                    toon_data = convert_json_to_toon(data)
+                    return toon_data
+                except Exception as e:
+                    print(f"警告：toon轉換失敗：{e}，使用JSON格式")
+                    return json.dumps(data, ensure_ascii=False, indent=2)
+            else:
+                return json.dumps(data, ensure_ascii=False, indent=2)
         
         return response
         
@@ -126,7 +141,7 @@ def get_balance_sheet(ticker: str, freq: str = "quarterly", curr_date: str = Non
         return response
 
 
-def get_cashflow(ticker: str, freq: str = "quarterly", curr_date: str = None) -> str:
+def get_cashflow(ticker: str, freq: str = "quarterly", curr_date: str = None, use_toon: bool = None) -> str:
     """
     使用 Alpha Vantage 檢索給定股票代碼的現金流量表數據。
 
@@ -134,10 +149,15 @@ def get_cashflow(ticker: str, freq: str = "quarterly", curr_date: str = None) ->
         ticker (str): 公司的股票代碼
         freq (str): 報告頻率：年度/季度 (預設為季度) - Alpha Vantage 未使用
         curr_date (str): 您正在交易的當前日期，格式為 yyyy-mm-dd (Alpha Vantage 未使用)
+        use_toon (bool): 是否使用toon格式（減少token消耗）。默認從環境變量讀取
 
     Returns:
-        str: 具有標準化欄位的現金流量表數據
+        str: 具有標準化欄位的現金流量表數據（JSON或toon格式）
     """
+    # 從環境變量或參數決定是否使用toon
+    if use_toon is None:
+        use_toon = os.getenv("USE_TOON_FORMAT", "true").lower() == "true"
+
     params = {
         "symbol": ticker,
     }
@@ -155,7 +175,17 @@ def get_cashflow(ticker: str, freq: str = "quarterly", curr_date: str = None) ->
             if "annualReports" in data and isinstance(data["annualReports"], list):
                 data["annualReports"] = data["annualReports"][:2]
             
-            return json.dumps(data, ensure_ascii=False, indent=2)
+            # 使用toon格式或JSON格式返回
+            if use_toon:
+                try:
+                    from tradingagents.utils.toon_converter import convert_json_to_toon
+                    toon_data = convert_json_to_toon(data)
+                    return toon_data
+                except Exception as e:
+                    print(f"警告：toon轉換失敗：{e}，使用JSON格式")
+                    return json.dumps(data, ensure_ascii=False, indent=2)
+            else:
+                return json.dumps(data, ensure_ascii=False, indent=2)
         
         return response
         
@@ -164,7 +194,7 @@ def get_cashflow(ticker: str, freq: str = "quarterly", curr_date: str = None) ->
         return response
 
 
-def get_income_statement(ticker: str, freq: str = "quarterly", curr_date: str = None) -> str:
+def get_income_statement(ticker: str, freq: str = "quarterly", curr_date: str = None, use_toon: bool = None) -> str:
     """
     使用 Alpha Vantage 檢索給定股票代碼的損益表數據。
 
@@ -172,10 +202,15 @@ def get_income_statement(ticker: str, freq: str = "quarterly", curr_date: str =
         ticker (str): 公司的股票代碼
         freq (str): 報告頻率：年度/季度 (預設為季度) - Alpha Vantage 未使用
         curr_date (str): 您正在交易的當前日期，格式為 yyyy-mm-dd (Alpha Vantage 未使用)
+        use_toon (bool): 是否使用toon格式（減少token消耗）。默認從環境變量讀取
 
     Returns:
-        str: 具有標準化欄位的損益表數據
+        str: 具有標準化欄位的損益表數據（JSON或toon格式）
     """
+    # 從環境變量或參數決定是否使用toon
+    if use_toon is None:
+        use_toon = os.getenv("USE_TOON_FORMAT", "true").lower() == "true"
+
     params = {
         "symbol": ticker,
     }
@@ -193,7 +228,17 @@ def get_income_statement(ticker: str, freq: str = "quarterly", curr_date: str =
             if "annualReports" in data and isinstance(data["annualReports"], list):
                 data["annualReports"] = data["annualReports"][:2]
             
-            return json.dumps(data, ensure_ascii=False, indent=2)
+            # 使用toon格式或JSON格式返回
+            if use_toon:
+                try:
+                    from tradingagents.utils.toon_converter import convert_json_to_toon
+                    toon_data = convert_json_to_toon(data)
+                    return toon_data
+                except Exception as e:
+                    print(f"警告：toon轉換失敗：{e}，使用JSON格式")
+                    return json.dumps(data, ensure_ascii=False, indent=2)
+            else:
+                return json.dumps(data, ensure_ascii=False, indent=2)
         
         return response