redis

Reviewed-on: kodorvan/stcs#36

.env.sample

@@ -1,6 +1 @@
-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
+BOT_TOKEN=YOUR_BOT_TOKEN

.gitignore

@@ -146,6 +146,9 @@ myenv
 ENV/
 env.bak/
 venv.bak/
+/logger_helper/loggers
+/app/bybit/logger_bybit/loggers
+*.db
 # Spyder project settings
 .spyderproject
 .spyproject
@@ -207,3 +210,6 @@ cython_debug/
 marimo/_static/
 marimo/_lsp/
 __marimo__/
+
+stcs_venv
+venv

README.md

@@ -1,6 +1,11 @@
-Crypto Trading Telegram Bot
+# Crypto Trading Telegram Bot by [KODORVAN](https://git.svoboda.works/kodorvan)
 
-Этот бот — автоматизированный торговый помощник для работы с криптовалютной биржей Bybit на основе стратегии мартингейла. Он позволяет торговать бессрочными контрактами с управлением рисками, тейк-профитами, стоп-лоссами и кредитным плечом.
+Автоматизированный торговый помощник для работы с криптовалютной биржей Bybit на основе стратегии мартингейла.<br>
+Он позволяет торговать бессрочными контрактами с управлением рисками, тейк-профитами, стоп-лоссами и кредитным плечом.
+
+
+**Разработано командой [КОДОРВАНЬ](https://git.svoboda.works/kodorvan)**<br>
+_Мы окажем полное содействие и поддержку, пишите в телеграм: https://t.me/kodorvan_
 
 ## Основные возможности
 
@@ -54,8 +59,17 @@ sudo -u www-data /usr/bin/pip install -r requirements.txt
 cp .env.sample .env
 nvim .env
 ```
+5. Выполните миграции:
+```bash
+alembic upgrade head
+```
 
-5. Запустите бота:
+6. Убедитесь в том, что установлен redis и открыт порт 6789
+```bash
+sudo ufw allow 6789
+```
+
+7. Запустите бота:
 
 ```bash
 python run.py
@@ -110,4 +124,4 @@ sudo service stcs status
 
 - Бот требует аккуратной настройки параметров риска.
 
-- Храните API ключи в безопасности, избегайте публикации.
+- Храните API ключи в безопасности, избегайте публикации.

alembic.ini

@@ -84,7 +84,7 @@ path_separator = os
 # 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 = driver://user:pass@localhost/dbname
+sqlalchemy.url = sqlite+aiosqlite:///./database/stcs.db
 
 
 [post_write_hooks]

alembic/env.py

@@ -1,73 +1,29 @@
 import asyncio
 from logging.config import fileConfig
-
 from sqlalchemy import pool
-from sqlalchemy.engine import Connection
 from sqlalchemy.ext.asyncio import async_engine_from_config
-
 from alembic import context
 
-# this is the Alembic Config object, which provides
-# access to the values within the .ini file in use.
-from config import DATABASE_URL
 config = context.config
-config.set_main_option('sqlalchemy.url', DATABASE_URL)
-# Interpret the config file for Python logging.
-# This line sets up loggers basically.
+
 if config.config_file_name is not None:
     fileConfig(config.config_file_name)
 
-# add your model's MetaData object here
-# for 'autogenerate' support
-# from myapp import mymodel
-# target_metadata = mymodel.Base.metadata
 from database.models import Base
 target_metadata = Base.metadata
 
-# other values from the config, defined by the needs of env.py,
-# can be acquired:
-# my_important_option = config.get_main_option("my_important_option")
-# ... etc.
-
-
-def run_migrations_offline() -> None:
-    """Run migrations in 'offline' mode.
-
-    This configures the context with just a URL
-    and not an Engine, though an Engine is acceptable
-    here as well.  By skipping the Engine creation
-    we don't even need a DBAPI to be available.
-
-    Calls to context.execute() here emit the given string to the
-    script output.
-
-    """
+def do_run_migrations(connection):
     context.configure(
-        url=DATABASE_URL,
+        connection=connection,
         target_metadata=target_metadata,
-        literal_binds=True,
-        dialect_opts={"paramstyle": "named"},
+        compare_type=True,
     )
-
     with context.begin_transaction():
         context.run_migrations()
 
-
-def do_run_migrations(connection: Connection) -> None:
-    context.configure(connection=connection, target_metadata=target_metadata)
-
-    with context.begin_transaction():
-        context.run_migrations()
-
-
-async def run_async_migrations() -> None:
-    """In this scenario we need to create an Engine
-    and associate a connection with the context.
-
-    """
-
+async def run_async_migrations():
     connectable = async_engine_from_config(
-        config.get_section(config.config_ini_section, {}),
+        config.get_section(config.config_ini_section),
         prefix="sqlalchemy.",
         poolclass=pool.NullPool,
     )
@@ -77,13 +33,20 @@ async def run_async_migrations() -> None:
 
     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() -> None:
-    """Run migrations in 'online' mode."""
-
+def run_migrations_online():
     asyncio.run(run_async_migrations())
 
-
 if context.is_offline_mode():
     run_migrations_offline()
 else:

alembic/versions/09db71875980_updated_user_deals_table.py

@@ -1,36 +0,0 @@
-"""updated user deals table
-
-Revision ID: 09db71875980
-Revises: 77197715747c
-Create Date: 2025-09-29 12:57:39.943294
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '09db71875980'
-down_revision: Union[str, Sequence[str], None] = '77197715747c'
-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('order_quantity', sa.Float(), nullable=True))
-    op.create_unique_constraint('uq_user_symbol', 'user_deals', ['user_id', 'symbol'])
-    op.drop_column('user_deals', 'quantity')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_deals', sa.Column('quantity', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True))
-    op.drop_constraint('uq_user_symbol', 'user_deals', type_='unique')
-    op.drop_column('user_deals', 'order_quantity')
-    # ### end Alembic commands ###

alembic/versions/0eed68eddcdb_added_conditional_order_type.py

@@ -1,40 +0,0 @@
-"""Added conditional_order_type
-
-Revision ID: 0eed68eddcdb
-Revises: 70094ba27e80
-Create Date: 2025-09-24 13:47:23.282807
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '0eed68eddcdb'
-down_revision: Union[str, Sequence[str], None] = '70094ba27e80'
-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_additional_settings', sa.Column('conditional_order_type', sa.String(), nullable=False))
-    op.add_column('user_additional_settings', sa.Column('limit_price', sa.Float(), nullable=False))
-    op.add_column('user_additional_settings', sa.Column('trigger_price', sa.Float(), nullable=False))
-    op.drop_column('user_conditional_settings', 'trigger_price')
-    op.drop_column('user_conditional_settings', 'limit_price')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_conditional_settings', sa.Column('limit_price', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=False))
-    op.add_column('user_conditional_settings', sa.Column('trigger_price', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=False))
-    op.drop_column('user_additional_settings', 'trigger_price')
-    op.drop_column('user_additional_settings', 'limit_price')
-    op.drop_column('user_additional_settings', 'conditional_order_type')
-    # ### end Alembic commands ###

alembic/versions/10bf073c71f9_added_fee_for_user_auto_trading.py

@@ -1,34 +0,0 @@
-"""Added fee for user auto trading
-
-Revision ID: 10bf073c71f9
-Revises: 2b9572b49ecd
-Create Date: 2025-10-02 17:52:05.235523
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '10bf073c71f9'
-down_revision: Union[str, Sequence[str], None] = '2b9572b49ecd'
-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_auto_trading', sa.Column('fee', sa.Float(), nullable=True))
-    op.drop_column('user_deals', 'fee')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_deals', sa.Column('fee', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True))
-    op.drop_column('user_auto_trading', 'fee')
-    # ### end Alembic commands ###

alembic/versions/2b9572b49ecd_added_side_for_user_auto_trading.py

@@ -1,34 +0,0 @@
-"""Added side for user auto trading
-
-Revision ID: 2b9572b49ecd
-Revises: ef342b38e17b
-Create Date: 2025-10-02 17:21:20.904797
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '2b9572b49ecd'
-down_revision: Union[str, Sequence[str], None] = 'ef342b38e17b'
-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_auto_trading', sa.Column('side', sa.String(), nullable=True))
-    op.drop_constraint(op.f('uq_user_auto_trading_symbol'), 'user_auto_trading', type_='unique')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_unique_constraint(op.f('uq_user_auto_trading_symbol'), 'user_auto_trading', ['user_id', 'symbol'], postgresql_nulls_not_distinct=False)
-    op.drop_column('user_auto_trading', 'side')
-    # ### end Alembic commands ###

alembic/versions/3534adf891fc_update_last_side_the_conditional_data.py

@@ -1,32 +0,0 @@
-"""update last side the conditional data
-
-Revision ID: 3534adf891fc
-Revises: ef38c90eed55
-Create Date: 2025-09-30 08:39:02.971158
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '3534adf891fc'
-down_revision: Union[str, Sequence[str], None] = 'ef38c90eed55'
-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! ###
-    pass
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###

alembic/versions/42c66cfe8d4e_updated_martingale_factor.py

@@ -1,38 +0,0 @@
-"""Updated martingale factor
-
-Revision ID: 42c66cfe8d4e
-Revises: 45977e9d8558
-Create Date: 2025-09-22 17:17:39.779979
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '42c66cfe8d4e'
-down_revision: Union[str, Sequence[str], None] = '45977e9d8558'
-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.alter_column('user_additional_settings', 'martingale_factor',
-               existing_type=sa.INTEGER(),
-               type_=sa.Float(),
-               existing_nullable=False)
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.alter_column('user_additional_settings', 'martingale_factor',
-               existing_type=sa.Float(),
-               type_=sa.INTEGER(),
-               existing_nullable=False)
-    # ### end Alembic commands ###

alembic/versions/45977e9d8558_updated_order_quantity.py

@@ -1,38 +0,0 @@
-"""Updated order quantity
-
-Revision ID: 45977e9d8558
-Revises: fd8581c0cc87
-Create Date: 2025-09-22 16:59:40.415398
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '45977e9d8558'
-down_revision: Union[str, Sequence[str], None] = 'fd8581c0cc87'
-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.alter_column('user_additional_settings', 'order_quantity',
-               existing_type=sa.INTEGER(),
-               type_=sa.Float(),
-               existing_nullable=False)
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.alter_column('user_additional_settings', 'order_quantity',
-               existing_type=sa.Float(),
-               type_=sa.INTEGER(),
-               existing_nullable=False)
-    # ### end Alembic commands ###

alembic/versions/70094ba27e80_create_user_conditional_setting.py

@@ -1,40 +0,0 @@
-"""Create User Conditional Setting
-
-Revision ID: 70094ba27e80
-Revises: 42c66cfe8d4e
-Create Date: 2025-09-23 16:47:07.161544
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '70094ba27e80'
-down_revision: Union[str, Sequence[str], None] = '42c66cfe8d4e'
-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.create_table('user_conditional_settings',
-    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=False),
-    sa.Column('limit_price', sa.Float(), nullable=False),
-    sa.Column('trigger_price', sa.Float(), nullable=False),
-    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('user_id')
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table('user_conditional_settings')
-    # ### end Alembic commands ###

alembic/versions/73a00faa4f7f_added_user_auto_trading_table.py

@@ -1,42 +0,0 @@
-"""added user_auto_trading table
-
-Revision ID: 73a00faa4f7f
-Revises: 968f8121104f
-Create Date: 2025-10-01 12:30:21.830851
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '73a00faa4f7f'
-down_revision: Union[str, Sequence[str], None] = '968f8121104f'
-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.create_table('user_auto_trading',
-    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=False),
-    sa.Column('symbol', sa.String(), nullable=True),
-    sa.Column('auto_trading', sa.Boolean(), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('user_id', 'symbol', name='uq_user_auto_trading_symbol')
-    )
-    op.drop_column('user_conditional_settings', 'auto_trading')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_conditional_settings', sa.Column('auto_trading', sa.BOOLEAN(), autoincrement=False, nullable=True))
-    op.drop_table('user_auto_trading')
-    # ### end Alembic commands ###

alembic/versions/77197715747c_deleted_position_idx_for_user_deals_.py

@@ -1,32 +0,0 @@
-"""deleted position_idx for user deals table
-
-Revision ID: 77197715747c
-Revises: 8f1476c68efa
-Create Date: 2025-09-29 12:20:18.928995
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '77197715747c'
-down_revision: Union[str, Sequence[str], None] = '8f1476c68efa'
-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.drop_column('user_deals', 'position_idx')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_deals', sa.Column('position_idx', sa.INTEGER(), autoincrement=False, nullable=True))
-    # ### end Alembic commands ###

alembic/versions/863d6215e1eb_updated_deals.py

@@ -1,32 +0,0 @@
-"""Updated Deals
-
-Revision ID: 863d6215e1eb
-Revises: f00a94ccdf01
-Create Date: 2025-09-28 23:13:39.484468
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '863d6215e1eb'
-down_revision: Union[str, Sequence[str], None] = 'f00a94ccdf01'
-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('margin_type', sa.String(), nullable=True))
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('user_deals', 'margin_type')
-    # ### end Alembic commands ###

alembic/versions/8f1476c68efa_added_position_idx_for_user_deals_table.py

@@ -1,34 +0,0 @@
-"""added position_idx for user deals table
-
-Revision ID: 8f1476c68efa
-Revises: 863d6215e1eb
-Create Date: 2025-09-29 11:40:46.512160
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '8f1476c68efa'
-down_revision: Union[str, Sequence[str], None] = '863d6215e1eb'
-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('position_idx', sa.Integer(), nullable=True))
-    op.drop_constraint(op.f('user_deals_user_id_key'), 'user_deals', type_='unique')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_unique_constraint(op.f('user_deals_user_id_key'), 'user_deals', ['user_id'], postgresql_nulls_not_distinct=False)
-    op.drop_column('user_deals', 'position_idx')
-    # ### end Alembic commands ###

alembic/versions/968f8121104f_updated_user_deals_and_user_conditional_.py

@@ -1,36 +0,0 @@
-"""updated user_deals and user_conditional_settings
-
-Revision ID: 968f8121104f
-Revises: dbffe818030c
-Create Date: 2025-10-01 11:45:49.073865
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '968f8121104f'
-down_revision: Union[str, Sequence[str], None] = 'dbffe818030c'
-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_conditional_settings', sa.Column('auto_trading', sa.Boolean(), nullable=True))
-    op.drop_column('user_deals', 'commission_fee')
-    op.drop_column('user_deals', 'auto_trading')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_deals', sa.Column('auto_trading', sa.BOOLEAN(), autoincrement=False, nullable=True))
-    op.add_column('user_deals', sa.Column('commission_fee', sa.VARCHAR(), autoincrement=False, nullable=True))
-    op.drop_column('user_conditional_settings', 'auto_trading')
-    # ### end Alembic commands ###

alembic/versions/acbcc95de48d_updated_userdeals.py

@@ -1,60 +0,0 @@
-"""Updated UserDeals
-
-Revision ID: acbcc95de48d
-Revises: ccdc5764eb4f
-Create Date: 2025-09-28 16:57:28.384116
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'acbcc95de48d'
-down_revision: Union[str, Sequence[str], None] = 'ccdc5764eb4f'
-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_conditional_settings', sa.Column('auto_trading', sa.String(), nullable=False))
-    op.add_column('user_deals', sa.Column('trading_type', sa.String(), nullable=True))
-    op.add_column('user_deals', sa.Column('conditional_order_type', sa.String(), nullable=True))
-    op.add_column('user_deals', sa.Column('take_profit_percent', sa.Integer(), nullable=True))
-    op.add_column('user_deals', sa.Column('stop_loss_percent', sa.Integer(), nullable=True))
-    op.add_column('user_deals', sa.Column('max_risk_percent', sa.Integer(), nullable=True))
-    op.add_column('user_deals', sa.Column('commission_fee', sa.String(), nullable=True))
-    op.add_column('user_deals', sa.Column('switch_side_mode', sa.String(), nullable=True))
-    op.drop_index(op.f('ix_user_deals_deal_series_id'), table_name='user_deals')
-    op.drop_column('user_deals', 'take_profit')
-    op.drop_column('user_deals', 'deal_series_id')
-    op.drop_column('user_deals', 'price')
-    op.drop_column('user_deals', 'exec_fee')
-    op.drop_column('user_deals', 'stop_loss')
-    op.drop_column('user_deals', 'closed_size')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_deals', sa.Column('closed_size', sa.VARCHAR(), autoincrement=False, nullable=True))
-    op.add_column('user_deals', sa.Column('stop_loss', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True))
-    op.add_column('user_deals', sa.Column('exec_fee', sa.VARCHAR(), autoincrement=False, nullable=True))
-    op.add_column('user_deals', sa.Column('price', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True))
-    op.add_column('user_deals', sa.Column('deal_series_id', sa.INTEGER(), autoincrement=False, nullable=True))
-    op.add_column('user_deals', sa.Column('take_profit', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True))
-    op.create_index(op.f('ix_user_deals_deal_series_id'), 'user_deals', ['deal_series_id'], unique=False)
-    op.drop_column('user_deals', 'switch_side_mode')
-    op.drop_column('user_deals', 'commission_fee')
-    op.drop_column('user_deals', 'max_risk_percent')
-    op.drop_column('user_deals', 'stop_loss_percent')
-    op.drop_column('user_deals', 'take_profit_percent')
-    op.drop_column('user_deals', 'conditional_order_type')
-    op.drop_column('user_deals', 'trading_type')
-    op.drop_column('user_conditional_settings', 'auto_trading')
-    # ### end Alembic commands ###

alembic/versions/c710f4e2259c_unnecessary_data_has_been_deleted.py

@@ -1,79 +0,0 @@
-"""unnecessary data has been deleted
-
-Revision ID: c710f4e2259c
-Revises: 10bf073c71f9
-Create Date: 2025-10-09 14:17:32.632574
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'c710f4e2259c'
-down_revision: Union[str, Sequence[str], None] = '10bf073c71f9'
-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_additional_settings',
-                  sa.Column('switch_side', sa.Boolean(), nullable=False, server_default=sa.false()))
-    op.drop_column('user_additional_settings', 'leverage_to_buy')
-    op.drop_column('user_additional_settings', 'order_type')
-    op.drop_column('user_additional_settings', 'limit_price')
-    op.drop_column('user_additional_settings', 'leverage_to_sell')
-    op.drop_column('user_additional_settings', 'conditional_order_type')
-    op.add_column('user_auto_trading', sa.Column('total_fee', sa.Float(), nullable=True))
-    op.drop_column('user_auto_trading', 'side')
-    op.drop_column('user_deals', 'switch_side_mode')
-    op.drop_column('user_deals', 'leverage_to_buy')
-    op.drop_column('user_deals', 'order_type')
-    op.drop_column('user_deals', 'limit_price')
-    op.drop_column('user_deals', 'max_risk_percent')
-    op.drop_column('user_deals', 'leverage_to_sell')
-    op.drop_column('user_deals', 'conditional_order_type')
-    op.alter_column('user_risk_management', 'take_profit_percent',
-               existing_type=sa.INTEGER(),
-               type_=sa.Float(),
-               existing_nullable=False)
-    op.alter_column('user_risk_management', 'stop_loss_percent',
-               existing_type=sa.INTEGER(),
-               type_=sa.Float(),
-               existing_nullable=False)
-    op.drop_column('user_risk_management', 'max_risk_percent')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_risk_management', sa.Column('max_risk_percent', sa.INTEGER(), autoincrement=False, nullable=False))
-    op.alter_column('user_risk_management', 'stop_loss_percent',
-               existing_type=sa.Float(),
-               type_=sa.INTEGER(),
-               existing_nullable=False)
-    op.alter_column('user_risk_management', 'take_profit_percent',
-               existing_type=sa.Float(),
-               type_=sa.INTEGER(),
-               existing_nullable=False)
-    op.add_column('user_deals', sa.Column('conditional_order_type', sa.VARCHAR(), autoincrement=False, nullable=True))
-    op.add_column('user_deals', sa.Column('leverage_to_sell', sa.VARCHAR(), autoincrement=False, nullable=True))
-    op.add_column('user_deals', sa.Column('max_risk_percent', sa.INTEGER(), autoincrement=False, nullable=True))
-    op.add_column('user_deals', sa.Column('limit_price', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True))
-    op.add_column('user_deals', sa.Column('order_type', sa.VARCHAR(), autoincrement=False, nullable=True))
-    op.add_column('user_deals', sa.Column('leverage_to_buy', sa.VARCHAR(), autoincrement=False, nullable=True))
-    op.add_column('user_deals', sa.Column('switch_side_mode', sa.BOOLEAN(), autoincrement=False, nullable=True))
-    op.add_column('user_auto_trading', sa.Column('side', sa.VARCHAR(), autoincrement=False, nullable=True))
-    op.drop_column('user_auto_trading', 'total_fee')
-    op.add_column('user_additional_settings', sa.Column('conditional_order_type', sa.VARCHAR(), autoincrement=False, nullable=False))
-    op.add_column('user_additional_settings', sa.Column('leverage_to_sell', sa.VARCHAR(), autoincrement=False, nullable=False))
-    op.add_column('user_additional_settings', sa.Column('limit_price', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=False))
-    op.add_column('user_additional_settings', sa.Column('order_type', sa.VARCHAR(), server_default=sa.text("'Market'::character varying"), autoincrement=False, nullable=False))
-    op.add_column('user_additional_settings', sa.Column('leverage_to_buy', sa.VARCHAR(), autoincrement=False, nullable=False))
-    op.drop_column('user_additional_settings', 'switch_side')
-    # ### end Alembic commands ###

alembic/versions/c98b9dc36d15_fixed_auto_trade.py

@@ -1,38 +0,0 @@
-"""Fixed auto_trade
-
-Revision ID: c98b9dc36d15
-Revises: acbcc95de48d
-Create Date: 2025-09-28 21:33:08.319232
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'c98b9dc36d15'
-down_revision: Union[str, Sequence[str], None] = 'acbcc95de48d'
-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.alter_column('user_conditional_settings', 'auto_trading',
-               existing_type=sa.VARCHAR(),
-               type_=sa.Boolean(),
-               existing_nullable=False)
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.alter_column('user_conditional_settings', 'auto_trading',
-               existing_type=sa.Boolean(),
-               type_=sa.VARCHAR(),
-               existing_nullable=False)
-    # ### end Alembic commands ###

