Alex/stcs
2
0
Fork 0
forked from kodorvan/stcs
Code Pull Requests Activity

Fixed

Browse Source
This commit is contained in:
algizn97
2025-09-18 16:17:39 +05:00
parent 4f0668970f
commit e2f9478971
4 changed files with 44 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/services/Bybit/functions/functions.py
View File

@@ -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="Автоматический")