kodorvan/stcs
7
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the counting of the series, added a request to set the serial number

Browse Source
This commit is contained in:
algizn97
2025-10-26 19:44:16 +05:00
parent a2164853d9
commit a0ef48810a
3 changed files with 95 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
app/bybit/open_positions.py
View File

@@ -61,6 +61,26 @@ async def start_trading_cycle(
leverage=leverage,
)
await rq.set_user_deal(
tg_id=tg_id,
symbol=symbol,
current_step=1,
current_series=1,
trade_mode=trade_mode,
side_mode=switch_side,
margin_type=margin_type,
leverage=leverage,
order_quantity=order_quantity,
trigger_price=trigger_price,
martingale_factor=martingale_factor,
max_bets_in_series=max_bets_in_series,
take_profit_percent=take_profit_percent,
stop_loss_percent=stop_loss_percent,
base_quantity=order_quantity,
commission_fee=commission_fee,
commission_place=commission_place
)
res = await open_positions(
tg_id=tg_id,
symbol=symbol,
@@ -74,25 +94,6 @@ async def start_trading_cycle(
)
if res == "OK":
await rq.set_user_deal(
tg_id=tg_id,
symbol=symbol,
current_step=1,
current_series=1,
trade_mode=trade_mode,
side_mode=switch_side,
margin_type=margin_type,
leverage=leverage,
order_quantity=order_quantity,
trigger_price=trigger_price,
martingale_factor=martingale_factor,
max_bets_in_series=max_bets_in_series,
take_profit_percent=take_profit_percent,
stop_loss_percent=stop_loss_percent,
base_quantity=order_quantity,
commission_fee=commission_fee,
commission_place=commission_place
)
return "OK"
return (
res
@@ -151,7 +152,25 @@ async def trading_cycle_profit(
else:
s_side = side
next_series = current_series + 1
await rq.set_user_deal(
tg_id=tg_id,
symbol=symbol,
current_step=1,
current_series=current_series,
trade_mode=trade_mode,
side_mode=side_mode,
margin_type=margin_type,
leverage=leverage,
order_quantity=base_quantity,
trigger_price=trigger_price,
martingale_factor=martingale_factor,
max_bets_in_series=max_bets_in_series,
take_profit_percent=take_profit_percent,
stop_loss_percent=stop_loss_percent,
base_quantity=base_quantity,
commission_fee=commission_fee,
commission_place=commission_place
)
res = await open_positions(
tg_id=tg_id,
@@ -166,25 +185,6 @@ async def trading_cycle_profit(
)
if res == "OK":
await rq.set_user_deal(
tg_id=tg_id,
symbol=symbol,
current_step=1,
current_series=next_series,
trade_mode=trade_mode,
side_mode=side_mode,
margin_type=margin_type,
leverage=leverage,
order_quantity=base_quantity,
trigger_price=trigger_price,
martingale_factor=martingale_factor,
max_bets_in_series=max_bets_in_series,
take_profit_percent=take_profit_percent,
stop_loss_percent=stop_loss_percent,
base_quantity=base_quantity,
commission_fee=commission_fee,
commission_place=commission_place
)
return "OK"
return (
@@ -253,6 +253,26 @@ async def trading_cycle(
else:
r_side = side
await rq.set_user_deal(
tg_id=tg_id,
symbol=symbol,
current_step=current_step,
current_series=current_series,
trade_mode=trade_mode,
side_mode=side_mode,
margin_type=margin_type,
leverage=leverage,
order_quantity=next_quantity,
trigger_price=trigger_price,
martingale_factor=martingale_factor,
max_bets_in_series=max_bets_in_series,
take_profit_percent=take_profit_percent,
stop_loss_percent=stop_loss_percent,
base_quantity=base_quantity,
commission_fee=commission_fee,
commission_place=commission_place
)
res = await open_positions(
tg_id=tg_id,
symbol=symbol,
@@ -266,25 +286,6 @@ async def trading_cycle(
)
if res == "OK":
await rq.set_user_deal(
tg_id=tg_id,
symbol=symbol,
current_step=current_step,
current_series=current_series,
trade_mode=trade_mode,
side_mode=side_mode,
margin_type=margin_type,
leverage=leverage,
order_quantity=next_quantity,
trigger_price=trigger_price,
martingale_factor=martingale_factor,
max_bets_in_series=max_bets_in_series,
take_profit_percent=take_profit_percent,
stop_loss_percent=stop_loss_percent,
base_quantity=base_quantity,
commission_fee=commission_fee,
commission_place=commission_place
)
return "OK"
return (