Beesquit/TradingBot-with-BybitAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

websocket WIP 3

Browse Source
This commit is contained in:
EugeneBee
2025-04-29 19:32:43 +03:00
parent 31966e5561
commit ffab00601a
4 changed files with 112 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.py
View File

@ -13,7 +13,7 @@ from aiogram.fsm.state import State, StatesGroup
from aiogram.fsm.storage.memory import MemoryStorage
import bybit
import arbus
import jsonProcessing
import credentials
import strings
@ -82,7 +82,7 @@ async def capture_start_pair(message: Message, state: FSMContext):
data = await state.get_data()
t = 0
if await arbus.checkPair(data.get("pair")) == 1:
if await jsonProcessing.checkPair(data.get("pair")) == 1:
msg_text = (f'Стратегия на паре <b>{data.get("pair")}</b> уже запущена.\nПожалуйста остановите стратегию либо введите другую пару.')
t = 1
else:
@ -101,14 +101,13 @@ async def capture_params(message: Message, state: FSMContext):
await state.update_data(params=message.text)
data = await state.get_data()
t = await arbus.mainWrapper(pair=data.get("pair"), params=data.get("params"))
t = await jsonProcessing.savePairParams(pair=data.get("pair"), params=data.get("params"))
if t == 0:
client = await bybit.getClient(credentials.api_key, credentials.api_secret, options.testnet)
if client == -1:
msg_text = (f'Аутентификация не удалась, сообщите администратору если увидете данное сообщение.')
else:
asyncio.create_task(bybit.socketStrategy(data.get("pair"), data.get("params")))
# asyncio.create_task(bybit.strategy(client, data.get("pair"), data.get("params")))
msg_text = (f'Вы запустили стратегию на паре <b>{data.get("pair")}</b> с данными параметрами:\n<b>{data.get("params")}</b>\n')
elif t == -1:
msg_text = (f'Параметры введены в неверном формате, пожалуйста начните заново.')
@ -132,8 +131,8 @@ async def capture_stop_pair(message: Message, state: FSMContext):
await state.update_data(pair=message.text)
data = await state.get_data()
if await arbus.checkPair(data.get("pair")) == 1:
t = await arbus.deletePair(data.get("pair"))
if await jsonProcessing.checkPair(data.get("pair")) == 1:
t = await jsonProcessing.deletePair(data.get("pair"))
if t == 0:
print('Deleted pair succesfuly')
else: