diff --git a/cryptoai/agents/__pycache__/crypto_agent.cpython-313.pyc b/cryptoai/agents/__pycache__/crypto_agent.cpython-313.pyc index e74f4b9..8080a57 100644 Binary files a/cryptoai/agents/__pycache__/crypto_agent.cpython-313.pyc and b/cryptoai/agents/__pycache__/crypto_agent.cpython-313.pyc differ diff --git a/cryptoai/agents/crypto_agent.py b/cryptoai/agents/crypto_agent.py index e8d215f..d6ab967 100644 --- a/cryptoai/agents/crypto_agent.py +++ b/cryptoai/agents/crypto_agent.py @@ -109,9 +109,10 @@ class CryptoAgent: data = self.binance_api.get_historical_klines( symbol=symbol, interval=self.time_interval, - start_str=start_str + start_str=start_str, + limit=200 ) - + print(f"Binance获取数据: {data}") if data.empty: # 如果从Binance获取失败,尝试从OKX获取 print(f"从Binance获取数据失败,尝试从OKX获取{symbol}的K线数据...") diff --git a/cryptoai/api/__pycache__/binance_api.cpython-313.pyc b/cryptoai/api/__pycache__/binance_api.cpython-313.pyc index fdd8330..bcc4f5e 100644 Binary files a/cryptoai/api/__pycache__/binance_api.cpython-313.pyc and b/cryptoai/api/__pycache__/binance_api.cpython-313.pyc differ diff --git a/cryptoai/api/binance_api.py b/cryptoai/api/binance_api.py index d21db19..0e8ba28 100644 --- a/cryptoai/api/binance_api.py +++ b/cryptoai/api/binance_api.py @@ -84,7 +84,7 @@ class BinanceAPI: print(f"获取交易对大户持仓多空比时出错: {e}") return 0 - def get_historical_klines(self, symbol: str, interval: str, start_str: Optional[str] = None, end_str: Optional[str] = None, limit: Optional[int] = None) -> pd.DataFrame: + def get_historical_klines(self, symbol: str, interval: str, start_str: Optional[str] = None, end_str: Optional[str] = None, limit: int = 200) -> pd.DataFrame: """ 获取历史K线数据 @@ -106,6 +106,7 @@ class BinanceAPI: limit=limit, klines_type=HistoricalKlinesType.FUTURES ) + print(f"Binance获取数据: {klines}") # 转换为DataFrame df = pd.DataFrame(klines, columns=[ diff --git a/docker-compose.yml b/docker-compose.yml index bf877c8..13ba3e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: cryptoai-task: build: . container_name: cryptoai-task - image: cryptoai:0.0.17 + image: cryptoai:0.0.18 restart: always volumes: - ./cryptoai/data:/app/cryptoai/data diff --git a/test.py b/test.py index cdfada6..b23d29b 100644 --- a/test.py +++ b/test.py @@ -5,6 +5,16 @@ from time import sleep from cryptoai.models.token import TokenManager from cryptoai.utils.db_manager import get_db_context from cryptoai.tasks.user import task_run +from cryptoai.agents.crypto_agent import CryptoAgent if __name__ == "__main__": - task_run() + CryptoAgent().start_agent() + + # data = get_binance_api().get_historical_klines( + # symbol="BTCUSDT", + # interval="1h", + # start_str="2024-01-01", + # end_str="2024-01-02", + # limit=100 + # ) + # print(data)