alembic/versions/ccdc5764eb4f_added_userdeals.py

@@ -1,50 +0,0 @@
-"""Added UserDeals
-
-Revision ID: ccdc5764eb4f
-Revises: 0eed68eddcdb
-Create Date: 2025-09-25 22:39:17.246594
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'ccdc5764eb4f'
-down_revision: Union[str, Sequence[str], None] = '0eed68eddcdb'
-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_conditional_settings', sa.Column('timer_start', sa.Integer(), nullable=False))
-    op.add_column('user_conditional_settings', sa.Column('timer_end', sa.Integer(), nullable=False))
-    op.add_column('user_deals', sa.Column('trade_mode', sa.String(), nullable=True))
-    op.add_column('user_deals', sa.Column('order_type', sa.String(), nullable=True))
-    op.add_column('user_deals', sa.Column('leverage', sa.String(), nullable=True))
-    op.add_column('user_deals', sa.Column('leverage_to_buy', sa.String(), nullable=True))
-    op.add_column('user_deals', sa.Column('leverage_to_sell', sa.String(), nullable=True))
-    op.add_column('user_deals', sa.Column('closed_side', sa.String(), nullable=True))
-    op.add_column('user_deals', sa.Column('martingale_factor', sa.Float(), nullable=True))
-    op.add_column('user_deals', sa.Column('max_bets_in_series', sa.Integer(), nullable=True))
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('user_deals', 'max_bets_in_series')
-    op.drop_column('user_deals', 'martingale_factor')
-    op.drop_column('user_deals', 'closed_side')
-    op.drop_column('user_deals', 'leverage_to_sell')
-    op.drop_column('user_deals', 'leverage_to_buy')
-    op.drop_column('user_deals', 'leverage')
-    op.drop_column('user_deals', 'order_type')
-    op.drop_column('user_deals', 'trade_mode')
-    op.drop_column('user_conditional_settings', 'timer_end')
-    op.drop_column('user_conditional_settings', 'timer_start')
-    # ### end Alembic commands ###

alembic/versions/d3c85bad8c98_added_limit_and_trigger_price_for_user_.py

@@ -1,34 +0,0 @@
-"""added limit and trigger price for user deals
-
-Revision ID: d3c85bad8c98
-Revises: 09db71875980
-Create Date: 2025-09-29 16:50:36.818798
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'd3c85bad8c98'
-down_revision: Union[str, Sequence[str], None] = '09db71875980'
-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('limit_price', sa.Float(), nullable=True))
-    op.add_column('user_deals', sa.Column('trigger_price', sa.Float(), nullable=True))
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('user_deals', 'trigger_price')
-    op.drop_column('user_deals', 'limit_price')
-    # ### end Alembic commands ###

alembic/versions/dbffe818030c_added_last_side_and_auto_trading_for_.py

@@ -1,40 +0,0 @@
-"""added last_side and auto_trading for user_deals
-
-Revision ID: dbffe818030c
-Revises: 3534adf891fc
-Create Date: 2025-10-01 09:29:55.554101
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'dbffe818030c'
-down_revision: Union[str, Sequence[str], None] = '3534adf891fc'
-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.drop_column('user_conditional_settings', 'last_side')
-    op.drop_column('user_conditional_settings', 'auto_trading')
-    op.add_column('user_deals', sa.Column('last_side', sa.String(), nullable=True))
-    op.add_column('user_deals', sa.Column('auto_trading', sa.Boolean(), nullable=True))
-    op.drop_column('user_deals', 'side')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('user_deals', sa.Column('side', sa.VARCHAR(), autoincrement=False, nullable=True))
-    op.drop_column('user_deals', 'auto_trading')
-    op.drop_column('user_deals', 'last_side')
-    op.add_column('user_conditional_settings', sa.Column('auto_trading', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=False))
-    op.add_column('user_conditional_settings', sa.Column('last_side', sa.VARCHAR(), autoincrement=False, nullable=False))
-    # ### end Alembic commands ###

alembic/versions/ef342b38e17b_added_fee_user_deals.py

@@ -1,32 +0,0 @@
-"""added fee user deals
-
-Revision ID: ef342b38e17b
-Revises: 73a00faa4f7f
-Create Date: 2025-10-02 15:10:25.456983
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'ef342b38e17b'
-down_revision: Union[str, Sequence[str], None] = '73a00faa4f7f'
-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('fee', sa.Float(), nullable=True))
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('user_deals', 'fee')
-    # ### end Alembic commands ###

