From e22a1eb0dc20644fed3524d5ad5c3e6b5e04dece Mon Sep 17 00:00:00 2001 From: aaron <> Date: Sun, 18 May 2025 10:27:17 +0800 Subject: [PATCH] update --- .../__pycache__/binance_api.cpython-313.pyc | Bin 9804 -> 9790 bytes cryptoai/api/binance_api.py | 8 +++----- cryptoai/routes/crypto.py | 9 ++++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/cryptoai/api/__pycache__/binance_api.cpython-313.pyc b/cryptoai/api/__pycache__/binance_api.cpython-313.pyc index fe33dda7b1ba7bb29002faf60b44b66684556e1a..df494edcc23ca4d3b878e46545190c7d06369288 100644 GIT binary patch delta 1275 zcmZWoUrd`-6u;;D`iGW&rKNxP3R~N+wq?y+F#MTY*ib+=5bT_{RkoHvEk#<|vfLI# zXO_)}VX~)jHSu{dnI@WGn&_T1Zizv%hxQ56Eb(~{ix5V9@WpdWB{81l{LXjI`JH>t zy*+(0_0yEHuPA1MGBXxgoW7_0tu6u~UyvkWKnas5FqukBM~`tooPyZAax)Rfdy zGpaFZ?l(|NC&}q@z%10uKZS1o9jGn~ZEr^H)YstKlUDvMcoYM5G&Akgzae>2&Zg_4 zT7zgzI+FUNvtQEVT>U!gYUbU|yc-*LpsGnT^`QQjZ=sz{eh2Mh>IX_BQ2AJT-K?e! z;+{=uK`W!~{|#ljjPs^eQP56mY0xL;zw4HXe4116+(<8bqcwr zgyYc1dTZRoSFMAdwxVg+6eP4^7hr*$mwjXbBDTu5^(nv^{=oLjU>VCw9)w$@x|rQr zEY}vxyM(O5nDl~>EL@OS2(xwD!ZItQ%CqHcAyX=+3fI{Xzh@trpTH!0Q@|8LN!-QH zT*8kExP-8R`frQe(oSx*mRrRZYj9DtSc36p3wyIgI=@`XG#W)(*jX&*zIK=6HF4aq zfDwchO~k8KH-Eo9V=yyud;Uk8=jFO#DW5H7N_A;|p)RMF^UR5K>*oJQieyr4dgP@b6(I~fTdAP!FYHH+gQgH|sFegAKK>YF8ynw8LkND5p08W0O zSmjCJSAccSgK_;`?EZ{D4;CQC6QSF|buo3!MJ4^MIgfRQ&_=hBLYV delta 1344 zcmZ9LUrbw79LLW&xBs~9EwzPG{*3nakF(-7!WfD`1v)qWJ2)*P>JHOxk z{{GyXb3Y&YW=Ppl6dA#~dOtAt{<`vqD}@odhBU-5MT}6)Bubc$9^f8)2siQ(TwC8r zD>OZoVH-8M)j%zED5*0imB92 zGN!2EiE`G=1VX%1QL%|nDMus|)$uhY0Jeg^q^NGW4jqHfC{`3=2fR^}`M9;itz_gL*^g++CU63E zNp6(DLFQIX_=Q6J!WM*ZFZl&QUYM`| zJY~-T_UDKJGVKTEzD-2=n_6Iiq7HZ_lgEh z>{*f0AMt>>Gn0xNk4!N23Mr_@;NV z;GNt?NQ0N(LCANUtdX^j^~wjnz|GM0(1v$IE41|9t;*BW1>eM`Pb>H|kWayDf!u#W z$U6%*5C6$AS>M*%j=pS{!_Cqi$s2Bx?gX$nH|fL89Gh!$uT*`F4HTwj5kBDTz|(xy zsp2qPDa8( z19OY`zN~0ooKMI5Gba{UEdD4bsQaIerFffr(6*mfmhyFX2!EQ(yF0L6H!?C3;gxC% zPw*Ah72F$MbQ=?x7SIWZ|Bb~2<^*2mpQ*?2dA_42FFmRE-U@FaFrOSPnY+*ABd70m zmCpGj%V(Dh$%`cq?oA&#MZk=b2!Ze1N21_CDuhzx{Qh}`yh?sUXod7ipb}WdO~ZX?0nZX?2NTRIDFd$(>Efhnc^4Px9nwg3PC diff --git a/cryptoai/api/binance_api.py b/cryptoai/api/binance_api.py index 372e4de..069085a 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, ts_transform: bool = True) -> pd.DataFrame: + 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: """ 获取历史K线数据 @@ -113,10 +113,8 @@ class BinanceAPI: 'taker_buy_base_asset_volume', 'taker_buy_quote_asset_volume', 'ignore' ]) - # 转换数据类型 - if ts_transform: - df['timestamp'] = pd.to_datetime(df['timestamp'], unit='ms', utc=True).map(lambda x: x.tz_convert('Asia/Shanghai')) - df['close_time'] = pd.to_datetime(df['close_time'], unit='ms', utc=True).map(lambda x: x.tz_convert('Asia/Shanghai')) + df['format_timestamp'] = pd.to_datetime(df['timestamp'], unit='ms', utc=True).map(lambda x: x.tz_convert('Asia/Shanghai')) + df['format_close_time'] = pd.to_datetime(df['close_time'], unit='ms', utc=True).map(lambda x: x.tz_convert('Asia/Shanghai')) for col in ['open', 'high', 'low', 'close', 'volume', 'quote_asset_volume', 'taker_buy_base_asset_volume', 'taker_buy_quote_asset_volume']: diff --git a/cryptoai/routes/crypto.py b/cryptoai/routes/crypto.py index 85e0ff4..564d567 100644 --- a/cryptoai/routes/crypto.py +++ b/cryptoai/routes/crypto.py @@ -43,12 +43,11 @@ async def get_crypto_kline(symbol: str, timeframe: Optional[str] = None, limit: result = {} if timeframe is None: - result["1h"] = binance_api.get_historical_klines(symbol=symbol, interval="1h", limit=limit, ts_transform=False).to_dict(orient="records") - result["4h"] = binance_api.get_historical_klines(symbol=symbol, interval="4h", limit=limit, ts_transform=False).to_dict(orient="records") - result["1d"] = binance_api.get_historical_klines(symbol=symbol, interval="1d", limit=limit, ts_transform=False).to_dict(orient="records") - # result["1w"] = binance_api.get_historical_klines(symbol=symbol, interval="1w", limit=limit, ts_transform=False).to_dict(orient="records") + result["1h"] = binance_api.get_historical_klines(symbol=symbol, interval="1h", limit=limit).to_dict(orient="records") + result["4h"] = binance_api.get_historical_klines(symbol=symbol, interval="4h", limit=limit).to_dict(orient="records") + result["1d"] = binance_api.get_historical_klines(symbol=symbol, interval="1d", limit=limit).to_dict(orient="records") else: - result[timeframe] = binance_api.get_historical_klines(symbol=symbol, interval=timeframe, limit=limit, ts_transform=False).to_dict(orient="records") + result[timeframe] = binance_api.get_historical_klines(symbol=symbol, interval=timeframe, limit=limit).to_dict(orient="records") return result