redis

Reviewed-on: kodorvan/stcs#36

.gitignore

@@ -210,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_
 
 ## Основные возможности
 
@@ -59,7 +64,12 @@ nvim .env
 alembic upgrade head
 ```
 
-5. Запустите бота:
+6. Убедитесь в том, что установлен redis и открыт порт 6789
+```bash
+sudo ufw allow 6789
+```
+
+7. Запустите бота:
 
 ```bash
 python run.py
@@ -114,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 = sqlite+aiosqlite:///./database/db/stcs.db
+sqlalchemy.url = sqlite+aiosqlite:///./database/stcs.db
 
 
 [post_write_hooks]

alembic/versions/0ee52ab23e66_added_column_current_series.py

@@ -1,32 +0,0 @@
-"""Added column current_series
-
-Revision ID: 0ee52ab23e66
-Revises: e5d612e44563
-Create Date: 2025-10-26 11:48:48.055031
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '0ee52ab23e66'
-down_revision: Union[str, Sequence[str], None] = 'e5d612e44563'
-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('current_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', 'current_series')
-    # ### end Alembic commands ###

alembic/versions/3fca121b7554_added_tp_sl_and_pnl.py

@@ -1,44 +0,0 @@
-"""Added TP_SL and PNL
-
-Revision ID: 3fca121b7554
-Revises: adf3d2991896
-Create Date: 2025-10-29 11:07:45.350771
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy import inspect
-
-
-# revision identifiers, used by Alembic.
-revision: str = '3fca121b7554'
-down_revision: Union[str, Sequence[str], None] = 'adf3d2991896'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    conn = op.get_bind()
-    inspector = inspect(conn)
-
-    columns = [col['name'] for col in inspector.get_columns('user_deals')]
-
-    if 'pnl_series' not in columns:
-        op.add_column('user_deals', sa.Column('pnl_series', sa.Float(), nullable=True))
-    if 'take_profit' not in columns:
-        op.add_column('user_deals', sa.Column('take_profit', sa.Boolean(), nullable=False, server_default=sa.false()))
-    if 'stop_loss' not in columns:
-        op.add_column('user_deals', sa.Column('stop_loss', sa.Boolean(), nullable=False, server_default=sa.false()))
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('user_deals', 'stop_loss')
-    op.drop_column('user_deals', 'take_profit')
-    op.drop_column('user_deals', 'pnl_series')
-    # ### end Alembic commands ###

alembic/versions/8329c0994b26_fixed_tp_sl_type.py

@@ -1,49 +0,0 @@
-"""Fixed TP_SL type
-
-Revision ID: 8329c0994b26
-Revises: 3fca121b7554
-Create Date: 2025-10-29 13:07:52.161139
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '8329c0994b26'
-down_revision: Union[str, Sequence[str], None] = '3fca121b7554'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade():
-    with op.batch_alter_table('user_deals', recreate='always') as batch_op:
-        # Добавляем новую колонку с нужным типом
-        batch_op.add_column(sa.Column('take_profit_new', sa.Float(), nullable=False, server_default='0'))
-
-    # После закрытия batch создается и переименовывается таблица.
-    # Теперь мы можем обновить данные.
-    op.execute(
-        "UPDATE user_deals SET take_profit_new = CAST(take_profit AS FLOAT)"
-    )
-
-    with op.batch_alter_table('user_deals', recreate='always') as batch_op:
-        # Удаляем старую колонку
-        batch_op.drop_column('take_profit')
-        # Меняем имя новой колонки на старое
-        batch_op.alter_column('take_profit_new', new_column_name='take_profit')
-
-def downgrade():
-    # Аналогично, но в обратном порядке и типе
-    with op.batch_alter_table('user_deals', recreate='always') as batch_op:
-        batch_op.add_column(sa.Column('take_profit_old', sa.Boolean(), nullable=False, server_default='0'))
-
-    op.execute(
-        "UPDATE user_deals SET take_profit_old = CAST(take_profit AS BOOLEAN)"
-    )
-
-    with op.batch_alter_table('user_deals', recreate='always') as batch_op:
-        batch_op.drop_column('take_profit')
-        batch_op.alter_column('take_profit_old', new_column_name='take_profit')

alembic/versions/adf3d2991896_added_column_commission_place.py

@@ -1,45 +0,0 @@
-"""Added column commission_place
-
-Revision ID: adf3d2991896
-Revises: 0ee52ab23e66
-Create Date: 2025-10-26 13:37:33.662318
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy import inspect
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'adf3d2991896'
-down_revision: Union[str, Sequence[str], None] = '0ee52ab23e66'
-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! ###
-    bind = op.get_bind()
-    inspector = inspect(bind)
-    columns_user_deals = [col['name'] for col in inspector.get_columns('user_deals')]
-    if 'commission_fee' not in columns_user_deals:
-        op.add_column('user_deals', sa.Column('commission_fee', sa.String(), server_default='', nullable=True))
-    if 'commission_place' not in columns_user_deals:
-        op.add_column('user_deals', sa.Column('commission_place', sa.String(), server_default='', nullable=True))
-
-    columns_user_risk_mgmt = [col['name'] for col in inspector.get_columns('user_risk_management')]
-    if 'commission_place' not in columns_user_risk_mgmt:
-        op.add_column('user_risk_management',
-                      sa.Column('commission_place', sa.String(), server_default='', nullable=False))
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('user_risk_management', 'commission_place')
-    op.drop_column('user_deals', 'commission_place')
-    op.drop_column('user_deals', 'commission_fee')
-    # ### end Alembic commands ###

alembic/versions/e5d612e44563_added_column_side_for_additional_.py

@@ -1,34 +0,0 @@
-"""Added column side for additional_setiings
-
-Revision ID: e5d612e44563
-Revises: fbf4e3658310
-Create Date: 2025-10-25 18:25:52.746250
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'e5d612e44563'
-down_revision: Union[str, Sequence[str], None] = 'fbf4e3658310'
-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('side', sa.String(), nullable=False, server_default='')
-                  )
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('user_additional_settings', 'side')
-    # ### end Alembic commands ###

alembic/versions/f6e7eb3f25c0_initial.py

@@ -1,8 +1,8 @@
-"""Added side_mode column
+"""initial
 
-Revision ID: fbf4e3658310
+Revision ID: f6e7eb3f25c0
 Revises: 
-Create Date: 2025-10-22 13:08:02.317419
+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 = 'fbf4e3658310'
+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
@@ -21,12 +21,12 @@ 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))
+    pass
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     """Downgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('user_deals', 'side_mode')
+    pass
     # ### end Alembic commands ###

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

@@ -109,6 +109,7 @@ async def start_trading_cycle(
                    "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
         )
@@ -232,9 +233,6 @@ async def trading_cycle(
         )
         current_step += 1
 
-        if max_bets_in_series < current_step:
-            return "Max bets in series"
-
         await set_margin_mode(tg_id=tg_id, margin_mode=margin_type)
         await set_leverage(
             tg_id=tg_id,
@@ -371,6 +369,7 @@ async def open_positions(
             "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:

app/bybit/profile_bybit.py

@@ -37,7 +37,7 @@ async def user_profile_bybit(tg_id: int, message: Message, state: FSMContext) ->
                 )
         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/telegram_message_handler.py

@@ -1,10 +1,9 @@
 import logging.config
 import math
-# import json
+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.get_functions.get_positions import get_active_positions_by_symbol
 from app.bybit.logger_bybit.logger_bybit import LOGGING_CONFIG
 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
@@ -123,7 +122,6 @@ class TelegramMessageHandler:
                     current_step = user_deals_data.current_step
                     order_quantity = user_deals_data.order_quantity
                     pnl_series = user_deals_data.pnl_series
-                    margin_type = user_deals_data.margin_type
                     take_profit_percent = user_deals_data.take_profit_percent
                     stop_loss_percent = user_deals_data.stop_loss_percent
                     leverage = safe_float(user_deals_data.leverage)
@@ -167,24 +165,14 @@ class TelegramMessageHandler:
                             if commission_place == "Commission_for_tp":
                                 total_commission = safe_float(total_fee) / qty_formatted
 
-                        if margin_type == "ISOLATED_MARGIN":
-                            if side == "Buy":
-                                take_profit_price = safe_float(exec_price) * (
-                                        1 + take_profit_percent / 100) + total_commission
-                                stop_loss_price = None
-                            else:
-                                take_profit_price = safe_float(exec_price) * (
-                                        1 - take_profit_percent / 100) - total_commission
-                                stop_loss_price = None
+                        if side == "Buy":
+                            take_profit_price = safe_float(exec_price) * (
+                                    1 + take_profit_percent / 100) + total_commission
+                            stop_loss_price = safe_float(exec_price) * (1 - stop_loss_percent / 100)
                         else:
-                            if side == "Buy":
-                                take_profit_price = safe_float(exec_price) * (
-                                        1 + take_profit_percent / 100) + total_commission
-                                stop_loss_price = safe_float(exec_price) * (1 - stop_loss_percent / 100)
-                            else:
-                                take_profit_price = safe_float(exec_price) * (
-                                        1 - take_profit_percent / 100) - total_commission
-                                stop_loss_price = safe_float(exec_price) * (1 + stop_loss_percent / 100)
+                            take_profit_price = safe_float(exec_price) * (
+                                    1 - take_profit_percent / 100) - total_commission
+                            stop_loss_price = safe_float(exec_price) * (1 + stop_loss_percent / 100)
 
                         ress = await set_tp_sl_for_position(tg_id=tg_id,
                                                             symbol=symbol,
@@ -193,27 +181,11 @@ class TelegramMessageHandler:
                                                             position_idx=0)
                         if ress or ress == "not modified":
                             take_profit_truncated = await truncate_float(take_profit_price, 6)
+                            stop_loss_truncated = await truncate_float(stop_loss_price, 6)
                             text += (f"Движение: {side_rus}\n"
                                      f"Тейк-профит: {take_profit_truncated}\n"
+                                     f"Стоп-лосс: {stop_loss_truncated}\n"
                                      )
-                            if stop_loss_price is not None:
-                                stop_loss_truncated = await truncate_float(stop_loss_price, 6)
-                            else:
-                                stop_loss_truncated = None
-
-                            if stop_loss_truncated is not None:
-                                text += f"Стоп-лосс: {stop_loss_truncated}\n"
-                            else:
-                                deals = await get_active_positions_by_symbol(
-                                    tg_id=tg_id, symbol=symbol
-                                )
-                                position = next((d for d in deals if d.get("symbol") == symbol), None)
-
-                                if position:
-                                    liq_price = position.get("liqPrice", 0)
-                                    text += f"Цена ликвидации: {liq_price}\n"
-
-
                         else:
                             text += (f"Движение: {side_rus}\n"
                                      "Не удалось установить ТП и СЛ\n")
@@ -258,7 +230,6 @@ class TelegramMessageHandler:
                             pass
                         else:
                             errors = {
-                                "Max bets in series": "❗️ Максимальное количество сделок в серии достигнуто",
                                 "Risk is too high for this trade": "❗️ Риск сделки слишком высок для продолжения",
                                 "ab not enough for new order": "❗️ Недостаточно средств для продолжения торговли",
                                 "InvalidRequestError": "❗️ Недостаточно средств для размещения нового ордера с заданным количеством и плечом.",
@@ -285,49 +256,105 @@ class TelegramMessageHandler:
                             )
 
                     elif stop_order_type == "StopLoss" or exec_type == "BustTrade":
-                        open_order_text = "\n❗️ Открываю новую сделку с увеличенной ставкой.\n"
-                        await self.telegram_bot.send_message(
-                            chat_id=tg_id, text=open_order_text
-                        )
+                        current_step = user_deals_data.current_step
+                        max_bets_in_series = user_deals_data.max_bets_in_series
+                        current_step += 1
 
-                        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": "❗️ Превышен максимальный лимит ставки",
-                                "Order placement failed as your position may exceed the max": "❗️ Превышен максимальный лимит ставки с текущим плечом",
-                            }
-                            error_text = errors.get(
-                                res, "❗️ Не удалось открыть новую сделку"
-                            )
-                            await rq.set_auto_trading(
-                                tg_id=tg_id, symbol=symbol, auto_trading=False
+                        if max_bets_in_series < current_step:
+                            text_series = ("\n❗️ Максимальное количество сделок в серии достигнуто.\n"
+                                           "📈 Начинаю новую серию с базовой ставки\n")
+                            await self.telegram_bot.send_message(
+                                chat_id=tg_id, text=text_series
                             )
+                            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(
                                 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,
+                            await rq.set_pnl_series_by_symbol(tg_id=tg_id, symbol=symbol, pnl_series=0)
+
+                            res = await trading_cycle_profit(
+                                tg_id=tg_id, symbol=symbol, side=r_side
                             )
+                            if res == "OK":
+                                pass
+                            else:
+                                errors = {
+                                    "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": "❗️ Превышен максимальный лимит ставки",
+                                }
+                                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 = {
+                                    "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": "❗️ Превышен максимальный лимит ставки с текущим плечом",
+                                }
+                                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,
+                                )
                     elif create_type == "CreateByClosing":
                         await self.telegram_bot.send_message(
                             chat_id=tg_id,
@@ -346,5 +373,7 @@ class TelegramMessageHandler:
                         )
                         logger.info("Stop trading for symbol: %s, create_type: %s, stop_order_type: %s: %s",
                                     symbol, create_type, stop_order_type, tg_id)
+            else:
+                logger.info("Execution update: %s", json.dumps(message))
         except Exception as e:
             logger.error("Error in telegram_message_handler: %s", e, exc_info=True)

app/bybit/web_socket.py

@@ -1,4 +1,5 @@
 import asyncio
+from collections import deque
 import logging.config
 
 from pybit.unified_trading import WebSocket
@@ -11,104 +12,178 @@ logging.config.dictConfig(LOGGING_CONFIG)
 logger = logging.getLogger("web_socket")
 
 
+class CustomWebSocket(WebSocket):
+    """Custom WebSocket wrapper with enhanced error handling."""
+
+    def _on_error(self, error):
+        logger.error(f"WebSocket error: {error}")
+        return super()._on_error(error)
+
+    def _on_close(self):
+        logger.warning("WebSocket connection closed")
+        super()._on_close()
+
+
 class WebSocketBot:
     """
-    Class to handle WebSocket connections and messages.
+    Manages multiple Bybit private WebSocket connections for Telegram users.
+    Uses queue-based message processing to handle thread-safe async calls.
     """
 
     def __init__(self, telegram_bot):
-        """Initialize the TradingBot class."""
+        """
+        Initialize WebSocketBot.
+
+        Args:
+            telegram_bot: Telegram bot instance for message handling
+        """
         self.telegram_bot = telegram_bot
-        self.ws_private = None
-        self.user_messages = {}
         self.user_sockets = {}
+        self.user_messages = {}
         self.user_keys = {}
         self.loop = None
         self.message_handler = TelegramMessageHandler(telegram_bot)
 
+        self.order_queues = {}  # {tg_id: deque}
+        self.execution_queues = {}  # {tg_id: deque}
+        self.processing_tasks = {}  # {tg_id: task}
+
     async def run_user_check_loop(self):
-        """Run a loop to check for users and connect them to the WebSocket."""
+        """Main loop that continuously checks users and maintains connections."""
         self.loop = asyncio.get_running_loop()
+        logger.info("Starting WebSocket user check loop")
+
         while True:
-            users = await WebSocketBot.get_users_from_db()
-            for user in users:
-                tg_id = user.tg_id
-                api_key, api_secret = await rq.get_user_api(tg_id=tg_id)
+            try:
+                users = await WebSocketBot.get_users_from_db()
+                for user in users:
+                    tg_id = user.tg_id
+                    api_key, api_secret = await rq.get_user_api(tg_id=tg_id)
 
-                if not api_key or not api_secret:
-                    continue
+                    if not api_key or not api_secret:
+                        continue
 
-                keys_stored = self.user_keys.get(tg_id)
-                if tg_id in self.user_sockets and keys_stored == (api_key, api_secret):
-                    continue
+                    keys_stored = self.user_keys.get(tg_id)
+                    socket_exists = tg_id in self.user_sockets
 
-                if tg_id in self.user_sockets:
-                    self.user_sockets.clear()
-                    self.user_messages.clear()
-                    self.user_keys.clear()
-                    logger.info(
-                        "Closed old websocket for user %s due to key change", tg_id
-                    )
+                    if socket_exists and keys_stored == (api_key, api_secret):
+                        continue
 
-                success = await self.try_connect_user(api_key, api_secret, tg_id)
-                if success:
-                    self.user_keys[tg_id] = (api_key, api_secret)
-                    self.user_messages.setdefault(
-                        tg_id, {"position": None, "order": None, "execution": None}
-                    )
-                    logger.info("User %s connected to WebSocket", tg_id)
-                else:
-                    await asyncio.sleep(5)
-                    await self.try_connect_user(api_key, api_secret, tg_id)
+                    if socket_exists:
+                        await self.close_user_socket(tg_id)
+
+                    success = await self.try_connect_user(api_key, api_secret, tg_id)
+                    if success:
+                        self.user_keys[tg_id] = (api_key, api_secret)
+                        self.user_messages.setdefault(
+                            tg_id, {"position": None, "order": None, "execution": None}
+                        )
+                        logger.info("User %s successfully connected", tg_id)
+
+            except Exception as e:
+                logger.error("Error in user check loop: %s", e)
 
             await asyncio.sleep(10)
 
-    async def clear_user_sockets(self):
-        """Clear the user_sockets and user_messages dictionaries."""
-        self.user_sockets.clear()
-        self.user_messages.clear()
-        self.user_keys.clear()
-        logger.info("Cleared user_sockets")
-
     async def try_connect_user(self, api_key, api_secret, tg_id):
-        """Try to connect a user to the WebSocket."""
+        """
+        Create and setup WebSocket streams with thread-safe queues.
+        """
         try:
-            self.ws_private = WebSocket(
+            ws = CustomWebSocket(
                 demo=True,
                 testnet=False,
                 channel_type="private",
                 api_key=api_key,
-                api_secret=api_secret,
+                api_secret=api_secret
             )
 
-            self.user_sockets[tg_id] = self.ws_private
-            # Connect to the WebSocket private channel
-            # Handle order updates
-            self.ws_private.order_stream(
-                lambda msg: self.loop.call_soon_threadsafe(
-                    asyncio.create_task, self.handle_order_update(msg, tg_id)
-                )
+            self.user_sockets[tg_id] = ws
+
+            self.order_queues[tg_id] = deque()
+            self.execution_queues[tg_id] = deque()
+
+            self.processing_tasks[tg_id] = asyncio.create_task(
+                self._process_order_queue(tg_id)
             )
-            # Handle execution updates
-            self.ws_private.execution_stream(
-                lambda msg: self.loop.call_soon_threadsafe(
-                    asyncio.create_task, self.handle_execution_update(msg, tg_id)
-                )
+            self.processing_tasks[tg_id + 1] = asyncio.create_task(
+                self._process_execution_queue(tg_id)
             )
+
+            def order_callback(msg):
+                self.order_queues[tg_id].append(msg)
+
+            def execution_callback(msg):
+                self.execution_queues[tg_id].append(msg)
+
+            ws.order_stream(order_callback)
+            ws.execution_stream(execution_callback)
+
+            logger.info("WebSocket streams configured for user %s", tg_id)
             return True
+
         except Exception as e:
             logger.error("Error connecting user %s: %s", tg_id, e)
+            self.user_sockets.pop(tg_id, None)
             return False
 
+    async def _process_order_queue(self, tg_id):
+        """Continuously process order queue for user."""
+        while tg_id in self.user_sockets:
+            try:
+                if self.order_queues[tg_id]:
+                    msg = self.order_queues[tg_id].popleft()
+                    await self.handle_order_update(msg, tg_id)
+            except Exception as e:
+                logger.error("Error processing order queue %s: %s", tg_id, e)
+            await asyncio.sleep(0.01)
+
+    async def _process_execution_queue(self, tg_id):
+        """Continuously process execution queue for user."""
+        while tg_id in self.user_sockets:
+            try:
+                if self.execution_queues[tg_id]:
+                    msg = self.execution_queues[tg_id].popleft()
+                    await self.handle_execution_update(msg, tg_id)
+            except Exception as e:
+                logger.error("Error processing execution queue %s: %s", tg_id, e)
+            await asyncio.sleep(0.01)
+
+    async def close_user_socket(self, tg_id):
+        """Gracefully close user connection."""
+        if tg_id in self.user_sockets:
+            self.user_sockets.pop(tg_id, None)
+
+            for key in (tg_id, tg_id + 1):
+                task = self.processing_tasks.pop(key, None)
+                if task and not task.done():
+                    task.cancel()
+
+            self.order_queues.pop(tg_id, None)
+            self.execution_queues.pop(tg_id, None)
+            self.user_messages.pop(tg_id, None)
+            self.user_keys.pop(tg_id, None)
+            logger.info("Cleaned up user %s", tg_id)
+
     async def handle_order_update(self, message, tg_id):
-        """Handle order updates."""
-        await self.message_handler.format_order_update(message, tg_id)
+        """Process order updates."""
+        try:
+            await self.message_handler.format_order_update(message, tg_id)
+        except Exception as e:
+            logger.error("Error handling order update for %s: %s", tg_id, e)
 
     async def handle_execution_update(self, message, tg_id):
-        """Handle execution updates without duplicate processing."""
-        await self.message_handler.format_execution_update(message, tg_id)
+        """Process execution updates."""
+        try:
+            await self.message_handler.format_execution_update(message, tg_id)
+        except Exception as e:
+            logger.error("Error handling execution update for %s: %s", tg_id, e)
 
     @staticmethod
     async def get_users_from_db():
-        """Get all users from the database."""
-        return await rq.get_users()
+        """Fetch all users from database."""
+        try:
+            return await rq.get_users()
+        except Exception as e:
+            logger.error("Error getting users from DB: %s", e)
+            return []

app/telegram/handlers/main_settings/additional_settings.py

@@ -299,6 +299,12 @@ async def settings_for_margin_type(
         deals = await get_active_positions_by_symbol(
             tg_id=callback_query.from_user.id, symbol=symbol
         )
+        if deals == "Invalid API key permissions":
+            await callback_query.answer(
+                text="API ключ не имеет достаточных прав для смены маржи",
+            )
+            return
+
         position = next((d for d in deals if d.get("symbol") == symbol), None)
 
         if position:
@@ -676,10 +682,19 @@ async def set_leverage_handler(message: Message, state: FSMContext) -> None:
 
         await state.clear()
     except Exception as e:
-        await message.answer(
-            text="Произошла ошибка при установке кредитного плеча. Пожалуйста, попробуйте позже.",
-            reply_markup=kbi.back_to_additional_settings,
-        )
+        errors_text = str(e)
+        known_errors = {
+            "Permission denied, please check your API key permissions": "API ключ не имеет достаточных прав для установки кредитного плеча"
+
+        }
+        for key, msg in known_errors.items():
+            if key in errors_text:
+                await message.answer(msg, reply_markup=kbi.back_to_additional_settings)
+            else:
+                await message.answer(
+                    text="Произошла ошибка при установке кредитного плеча. Пожалуйста, попробуйте позже.",
+                    reply_markup=kbi.back_to_additional_settings,
+                )
         logger.error(
             "Error processing command leverage for user %s: %s", message.from_user.id, e
         )

app/telegram/handlers/start_trading.py

@@ -38,6 +38,12 @@ async def start_trading(callback_query: CallbackQuery, state: FSMContext) -> Non
         deals = await get_active_positions_by_symbol(
             tg_id=callback_query.from_user.id, symbol=symbol
         )
+        if deals == "Invalid API key permissions":
+            await callback_query.answer(
+                text="API ключ не имеет достаточных прав для запуска торговли",
+            )
+            return
+
         position = next((d for d in deals if d.get("symbol") == symbol), None)
 
         if position:
@@ -109,7 +115,9 @@ async def start_trading(callback_query: CallbackQuery, state: FSMContext) -> Non
                 "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": "API ключ не имеет достаточных прав для запуска торговли"
+
             }
 
             if res == "OK":
@@ -131,7 +139,16 @@ async def start_trading(callback_query: CallbackQuery, state: FSMContext) -> Non
         await add_start_task_merged(user_id=callback_query.from_user.id, task=task)
 
     except Exception as e:
-        await callback_query.answer(text="Произошла ошибка при запуске торговли")
+        error_text = str(e)
+        known_errors = {
+                "Permission denied, please check your API key permissions": "API ключ не имеет достаточных прав для запуска торговли"
+
+        }
+        for key, msg in known_errors.items():
+            if key in error_text:
+                await callback_query.answer(msg)
+            else:
+                await callback_query.answer(text="Произошла ошибка при запуске торговли")
         logger.error(
             "Error processing command start_trading for user %s: %s",
             callback_query.from_user.id,

database/__init__.py

@@ -10,10 +10,9 @@ logging.config.dictConfig(LOGGING_CONFIG)
 logger = logging.getLogger("database")
 
 BASE_DIR = Path(__file__).parent.resolve()
-DATA_DIR = BASE_DIR / "db"
-DATA_DIR.mkdir(parents=True, exist_ok=True)
+BASE_DIR.mkdir(parents=True, exist_ok=True)
 
-DATABASE_URL = f"sqlite+aiosqlite:///{DATA_DIR / 'stcs.db'}"
+DATABASE_URL = f"sqlite+aiosqlite:///{BASE_DIR / 'stcs.db'}"
 
 async_engine = create_async_engine(
     DATABASE_URL,
@@ -39,7 +38,7 @@ async_session = async_sessionmaker(
 async def init_db():
     try:
         async with async_engine.begin() as conn:
-            await conn.run_sync(Base.metadata.create_all)
+            await conn.run_sync(lambda sync_conn: Base.metadata.create_all(bind=sync_conn, checkfirst=True))
         logger.info("Database initialized.")
     except Exception as e:
-        logger.error("Database initialization failed: %s", e)
+        logger.error("Database initialization failed: %s", e)

database/models.py

@@ -154,8 +154,8 @@ class UserDeals(Base):
     order_quantity = Column(Float, nullable=True)
     martingale_factor = Column(Float, nullable=True)
     max_bets_in_series = Column(Integer, nullable=True)
-    take_profit_percent = Column(Integer, nullable=True)
-    stop_loss_percent = Column(Integer, nullable=True)
+    take_profit_percent = Column(Float, nullable=True)
+    stop_loss_percent = Column(Float, nullable=True)
     trigger_price = Column(Float, nullable=True)
     current_series = Column(Integer, nullable=True)
     commission_fee = Column(String, nullable=True)

database/request.py

@@ -86,7 +86,7 @@ async def set_user_api(tg_id: int, api_key: str, api_secret: str) -> bool:
                 else:
                     # Creating new record
                     user_api = UserApi(
-                        user=user, api_key=api_key, api_secret=api_secret
+                        user_id=user.id, api_key=api_key, api_secret=api_secret
                     )
                     session.add(user_api)
 
@@ -141,7 +141,7 @@ async def set_user_symbol(tg_id: int, symbol: str) -> bool:
                     # Creating new record
                     user_symbol = UserSymbol(
                         symbol=symbol,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_symbol)
 
@@ -197,7 +197,7 @@ async def create_user_additional_settings(tg_id: int) -> None:
 
             # Create the user additional settings
             user_additional_settings = UserAdditionalSettings(
-                user=user,
+                user_id=user.id,
                 trade_mode="Long",  # Default value
                 switch_side="По направлению",
                 side="Buy",
@@ -267,7 +267,7 @@ async def set_trade_mode(tg_id: int, trade_mode: str) -> bool:
                     # Creating new record
                     user_additional_settings = UserAdditionalSettings(
                         trade_mode=trade_mode,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_additional_settings)
 
@@ -306,7 +306,7 @@ async def set_margin_type(tg_id: int, margin_type: str) -> bool:
                     # Creating new record
                     user_additional_settings = UserAdditionalSettings(
                         margin_type=margin_type,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_additional_settings)
 
@@ -345,7 +345,7 @@ async def set_switch_side(tg_id: int, switch_side: str) -> bool:
                     # Creating new record
                     user_additional_settings = UserAdditionalSettings(
                         switch_side=switch_side,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_additional_settings)
 
@@ -384,7 +384,7 @@ async def set_side(tg_id: int, side: str) -> bool:
                     # Creating new record
                     user_additional_settings = UserAdditionalSettings(
                         side=side,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_additional_settings)
 
@@ -423,7 +423,7 @@ async def set_leverage(tg_id: int, leverage: str) -> bool:
                     # Creating new record
                     user_additional_settings = UserAdditionalSettings(
                         leverage=leverage,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_additional_settings)
 
@@ -462,7 +462,7 @@ async def set_order_quantity(tg_id: int, order_quantity: float) -> bool:
                     # Creating new record
                     user_additional_settings = UserAdditionalSettings(
                         order_quantity=order_quantity,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_additional_settings)
 
@@ -503,7 +503,7 @@ async def set_martingale_factor(tg_id: int, martingale_factor: float) -> bool:
                     # Creating new record
                     user_additional_settings = UserAdditionalSettings(
                         martingale_factor=martingale_factor,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_additional_settings)
 
@@ -546,7 +546,7 @@ async def set_max_bets_in_series(tg_id: int, max_bets_in_series: int) -> bool:
                     # Creating new record
                     user_additional_settings = UserAdditionalSettings(
                         max_bets_in_series=max_bets_in_series,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_additional_settings)
 
@@ -587,7 +587,7 @@ async def set_trigger_price(tg_id: int, trigger_price: float) -> bool:
                     # Creating new record
                     user_additional_settings = UserAdditionalSettings(
                         trigger_price=trigger_price,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_additional_settings)
 
@@ -627,7 +627,7 @@ async def create_user_risk_management(tg_id: int) -> None:
 
             # Create the user risk management
             user_risk_management = UserRiskManagement(
-                user=user,
+                user_id=user.id,
                 take_profit_percent=1.0,
                 stop_loss_percent=1.0,
                 commission_fee="Yes_commission_fee",
@@ -692,7 +692,7 @@ async def set_take_profit_percent(tg_id: int, take_profit_percent: float) -> boo
                     # Creating new record
                     user_risk_management = UserRiskManagement(
                         take_profit_percent=take_profit_percent,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_risk_management)
 
@@ -733,7 +733,7 @@ async def set_stop_loss_percent(tg_id: int, stop_loss_percent: float) -> bool:
                     # Creating new record
                     user_risk_management = UserRiskManagement(
                         stop_loss_percent=stop_loss_percent,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_risk_management)
 
@@ -774,7 +774,7 @@ async def set_commission_fee(tg_id: int, commission_fee: str) -> bool:
                     # Creating new record
                     user_risk_management = UserRiskManagement(
                         commission_fee=commission_fee,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_risk_management)
 
@@ -815,7 +815,7 @@ async def set_commission_place(tg_id: int, commission_place: str) -> bool:
                     # Creating new record
                     user_risk_management = UserRiskManagement(
                         commission_place=commission_place,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_risk_management)
 
@@ -855,7 +855,7 @@ async def create_user_conditional_settings(tg_id: int) -> None:
 
             # Create the user conditional settings
             user_conditional_settings = UserConditionalSettings(
-                user=user,
+                user_id=user.id,
                 timer_start=0,
                 timer_end=0,
             )
@@ -920,7 +920,7 @@ async def set_start_timer(tg_id: int, timer_start: int) -> bool:
                     # Creating new record
                     user_conditional_settings = UserConditionalSettings(
                         timer_start=timer_start,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_conditional_settings)
 
@@ -959,7 +959,7 @@ async def set_stop_timer(tg_id: int, timer_end: int) -> bool:
                     # Creating new record
                     user_conditional_settings = UserConditionalSettings(
                         timer_end=timer_end,
-                        user=user,
+                        user_id=user.id,
                     )
                     session.add(user_conditional_settings)
 
@@ -1051,7 +1051,7 @@ async def set_user_deal(
             else:
                 # Creating new record
                 new_deal = UserDeals(
-                    user=user,
+                    user_id=user.id,
                     symbol=symbol,
                     current_step=current_step,
                     current_series=current_series,

examples/systemd/stcs.service

@@ -8,7 +8,7 @@ After=syslog.target network-online.target
 ExecStart=sudo -u www-data /usr/bin/python3 /var/www/stcs/BybitBot_API.py
 PIDFile=/var/run/python/stcs.pid
 RemainAfterExit=no
-RuntimeMaxSec=3600s
+RuntimeMaxSec=604800s
 Restart=always
 RestartSec=5s
 

run.py

@@ -31,7 +31,6 @@ async def main():
         dp = Dispatcher(storage=storage)
         dp.include_router(router)
         web_socket = WebSocketBot(telegram_bot=bot)
-        await web_socket.clear_user_sockets()
         ws_task = asyncio.create_task(web_socket.run_user_check_loop())
         tg_task = asyncio.create_task(dp.start_polling(bot))