Skip to content

"Vibe-Trading: Your Personal Trading Agent"

fix(market-data): also validate interval and max_rows

cgycoreye861623edf23
diff --git a/agent/src/tools/market_data_tool.py b/agent/src/tools/market_data_tool.py
index 220d19cfc..d1583e3bb 100644
--- a/agent/src/tools/market_data_tool.py
+++ b/agent/src/tools/market_data_tool.py
@@ -10,6 +10,7 @@ from typing import Any
from src.agent.tools import BaseTool
from src.market_data import DEFAULT_MAX_ROWS, fetch_market_data_json
+from backtest.runner import _VALID_INTERVALS
_ISO_DATE_RE = re.compile(r"^\d{4}-\d{2}-\d{2}$")
@@ -159,12 +160,26 @@ class MarketDataTool(BaseTool):
if source not in source_enum:
return _error(f"source must be one of {list(source_enum)}")
+ interval = kwargs.get("interval", "1D")
+ if not isinstance(interval, str):
+ return _error("interval must be a string like '1D', '1H', '4H', '30m'")
+ normalized_interval = interval.strip().upper()
+ if normalized_interval not in _VALID_INTERVALS:
+ return _error(
+ f"interval must be one of {sorted(_VALID_INTERVALS)} "
+ f"(case-insensitive); got {interval!r}"
+ )
+
+ max_rows = kwargs.get("max_rows", DEFAULT_MAX_ROWS)
+ if not isinstance(max_rows, int) or isinstance(max_rows, bool) or max_rows < 0:
+ return _error("max_rows must be a non-negative integer (0 = all rows)")
+
return fetch_market_data_json(
codes=codes,
start_date=start_date,
end_date=end_date,
source=source,
- interval=kwargs.get("interval", "1D"),
- max_rows=kwargs.get("max_rows", DEFAULT_MAX_ROWS),
+ interval=normalized_interval,
+ max_rows=max_rows,
include_provenance=True,
)
diff --git a/agent/tests/test_market_data_tool.py b/agent/tests/test_market_data_tool.py
index f45faea43..6c3ca973b 100644
--- a/agent/tests/test_market_data_tool.py
+++ b/agent/tests/test_market_data_tool.py
@@ -312,3 +312,37 @@ def test_market_data_tool_rejects_unknown_source():
out = json.loads(MarketDataTool().execute(codes=["AAPL.US"], start_date="2026-01-01", end_date="2026-02-01", source="bogus"))
assert out == {"ok": False, "error": "source must be one of ['auto', 'longbridge', 'yfinance', 'yahoo', 'okx', 'ccxt', 'tushare', 'baostock', 'tencent', 'akshare', 'mootdx', 'eastmoney', 'sina', 'stooq', 'finnhub', 'alphavantage', 'tiingo', 'fmp', 'mt5', 'pykrx']"}
+
+
+def test_market_data_tool_rejects_garbage_interval():
+ from src.tools.market_data_tool import MarketDataTool
+
+ out = json.loads(MarketDataTool().execute(codes=["AAPL.US"], start_date="2026-01-01", end_date="2026-02-01", interval="BANANA"))
+ assert out["ok"] is False
+ assert "interval must be one of" in out["error"]
+ assert "BANANA" in out["error"]
+
+
+def test_market_data_tool_normalizes_interval_case():
+ """'1d' is accepted but normalized to canonical '1D' before fetch."""
+ import src.tools.market_data_tool as mod
+ from unittest import mock
+
+ calls = []
+ with mock.patch.object(mod, "fetch_market_data_json", side_effect=lambda **kw: calls.append(kw) or "{}"):
+ mod.MarketDataTool().execute(codes=["AAPL.US"], start_date="2026-08-20", end_date="2026-08-21", interval="1d", max_rows=0)
+ assert calls and calls[0]["interval"] == "1D"
+
+
+def test_market_data_tool_rejects_non_int_max_rows():
+ from src.tools.market_data_tool import MarketDataTool
+
+ out = json.loads(MarketDataTool().execute(codes=["AAPL.US"], start_date="2026-01-01", end_date="2026-02-01", max_rows="abc"))
+ assert out == {"ok": False, "error": "max_rows must be a non-negative integer (0 = all rows)"}
+
+
+def test_market_data_tool_rejects_negative_max_rows():
+ from src.tools.market_data_tool import MarketDataTool
+
+ out = json.loads(MarketDataTool().execute(codes=["AAPL.US"], start_date="2026-01-01", end_date="2026-02-01", max_rows=-5))
+ assert out == {"ok": False, "error": "max_rows must be a non-negative integer (0 = all rows)"}