alembic/versions/ef38c90eed55_added_last_side_the_conditional_data.py

@@ -1,38 +0,0 @@
-"""added last side the conditional data
-
-Revision ID: ef38c90eed55
-Revises: d3c85bad8c98
-Create Date: 2025-09-30 08:33:23.415545
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'ef38c90eed55'
-down_revision: Union[str, Sequence[str], None] = 'd3c85bad8c98'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    op.add_column('user_conditional_settings', sa.Column('last_side', sa.String(), nullable=True))
-
-    # Обновляем все существующие строки значением по умолчанию
-    op.execute(
-        "UPDATE user_conditional_settings SET last_side = 'default_value' WHERE last_side IS NULL"
-    )
-
-    # Устанавливаем ограничение NOT NULL
-    op.alter_column('user_conditional_settings', 'last_side', nullable=False)
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('user_conditional_settings', 'last_side')
-    # ### end Alembic commands ###

alembic/versions/f00a94ccdf01_updated_deals.py

@@ -1,40 +0,0 @@
-"""Updated Deals
-
-Revision ID: f00a94ccdf01
-Revises: c98b9dc36d15
-Create Date: 2025-09-28 22:25:00.092196
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'f00a94ccdf01'
-down_revision: Union[str, Sequence[str], None] = 'c98b9dc36d15'
-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.alter_column('user_deals', 'switch_side_mode',
-               existing_type=sa.VARCHAR(),
-               type_=sa.Boolean(),
-               existing_nullable=True)
-    op.create_unique_constraint(None, 'user_deals', ['user_id'])
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_constraint(None, 'user_deals', type_='unique')
-    op.alter_column('user_deals', 'switch_side_mode',
-               existing_type=sa.Boolean(),
-               type_=sa.VARCHAR(),
-               existing_nullable=True)
-    # ### end Alembic commands ###

alembic/versions/f6e7eb3f25c0_initial.py

@@ -1,8 +1,8 @@
-"""Updated leverage
+"""initial
 
-Revision ID: fd8581c0cc87
-Revises: bb586fa9bcd2
-Create Date: 2025-09-22 15:13:21.487402
+Revision ID: f6e7eb3f25c0
+Revises: 
+Create Date: 2025-11-12 22:53:02.189445
 
 """
 from typing import Sequence, Union
@@ -12,7 +12,7 @@ import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision: str = 'fd8581c0cc87'
+revision: str = 'f6e7eb3f25c0'
 down_revision: Union[str, Sequence[str], None] = None
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None

app/bybit/__init__.py

@@ -15,7 +15,7 @@ async def get_bybit_client(tg_id: int) -> HTTP | None:
     """
     try:
         api_key, api_secret = await rq.get_user_api(tg_id=tg_id)
-        return HTTP(api_key=api_key, api_secret=api_secret)
+        return HTTP(demo=True, api_key=api_key, api_secret=api_secret)
     except Exception as e:
         logger.error("Error getting bybit client for user %s: %s", tg_id, e)
         return None

app/bybit/close_positions.py

@@ -7,25 +7,25 @@ logging.config.dictConfig(LOGGING_CONFIG)
 logger = logging.getLogger("close_positions")
 
 
-async def close_position(
-    tg_id: int, symbol: str, side: str, position_idx: int, qty: float
+async def close_position_by_symbol(
+    tg_id: int, symbol: str
 ) -> bool:
     """
     Closes all positions
     :param tg_id: Telegram user ID
     :param symbol: symbol
-    :param side: side
-    :param position_idx: position index
-    :param qty: quantity
     :return: bool
     """
     try:
         client = await get_bybit_client(tg_id)
 
-        if side == "Buy":
-            r_side = "Sell"
-        else:
-            r_side = "Buy"
+        response = client.get_positions(
+            category="linear", symbol=symbol
+        )
+        positions = response.get("result", {}).get("list", [])
+        r_side = "Sell" if positions[0].get("side") == "Buy" else "Buy"
+        qty = positions[0].get("size")
+        position_idx = positions[0].get("positionIdx")
 
         response = client.place_order(
             category="linear",
@@ -37,16 +37,16 @@ async def close_position(
             positionIdx=position_idx,
         )
         if response["retCode"] == 0:
-            logger.info("All positions closed for %s for user %s", symbol, tg_id)
+            logger.info("Positions closed for %s for user %s", symbol, tg_id)
             return True
         else:
             logger.error(
-                "Error closing all positions for %s for user %s", symbol, tg_id
+                "Error closing position for %s for user %s", symbol, tg_id
             )
             return False
     except Exception as e:
         logger.error(
-            "Error closing all positions for %s for user %s: %s", symbol, tg_id, e
+            "Error closing positions for %s for user %s: %s", symbol, tg_id, e
         )
         return False
 

app/bybit/get_functions/get_positions.py

@@ -38,7 +38,7 @@ async def get_active_positions(tg_id: int) -> list | None:
         return None
 
 
-async def get_active_positions_by_symbol(tg_id: int, symbol: str) -> dict | None:
+async def get_active_positions_by_symbol(tg_id: int, symbol: str):
     """
     Get active positions for a user by symbol
     """
@@ -62,8 +62,12 @@ async def get_active_positions_by_symbol(tg_id: int, symbol: str) -> dict | None
             )
             return None
     except Exception as e:
-        logger.error("Error getting active positions for user %s: %s", tg_id, e)
-        return None
+        errors = str(e)
+        if errors.startswith("Permission denied, please check your API key permissions"):
+            return "Invalid API key permissions"
+        else:
+            logger.error("Error getting active positions for user %s: %s", tg_id, e)
+            return None
 
 
 async def get_active_orders(tg_id: int) -> list | None:

app/bybit/open_positions.py

@@ -10,26 +10,27 @@ from app.bybit.get_functions.get_tickers import get_tickers
 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_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)
 logger = logging.getLogger("open_positions")
 
 
-async def start_trading_cycle(tg_id: int) -> str | None:
+async def start_trading_cycle(
+        tg_id: int
+) -> str | None:
     """
     Start trading cycle
     :param tg_id: Telegram user ID
     """
     try:
-        client = await get_bybit_client(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)
         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(tg_id=tg_id, symbol=symbol)
         trade_mode = additional_data.trade_mode
         switch_side = additional_data.switch_side
+        side = additional_data.side
         margin_type = additional_data.margin_type
         leverage = additional_data.leverage
         order_quantity = additional_data.order_quantity
@@ -38,59 +39,47 @@ async def start_trading_cycle(tg_id: int) -> str | None:
         max_bets_in_series = additional_data.max_bets_in_series
         take_profit_percent = risk_management_data.take_profit_percent
         stop_loss_percent = risk_management_data.stop_loss_percent
