forked from kodorvan/stcs
Compare commits
25 Commits
630f2002d3
...
stable
Author | SHA1 | Date | |
---|---|---|---|
7b1a803db4 | |||
![]() |
ddfa3a7360 | ||
9fcd92cc72 | |||
![]() |
e61b7334a4 | ||
97a199f31e | |||
![]() |
5ad69f3f6d | ||
![]() |
abad01352a | ||
![]() |
720b30d681 | ||
![]() |
3616e2cbd3 | ||
![]() |
7d108337fa | ||
![]() |
0f6e6a2168 | ||
951bc15957 | |||
![]() |
258ed970f1 | ||
![]() |
a3a6509933 | ||
5937058899 | |||
![]() |
8251938b2f | ||
f0732607e2 | |||
![]() |
458b34fcec | ||
56af1d8f3b | |||
![]() |
4a7577b977 | ||
9f069df68a | |||
![]() |
6e0a170f4b | ||
![]() |
c7b4a08a6a | ||
![]() |
d0971f59b4 | ||
b92376d2da |
@@ -1,6 +1 @@
|
|||||||
BOT_TOKEN=YOUR_BOT_TOKEN
|
BOT_TOKEN=YOUR_BOT_TOKEN
|
||||||
DB_USER=your_username
|
|
||||||
DB_PASS=your_password
|
|
||||||
DB_HOST=your_host
|
|
||||||
DB_PORT=your_port
|
|
||||||
DB_NAME=your_database
|
|
3
.gitignore
vendored
3
.gitignore
vendored
@@ -146,6 +146,9 @@ myenv
|
|||||||
ENV/
|
ENV/
|
||||||
env.bak/
|
env.bak/
|
||||||
venv.bak/
|
venv.bak/
|
||||||
|
/logger_helper/loggers
|
||||||
|
/app/bybit/logger_bybit/loggers
|
||||||
|
*.db
|
||||||
# Spyder project settings
|
# Spyder project settings
|
||||||
.spyderproject
|
.spyderproject
|
||||||
.spyproject
|
.spyproject
|
||||||
|
@@ -54,6 +54,10 @@ sudo -u www-data /usr/bin/pip install -r requirements.txt
|
|||||||
cp .env.sample .env
|
cp .env.sample .env
|
||||||
nvim .env
|
nvim .env
|
||||||
```
|
```
|
||||||
|
5. Выполните миграции:
|
||||||
|
```bash
|
||||||
|
alembic upgrade head
|
||||||
|
```
|
||||||
|
|
||||||
5. Запустите бота:
|
5. Запустите бота:
|
||||||
|
|
||||||
|
147
alembic.ini
Normal file
147
alembic.ini
Normal file
@@ -0,0 +1,147 @@
|
|||||||
|
# A generic, single database configuration.
|
||||||
|
|
||||||
|
[alembic]
|
||||||
|
# path to migration scripts.
|
||||||
|
# this is typically a path given in POSIX (e.g. forward slashes)
|
||||||
|
# format, relative to the token %(here)s which refers to the location of this
|
||||||
|
# ini file
|
||||||
|
script_location = %(here)s/alembic
|
||||||
|
|
||||||
|
# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
|
||||||
|
# Uncomment the line below if you want the files to be prepended with date and time
|
||||||
|
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
|
||||||
|
# for all available tokens
|
||||||
|
# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
|
||||||
|
|
||||||
|
# sys.path path, will be prepended to sys.path if present.
|
||||||
|
# defaults to the current working directory. for multiple paths, the path separator
|
||||||
|
# is defined by "path_separator" below.
|
||||||
|
prepend_sys_path = .
|
||||||
|
|
||||||
|
|
||||||
|
# timezone to use when rendering the date within the migration file
|
||||||
|
# as well as the filename.
|
||||||
|
# If specified, requires the python>=3.9 or backports.zoneinfo library and tzdata library.
|
||||||
|
# Any required deps can installed by adding `alembic[tz]` to the pip requirements
|
||||||
|
# string value is passed to ZoneInfo()
|
||||||
|
# leave blank for localtime
|
||||||
|
# timezone =
|
||||||
|
|
||||||
|
# max length of characters to apply to the "slug" field
|
||||||
|
# truncate_slug_length = 40
|
||||||
|
|
||||||
|
# set to 'true' to run the environment during
|
||||||
|
# the 'revision' command, regardless of autogenerate
|
||||||
|
# revision_environment = false
|
||||||
|
|
||||||
|
# set to 'true' to allow .pyc and .pyo files without
|
||||||
|
# a source .py file to be detected as revisions in the
|
||||||
|
# versions/ directory
|
||||||
|
# sourceless = false
|
||||||
|
|
||||||
|
# version location specification; This defaults
|
||||||
|
# to <script_location>/versions. When using multiple version
|
||||||
|
# directories, initial revisions must be specified with --version-path.
|
||||||
|
# The path separator used here should be the separator specified by "path_separator"
|
||||||
|
# below.
|
||||||
|
# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions
|
||||||
|
|
||||||
|
# path_separator; This indicates what character is used to split lists of file
|
||||||
|
# paths, including version_locations and prepend_sys_path within configparser
|
||||||
|
# files such as alembic.ini.
|
||||||
|
# The default rendered in new alembic.ini files is "os", which uses os.pathsep
|
||||||
|
# to provide os-dependent path splitting.
|
||||||
|
#
|
||||||
|
# Note that in order to support legacy alembic.ini files, this default does NOT
|
||||||
|
# take place if path_separator is not present in alembic.ini. If this
|
||||||
|
# option is omitted entirely, fallback logic is as follows:
|
||||||
|
#
|
||||||
|
# 1. Parsing of the version_locations option falls back to using the legacy
|
||||||
|
# "version_path_separator" key, which if absent then falls back to the legacy
|
||||||
|
# behavior of splitting on spaces and/or commas.
|
||||||
|
# 2. Parsing of the prepend_sys_path option falls back to the legacy
|
||||||
|
# behavior of splitting on spaces, commas, or colons.
|
||||||
|
#
|
||||||
|
# Valid values for path_separator are:
|
||||||
|
#
|
||||||
|
# path_separator = :
|
||||||
|
# path_separator = ;
|
||||||
|
# path_separator = space
|
||||||
|
# path_separator = newline
|
||||||
|
#
|
||||||
|
# Use os.pathsep. Default configuration used for new projects.
|
||||||
|
path_separator = os
|
||||||
|
|
||||||
|
# set to 'true' to search source files recursively
|
||||||
|
# in each "version_locations" directory
|
||||||
|
# new in Alembic version 1.10
|
||||||
|
# recursive_version_locations = false
|
||||||
|
|
||||||
|
# the output encoding used when revision files
|
||||||
|
# are written from script.py.mako
|
||||||
|
# output_encoding = utf-8
|
||||||
|
|
||||||
|
# database URL. This is consumed by the user-maintained env.py script only.
|
||||||
|
# other means of configuring database URLs may be customized within the env.py
|
||||||
|
# file.
|
||||||
|
sqlalchemy.url = sqlite+aiosqlite:///./database/db/stcs.db
|
||||||
|
|
||||||
|
|
||||||
|
[post_write_hooks]
|
||||||
|
# post_write_hooks defines scripts or Python functions that are run
|
||||||
|
# on newly generated revision scripts. See the documentation for further
|
||||||
|
# detail and examples
|
||||||
|
|
||||||
|
# format using "black" - use the console_scripts runner, against the "black" entrypoint
|
||||||
|
# hooks = black
|
||||||
|
# black.type = console_scripts
|
||||||
|
# black.entrypoint = black
|
||||||
|
# black.options = -l 79 REVISION_SCRIPT_FILENAME
|
||||||
|
|
||||||
|
# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module
|
||||||
|
# hooks = ruff
|
||||||
|
# ruff.type = module
|
||||||
|
# ruff.module = ruff
|
||||||
|
# ruff.options = check --fix REVISION_SCRIPT_FILENAME
|
||||||
|
|
||||||
|
# Alternatively, use the exec runner to execute a binary found on your PATH
|
||||||
|
# hooks = ruff
|
||||||
|
# ruff.type = exec
|
||||||
|
# ruff.executable = ruff
|
||||||
|
# ruff.options = check --fix REVISION_SCRIPT_FILENAME
|
||||||
|
|
||||||
|
# Logging configuration. This is also consumed by the user-maintained
|
||||||
|
# env.py script only.
|
||||||
|
[loggers]
|
||||||
|
keys = root,sqlalchemy,alembic
|
||||||
|
|
||||||
|
[handlers]
|
||||||
|
keys = console
|
||||||
|
|
||||||
|
[formatters]
|
||||||
|
keys = generic
|
||||||
|
|
||||||
|
[logger_root]
|
||||||
|
level = WARNING
|
||||||
|
handlers = console
|
||||||
|
qualname =
|
||||||
|
|
||||||
|
[logger_sqlalchemy]
|
||||||
|
level = WARNING
|
||||||
|
handlers =
|
||||||
|
qualname = sqlalchemy.engine
|
||||||
|
|
||||||
|
[logger_alembic]
|
||||||
|
level = INFO
|
||||||
|
handlers =
|
||||||
|
qualname = alembic
|
||||||
|
|
||||||
|
[handler_console]
|
||||||
|
class = StreamHandler
|
||||||
|
args = (sys.stderr,)
|
||||||
|
level = NOTSET
|
||||||
|
formatter = generic
|
||||||
|
|
||||||
|
[formatter_generic]
|
||||||
|
format = %(levelname)-5.5s [%(name)s] %(message)s
|
||||||
|
datefmt = %H:%M:%S
|
1
alembic/README
Normal file
1
alembic/README
Normal file
@@ -0,0 +1 @@
|
|||||||
|
Generic single-database configuration.
|
53
alembic/env.py
Normal file
53
alembic/env.py
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
import asyncio
|
||||||
|
from logging.config import fileConfig
|
||||||
|
from sqlalchemy import pool
|
||||||
|
from sqlalchemy.ext.asyncio import async_engine_from_config
|
||||||
|
from alembic import context
|
||||||
|
|
||||||
|
config = context.config
|
||||||
|
|
||||||
|
if config.config_file_name is not None:
|
||||||
|
fileConfig(config.config_file_name)
|
||||||
|
|
||||||
|
from database.models import Base
|
||||||
|
target_metadata = Base.metadata
|
||||||
|
|
||||||
|
def do_run_migrations(connection):
|
||||||
|
context.configure(
|
||||||
|
connection=connection,
|
||||||
|
target_metadata=target_metadata,
|
||||||
|
compare_type=True,
|
||||||
|
)
|
||||||
|
with context.begin_transaction():
|
||||||
|
context.run_migrations()
|
||||||
|
|
||||||
|
async def run_async_migrations():
|
||||||
|
connectable = async_engine_from_config(
|
||||||
|
config.get_section(config.config_ini_section),
|
||||||
|
prefix="sqlalchemy.",
|
||||||
|
poolclass=pool.NullPool,
|
||||||
|
)
|
||||||
|
|
||||||
|
async with connectable.connect() as connection:
|
||||||
|
await connection.run_sync(do_run_migrations)
|
||||||
|
|
||||||
|
await connectable.dispose()
|
||||||
|
|
||||||
|
def run_migrations_offline():
|
||||||
|
url = config.get_main_option("sqlalchemy.url")
|
||||||
|
context.configure(
|
||||||
|
url=url,
|
||||||
|
target_metadata=target_metadata,
|
||||||
|
literal_binds=True,
|
||||||
|
dialect_opts={"paramstyle": "named"},
|
||||||
|
)
|
||||||
|
with context.begin_transaction():
|
||||||
|
context.run_migrations()
|
||||||
|
|
||||||
|
def run_migrations_online():
|
||||||
|
asyncio.run(run_async_migrations())
|
||||||
|
|
||||||
|
if context.is_offline_mode():
|
||||||
|
run_migrations_offline()
|
||||||
|
else:
|
||||||
|
run_migrations_online()
|
28
alembic/script.py.mako
Normal file
28
alembic/script.py.mako
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
"""${message}
|
||||||
|
|
||||||
|
Revision ID: ${up_revision}
|
||||||
|
Revises: ${down_revision | comma,n}
|
||||||
|
Create Date: ${create_date}
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
${imports if imports else ""}
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = ${repr(up_revision)}
|
||||||
|
down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
|
||||||
|
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
"""Upgrade schema."""
|
||||||
|
${upgrades if upgrades else "pass"}
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade schema."""
|
||||||
|
${downgrades if downgrades else "pass"}
|
32
alembic/versions/fbf4e3658310_added_side_mode_column.py
Normal file
32
alembic/versions/fbf4e3658310_added_side_mode_column.py
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
"""Added side_mode column
|
||||||
|
|
||||||
|
Revision ID: fbf4e3658310
|
||||||
|
Revises:
|
||||||
|
Create Date: 2025-10-22 13:08:02.317419
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = 'fbf4e3658310'
|
||||||
|
down_revision: Union[str, Sequence[str], None] = None
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
"""Upgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.add_column('user_deals', sa.Column('side_mode', sa.String(), nullable=True))
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_column('user_deals', 'side_mode')
|
||||||
|
# ### end Alembic commands ###
|
@@ -10,25 +10,24 @@ from app.bybit.get_functions.get_tickers import get_tickers
|
|||||||
from app.bybit.logger_bybit.logger_bybit import LOGGING_CONFIG
|
from app.bybit.logger_bybit.logger_bybit import LOGGING_CONFIG
|
||||||
from app.bybit.set_functions.set_leverage import set_leverage
|
from app.bybit.set_functions.set_leverage import set_leverage
|
||||||
from app.bybit.set_functions.set_margin_mode import set_margin_mode
|
from app.bybit.set_functions.set_margin_mode import set_margin_mode
|
||||||
from app.helper_functions import get_liquidation_price, safe_float
|
from app.bybit.set_functions.set_switch_position_mode import set_switch_position_mode
|
||||||
|
from app.helper_functions import safe_float
|
||||||
|
|
||||||
logging.config.dictConfig(LOGGING_CONFIG)
|
logging.config.dictConfig(LOGGING_CONFIG)
|
||||||
logger = logging.getLogger("open_positions")
|
logger = logging.getLogger("open_positions")
|
||||||
|
|
||||||
|
|
||||||
async def start_trading_cycle(
|
async def start_trading_cycle(
|
||||||
tg_id: int
|
tg_id: int
|
||||||
) -> str | None:
|
) -> str | None:
|
||||||
"""
|
"""
|
||||||
Start trading cycle
|
Start trading cycle
|
||||||
:param tg_id: Telegram user ID
|
:param tg_id: Telegram user ID
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
client = await get_bybit_client(tg_id=tg_id)
|
|
||||||
symbol = await rq.get_user_symbol(tg_id=tg_id)
|
symbol = await rq.get_user_symbol(tg_id=tg_id)
|
||||||
additional_data = await rq.get_user_additional_settings(tg_id=tg_id)
|
additional_data = await rq.get_user_additional_settings(tg_id=tg_id)
|
||||||
risk_management_data = await rq.get_user_risk_management(tg_id=tg_id)
|
risk_management_data = await rq.get_user_risk_management(tg_id=tg_id)
|
||||||
commission_fee = risk_management_data.commission_fee
|
|
||||||
user_deals_data = await rq.get_user_deal_by_symbol(
|
user_deals_data = await rq.get_user_deal_by_symbol(
|
||||||
tg_id=tg_id, symbol=symbol
|
tg_id=tg_id, symbol=symbol
|
||||||
)
|
)
|
||||||
@@ -42,6 +41,7 @@ async def start_trading_cycle(
|
|||||||
max_bets_in_series = additional_data.max_bets_in_series
|
max_bets_in_series = additional_data.max_bets_in_series
|
||||||
take_profit_percent = risk_management_data.take_profit_percent
|
take_profit_percent = risk_management_data.take_profit_percent
|
||||||
stop_loss_percent = risk_management_data.stop_loss_percent
|
stop_loss_percent = risk_management_data.stop_loss_percent
|
||||||
|
total_commission = 0
|
||||||
|
|
||||||
get_side = "Buy"
|
get_side = "Buy"
|
||||||
|
|
||||||
@@ -62,34 +62,10 @@ async def start_trading_cycle(
|
|||||||
else:
|
else:
|
||||||
side = "Sell"
|
side = "Sell"
|
||||||
|
|
||||||
# Get fee rates
|
await set_switch_position_mode(
|
||||||
fee_info = client.get_fee_rates(category="linear", symbol=symbol)
|
tg_id=tg_id,
|
||||||
|
symbol=symbol,
|
||||||
# Check if commission fee is enabled
|
mode=0)
|
||||||
commission_fee_percent = 0.0
|
|
||||||
if commission_fee == "Yes_commission_fee":
|
|
||||||
commission_fee_percent = safe_float(
|
|
||||||
fee_info["result"]["list"][0]["takerFeeRate"]
|
|
||||||
)
|
|
||||||
|
|
||||||
get_ticker = await get_tickers(tg_id, symbol=symbol)
|
|
||||||
price_symbol = safe_float(get_ticker.get("lastPrice")) or 0
|
|
||||||
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)
|
|
||||||
qty = safe_float(order_quantity) / safe_float(price_symbol)
|
|
||||||
decimals = abs(int(round(math.log10(qty_step))))
|
|
||||||
qty_formatted = math.floor(qty / qty_step) * qty_step
|
|
||||||
qty_formatted = round(qty_formatted, decimals)
|
|
||||||
|
|
||||||
if trigger_price > 0:
|
|
||||||
po_trigger_price = str(trigger_price)
|
|
||||||
else:
|
|
||||||
po_trigger_price = None
|
|
||||||
|
|
||||||
price_for_cals = trigger_price if po_trigger_price is not None else price_symbol
|
|
||||||
total_commission = price_for_cals * qty_formatted * commission_fee_percent
|
|
||||||
|
|
||||||
await set_margin_mode(tg_id=tg_id, margin_mode=margin_type)
|
await set_margin_mode(tg_id=tg_id, margin_mode=margin_type)
|
||||||
await set_leverage(
|
await set_leverage(
|
||||||
tg_id=tg_id,
|
tg_id=tg_id,
|
||||||
@@ -117,6 +93,7 @@ async def start_trading_cycle(
|
|||||||
last_side=side,
|
last_side=side,
|
||||||
current_step=1,
|
current_step=1,
|
||||||
trade_mode=trade_mode,
|
trade_mode=trade_mode,
|
||||||
|
side_mode=switch_side,
|
||||||
margin_type=margin_type,
|
margin_type=margin_type,
|
||||||
leverage=leverage,
|
leverage=leverage,
|
||||||
order_quantity=order_quantity,
|
order_quantity=order_quantity,
|
||||||
@@ -131,19 +108,19 @@ async def start_trading_cycle(
|
|||||||
return (
|
return (
|
||||||
res
|
res
|
||||||
if res
|
if res
|
||||||
in {
|
in {
|
||||||
"Limit price is out min price",
|
"Limit price is out min price",
|
||||||
"Limit price is out max price",
|
"Limit price is out max price",
|
||||||
"Risk is too high for this trade",
|
"Risk is too high for this trade",
|
||||||
"estimated will trigger liq",
|
"estimated will trigger liq",
|
||||||
"ab not enough for new order",
|
"ab not enough for new order",
|
||||||
"InvalidRequestError",
|
"InvalidRequestError",
|
||||||
"Order does not meet minimum order value",
|
"Order does not meet minimum order value",
|
||||||
"position idx not match position mode",
|
"position idx not match position mode",
|
||||||
"Qty invalid",
|
"Qty invalid",
|
||||||
"The number of contracts exceeds maximum limit allowed",
|
"The number of contracts exceeds maximum limit allowed",
|
||||||
"The number of contracts exceeds minimum limit allowed"
|
"The number of contracts exceeds minimum limit allowed"
|
||||||
}
|
}
|
||||||
else None
|
else None
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -152,8 +129,90 @@ async def start_trading_cycle(
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
async def trading_cycle_profit(
|
||||||
|
tg_id: int, symbol: str, side: str) -> str | None:
|
||||||
|
try:
|
||||||
|
user_deals_data = await rq.get_user_deal_by_symbol(tg_id=tg_id, symbol=symbol)
|
||||||
|
user_auto_trading_data = await rq.get_user_auto_trading(tg_id=tg_id, symbol=symbol)
|
||||||
|
total_fee = user_auto_trading_data.total_fee
|
||||||
|
trade_mode = user_deals_data.trade_mode
|
||||||
|
margin_type = user_deals_data.margin_type
|
||||||
|
leverage = user_deals_data.leverage
|
||||||
|
trigger_price = 0
|
||||||
|
take_profit_percent = user_deals_data.take_profit_percent
|
||||||
|
stop_loss_percent = user_deals_data.stop_loss_percent
|
||||||
|
max_bets_in_series = user_deals_data.max_bets_in_series
|
||||||
|
martingale_factor = user_deals_data.martingale_factor
|
||||||
|
side_mode = user_deals_data.side_mode
|
||||||
|
base_quantity = user_deals_data.base_quantity
|
||||||
|
|
||||||
|
await set_margin_mode(tg_id=tg_id, margin_mode=margin_type)
|
||||||
|
await set_leverage(
|
||||||
|
tg_id=tg_id,
|
||||||
|
symbol=symbol,
|
||||||
|
leverage=leverage,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
if trade_mode == "Switch":
|
||||||
|
if side_mode == "Противоположно":
|
||||||
|
s_side = "Sell" if side == "Buy" else "Buy"
|
||||||
|
else:
|
||||||
|
s_side = side
|
||||||
|
else:
|
||||||
|
s_side = side
|
||||||
|
|
||||||
|
res = await open_positions(
|
||||||
|
tg_id=tg_id,
|
||||||
|
symbol=symbol,
|
||||||
|
side=s_side,
|
||||||
|
order_quantity=base_quantity,
|
||||||
|
trigger_price=trigger_price,
|
||||||
|
margin_type=margin_type,
|
||||||
|
leverage=leverage,
|
||||||
|
take_profit_percent=take_profit_percent,
|
||||||
|
stop_loss_percent=stop_loss_percent,
|
||||||
|
commission_fee_percent=total_fee
|
||||||
|
)
|
||||||
|
|
||||||
|
if res == "OK":
|
||||||
|
await rq.set_user_deal(
|
||||||
|
tg_id=tg_id,
|
||||||
|
symbol=symbol,
|
||||||
|
last_side=side,
|
||||||
|
current_step=1,
|
||||||
|
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
|
||||||
|
)
|
||||||
|
return "OK"
|
||||||
|
|
||||||
|
return (
|
||||||
|
res
|
||||||
|
if res
|
||||||
|
in {
|
||||||
|
"Risk is too high for this trade",
|
||||||
|
"ab not enough for new order",
|
||||||
|
"InvalidRequestError",
|
||||||
|
"The number of contracts exceeds maximum limit allowed",
|
||||||
|
}
|
||||||
|
else None
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.error("Error in trading_cycle_profit: %s", e)
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
async def trading_cycle(
|
async def trading_cycle(
|
||||||
tg_id: int, symbol: str, reverse_side: str
|
tg_id: int, symbol: str, side: str,
|
||||||
) -> str | None:
|
) -> str | None:
|
||||||
try:
|
try:
|
||||||
user_deals_data = await rq.get_user_deal_by_symbol(tg_id=tg_id, symbol=symbol)
|
user_deals_data = await rq.get_user_deal_by_symbol(tg_id=tg_id, symbol=symbol)
|
||||||
@@ -170,23 +229,7 @@ async def trading_cycle(
|
|||||||
current_step = user_deals_data.current_step
|
current_step = user_deals_data.current_step
|
||||||
order_quantity = user_deals_data.order_quantity
|
order_quantity = user_deals_data.order_quantity
|
||||||
base_quantity = user_deals_data.base_quantity
|
base_quantity = user_deals_data.base_quantity
|
||||||
|
side_mode = user_deals_data.side_mode
|
||||||
await set_margin_mode(tg_id=tg_id, margin_mode=margin_type)
|
|
||||||
await set_leverage(
|
|
||||||
tg_id=tg_id,
|
|
||||||
symbol=symbol,
|
|
||||||
leverage=leverage,
|
|
||||||
)
|
|
||||||
|
|
||||||
if reverse_side == "Buy":
|
|
||||||
real_side = "Sell"
|
|
||||||
else:
|
|
||||||
real_side = "Buy"
|
|
||||||
|
|
||||||
side = real_side
|
|
||||||
|
|
||||||
if trade_mode == "Switch":
|
|
||||||
side = "Sell" if real_side == "Buy" else "Buy"
|
|
||||||
|
|
||||||
next_quantity = safe_float(order_quantity) * (
|
next_quantity = safe_float(order_quantity) * (
|
||||||
safe_float(martingale_factor)
|
safe_float(martingale_factor)
|
||||||
@@ -196,6 +239,13 @@ async def trading_cycle(
|
|||||||
if max_bets_in_series < current_step:
|
if max_bets_in_series < current_step:
|
||||||
return "Max bets in series"
|
return "Max bets in series"
|
||||||
|
|
||||||
|
await set_margin_mode(tg_id=tg_id, margin_mode=margin_type)
|
||||||
|
await set_leverage(
|
||||||
|
tg_id=tg_id,
|
||||||
|
symbol=symbol,
|
||||||
|
leverage=leverage,
|
||||||
|
)
|
||||||
|
|
||||||
res = await open_positions(
|
res = await open_positions(
|
||||||
tg_id=tg_id,
|
tg_id=tg_id,
|
||||||
symbol=symbol,
|
symbol=symbol,
|
||||||
@@ -216,6 +266,7 @@ async def trading_cycle(
|
|||||||
last_side=side,
|
last_side=side,
|
||||||
current_step=current_step,
|
current_step=current_step,
|
||||||
trade_mode=trade_mode,
|
trade_mode=trade_mode,
|
||||||
|
side_mode=side_mode,
|
||||||
margin_type=margin_type,
|
margin_type=margin_type,
|
||||||
leverage=leverage,
|
leverage=leverage,
|
||||||
order_quantity=next_quantity,
|
order_quantity=next_quantity,
|
||||||
@@ -231,12 +282,12 @@ async def trading_cycle(
|
|||||||
return (
|
return (
|
||||||
res
|
res
|
||||||
if res
|
if res
|
||||||
in {
|
in {
|
||||||
"Risk is too high for this trade",
|
"Risk is too high for this trade",
|
||||||
"ab not enough for new order",
|
"ab not enough for new order",
|
||||||
"InvalidRequestError",
|
"InvalidRequestError",
|
||||||
"The number of contracts exceeds maximum limit allowed",
|
"The number of contracts exceeds maximum limit allowed",
|
||||||
}
|
}
|
||||||
else None
|
else None
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -246,16 +297,16 @@ async def trading_cycle(
|
|||||||
|
|
||||||
|
|
||||||
async def open_positions(
|
async def open_positions(
|
||||||
tg_id: int,
|
tg_id: int,
|
||||||
side: str,
|
side: str,
|
||||||
symbol: str,
|
symbol: str,
|
||||||
order_quantity: float,
|
order_quantity: float,
|
||||||
trigger_price: float,
|
trigger_price: float,
|
||||||
margin_type: str,
|
margin_type: str,
|
||||||
leverage: str,
|
leverage: str,
|
||||||
take_profit_percent: float,
|
take_profit_percent: float,
|
||||||
stop_loss_percent: float,
|
stop_loss_percent: float,
|
||||||
commission_fee_percent: float
|
commission_fee_percent: float
|
||||||
) -> str | None:
|
) -> str | None:
|
||||||
try:
|
try:
|
||||||
client = await get_bybit_client(tg_id=tg_id)
|
client = await get_bybit_client(tg_id=tg_id)
|
||||||
@@ -264,7 +315,7 @@ async def open_positions(
|
|||||||
instruments_info = await get_instruments_info(tg_id=tg_id, symbol=symbol)
|
instruments_info = await get_instruments_info(tg_id=tg_id, symbol=symbol)
|
||||||
qty_step_str = instruments_info.get("lotSizeFilter").get("qtyStep")
|
qty_step_str = instruments_info.get("lotSizeFilter").get("qtyStep")
|
||||||
qty_step = safe_float(qty_step_str)
|
qty_step = safe_float(qty_step_str)
|
||||||
qty = safe_float(order_quantity) / safe_float(price_symbol)
|
qty = (safe_float(order_quantity) * safe_float(leverage)) / safe_float(price_symbol)
|
||||||
decimals = abs(int(round(math.log10(qty_step))))
|
decimals = abs(int(round(math.log10(qty_step))))
|
||||||
qty_formatted = math.floor(qty / qty_step) * qty_step
|
qty_formatted = math.floor(qty / qty_step) * qty_step
|
||||||
qty_formatted = round(qty_formatted, decimals)
|
qty_formatted = round(qty_formatted, decimals)
|
||||||
@@ -276,51 +327,33 @@ async def open_positions(
|
|||||||
po_trigger_price = None
|
po_trigger_price = None
|
||||||
trigger_direction = None
|
trigger_direction = None
|
||||||
|
|
||||||
get_leverage = safe_float(leverage)
|
|
||||||
|
|
||||||
price_for_cals = trigger_price if po_trigger_price is not None else price_symbol
|
price_for_cals = trigger_price if po_trigger_price is not None else price_symbol
|
||||||
|
|
||||||
tp_multiplier = 1 + (take_profit_percent / 100)
|
if qty_formatted <= 0:
|
||||||
if commission_fee_percent > 0:
|
return "Order does not meet minimum order value"
|
||||||
tp_multiplier += commission_fee_percent
|
|
||||||
|
|
||||||
if margin_type == "ISOLATED_MARGIN":
|
if margin_type == "ISOLATED_MARGIN":
|
||||||
liq_long, liq_short = await get_liquidation_price(
|
if side == "Buy":
|
||||||
tg_id=tg_id,
|
take_profit_price = price_for_cals * (
|
||||||
entry_price=price_for_cals,
|
1 + take_profit_percent / 100) + commission_fee_percent / qty_formatted
|
||||||
symbol=symbol,
|
stop_loss_price = None
|
||||||
leverage=get_leverage,
|
|
||||||
)
|
|
||||||
|
|
||||||
if (liq_long > 0 or liq_short > 0) and price_for_cals > 0:
|
|
||||||
if side == "Buy":
|
|
||||||
base_tp = price_for_cals + (price_for_cals - liq_long)
|
|
||||||
take_profit_price = base_tp + commission_fee_percent
|
|
||||||
else:
|
|
||||||
base_tp = price_for_cals - (liq_short - price_for_cals)
|
|
||||||
take_profit_price = base_tp - commission_fee_percent
|
|
||||||
take_profit_price = max(take_profit_price, 0)
|
|
||||||
else:
|
else:
|
||||||
take_profit_price = None
|
take_profit_price = price_for_cals * (
|
||||||
|
1 - take_profit_percent / 100) - commission_fee_percent / qty_formatted
|
||||||
stop_loss_price = None
|
stop_loss_price = None
|
||||||
else:
|
else:
|
||||||
if side == "Buy":
|
if side == "Buy":
|
||||||
take_profit_price = price_for_cals * tp_multiplier
|
take_profit_price = price_for_cals * (
|
||||||
|
1 + take_profit_percent / 100) + commission_fee_percent / qty_formatted
|
||||||
stop_loss_price = price_for_cals * (1 - stop_loss_percent / 100)
|
stop_loss_price = price_for_cals * (1 - stop_loss_percent / 100)
|
||||||
else:
|
else:
|
||||||
take_profit_price = price_for_cals * (
|
take_profit_price = price_for_cals * (
|
||||||
1 - (take_profit_percent / 100) - commission_fee_percent
|
1 - take_profit_percent / 100) - commission_fee_percent / qty_formatted
|
||||||
)
|
stop_loss_price = price_for_cals * (1 + stop_loss_percent / 100)
|
||||||
stop_loss_price = trigger_price * (1 + stop_loss_percent / 100)
|
|
||||||
|
|
||||||
take_profit_price = max(take_profit_price, 0)
|
take_profit_price = max(take_profit_price, 0)
|
||||||
stop_loss_price = max(stop_loss_price, 0)
|
stop_loss_price = max(stop_loss_price, 0)
|
||||||
|
|
||||||
logger.info("Take profit price: %s", take_profit_price)
|
|
||||||
logger.info("Stop loss price: %s", stop_loss_price)
|
|
||||||
logger.info("Commission fee percent: %s", commission_fee_percent)
|
|
||||||
|
|
||||||
# Place order
|
# Place order
|
||||||
order_params = {
|
order_params = {
|
||||||
"category": "linear",
|
"category": "linear",
|
||||||
@@ -366,5 +399,5 @@ async def open_positions(
|
|||||||
return "InvalidRequestError"
|
return "InvalidRequestError"
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error("Error opening position for user %s: %s", tg_id, e)
|
logger.error("Error opening position for user %s: %s", tg_id, e, exc_info=True)
|
||||||
return None
|
return None
|
||||||
|
@@ -21,16 +21,20 @@ async def user_profile_bybit(tg_id: int, message: Message, state: FSMContext) ->
|
|||||||
if wallet:
|
if wallet:
|
||||||
balance = wallet.get("totalWalletBalance", "0")
|
balance = wallet.get("totalWalletBalance", "0")
|
||||||
symbol = await rq.get_user_symbol(tg_id=tg_id)
|
symbol = await rq.get_user_symbol(tg_id=tg_id)
|
||||||
await message.answer(
|
if symbol is None:
|
||||||
text=f"💎Ваш профиль:\n\n"
|
await rq.set_user_symbol(tg_id=tg_id, symbol="BTCUSDT")
|
||||||
f"⚖️ Баланс: {float(balance):,.2f} USD\n"
|
await user_profile_bybit(tg_id=tg_id, message=message, state=state)
|
||||||
f"📊Торговая пара: {symbol}\n\n"
|
else:
|
||||||
f"Краткая инструкция:\n"
|
await message.answer(
|
||||||
f"1. Укажите торговую пару (например: BTCUSDT).\n"
|
text=f"💎Ваш профиль:\n\n"
|
||||||
f"2. В настройках выставьте все необходимые параметры.\n"
|
f"⚖️ Баланс: {float(balance):,.2f} USD\n"
|
||||||
f"3. Нажмите кнопку 'Начать торговлю'.\n",
|
f"📊Торговая пара: {symbol}\n\n"
|
||||||
reply_markup=kbi.main_menu,
|
f"Краткая инструкция:\n"
|
||||||
)
|
f"1. Укажите торговую пару (например: BTCUSDT).\n"
|
||||||
|
f"2. В настройках выставьте все необходимые параметры.\n"
|
||||||
|
f"3. Нажмите кнопку 'Начать торговлю'.\n",
|
||||||
|
reply_markup=kbi.main_menu,
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
await message.answer(
|
await message.answer(
|
||||||
text="Ошибка при подключении, повторите попытку",
|
text="Ошибка при подключении, повторите попытку",
|
||||||
|
@@ -3,7 +3,7 @@ import logging.config
|
|||||||
import app.telegram.keyboards.inline as kbi
|
import app.telegram.keyboards.inline as kbi
|
||||||
import database.request as rq
|
import database.request as rq
|
||||||
from app.bybit.logger_bybit.logger_bybit import LOGGING_CONFIG
|
from app.bybit.logger_bybit.logger_bybit import LOGGING_CONFIG
|
||||||
from app.bybit.open_positions import trading_cycle
|
from app.bybit.open_positions import trading_cycle, trading_cycle_profit
|
||||||
from app.helper_functions import format_value, safe_float
|
from app.helper_functions import format_value, safe_float
|
||||||
|
|
||||||
logging.config.dictConfig(LOGGING_CONFIG)
|
logging.config.dictConfig(LOGGING_CONFIG)
|
||||||
@@ -41,11 +41,26 @@ class TelegramMessageHandler:
|
|||||||
if order_status == "Filled" or order_status not in status_map:
|
if order_status == "Filled" or order_status not in status_map:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
user_auto_trading = await rq.get_user_auto_trading(
|
||||||
|
tg_id=tg_id, symbol=symbol
|
||||||
|
)
|
||||||
|
auto_trading = (
|
||||||
|
user_auto_trading.auto_trading if user_auto_trading else False
|
||||||
|
)
|
||||||
|
user_deals_data = await rq.get_user_deal_by_symbol(
|
||||||
|
tg_id=tg_id, symbol=symbol
|
||||||
|
)
|
||||||
|
|
||||||
text = (
|
text = (
|
||||||
f"Торговая пара: {symbol}\n"
|
f"Торговая пара: {symbol}\n"
|
||||||
f"Количество: {qty}\n"
|
|
||||||
f"Движение: {side_rus}\n"
|
f"Движение: {side_rus}\n"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if user_deals_data is not None and auto_trading:
|
||||||
|
text += f"Текущая ставка: {user_deals_data.order_quantity} USDT\n"
|
||||||
|
else:
|
||||||
|
text += f"Количество: {qty}\n"
|
||||||
|
|
||||||
if price and price != "0":
|
if price and price != "0":
|
||||||
text += f"Цена: {price}\n"
|
text += f"Цена: {price}\n"
|
||||||
if take_profit and take_profit != "Нет данных":
|
if take_profit and take_profit != "Нет данных":
|
||||||
@@ -67,13 +82,21 @@ class TelegramMessageHandler:
|
|||||||
closed_size = format_value(execution.get("closedSize"))
|
closed_size = format_value(execution.get("closedSize"))
|
||||||
symbol = format_value(execution.get("symbol"))
|
symbol = format_value(execution.get("symbol"))
|
||||||
exec_price = format_value(execution.get("execPrice"))
|
exec_price = format_value(execution.get("execPrice"))
|
||||||
exec_fee = format_value(execution.get("execFee"))
|
exec_qty = format_value(execution.get("execQty"))
|
||||||
|
exec_fees = format_value(execution.get("execFee"))
|
||||||
|
fee_rate = format_value(execution.get("feeRate"))
|
||||||
side = format_value(execution.get("side"))
|
side = format_value(execution.get("side"))
|
||||||
side_rus = (
|
side_rus = (
|
||||||
"Покупка"
|
"Покупка"
|
||||||
if side == "Buy"
|
if side == "Buy"
|
||||||
else "Продажа" if side == "Sell" else "Нет данных"
|
else "Продажа" if side == "Sell" else "Нет данных"
|
||||||
)
|
)
|
||||||
|
if safe_float(exec_fees) == 0:
|
||||||
|
exec_fee = safe_float(exec_price) * safe_float(exec_qty) * safe_float(
|
||||||
|
fee_rate
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
exec_fee = safe_float(exec_fees)
|
||||||
|
|
||||||
if safe_float(closed_size) == 0:
|
if safe_float(closed_size) == 0:
|
||||||
await rq.set_fee_user_auto_trading(
|
await rq.set_fee_user_auto_trading(
|
||||||
@@ -86,9 +109,7 @@ class TelegramMessageHandler:
|
|||||||
|
|
||||||
get_total_fee = user_auto_trading.total_fee
|
get_total_fee = user_auto_trading.total_fee
|
||||||
total_fee = safe_float(exec_fee) + safe_float(get_total_fee)
|
total_fee = safe_float(exec_fee) + safe_float(get_total_fee)
|
||||||
await rq.set_total_fee_user_auto_trading(
|
|
||||||
tg_id=tg_id, symbol=symbol, total_fee=total_fee
|
|
||||||
)
|
|
||||||
|
|
||||||
if user_auto_trading is not None and user_auto_trading.fee is not None:
|
if user_auto_trading is not None and user_auto_trading.fee is not None:
|
||||||
fee = user_auto_trading.fee
|
fee = user_auto_trading.fee
|
||||||
@@ -109,29 +130,34 @@ class TelegramMessageHandler:
|
|||||||
)
|
)
|
||||||
text = f"{header}\n" f"Торговая пара: {symbol}\n"
|
text = f"{header}\n" f"Торговая пара: {symbol}\n"
|
||||||
|
|
||||||
|
auto_trading = (
|
||||||
|
user_auto_trading.auto_trading if user_auto_trading else False
|
||||||
|
)
|
||||||
user_deals_data = await rq.get_user_deal_by_symbol(
|
user_deals_data = await rq.get_user_deal_by_symbol(
|
||||||
tg_id=tg_id, symbol=symbol
|
tg_id=tg_id, symbol=symbol
|
||||||
)
|
)
|
||||||
exec_bet = user_deals_data.order_quantity
|
if user_deals_data is not None and auto_trading:
|
||||||
base_quantity = user_deals_data.base_quantity
|
await rq.set_total_fee_user_auto_trading(
|
||||||
|
tg_id=tg_id, symbol=symbol, total_fee=total_fee
|
||||||
|
)
|
||||||
|
text += f"Текущая ставка: {user_deals_data.order_quantity} USDT\n"
|
||||||
|
else:
|
||||||
|
text += f"Количество: {exec_qty}\n"
|
||||||
|
|
||||||
text += (
|
text += (
|
||||||
f"Цена исполнения: {exec_price}\n"
|
f"Цена исполнения: {exec_price}\n"
|
||||||
f"Текущая ставка: {exec_bet}\n"
|
f"Комиссия: {exec_fee:.8f}\n"
|
||||||
f"Движение: {side_rus}\n"
|
|
||||||
f"Комиссия за сделку: {exec_fee}\n"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if safe_float(closed_size) > 0:
|
if safe_float(closed_size) == 0:
|
||||||
|
text += f"Движение: {side_rus}\n"
|
||||||
|
else:
|
||||||
text += f"\nРеализованная прибыль: {total_pnl:.7f}\n"
|
text += f"\nРеализованная прибыль: {total_pnl:.7f}\n"
|
||||||
|
|
||||||
await self.telegram_bot.send_message(
|
await self.telegram_bot.send_message(
|
||||||
chat_id=tg_id, text=text, reply_markup=kbi.profile_bybit
|
chat_id=tg_id, text=text, reply_markup=kbi.profile_bybit
|
||||||
)
|
)
|
||||||
|
|
||||||
auto_trading = (
|
|
||||||
user_auto_trading.auto_trading if user_auto_trading else False
|
|
||||||
)
|
|
||||||
user_symbols = user_auto_trading.symbol if user_auto_trading else None
|
user_symbols = user_auto_trading.symbol if user_auto_trading else None
|
||||||
|
|
||||||
if (
|
if (
|
||||||
@@ -140,30 +166,27 @@ class TelegramMessageHandler:
|
|||||||
and user_symbols is not None
|
and user_symbols is not None
|
||||||
):
|
):
|
||||||
if safe_float(total_pnl) > 0:
|
if safe_float(total_pnl) > 0:
|
||||||
profit_text = "📈 Прибыль достигнута\n"
|
profit_text = "📈 Прибыль достигнута. Начинаем новую серию с базовой ставки\n"
|
||||||
await self.telegram_bot.send_message(
|
await self.telegram_bot.send_message(
|
||||||
chat_id=tg_id, text=profit_text, reply_markup=kbi.profile_bybit
|
chat_id=tg_id, text=profit_text, reply_markup=kbi.profile_bybit
|
||||||
)
|
)
|
||||||
await rq.set_auto_trading(
|
|
||||||
tg_id=tg_id, symbol=symbol, auto_trading=False
|
|
||||||
)
|
|
||||||
|
|
||||||
|
if side == "Buy":
|
||||||
|
r_side = "Sell"
|
||||||
|
else:
|
||||||
|
r_side = "Buy"
|
||||||
|
|
||||||
|
await rq.set_last_side_by_symbol(
|
||||||
|
tg_id=tg_id, symbol=symbol, last_side=r_side)
|
||||||
await rq.set_total_fee_user_auto_trading(
|
await rq.set_total_fee_user_auto_trading(
|
||||||
tg_id=tg_id, symbol=symbol, total_fee=0
|
tg_id=tg_id, symbol=symbol, total_fee=0
|
||||||
)
|
)
|
||||||
await rq.set_fee_user_auto_trading(
|
await rq.set_fee_user_auto_trading(
|
||||||
tg_id=tg_id, symbol=symbol, fee=0
|
tg_id=tg_id, symbol=symbol, fee=0
|
||||||
)
|
)
|
||||||
await rq.set_order_quantity(
|
|
||||||
tg_id=message.from_user.id, order_quantity=base_quantity
|
res = await trading_cycle_profit(
|
||||||
)
|
tg_id=tg_id, symbol=symbol, side=r_side
|
||||||
else:
|
|
||||||
open_order_text = "\n❗️ Сделка закрылась в минус, открываю новую сделку с увеличенной ставкой.\n"
|
|
||||||
await self.telegram_bot.send_message(
|
|
||||||
chat_id=tg_id, text=open_order_text
|
|
||||||
)
|
|
||||||
res = await trading_cycle(
|
|
||||||
tg_id=tg_id, symbol=symbol, reverse_side=side
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if res == "OK":
|
if res == "OK":
|
||||||
@@ -174,7 +197,50 @@ class TelegramMessageHandler:
|
|||||||
"Risk is too high for this trade": "❗️ Риск сделки слишком высок для продолжения",
|
"Risk is too high for this trade": "❗️ Риск сделки слишком высок для продолжения",
|
||||||
"ab not enough for new order": "❗️ Недостаточно средств для продолжения торговли",
|
"ab not enough for new order": "❗️ Недостаточно средств для продолжения торговли",
|
||||||
"InvalidRequestError": "❗️ Недостаточно средств для размещения нового ордера с заданным количеством и плечом.",
|
"InvalidRequestError": "❗️ Недостаточно средств для размещения нового ордера с заданным количеством и плечом.",
|
||||||
"The number of contracts exceeds maximum limit allowed": "❗️ Количество контрактов превышает допустимое максимальное количество контрактов",
|
"The number of contracts exceeds maximum limit allowed": "❗️ Превышен максимальный лимит ставки",
|
||||||
|
}
|
||||||
|
error_text = errors.get(
|
||||||
|
res, "❗️ Не удалось открыть новую сделку"
|
||||||
|
)
|
||||||
|
await rq.set_auto_trading(
|
||||||
|
tg_id=tg_id, symbol=symbol, auto_trading=False
|
||||||
|
)
|
||||||
|
|
||||||
|
await rq.set_total_fee_user_auto_trading(
|
||||||
|
tg_id=tg_id, symbol=symbol, total_fee=0
|
||||||
|
)
|
||||||
|
await rq.set_fee_user_auto_trading(
|
||||||
|
tg_id=tg_id, symbol=symbol, fee=0
|
||||||
|
)
|
||||||
|
await self.telegram_bot.send_message(
|
||||||
|
chat_id=tg_id,
|
||||||
|
text=error_text,
|
||||||
|
reply_markup=kbi.profile_bybit,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
open_order_text = "\n❗️ Сделка закрылась в минус, открываю новую сделку с увеличенной ставкой.\n"
|
||||||
|
await self.telegram_bot.send_message(
|
||||||
|
chat_id=tg_id, text=open_order_text
|
||||||
|
)
|
||||||
|
|
||||||
|
if side == "Buy":
|
||||||
|
r_side = "Sell"
|
||||||
|
else:
|
||||||
|
r_side = "Buy"
|
||||||
|
|
||||||
|
res = await trading_cycle(
|
||||||
|
tg_id=tg_id, symbol=symbol, side=r_side
|
||||||
|
)
|
||||||
|
|
||||||
|
if res == "OK":
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
errors = {
|
||||||
|
"Max bets in series": "❗️ Максимальное количество сделок в серии достигнуто",
|
||||||
|
"Risk is too high for this trade": "❗️ Риск сделки слишком высок для продолжения",
|
||||||
|
"ab not enough for new order": "❗️ Недостаточно средств для продолжения торговли",
|
||||||
|
"InvalidRequestError": "❗️ Недостаточно средств для размещения нового ордера с заданным количеством и плечом.",
|
||||||
|
"The number of contracts exceeds maximum limit allowed": "❗️ Превышен максимальный лимит ставки",
|
||||||
}
|
}
|
||||||
error_text = errors.get(
|
error_text = errors.get(
|
||||||
res, "❗️ Не удалось открыть новую сделку"
|
res, "❗️ Не удалось открыть новую сделку"
|
||||||
|
@@ -124,6 +124,8 @@ async def set_symbol(message: Message, state: FSMContext) -> None:
|
|||||||
risk_percent = 100 / safe_float(max_leverage)
|
risk_percent = 100 / safe_float(max_leverage)
|
||||||
await rq.set_stop_loss_percent(
|
await rq.set_stop_loss_percent(
|
||||||
tg_id=message.from_user.id, stop_loss_percent=risk_percent)
|
tg_id=message.from_user.id, stop_loss_percent=risk_percent)
|
||||||
|
await rq.set_take_profit_percent(
|
||||||
|
tg_id=message.from_user.id, take_profit_percent=risk_percent)
|
||||||
await rq.set_trigger_price(tg_id=message.from_user.id, trigger_price=0)
|
await rq.set_trigger_price(tg_id=message.from_user.id, trigger_price=0)
|
||||||
await rq.set_order_quantity(tg_id=message.from_user.id, order_quantity=1.0)
|
await rq.set_order_quantity(tg_id=message.from_user.id, order_quantity=1.0)
|
||||||
|
|
||||||
|
@@ -7,6 +7,7 @@ from aiogram.types import CallbackQuery, Message
|
|||||||
import app.telegram.keyboards.inline as kbi
|
import app.telegram.keyboards.inline as kbi
|
||||||
import database.request as rq
|
import database.request as rq
|
||||||
from app.bybit.get_functions.get_instruments_info import get_instruments_info
|
from app.bybit.get_functions.get_instruments_info import get_instruments_info
|
||||||
|
from app.bybit.get_functions.get_positions import get_active_positions_by_symbol, get_active_orders_by_symbol
|
||||||
from app.bybit.set_functions.set_leverage import set_leverage
|
from app.bybit.set_functions.set_leverage import set_leverage
|
||||||
from app.bybit.set_functions.set_margin_mode import set_margin_mode
|
from app.bybit.set_functions.set_margin_mode import set_margin_mode
|
||||||
from app.helper_functions import is_int, is_number, safe_float
|
from app.helper_functions import is_int, is_number, safe_float
|
||||||
@@ -42,7 +43,7 @@ async def settings_for_trade_mode(
|
|||||||
text="Выберите режим торговли:\n\n"
|
text="Выберите режим торговли:\n\n"
|
||||||
"Лонг - все сделки серии открываются на покупку.\n"
|
"Лонг - все сделки серии открываются на покупку.\n"
|
||||||
"Шорт - все сделки серии открываются на продажу.\n"
|
"Шорт - все сделки серии открываются на продажу.\n"
|
||||||
"Свитч - направление каждой сделки серии меняется по переменно.\n",
|
"Свитч - направление первой сделки серии меняется по переменно.\n",
|
||||||
reply_markup=kbi.trade_mode,
|
reply_markup=kbi.trade_mode,
|
||||||
)
|
)
|
||||||
logger.debug(
|
logger.debug(
|
||||||
@@ -211,6 +212,31 @@ async def settings_for_margin_type(
|
|||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
await state.clear()
|
await state.clear()
|
||||||
|
symbol = await rq.get_user_symbol(tg_id=callback_query.from_user.id)
|
||||||
|
deals = await get_active_positions_by_symbol(
|
||||||
|
tg_id=callback_query.from_user.id, symbol=symbol
|
||||||
|
)
|
||||||
|
position = next((d for d in deals if d.get("symbol") == symbol), None)
|
||||||
|
|
||||||
|
if position:
|
||||||
|
size = position.get("size", 0)
|
||||||
|
else:
|
||||||
|
size = 0
|
||||||
|
|
||||||
|
if safe_float(size) > 0:
|
||||||
|
await callback_query.answer(
|
||||||
|
text="У вас есть активная позиция по текущей паре",
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
|
orders = await get_active_orders_by_symbol(
|
||||||
|
tg_id=callback_query.from_user.id, symbol=symbol)
|
||||||
|
|
||||||
|
if orders is not None:
|
||||||
|
await callback_query.answer(
|
||||||
|
text="У вас есть активный ордер по текущей паре",
|
||||||
|
)
|
||||||
|
return
|
||||||
await callback_query.message.edit_text(
|
await callback_query.message.edit_text(
|
||||||
text="Выберите тип маржи:\n\n"
|
text="Выберите тип маржи:\n\n"
|
||||||
"Примечание: Если у вас есть открытые позиции, то маржа примениться ко всем позициям",
|
"Примечание: Если у вас есть открытые позиции, то маржа примениться ко всем позициям",
|
||||||
@@ -554,6 +580,8 @@ async def set_leverage_handler(message: Message, state: FSMContext) -> None:
|
|||||||
risk_percent = 100 / safe_float(leverage_float)
|
risk_percent = 100 / safe_float(leverage_float)
|
||||||
await rq.set_stop_loss_percent(
|
await rq.set_stop_loss_percent(
|
||||||
tg_id=message.from_user.id, stop_loss_percent=risk_percent)
|
tg_id=message.from_user.id, stop_loss_percent=risk_percent)
|
||||||
|
await rq.set_take_profit_percent(
|
||||||
|
tg_id=message.from_user.id, take_profit_percent=risk_percent)
|
||||||
logger.info(
|
logger.info(
|
||||||
"User %s set leverage: %s", message.from_user.id, leverage_float
|
"User %s set leverage: %s", message.from_user.id, leverage_float
|
||||||
)
|
)
|
||||||
|
@@ -123,8 +123,8 @@ async def risk_management(callback_query: CallbackQuery, state: FSMContext) -> N
|
|||||||
|
|
||||||
await callback_query.message.edit_text(
|
await callback_query.message.edit_text(
|
||||||
text=f"Риск-менеджмент:\n\n"
|
text=f"Риск-менеджмент:\n\n"
|
||||||
f"- Процент изменения цены для фиксации прибыли: {take_profit_percent}%\n"
|
f"- Процент изменения цены для фиксации прибыли: {take_profit_percent:.2f}%\n"
|
||||||
f"- Процент изменения цены для фиксации убытка: {stop_loss_percent}%\n\n"
|
f"- Процент изменения цены для фиксации убытка: {stop_loss_percent:.2f}%\n\n"
|
||||||
f"- Комиссия биржи для расчета прибыли: {commission_fee_rus}\n\n",
|
f"- Комиссия биржи для расчета прибыли: {commission_fee_rus}\n\n",
|
||||||
reply_markup=kbi.risk_management,
|
reply_markup=kbi.risk_management,
|
||||||
)
|
)
|
||||||
@@ -162,11 +162,9 @@ async def conditions(callback_query: CallbackQuery, state: FSMContext) -> None:
|
|||||||
)
|
)
|
||||||
if conditional_settings_data:
|
if conditional_settings_data:
|
||||||
start_timer = conditional_settings_data.timer_start or 0
|
start_timer = conditional_settings_data.timer_start or 0
|
||||||
stop_timer = conditional_settings_data.timer_end or 0
|
|
||||||
await callback_query.message.edit_text(
|
await callback_query.message.edit_text(
|
||||||
text="Условия торговли:\n\n"
|
text="Условия торговли:\n\n"
|
||||||
f"- Таймер для старта: {start_timer} мин.\n"
|
f"- Таймер для старта: {start_timer} мин.\n",
|
||||||
f"- Таймер для остановки: {stop_timer} мин.\n",
|
|
||||||
reply_markup=kbi.conditions,
|
reply_markup=kbi.conditions,
|
||||||
)
|
)
|
||||||
logger.debug(
|
logger.debug(
|
||||||
|
@@ -7,7 +7,7 @@ from aiogram.types import CallbackQuery
|
|||||||
|
|
||||||
import app.telegram.keyboards.inline as kbi
|
import app.telegram.keyboards.inline as kbi
|
||||||
import database.request as rq
|
import database.request as rq
|
||||||
from app.bybit.get_functions.get_positions import get_active_positions_by_symbol
|
from app.bybit.get_functions.get_positions import get_active_positions_by_symbol, get_active_orders_by_symbol
|
||||||
from app.bybit.open_positions import start_trading_cycle
|
from app.bybit.open_positions import start_trading_cycle
|
||||||
from app.helper_functions import safe_float
|
from app.helper_functions import safe_float
|
||||||
from app.telegram.tasks.tasks import (
|
from app.telegram.tasks.tasks import (
|
||||||
@@ -33,6 +33,7 @@ async def start_trading(callback_query: CallbackQuery, state: FSMContext) -> Non
|
|||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
await state.clear()
|
await state.clear()
|
||||||
|
tg_id = callback_query.from_user.id
|
||||||
symbol = await rq.get_user_symbol(tg_id=callback_query.from_user.id)
|
symbol = await rq.get_user_symbol(tg_id=callback_query.from_user.id)
|
||||||
deals = await get_active_positions_by_symbol(
|
deals = await get_active_positions_by_symbol(
|
||||||
tg_id=callback_query.from_user.id, symbol=symbol
|
tg_id=callback_query.from_user.id, symbol=symbol
|
||||||
@@ -46,7 +47,16 @@ async def start_trading(callback_query: CallbackQuery, state: FSMContext) -> Non
|
|||||||
|
|
||||||
if safe_float(size) > 0:
|
if safe_float(size) > 0:
|
||||||
await callback_query.answer(
|
await callback_query.answer(
|
||||||
text="У вас есть активная позиция",
|
text="У вас есть активная позиция по текущей паре",
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
|
orders = await get_active_orders_by_symbol(
|
||||||
|
tg_id=callback_query.from_user.id, symbol=symbol)
|
||||||
|
|
||||||
|
if orders is not None:
|
||||||
|
await callback_query.answer(
|
||||||
|
text="У вас есть активный ордер по текущей паре",
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -73,22 +83,29 @@ async def start_trading(callback_query: CallbackQuery, state: FSMContext) -> Non
|
|||||||
symbol=symbol,
|
symbol=symbol,
|
||||||
auto_trading=True,
|
auto_trading=True,
|
||||||
)
|
)
|
||||||
|
await rq.set_total_fee_user_auto_trading(
|
||||||
|
tg_id=tg_id, symbol=symbol, total_fee=0
|
||||||
|
)
|
||||||
|
await rq.set_fee_user_auto_trading(
|
||||||
|
tg_id=tg_id, symbol=symbol, fee=0
|
||||||
|
)
|
||||||
res = await start_trading_cycle(
|
res = await start_trading_cycle(
|
||||||
tg_id=callback_query.from_user.id,
|
tg_id=callback_query.from_user.id,
|
||||||
)
|
)
|
||||||
|
|
||||||
error_messages = {
|
error_messages = {
|
||||||
"Limit price is out min price": "Цена лимитного ордера меньше минимального",
|
"Limit price is out min price": "Цена лимитного ордера меньше допустимого",
|
||||||
"Limit price is out max price": "Цена лимитного ордера больше максимального",
|
"Limit price is out max price": "Цена лимитного ордера больше допустимого",
|
||||||
"Risk is too high for this trade": "Риск сделки превышает допустимый убыток",
|
"Risk is too high for this trade": "Риск сделки превышает допустимый убыток",
|
||||||
"estimated will trigger liq": "Лимитный ордер может вызвать мгновенную ликвидацию. Проверьте параметры ордера.",
|
"estimated will trigger liq": "Лимитный ордер может вызвать мгновенную ликвидацию. Проверьте параметры ордера.",
|
||||||
"ab not enough for new order": "Недостаточно средств для создания нового ордера",
|
"ab not enough for new order": "Недостаточно средств для создания нового ордера",
|
||||||
"InvalidRequestError": "Произошла ошибка при запуске торговли.",
|
"InvalidRequestError": "Произошла ошибка при запуске торговли.",
|
||||||
"Order does not meet minimum order value": "Сумма ордера не достаточна для запуска торговли",
|
"Order does not meet minimum order value": "Сумма ставки меньше допустимого для запуска торговли. "
|
||||||
"position idx not match position mode": "Ошибка режима позиции для данного инструмента",
|
"Увеличьте ставку, чтобы запустить торговлю",
|
||||||
"Qty invalid": "Некорректное значение ордера для данного инструмента",
|
"position idx not match position mode": "Измените режим позиции, чтобы запустить торговлю",
|
||||||
"The number of contracts exceeds maximum limit allowed": "️️Количество контрактов превышает допустимое максимальное количество контрактов",
|
"Qty invalid": "Некорректное значение ставки для данного инструмента",
|
||||||
"The number of contracts exceeds minimum limit allowed": "️️Количество контрактов превышает допустимое минимальное количество контрактов",
|
"The number of contracts exceeds maximum limit allowed": "️️Превышен максимальный лимит ставки",
|
||||||
|
"The number of contracts exceeds minimum limit allowed": "️️Лимит ставки меньше минимально допустимого",
|
||||||
}
|
}
|
||||||
|
|
||||||
if res == "OK":
|
if res == "OK":
|
||||||
@@ -112,7 +129,7 @@ async def start_trading(callback_query: CallbackQuery, state: FSMContext) -> Non
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
await callback_query.answer(text="Произошла ошибка при запуске торговли")
|
await callback_query.answer(text="Произошла ошибка при запуске торговли")
|
||||||
logger.error(
|
logger.error(
|
||||||
"Error processing command long for user %s: %s",
|
"Error processing command start_trading for user %s: %s",
|
||||||
callback_query.from_user.id,
|
callback_query.from_user.id,
|
||||||
e,
|
e,
|
||||||
)
|
)
|
||||||
|
@@ -227,9 +227,6 @@ conditions = InlineKeyboardMarkup(
|
|||||||
inline_keyboard=[
|
inline_keyboard=[
|
||||||
[
|
[
|
||||||
InlineKeyboardButton(text="Таймер для старта", callback_data="start_timer"),
|
InlineKeyboardButton(text="Таймер для старта", callback_data="start_timer"),
|
||||||
InlineKeyboardButton(
|
|
||||||
text="Таймер для остановки", callback_data="stop_timer"
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
InlineKeyboardButton(text="Назад", callback_data="main_settings"),
|
InlineKeyboardButton(text="Назад", callback_data="main_settings"),
|
||||||
|
25
config.py
25
config.py
@@ -1,31 +1,8 @@
|
|||||||
import os
|
import os
|
||||||
from dotenv import load_dotenv, find_dotenv
|
from dotenv import load_dotenv, find_dotenv
|
||||||
import logging.config
|
|
||||||
|
|
||||||
from logger_helper.logger_helper import LOGGING_CONFIG
|
|
||||||
|
|
||||||
logging.config.dictConfig(LOGGING_CONFIG)
|
|
||||||
logger = logging.getLogger("config")
|
|
||||||
|
|
||||||
env_path = find_dotenv()
|
env_path = find_dotenv()
|
||||||
|
|
||||||
if env_path:
|
if env_path:
|
||||||
load_dotenv(env_path)
|
load_dotenv(env_path)
|
||||||
logging.info(f"Loaded env from {env_path}")
|
|
||||||
else:
|
|
||||||
logging.warning(".env file not found, environment variables won't be loaded")
|
|
||||||
|
|
||||||
BOT_TOKEN = os.getenv('BOT_TOKEN')
|
BOT_TOKEN = os.getenv("BOT_TOKEN")
|
||||||
if not BOT_TOKEN:
|
|
||||||
logging.error("BOT_TOKEN is not set in environment variables")
|
|
||||||
|
|
||||||
DB_USER = os.getenv('DB_USER')
|
|
||||||
DB_PASS = os.getenv('DB_PASS')
|
|
||||||
DB_HOST = os.getenv('DB_HOST')
|
|
||||||
DB_PORT = os.getenv('DB_PORT')
|
|
||||||
DB_NAME = os.getenv('DB_NAME')
|
|
||||||
|
|
||||||
if not all([DB_USER, DB_PASS, DB_HOST, DB_PORT, DB_NAME]):
|
|
||||||
logger.error("One or more database environment variables are not set")
|
|
||||||
|
|
||||||
DATABASE_URL = f"postgresql+asyncpg://{DB_USER}:{DB_PASS}@{DB_HOST}:{DB_PORT}/{DB_NAME}"
|
|
||||||
|
@@ -1,18 +1,39 @@
|
|||||||
|
from database.models import Base, User, UserAdditionalSettings, UserApi, UserConditionalSettings, UserDeals, \
|
||||||
|
UserRiskManagement, UserSymbol
|
||||||
import logging.config
|
import logging.config
|
||||||
|
from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker, AsyncSession
|
||||||
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine, AsyncSession
|
from sqlalchemy import event
|
||||||
|
from pathlib import Path
|
||||||
from database.models import Base
|
|
||||||
|
|
||||||
from config import DATABASE_URL
|
|
||||||
from logger_helper.logger_helper import LOGGING_CONFIG
|
from logger_helper.logger_helper import LOGGING_CONFIG
|
||||||
|
|
||||||
logging.config.dictConfig(LOGGING_CONFIG)
|
logging.config.dictConfig(LOGGING_CONFIG)
|
||||||
logger = logging.getLogger("database")
|
logger = logging.getLogger("database")
|
||||||
|
|
||||||
async_engine = create_async_engine(DATABASE_URL, echo=False)
|
BASE_DIR = Path(__file__).parent.resolve()
|
||||||
|
DATA_DIR = BASE_DIR / "db"
|
||||||
|
DATA_DIR.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
async_session = async_sessionmaker(async_engine, class_=AsyncSession, expire_on_commit=False)
|
DATABASE_URL = f"sqlite+aiosqlite:///{DATA_DIR / 'stcs.db'}"
|
||||||
|
|
||||||
|
async_engine = create_async_engine(
|
||||||
|
DATABASE_URL,
|
||||||
|
echo=False,
|
||||||
|
connect_args={"check_same_thread": False}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@event.listens_for(async_engine.sync_engine, "connect")
|
||||||
|
def _enable_foreign_keys(dbapi_connection, connection_record):
|
||||||
|
cursor = dbapi_connection.cursor()
|
||||||
|
cursor.execute("PRAGMA foreign_keys=ON")
|
||||||
|
cursor.close()
|
||||||
|
|
||||||
|
|
||||||
|
async_session = async_sessionmaker(
|
||||||
|
async_engine,
|
||||||
|
class_=AsyncSession,
|
||||||
|
expire_on_commit=False
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
async def init_db():
|
async def init_db():
|
||||||
@@ -21,4 +42,4 @@ async def init_db():
|
|||||||
await conn.run_sync(Base.metadata.create_all)
|
await conn.run_sync(Base.metadata.create_all)
|
||||||
logger.info("Database initialized.")
|
logger.info("Database initialized.")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error("Database initialization failed: %s", e, exc_info=True)
|
logger.error("Database initialization failed: %s", e)
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
from sqlalchemy.ext.declarative import declarative_base
|
from sqlalchemy.ext.declarative import declarative_base
|
||||||
from sqlalchemy.ext.asyncio import AsyncAttrs
|
from sqlalchemy.ext.asyncio import AsyncAttrs
|
||||||
from sqlalchemy import Column, ForeignKey, Integer, String, BigInteger, Float, Boolean, UniqueConstraint
|
from sqlalchemy import Column, ForeignKey, Integer, String, Float, Boolean, UniqueConstraint
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
|
|
||||||
Base = declarative_base(cls=AsyncAttrs)
|
Base = declarative_base(cls=AsyncAttrs)
|
||||||
@@ -11,7 +11,7 @@ class User(Base):
|
|||||||
__tablename__ = "users"
|
__tablename__ = "users"
|
||||||
|
|
||||||
id = Column(Integer, primary_key=True, autoincrement=True)
|
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||||
tg_id = Column(BigInteger, nullable=False, unique=True)
|
tg_id = Column(Integer, nullable=False, unique=True)
|
||||||
username = Column(String, nullable=False)
|
username = Column(String, nullable=False)
|
||||||
|
|
||||||
user_api = relationship("UserApi",
|
user_api = relationship("UserApi",
|
||||||
@@ -143,6 +143,7 @@ class UserDeals(Base):
|
|||||||
current_step = Column(Integer, nullable=True)
|
current_step = Column(Integer, nullable=True)
|
||||||
symbol = Column(String, nullable=True)
|
symbol = Column(String, nullable=True)
|
||||||
trade_mode = Column(String, nullable=True)
|
trade_mode = Column(String, nullable=True)
|
||||||
|
side_mode = Column(String, nullable=True)
|
||||||
base_quantity = Column(Float, nullable=True)
|
base_quantity = Column(Float, nullable=True)
|
||||||
margin_type = Column(String, nullable=True)
|
margin_type = Column(String, nullable=True)
|
||||||
leverage = Column(String, nullable=True)
|
leverage = Column(String, nullable=True)
|
||||||
|
@@ -898,6 +898,7 @@ async def set_user_deal(
|
|||||||
last_side: str,
|
last_side: str,
|
||||||
current_step: int,
|
current_step: int,
|
||||||
trade_mode: str,
|
trade_mode: str,
|
||||||
|
side_mode: str,
|
||||||
margin_type: str,
|
margin_type: str,
|
||||||
leverage: str,
|
leverage: str,
|
||||||
order_quantity: float,
|
order_quantity: float,
|
||||||
@@ -915,6 +916,7 @@ async def set_user_deal(
|
|||||||
:param last_side: Last side
|
:param last_side: Last side
|
||||||
:param current_step: Current step
|
:param current_step: Current step
|
||||||
:param trade_mode: Trade mode
|
:param trade_mode: Trade mode
|
||||||
|
:param side_mode: Side mode
|
||||||
:param margin_type: Margin type
|
:param margin_type: Margin type
|
||||||
:param leverage: Leverage
|
:param leverage: Leverage
|
||||||
:param order_quantity: Order quantity
|
:param order_quantity: Order quantity
|
||||||
@@ -944,6 +946,7 @@ async def set_user_deal(
|
|||||||
deal.last_side = last_side
|
deal.last_side = last_side
|
||||||
deal.current_step = current_step
|
deal.current_step = current_step
|
||||||
deal.trade_mode = trade_mode
|
deal.trade_mode = trade_mode
|
||||||
|
deal.side_mode = side_mode
|
||||||
deal.margin_type = margin_type
|
deal.margin_type = margin_type
|
||||||
deal.leverage = leverage
|
deal.leverage = leverage
|
||||||
deal.order_quantity = order_quantity
|
deal.order_quantity = order_quantity
|
||||||
@@ -961,6 +964,7 @@ async def set_user_deal(
|
|||||||
last_side=last_side,
|
last_side=last_side,
|
||||||
current_step=current_step,
|
current_step=current_step,
|
||||||
trade_mode=trade_mode,
|
trade_mode=trade_mode,
|
||||||
|
side_mode=side_mode,
|
||||||
margin_type=margin_type,
|
margin_type=margin_type,
|
||||||
leverage=leverage,
|
leverage=leverage,
|
||||||
order_quantity=order_quantity,
|
order_quantity=order_quantity,
|
||||||
@@ -1050,6 +1054,34 @@ async def set_fee_user_deal_by_symbol(tg_id: int, symbol: str, fee: float):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
async def set_last_side_by_symbol(tg_id: int, symbol: str, last_side: str):
|
||||||
|
"""Set last side for a user deal by symbol in the database."""
|
||||||
|
try:
|
||||||
|
async with async_session() as session:
|
||||||
|
result = await session.execute(select(User).filter_by(tg_id=tg_id))
|
||||||
|
user = result.scalars().first()
|
||||||
|
if user is None:
|
||||||
|
logger.error(f"User with tg_id={tg_id} not found")
|
||||||
|
return False
|
||||||
|
|
||||||
|
result = await session.execute(
|
||||||
|
select(UserDeals).filter_by(user_id=user.id, symbol=symbol)
|
||||||
|
)
|
||||||
|
record = result.scalars().first()
|
||||||
|
|
||||||
|
if record:
|
||||||
|
record.last_side = last_side
|
||||||
|
else:
|
||||||
|
logger.error(f"User deal with user_id={user.id} and symbol={symbol} not found")
|
||||||
|
return False
|
||||||
|
await session.commit()
|
||||||
|
logger.info("Set last side for user %s and symbol %s", tg_id, symbol)
|
||||||
|
return True
|
||||||
|
except Exception as e:
|
||||||
|
logger.error("Error setting user deal last side for user %s and symbol %s: %s", tg_id, symbol, e)
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
# USER AUTO TRADING
|
# USER AUTO TRADING
|
||||||
|
|
||||||
async def get_all_user_auto_trading(tg_id: int):
|
async def get_all_user_auto_trading(tg_id: int):
|
||||||
|
3
run.py
3
run.py
@@ -5,10 +5,10 @@ import logging.config
|
|||||||
from aiogram import Bot, Dispatcher
|
from aiogram import Bot, Dispatcher
|
||||||
from aiogram.fsm.storage.redis import RedisStorage
|
from aiogram.fsm.storage.redis import RedisStorage
|
||||||
|
|
||||||
|
from database import init_db
|
||||||
from app.bybit.web_socket import WebSocketBot
|
from app.bybit.web_socket import WebSocketBot
|
||||||
from app.telegram.handlers import router
|
from app.telegram.handlers import router
|
||||||
from config import BOT_TOKEN
|
from config import BOT_TOKEN
|
||||||
from database import init_db
|
|
||||||
from logger_helper.logger_helper import LOGGING_CONFIG
|
from logger_helper.logger_helper import LOGGING_CONFIG
|
||||||
|
|
||||||
logging.config.dictConfig(LOGGING_CONFIG)
|
logging.config.dictConfig(LOGGING_CONFIG)
|
||||||
@@ -46,7 +46,6 @@ async def main():
|
|||||||
with contextlib.suppress(asyncio.CancelledError):
|
with contextlib.suppress(asyncio.CancelledError):
|
||||||
await ws_task
|
await ws_task
|
||||||
await tg_task
|
await tg_task
|
||||||
await web_socket.clear_user_sockets()
|
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error("Bot stopped with error: %s", e)
|
logger.error("Bot stopped with error: %s", e)
|
||||||
|
Reference in New Issue
Block a user