devel #15
1
.gitignore
vendored
1
.gitignore
vendored
@@ -148,6 +148,7 @@ env.bak/
|
|||||||
venv.bak/
|
venv.bak/
|
||||||
/logger_helper/loggers
|
/logger_helper/loggers
|
||||||
/app/bybit/logger_bybit/loggers
|
/app/bybit/logger_bybit/loggers
|
||||||
|
*.db
|
||||||
# Spyder project settings
|
# Spyder project settings
|
||||||
.spyderproject
|
.spyderproject
|
||||||
.spyproject
|
.spyproject
|
||||||
|
@@ -21,16 +21,20 @@ async def user_profile_bybit(tg_id: int, message: Message, state: FSMContext) ->
|
|||||||
if wallet:
|
if wallet:
|
||||||
balance = wallet.get("totalWalletBalance", "0")
|
balance = wallet.get("totalWalletBalance", "0")
|
||||||
symbol = await rq.get_user_symbol(tg_id=tg_id)
|
symbol = await rq.get_user_symbol(tg_id=tg_id)
|
||||||
await message.answer(
|
if symbol is None:
|
||||||
text=f"💎Ваш профиль:\n\n"
|
await rq.set_user_symbol(tg_id=tg_id, symbol="BTCUSDT")
|
||||||
f"⚖️ Баланс: {float(balance):,.2f} USD\n"
|
await user_profile_bybit(tg_id=tg_id, message=message, state=state)
|
||||||
f"📊Торговая пара: {symbol}\n\n"
|
else:
|
||||||
f"Краткая инструкция:\n"
|
await message.answer(
|
||||||
f"1. Укажите торговую пару (например: BTCUSDT).\n"
|
text=f"💎Ваш профиль:\n\n"
|
||||||
f"2. В настройках выставьте все необходимые параметры.\n"
|
f"⚖️ Баланс: {float(balance):,.2f} USD\n"
|
||||||
f"3. Нажмите кнопку 'Начать торговлю'.\n",
|
f"📊Торговая пара: {symbol}\n\n"
|
||||||
reply_markup=kbi.main_menu,
|
f"Краткая инструкция:\n"
|
||||||
)
|
f"1. Укажите торговую пару (например: BTCUSDT).\n"
|
||||||
|
f"2. В настройках выставьте все необходимые параметры.\n"
|
||||||
|
f"3. Нажмите кнопку 'Начать торговлю'.\n",
|
||||||
|
reply_markup=kbi.main_menu,
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
await message.answer(
|
await message.answer(
|
||||||
text="Ошибка при подключении, повторите попытку",
|
text="Ошибка при подключении, повторите попытку",
|
||||||
|
@@ -6,5 +6,3 @@ if env_path:
|
|||||||
load_dotenv(env_path)
|
load_dotenv(env_path)
|
||||||
|
|
||||||
BOT_TOKEN = os.getenv("BOT_TOKEN")
|
BOT_TOKEN = os.getenv("BOT_TOKEN")
|
||||||
|
|
||||||
DATABASE_URL = f"sqlite+aiosqlite:///database/data/sqlite.db"
|
|
||||||
|
@@ -1,14 +1,19 @@
|
|||||||
from database.models import Base
|
from database.models import Base, User, UserAdditionalSettings, UserApi, UserConditionalSettings, UserDeals, \
|
||||||
|
UserRiskManagement, UserSymbol
|
||||||
import logging.config
|
import logging.config
|
||||||
from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker, AsyncSession
|
from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker, AsyncSession
|
||||||
from sqlalchemy import event
|
from sqlalchemy import event
|
||||||
from config import DATABASE_URL
|
from pathlib import Path
|
||||||
|
|
||||||
from logger_helper.logger_helper import LOGGING_CONFIG
|
from logger_helper.logger_helper import LOGGING_CONFIG
|
||||||
|
|
||||||
logging.config.dictConfig(LOGGING_CONFIG)
|
logging.config.dictConfig(LOGGING_CONFIG)
|
||||||
logger = logging.getLogger("database")
|
logger = logging.getLogger("database")
|
||||||
|
|
||||||
|
BASE_DIR = Path(__file__).parent.resolve()
|
||||||
|
DATA_DIR = BASE_DIR / "db"
|
||||||
|
DATA_DIR.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
|
DATABASE_URL = f"sqlite+aiosqlite:///{DATA_DIR / 'stcs.db'}"
|
||||||
|
|
||||||
async_engine = create_async_engine(
|
async_engine = create_async_engine(
|
||||||
DATABASE_URL,
|
DATABASE_URL,
|
||||||
@@ -16,22 +21,25 @@ async_engine = create_async_engine(
|
|||||||
connect_args={"check_same_thread": False}
|
connect_args={"check_same_thread": False}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@event.listens_for(async_engine.sync_engine, "connect")
|
@event.listens_for(async_engine.sync_engine, "connect")
|
||||||
def _enable_foreign_keys(dbapi_connection, connection_record):
|
def _enable_foreign_keys(dbapi_connection, connection_record):
|
||||||
cursor = dbapi_connection.cursor()
|
cursor = dbapi_connection.cursor()
|
||||||
cursor.execute("PRAGMA foreign_keys=ON")
|
cursor.execute("PRAGMA foreign_keys=ON")
|
||||||
cursor.close()
|
cursor.close()
|
||||||
|
|
||||||
|
|
||||||
async_session = async_sessionmaker(
|
async_session = async_sessionmaker(
|
||||||
async_engine,
|
async_engine,
|
||||||
class_=AsyncSession,
|
class_=AsyncSession,
|
||||||
expire_on_commit=False
|
expire_on_commit=False
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
async def init_db():
|
async def init_db():
|
||||||
try:
|
try:
|
||||||
async with async_engine.begin() as conn:
|
async with async_engine.begin() as conn:
|
||||||
await conn.run_sync(Base.metadata.create_all)
|
await conn.run_sync(Base.metadata.create_all)
|
||||||
logger.info("Database initialized.")
|
logger.info("Database initialized.")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error("Database initialization failed: %s", e, exc_info=True)
|
logger.error("Database initialization failed: %s", e)
|
||||||
|
2
run.py
2
run.py
@@ -5,10 +5,10 @@ import logging.config
|
|||||||
from aiogram import Bot, Dispatcher
|
from aiogram import Bot, Dispatcher
|
||||||
from aiogram.fsm.storage.redis import RedisStorage
|
from aiogram.fsm.storage.redis import RedisStorage
|
||||||
|
|
||||||
|
from database import init_db
|
||||||
from app.bybit.web_socket import WebSocketBot
|
from app.bybit.web_socket import WebSocketBot
|
||||||
from app.telegram.handlers import router
|
from app.telegram.handlers import router
|
||||||
from config import BOT_TOKEN
|
from config import BOT_TOKEN
|
||||||
from database import init_db
|
|
||||||
from logger_helper.logger_helper import LOGGING_CONFIG
|
from logger_helper.logger_helper import LOGGING_CONFIG
|
||||||
|
|
||||||
logging.config.dictConfig(LOGGING_CONFIG)
|
logging.config.dictConfig(LOGGING_CONFIG)
|
||||||
|
Reference in New Issue
Block a user