diff --git a/czsc/data/jq.py b/czsc/data/jq.py index 9895e47a13e471370e011ff08853827edb22901a..80aafefa9a95624cb77d0b4944f260425b2d5cda 100644 --- a/czsc/data/jq.py +++ b/czsc/data/jq.py @@ -137,7 +137,7 @@ def get_kline(symbol, end_date, freq, start_date=None, count=None): :param end_date: datetime 截止日期 :param freq: str - K线级别,可选值 ['1min', '5min', '30min', '60min', 'D', 'W'] + K线级别,可选值 ['1min', '5min', '30min', '60min', 'D', 'W', 'M'] :param count: int K线数量,最大值为 5000 :return: pd.DataFrame @@ -152,7 +152,7 @@ def get_kline(symbol, end_date, freq, start_date=None, count=None): # 1m, 5m, 15m, 30m, 60m, 120m, 1d, 1w, 1M freq_convert = {"1min": "1m", "5min": '5m', '15min': '15m', - "30min": "30m", "60min": '60m', "D": "1d", "W": '1w'} + "30min": "30m", "60min": '60m', "D": "1d", "W": '1w', "M": "1M"} if start_date: data = { "method": "get_price_period", diff --git a/czsc/data/ts.py b/czsc/data/ts.py index 33a13be7aa510bcba673757f386c535cfc17a1f4..46f6e40a6d54f2e9f7a9338e3bcdd9ffa763a39f 100644 --- a/czsc/data/ts.py +++ b/czsc/data/ts.py @@ -22,12 +22,6 @@ def get_token(): return ts.get_token() -def text2df(text): - rows = [x.split(",") for x in text.strip().split('\n')] - df = pd.DataFrame(rows[1:], columns=rows[0]) - return df - - def get_concepts(): """获取概念列表 @@ -104,6 +98,8 @@ def _get_start_date(end_date, freq): start_date = end_date - timedelta(weeks=500) elif freq == 'W': start_date = end_date - timedelta(weeks=1000) + elif freq == 'M': + start_date = end_date - timedelta(weeks=2000) else: raise ValueError("'freq' value error, current value is %s, " "optional valid values are ['1min', '5min', '30min', " @@ -120,7 +116,7 @@ def get_kline(symbol, end_date, freq, start_date=None, count=None): :param end_date: datetime 截止日期 :param freq: str - K线级别,可选值 ['1min', '5min', '30min', '60min', 'D', 'W'] + K线级别,可选值 ['1min', '5min', '30min', '60min', 'D', 'W', "M"] :param count: int K线数量,最大值为 5000 :return: pd.DataFrame