-
-        get_side = "Buy"
-
-        if user_deals_data:
-            get_side = user_deals_data.last_side or "Buy"
+        commission_fee = risk_management_data.commission_fee
+        commission_place = risk_management_data.commission_place
 
         if trade_mode == "Switch":
-            if switch_side == "По направлению":
-                side = get_side
-            else:
-                if get_side == "Buy":
-                    side = "Sell"
-                else:
-                    side = "Buy"
+            side = side
         else:
             if trade_mode == "Long":
                 side = "Buy"
             else:
                 side = "Sell"
 
-        # Get fee rates
-        fee_info = client.get_fee_rates(category="linear", symbol=symbol)
-
-        # Check if commission fee is enabled
-        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_leverage(
+        await set_switch_position_mode(
             tg_id=tg_id,
             symbol=symbol,
+            mode=0)
+
+        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,
+            pnl_series=0
+        )
+        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 open_positions(
@@ -99,47 +88,29 @@ async def start_trading_cycle(tg_id: int) -> str | None:
             side=side,
             order_quantity=order_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_commission,
+            leverage=leverage
         )
 
         if res == "OK":
-            await rq.set_user_deal(
-                tg_id=tg_id,
-                symbol=symbol,
-                last_side=side,
-                current_step=1,
-                trade_mode=trade_mode,
-                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,
-            )
             return "OK"
         return (
             res
             if res
-            in {
-                "Limit price is out min price",
-                "Limit price is out max price",
-                "Risk is too high for this trade",
-                "estimated will trigger liq",
-                "ab not enough for new order",
-                "InvalidRequestError",
-                "Order does not meet minimum order value",
-                "position idx not match position mode",
-                "Qty invalid",
-                "The number of contracts exceeds maximum limit allowed",
-                "The number of contracts exceeds minimum limit allowed",
-            }
+               in {
+                   "Limit price is out min price",
+                   "Limit price is out max price",
+                   "Risk is too high for this trade",
+                   "estimated will trigger liq",
+                   "ab not enough for new order",
+                   "InvalidRequestError",
+                   "Order does not meet minimum order value",
+                   "position idx not match position mode",
+                   "Qty invalid",
+                   "The number of contracts exceeds maximum limit allowed",
+                   "The number of contracts exceeds minimum limit allowed",
+                   "Order placement failed as your position may exceed the max",
+                   "Permission denied, please check your API key permissions"
+               }
             else None
         )
 
@@ -148,12 +119,99 @@ async def start_trading_cycle(tg_id: int) -> str | None:
         return None
 
 
-async def trading_cycle(tg_id: int, symbol: str, reverse_side: str) -> str | 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
+        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
+        current_series = user_deals_data.current_series
+        commission_fee = user_deals_data.commission_fee
+        commission_place = user_deals_data.commission_place
+
+        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
+
+        next_series = current_series + 1
+
+        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,
+            pnl_series=0
+        )
+
+        res = await open_positions(
+            tg_id=tg_id,
+            symbol=symbol,
+            side=s_side,
+            order_quantity=base_quantity,
+            trigger_price=trigger_price,
+            leverage=leverage
+        )
+
+        if res == "OK":
+            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",
+                   "Order placement failed as your position may exceed the max",
+               }
+            else None
+        )
+    except Exception as e:
+        logger.error("Error in trading_cycle_profit: %s", e)
+        return None
+
+
+async def trading_cycle(
+        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)
+        commission_fee = user_deals_data.commission_fee
+        commission_place = user_deals_data.commission_place
         total_fee = user_auto_trading_data.total_fee
         trade_mode = user_deals_data.trade_mode
         margin_type = user_deals_data.margin_type
@@ -166,6 +224,14 @@ async def trading_cycle(tg_id: int, symbol: str, reverse_side: str) -> str | Non
         current_step = user_deals_data.current_step
         order_quantity = user_deals_data.order_quantity
         base_quantity = user_deals_data.base_quantity
+        side_mode = user_deals_data.side_mode
+        current_series = user_deals_data.current_series
+        pnl_series = user_deals_data.pnl_series
+
+        next_quantity = safe_float(order_quantity) * (
+            safe_float(martingale_factor)
+        )
+        current_step += 1
 
         await set_margin_mode(tg_id=tg_id, margin_mode=margin_type)
         await set_leverage(
@@ -173,64 +239,62 @@ async def trading_cycle(tg_id: int, symbol: str, reverse_side: str) -> str | Non
             symbol=symbol,
             leverage=leverage,
         )
-
-        if reverse_side == "Buy":
-            real_side = "Sell"
-        else:
-            real_side = "Buy"
-
-        side = real_side
+        total_quantity = next_quantity
+        if commission_fee == "Yes_commission_fee":
+            if commission_place == "Commission_for_qty":
+                total_quantity = next_quantity + total_fee
 
         if trade_mode == "Switch":
-            side = "Sell" if real_side == "Buy" else "Buy"
+            if side == "Buy":
+                r_side = "Sell"
+            else:
+                r_side = "Buy"
+        else:
+            r_side = side
 
-        next_quantity = safe_float(order_quantity) * (safe_float(martingale_factor))
-        current_step += 1
-
-        if max_bets_in_series < current_step:
-            return "Max bets in series"
+        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,
+            pnl_series=pnl_series
+        )
 
         res = await open_positions(
             tg_id=tg_id,
             symbol=symbol,
-            side=side,
-            order_quantity=next_quantity,
+            side=r_side,
+            order_quantity=total_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,
+            leverage=leverage
         )
 
         if res == "OK":
-            await rq.set_user_deal(
-                tg_id=tg_id,
-                symbol=symbol,
-                last_side=side,
-                current_step=current_step,
-                trade_mode=trade_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,
-            )
             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",
-            }
+               in {
+                   "Risk is too high for this trade",
+                   "ab not enough for new order",
+                   "InvalidRequestError",
+                   "The number of contracts exceeds maximum limit allowed",
+                   "Order placement failed as your position may exceed the max",
+               }
             else None
         )
 
@@ -240,28 +304,29 @@ async def trading_cycle(tg_id: int, symbol: str, reverse_side: str) -> str | Non
 
 
 async def open_positions(
-    tg_id: int,
-    side: str,
-    symbol: str,
-    order_quantity: float,
-    trigger_price: float,
-    margin_type: str,
-    leverage: str,
-    take_profit_percent: float,
-    stop_loss_percent: float,
-    commission_fee_percent: float,
+        tg_id: int,
+        side: str,
+        symbol: str,
+        order_quantity: float,
+        trigger_price: float,
+        leverage: str
 ) -> str | None:
     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)
-        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))))
-        qty_formatted = math.floor(qty / qty_step) * qty_step
-        qty_formatted = round(qty_formatted, decimals)
+        qty_format = math.floor(qty / qty_step) * qty_step
+        qty_formatted = round(qty_format, decimals)
 
         if trigger_price > 0:
             po_trigger_price = str(trigger_price)
