From e2f947897188b2756018b836726afd96c1a49040 Mon Sep 17 00:00:00 2001 From: algizn97 Date: Thu, 18 Sep 2025 16:17:39 +0500 Subject: [PATCH] Fixed --- app/services/Bybit/functions/Futures.py | 25 +++------ app/services/Bybit/functions/bybit_ws.py | 4 +- app/services/Bybit/functions/functions.py | 62 +++++++++++----------- app/telegram/Keyboards/inline_keyboards.py | 6 +-- 4 files changed, 44 insertions(+), 53 deletions(-) diff --git a/app/services/Bybit/functions/Futures.py b/app/services/Bybit/functions/Futures.py index 3d6727c..a6ce0e2 100644 --- a/app/services/Bybit/functions/Futures.py +++ b/app/services/Bybit/functions/Futures.py @@ -1,7 +1,6 @@ import asyncio import logging.config import time - import app.services.Bybit.functions.balance as balance_g import app.services.Bybit.functions.price_symbol as price_symbol import app.telegram.database.requests as rq @@ -47,11 +46,10 @@ def format_trade_details_position(data, commission_fee): Форматирует информацию о сделке в виде строки. """ msg = data.get("data", [{}])[0] - closed_size = safe_float(msg.get("closedSize", 0)) symbol = msg.get("symbol", "N/A") entry_price = safe_float(msg.get("execPrice", 0)) - qty = safe_float(msg.get("execQty", 0)) + qty = safe_float(msg.get("orderQty", 0)) order_type = msg.get("orderType", "N/A") side = msg.get("side", "") commission = safe_float(msg.get("execFee", 0)) @@ -69,7 +67,7 @@ def format_trade_details_position(data, commission_fee): movement = side if closed_size > 0: - return ( + text = ( f"Сделка закрыта:\n" f"Торговая пара: {symbol}\n" f"Цена исполнения: {entry_price:.6f}\n" @@ -80,8 +78,9 @@ def format_trade_details_position(data, commission_fee): f"Комиссия за сделку: {commission:.6f}\n" f"Реализованная прибыль: {pnl:.6f} USDT" ) + return text if order_type == "Market": - return ( + text = ( f"Сделка открыта:\n" f"Торговая пара: {symbol}\n" f"Цена исполнения: {entry_price:.6f}\n" @@ -90,6 +89,7 @@ def format_trade_details_position(data, commission_fee): f"Движение: {movement}\n" f"Комиссия за сделку: {commission:.6f}" ) + return text return None @@ -102,8 +102,6 @@ def format_order_details_position(data): qty = safe_float(msg.get("qty", 0)) cum_exec_qty = safe_float(msg.get("cumExecQty", 0)) cum_exec_fee = safe_float(msg.get("cumExecFee", 0)) - take_profit = safe_float(msg.get("takeProfit", 0)) - stop_loss = safe_float(msg.get("stopLoss", 0)) order_status = msg.get("orderStatus", "N/A") symbol = msg.get("symbol", "N/A") order_type = msg.get("orderType", "N/A") @@ -126,8 +124,6 @@ def format_order_details_position(data): f"Исполнено позиций: {cum_exec_qty}\n" f"Тип ордера: {order_type}\n" f"Движение: {movement}\n" - f"Тейк-профит: {take_profit:.6f}\n" - f"Стоп-лосс: {stop_loss:.6f}\n" f"Комиссия за сделку: {cum_exec_fee:.6f}\n" ) return text @@ -140,8 +136,6 @@ def format_order_details_position(data): f"Количество: {qty}\n" f"Тип ордера: {order_type}\n" f"Движение: {movement}\n" - f"Тейк-профит: {take_profit:.6f}\n" - f"Стоп-лосс: {stop_loss:.6f}\n" ) return text @@ -153,8 +147,6 @@ def format_order_details_position(data): f"Количество: {qty}\n" f"Тип ордера: {order_type}\n" f"Движение: {movement}\n" - f"Тейк-профит: {take_profit:.6f}\n" - f"Стоп-лосс: {stop_loss:.6f}\n" ) return text return None @@ -206,7 +198,6 @@ async def handle_execution_message(message, msg): Обработчик сообщений об исполнении сделки. Логирует событие и проверяет условия для мартингейла и TP. """ - tg_id = message.from_user.id data = msg.get("data", [{}])[0] data_main_risk_stgs = await rq.get_user_risk_management_settings(tg_id) @@ -270,7 +261,7 @@ async def handle_execution_message(message, msg): ) elif pnl > 0: - await rq.update_martingale_step(tg_id, 0) + await rq.update_martingale_step(tg_id, 1) num = data_main_stgs.get("base_quantity") await rq.update_starting_quantity(tg_id=tg_id, num=num) await message.answer( @@ -405,7 +396,7 @@ async def open_position( logger.info(f"Set leverage to {leverage_to_set} for {symbol}") except exceptions.InvalidRequestError as e: if "110043" in str(e): - logger.info(f"Leverage already set to {leverage} for {symbol}") + logger.info(f"Leverage already set to {leverage_to_set} for {symbol}") else: raise e @@ -482,7 +473,7 @@ async def open_position( logger.info("Режим TP/SL уже установлен - пропускаем") else: raise - resp = client.set_trading_stop( + client.set_trading_stop( category="linear", symbol=symbol, takeProfit=str(round(take_profit_price, 5)), diff --git a/app/services/Bybit/functions/bybit_ws.py b/app/services/Bybit/functions/bybit_ws.py index 28516e3..5eea159 100644 --- a/app/services/Bybit/functions/bybit_ws.py +++ b/app/services/Bybit/functions/bybit_ws.py @@ -71,7 +71,7 @@ def on_order_callback(message, msg): if event_loop is not None: from app.services.Bybit.functions.Futures import handle_order_message asyncio.run_coroutine_threadsafe(handle_order_message(message, msg), event_loop) - logger.info("Callback выполнен.") + logger.info("Callback для ордера выполнен.") else: logger.error("Event loop не установлен, callback пропущен.") @@ -80,7 +80,7 @@ def on_execution_callback(message, ws_msg): if event_loop is not None: from app.services.Bybit.functions.Futures import handle_execution_message asyncio.run_coroutine_threadsafe(handle_execution_message(message, ws_msg), event_loop) - logger.info("Callback выполнен.") + logger.info("Callback для маркета выполнен.") else: logger.error("Event loop не установлен, callback пропущен.") diff --git a/app/services/Bybit/functions/functions.py b/app/services/Bybit/functions/functions.py index d0d3e63..ec19984 100644 --- a/app/services/Bybit/functions/functions.py +++ b/app/services/Bybit/functions/functions.py @@ -146,14 +146,14 @@ async def entry_order_type_callback(callback: CallbackQuery, state: FSMContext) if order_type == 'Limit': await state.set_state(state_limit_price.price) - await callback.message.answer("Введите цену лимитного ордера:", reply_markup=inline_markup.cancel) + await callback.message.answer("Введите цену:", reply_markup=inline_markup.cancel) await callback.answer() return try: await state.update_data(entry_order_type=order_type) await rq.update_entry_order_type(callback.from_user.id, order_type) - await callback.message.answer(f"Выбран тип входа в позицию: {order_type}", + await callback.message.answer("Выбран тип входа в позицию по текущей цене:", reply_markup=inline_markup.start_trading_markup) await callback.answer() except Exception as e: @@ -183,7 +183,7 @@ async def set_limit_price(message: Message, state: FSMContext) -> None: await rq.update_entry_order_type(message.from_user.id, 'Limit') await rq.update_limit_price(message.from_user.id, price) - await message.answer(f"Цена лимитного ордера установлена: {price}", reply_markup=inline_markup.start_trading_markup) + await message.answer(f"Триггер цена установлена: {price}", reply_markup=inline_markup.start_trading_markup) await state.clear() @@ -198,17 +198,17 @@ async def start_trading_process(callback: CallbackQuery) -> None: tg_id = callback.from_user.id message = callback.message data_main_stgs = await rq.get_user_main_settings(tg_id) - data_risk_stgs = await rq.get_user_risk_management_settings(tg_id) - client = await get_bybit_client(tg_id) + # data_risk_stgs = await rq.get_user_risk_management_settings(tg_id) + # client = await get_bybit_client(tg_id) symbol = await rq.get_symbol(tg_id) margin_mode = data_main_stgs.get('margin_type', 'Isolated') trading_mode = data_main_stgs.get('trading_mode') starting_quantity = safe_float(data_main_stgs.get('starting_quantity')) switch_state = data_main_stgs.get("switch_state", "По направлению") - martingale_factor = safe_float(data_main_stgs.get('martingale_factor')) - max_martingale_steps = int(data_main_stgs.get("maximal_quantity", 0)) - commission_fee = data_risk_stgs.get("commission_fee") - fee_info = client.get_fee_rates(category='linear', symbol=symbol) + # martingale_factor = safe_float(data_main_stgs.get('martingale_factor')) + # max_martingale_steps = int(data_main_stgs.get("maximal_quantity", 0)) + # commission_fee = data_risk_stgs.get("commission_fee") + # fee_info = client.get_fee_rates(category='linear', symbol=symbol) if trading_mode == 'Switch': @@ -230,30 +230,30 @@ async def start_trading_process(callback: CallbackQuery) -> None: reply_markup=inline_markup.back_to_main) return - if commission_fee == "Да": - commission_fee_percent = safe_float(fee_info['result']['list'][0]['takerFeeRate']) - else: - commission_fee_percent = 0.0 + # if commission_fee == "Да": + # commission_fee_percent = safe_float(fee_info['result']['list'][0]['takerFeeRate']) + # else: + # commission_fee_percent = 0.0 - total_budget = await calculate_total_budget( - starting_quantity=starting_quantity, - martingale_factor=martingale_factor, - max_steps=max_martingale_steps, - commission_fee_percent=commission_fee_percent, - ) + # total_budget = await calculate_total_budget( + # starting_quantity=starting_quantity, + # martingale_factor=martingale_factor, + # max_steps=max_martingale_steps, + # commission_fee_percent=commission_fee_percent, + # ) - balance = await balance_g.get_balance(tg_id, message) - if safe_float(balance) < total_budget: - logger.error( - f"Недостаточно средств для серии из {max_martingale_steps} шагов с текущими параметрами. " - f"Требуемый бюджет: {total_budget:.2f} USDT, доступно: {balance} USDT." - ) - await message.answer( - f"Недостаточно средств для серии из {max_martingale_steps} шагов с текущими параметрами. " - f"Требуемый бюджет: {total_budget:.2f} USDT, доступно: {balance} USDT.", - reply_markup=inline_markup.back_to_main, - ) - return + # balance = await balance_g.get_balance(tg_id, message) + # if safe_float(balance) < total_budget: + # logger.error( + # f"Недостаточно средств для серии из {max_martingale_steps} шагов с текущими параметрами. " + # f"Требуемый бюджет: {total_budget:.2f} USDT, доступно: {balance} USDT." + # ) + # await message.answer( + # f"Недостаточно средств для серии из {max_martingale_steps} шагов с текущими параметрами. " + # f"Требуемый бюджет: {total_budget:.2f} USDT, доступно: {balance} USDT.", + # reply_markup=inline_markup.back_to_main, + # ) + # return await message.answer("Начинаю торговлю с использованием текущих настроек...") await rq.update_trigger(tg_id=tg_id, trigger="Автоматический") diff --git a/app/telegram/Keyboards/inline_keyboards.py b/app/telegram/Keyboards/inline_keyboards.py index 75c55e8..4ec335f 100644 --- a/app/telegram/Keyboards/inline_keyboards.py +++ b/app/telegram/Keyboards/inline_keyboards.py @@ -61,8 +61,8 @@ cancel = InlineKeyboardMarkup(inline_keyboard=[ entry_order_type_markup = InlineKeyboardMarkup( inline_keyboard=[ [ - InlineKeyboardButton(text="Market (текущая цена)", callback_data="entry_order_type:Market"), - InlineKeyboardButton(text="Limit (триггер цена)", callback_data="entry_order_type:Limit"), + InlineKeyboardButton(text="Текущая цена", callback_data="entry_order_type:Market"), + InlineKeyboardButton(text="Триггер цена", callback_data="entry_order_type:Limit"), ], back_btn_to_main ] ) @@ -79,7 +79,7 @@ main_settings_markup = InlineKeyboardMarkup(inline_keyboard=[ InlineKeyboardButton(text='Тип маржи', callback_data='clb_change_margin_type')], [InlineKeyboardButton(text='Размер кредитного плеча', callback_data='clb_change_size_leverage'), - InlineKeyboardButton(text='Начальная ставка', callback_data='clb_change_starting_quantity')], + InlineKeyboardButton(text='Ставка', callback_data='clb_change_starting_quantity')], [InlineKeyboardButton(text='Коэффициент Мартингейла', callback_data='clb_change_martingale_factor'), InlineKeyboardButton(text='Сбросить шаги Мартингейла', callback_data='clb_change_martingale_reset')],