diff --git a/app/bybit/open_positions.py b/app/bybit/open_positions.py index 5fe98b2..2c14636 100644 --- a/app/bybit/open_positions.py +++ b/app/bybit/open_positions.py @@ -54,12 +54,6 @@ async def start_trading_cycle( tg_id=tg_id, symbol=symbol, mode=0) - await set_margin_mode(tg_id=tg_id, margin_mode=margin_type) - await set_leverage( - tg_id=tg_id, - symbol=symbol, - leverage=leverage, - ) await rq.set_user_deal( tg_id=tg_id, @@ -316,7 +310,12 @@ async def open_positions( try: client = await get_bybit_client(tg_id=tg_id) get_ticker = await get_tickers(tg_id, symbol=symbol) - price_symbol = safe_float(get_ticker.get("lastPrice")) or 0 + + if get_ticker is None: + price_symbol = 0 + else: + price_symbol = safe_float(get_ticker.get("lastPrice")) + instruments_info = await get_instruments_info(tg_id=tg_id, symbol=symbol) qty_step_str = instruments_info.get("lotSizeFilter").get("qtyStep") qty_step = safe_float(qty_step_str) diff --git a/app/bybit/set_functions/set_tp_sl.py b/app/bybit/set_functions/set_tp_sl.py index eded48f..7c95a60 100644 --- a/app/bybit/set_functions/set_tp_sl.py +++ b/app/bybit/set_functions/set_tp_sl.py @@ -25,11 +25,13 @@ async def set_tp_sl_for_position( """ try: client = await get_bybit_client(tg_id) + take_profit = round(take_profit_price, 6) if take_profit_price is not None else None + stop_loss = round(stop_loss_price, 6) if stop_loss_price is not None else None resp = client.set_trading_stop( category="linear", symbol=symbol, - takeProfit=str(round(take_profit_price, 5)), - stopLoss=str(round(stop_loss_price, 5)), + takeProfit=str(take_profit) if take_profit is not None else None, + stopLoss=str(stop_loss) if stop_loss is not None else None, positionIdx=position_idx, tpslMode="Full", )