@@ -270,51 +335,6 @@ async def open_positions(
             po_trigger_price = None
             trigger_direction = None
 
-        get_leverage = safe_float(leverage)
-
-        price_for_cals = trigger_price if po_trigger_price is not None else price_symbol
-
-        tp_multiplier = 1 + (take_profit_percent / 100)
-        if commission_fee_percent > 0:
-            tp_multiplier += commission_fee_percent
-
-        if margin_type == "ISOLATED_MARGIN":
-            liq_long, liq_short = await get_liquidation_price(
-                tg_id=tg_id,
-                entry_price=price_for_cals,
-                symbol=symbol,
-                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:
-                take_profit_price = None
-
-            stop_loss_price = None
-        else:
-            if side == "Buy":
-                take_profit_price = price_for_cals * tp_multiplier
-                stop_loss_price = price_for_cals * (1 - stop_loss_percent / 100)
-            else:
-                take_profit_price = price_for_cals * (
-                    1 - (take_profit_percent / 100) - commission_fee_percent
-                )
-                stop_loss_price = trigger_price * (1 + stop_loss_percent / 100)
-
-            take_profit_price = max(take_profit_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
         order_params = {
             "category": "linear",
@@ -327,9 +347,6 @@ async def open_positions(
             "triggerBy": "LastPrice",
             "timeInForce": "GTC",
             "positionIdx": 0,
-            "tpslMode": "Full",
-            "takeProfit": str(take_profit_price) if take_profit_price else None,
-            "stopLoss": str(stop_loss_price) if stop_loss_price else None,
         }
 
         response = client.place_order(**order_params)
@@ -351,6 +368,8 @@ async def open_positions(
             "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",
+            "Order placement failed as your position may exceed the max": "Order placement failed as your position may exceed the max",
+            "Permission denied, please check your API key permissions": "Permission denied, please check your API key permissions"
         }
         for key, msg in known_errors.items():
             if key in error_text:
@@ -360,5 +379,5 @@ async def open_positions(
         return "InvalidRequestError"
 
     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

app/bybit/profile_bybit.py

@@ -21,19 +21,23 @@ async def user_profile_bybit(tg_id: int, message: Message, state: FSMContext) ->
         if wallet:
             balance = wallet.get("totalWalletBalance", "0")
             symbol = await rq.get_user_symbol(tg_id=tg_id)
-            await message.answer(
-                text=f"💎Ваш профиль:\n\n"
-                f"⚖️ Баланс: {float(balance):,.2f} USD\n"
-                f"📊Торговая пара: {symbol}\n\n"
-                f"Краткая инструкция:\n"
-                f"1. Укажите торговую пару (например: BTCUSDT).\n"
-                f"2. В настройках выставьте все необходимые параметры.\n"
-                f"3. Нажмите кнопку 'Начать торговлю'.\n",
-                reply_markup=kbi.main_menu,
-            )
+            if symbol is None:
+                await rq.set_user_symbol(tg_id=tg_id, symbol="BTCUSDT")
+                await user_profile_bybit(tg_id=tg_id, message=message, state=state)
+            else:
+                await message.answer(
+                    text=f"💎Ваш профиль:\n\n"
+                         f"⚖️ Баланс: {float(balance):,.2f} USD\n"
+                         f"📊Торговая пара: {symbol}\n\n"
+                         f"Краткая инструкция:\n"
+                         f"1. Укажите торговую пару (например: BTCUSDT).\n"
+                         f"2. В настройках выставьте все необходимые параметры.\n"
+                         f"3. Нажмите кнопку 'Начать торговлю'.\n",
+                    reply_markup=kbi.main_menu,
+                )
         else:
             await message.answer(
-                text="Ошибка при подключении, повторите попытку",
+                text="Ошибка при подключении к платформе. Проверьте корректность и разрешения API ключа и добавьте повторно.",
                 reply_markup=kbi.connect_the_platform,
             )
             logger.error("Error processing user profile for user %s", tg_id)

app/bybit/set_functions/set_tp_sl.py

@@ -13,7 +13,7 @@ async def set_tp_sl_for_position(
     take_profit_price: float,
     stop_loss_price: float,
     position_idx: int,
-) -> bool:
+) -> bool | str:
     """
     Set take profit and stop loss for a symbol.
     :param tg_id: Telegram user ID
@@ -21,15 +21,17 @@ async def set_tp_sl_for_position(
     :param take_profit_price: Take profit price
     :param stop_loss_price: Stop loss price
     :param position_idx: Position index
-    :return: bool
+    :return: bool or str
     """
     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",
         )
@@ -38,8 +40,18 @@ async def set_tp_sl_for_position(
             logger.info("TP/SL for %s has been set", symbol)
             return True
         else:
-            logger.error("Error setting TP/SL for %s: %s", symbol, resp.get("retMsg"))
-            return False
+            error_msg = resp.get("retMsg")
+            if "not modified" in error_msg.lower():
+                logger.info("TP/SL for %s not modified: %s", symbol, error_msg)
+                return "not modified"
+            else:
+                logger.error("Error setting TP/SL for %s: %s", symbol, error_msg)
+                return False
     except Exception as e:
-        logger.error("Error setting TP/SL for %s: %s", symbol, e)
-        return False
+        error_msg = str(e)
+        if "not modified" in error_msg.lower():
+            logger.info("TP/SL for %s not modified: %s", symbol, error_msg)
+            return "not modified"
+        else:
+            logger.error("Error set TP/SL for %s: %s", symbol, e)
+            return False

app/bybit/telegram_message_handler.py

@@ -1,10 +1,13 @@
 import logging.config
-
+import math
+import json
 import app.telegram.keyboards.inline as kbi
 import database.request as rq
+from app.bybit.get_functions.get_instruments_info import get_instruments_info
 from app.bybit.logger_bybit.logger_bybit import LOGGING_CONFIG
-from app.bybit.open_positions import trading_cycle
-from app.helper_functions import format_value, safe_float
+from app.bybit.open_positions import trading_cycle, trading_cycle_profit
+from app.bybit.set_functions.set_tp_sl import set_tp_sl_for_position
+from app.helper_functions import format_value, safe_float, truncate_float
 
 logging.config.dictConfig(LOGGING_CONFIG)
 logger = logging.getLogger("telegram_message_handler")
@@ -12,172 +15,351 @@ logger = logging.getLogger("telegram_message_handler")
 
 class TelegramMessageHandler:
     def __init__(self, telegram_bot):
+        """Initialize the TelegramMessageHandler class."""
         self.telegram_bot = telegram_bot
 
-    async def format_position_update(self, message):
-        pass
-
     async def format_order_update(self, message, tg_id):
+        """Handle order updates."""
         try:
-            order_data = message.get("data", [{}])[0]
-            symbol = format_value(order_data.get("symbol"))
-            qty = format_value(order_data.get("qty"))
-            side = format_value(order_data.get("side"))
-            side_rus = (
-                "Покупка"
-                if side == "Buy"
-                else "Продажа" if side == "Sell" else "Нет данных"
-            )
-            order_status = format_value(order_data.get("orderStatus"))
-            price = format_value(order_data.get("price"))
-            trigger_price = format_value(order_data.get("triggerPrice"))
-            take_profit = format_value(order_data.get("takeProfit"))
-            stop_loss = format_value(order_data.get("stopLoss"))
+            # logger.info("Order update: %s", json.dumps(message))
+            user_additional_data = await rq.get_user_additional_settings(tg_id=tg_id)
+            trigger_price = safe_float(user_additional_data.trigger_price)
+            if trigger_price > 0:
+                order_data = message.get("data", [{}])[0]
+                symbol = format_value(order_data.get("symbol"))
+                side = format_value(order_data.get("side"))
+                side_rus = (
+                    "Покупка"
+                    if side == "Buy"
+                    else "Продажа" if side == "Sell" else "Нет данных"
+                )
+                order_status = format_value(order_data.get("orderStatus"))
+                tr_price = format_value(order_data.get("triggerPrice"))
 
-            status_map = {
-                "Untriggered": "Условный ордер выставлен",
-            }
+                status_map = {
+                    "Untriggered": "Условный ордер выставлен",
+                }
 
-            if order_status == "Filled" or order_status not in status_map:
-                return None
+                if order_status == "Filled" or order_status not in status_map:
+                    return None
 
-            text = (
-                f"Торговая пара: {symbol}\n"
-                f"Количество: {qty}\n"
-                f"Движение: {side_rus}\n"
-            )
-            if price and price != "0":
-                text += f"Цена: {price}\n"
-            if take_profit and take_profit != "Нет данных":
-                text += f"Тейк-профит: {take_profit}\n"
-            if stop_loss and stop_loss != "Нет данных":
-                text += f"Стоп-лосс: {stop_loss}\n"
-            if trigger_price and trigger_price != "Нет данных":
-                text += f"Триггер цена: {trigger_price}\n"
+                text = (
+                    f"Торговая пара: {symbol}\n"
+                    f"Движение: {side_rus}\n"
+                )
+                if tr_price and tr_price != "Нет данных":
+                    text += f"Триггер цена: {tr_price}\n"
 
-            await self.telegram_bot.send_message(
-                chat_id=tg_id, text=text, reply_markup=kbi.profile_bybit
-            )
+                await self.telegram_bot.send_message(
+                    chat_id=tg_id, text=text, reply_markup=kbi.profile_bybit
+                )
+                await rq.set_trigger_price(tg_id=tg_id, trigger_price=0)
         except Exception as e:
             logger.error("Error in format_order_update: %s", e)
 
     async def format_execution_update(self, message, tg_id):
+        """Handle execution updates without duplicate processing."""
         try:
+            # logger.info("Execution update: %s", json.dumps(message))
             execution = message.get("data", [{}])[0]
-            closed_size = format_value(execution.get("closedSize"))
-            symbol = format_value(execution.get("symbol"))
-            exec_price = format_value(execution.get("execPrice"))
-            exec_fee = format_value(execution.get("execFee"))
-            side = format_value(execution.get("side"))
-            side_rus = (
-                "Покупка"
-                if side == "Buy"
-                else "Продажа" if side == "Sell" else "Нет данных"
-            )
+            exec_type = format_value(execution.get("execType"))
+            if exec_type == "Trade" or exec_type == "BustTrade":
+                closed_size = format_value(execution.get("closedSize"))
+                symbol = format_value(execution.get("symbol"))
+                exec_price = format_value(execution.get("execPrice"))
+                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"))
+                exec_pnl = format_value(execution.get("execPnl"))
+                stop_order_type = format_value(execution.get("stopOrderType"))
+                create_type = format_value(execution.get("createType"))
 
-            if safe_float(closed_size) == 0:
-                await rq.set_fee_user_auto_trading(
-                    tg_id=tg_id, symbol=symbol, fee=safe_float(exec_fee)
+                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_auto_trading = await rq.get_user_auto_trading(
-                tg_id=tg_id, symbol=symbol
-            )
-
-            get_total_fee = user_auto_trading.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:
-                fee = user_auto_trading.fee
-            else:
-                fee = 0
-
-            exec_pnl = format_value(execution.get("execPnl"))
-            risk_management_data = await rq.get_user_risk_management(tg_id=tg_id)
-            commission_fee = risk_management_data.commission_fee
-
-            if commission_fee == "Yes_commission_fee":
-                total_pnl = safe_float(exec_pnl) - safe_float(exec_fee) - fee
-            else:
-                total_pnl = safe_float(exec_pnl)
-
-            header = (
-                "Сделка закрыта:" if safe_float(closed_size) > 0 else "Сделка открыта:"
-            )
-            text = f"{header}\n" f"Торговая пара: {symbol}\n"
-
-            user_deals_data = await rq.get_user_deal_by_symbol(
-                tg_id=tg_id, symbol=symbol
-            )
-            exec_bet = user_deals_data.order_quantity
-            base_quantity = user_deals_data.base_quantity
-
-            text += (
-                f"Цена исполнения: {exec_price}\n"
-                f"Текущая ставка: {exec_bet}\n"
-                f"Движение: {side_rus}\n"
-                f"Комиссия за сделку: {exec_fee}\n"
-            )
-
-            if safe_float(closed_size) > 0:
-                text += f"\nРеализованная прибыль: {total_pnl:.7f}\n"
-
-            await self.telegram_bot.send_message(
-                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
-
-            if (
-                    auto_trading
-                    and safe_float(closed_size) > 0
-                    and user_symbols is not None
-            ):
-                if safe_float(total_pnl) > 0:
-                    profit_text = "📈 Прибыль достигнута\n"
-                    await self.telegram_bot.send_message(
-                        chat_id=tg_id, text=profit_text, reply_markup=kbi.profile_bybit
+                if auto_trading:
+                    side_rus = (
+                        "Покупка"
+                        if side == "Buy"
+                        else "Продажа" if side == "Sell" else "Нет данных"
                     )
-                    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 rq.set_order_quantity(
-                        tg_id=message.from_user.id, order_quantity=base_quantity
-                    )
-                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":
-                        pass
+                    if safe_float(exec_fees) == 0:
+                        exec_fee = safe_float(exec_price) * safe_float(exec_qty) * safe_float(
+                            fee_rate
+                        )
                     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(
-                            res, "❗️ Не удалось открыть новую сделку"
+                        exec_fee = safe_float(exec_fees)
+
+                    if safe_float(closed_size) == 0:
+                        await rq