Info and log fixes

README-EN.md

@@ -27,6 +27,8 @@ services:
       DEMOTRADING: "False"
       LOOPSLEEPTIME: "1"
       SHOWEXTRADEBUGLOGS: "False"
+    volumes:
+      - ./data:/app/data
     restart: unless-stopped
 ```
 ### After the basic pre-setup:

README.md

@@ -27,6 +27,8 @@ services:
       DEMOTRADING: "False"
       LOOPSLEEPTIME: "1"
       SHOWEXTRADEBUGLOGS: "False"
+    volumes:
+      - ./data:/app/data
     restart: unless-stopped
 ```
 ### После базовой развёртки выполните следующие шаги:

compose.yml

@@ -12,4 +12,6 @@ services:
       DEMOTRADING: "False"
       LOOPSLEEPTIME: "1"
       SHOWEXTRADEBUGLOGS: "False"
+    volumes:
+      - ./data:/app/data
     restart: unless-stopped

src/arbus.py

@@ -11,7 +11,7 @@ def setStartTime():
     startTime = time.time()
 
 def getPnL(pair):
-    with open("tradingLog.log", "r") as f:
+    with open("./data/tradingLog.log", "r") as f:
         lines = f.readlines()
 
     logEntries = []
@@ -25,7 +25,7 @@ def getPnL(pair):
 
     strategyStartTime = None
     for timestamp, message in logEntries:
-        if message == f"Starting strategy with {pair}":
+        if message == (f"Starting strategy with {pair}"):
             strategyStartTime = timestamp
 
     if not strategyStartTime:

src/bybit.py

@@ -59,7 +59,7 @@ class tradingData:
         self.orderSize = orderSize
         self.priceDecimals, self.qtyDecimals, self.minimumQty = self.getFilters(pair)
         self.previousPrice = -1
-        self.counter = 0
+        self.orderCounter = 0
 
 
     def getBalance(self, pair):
@@ -147,6 +147,7 @@ class tradingData:
                 stopLoss = str(sl),
                 tpslMode = "Full"
             )
+            self.orderCounter += 1
             orderID = response.get('result').get('orderId')
 
             generalLogger.info(f"Placed oder on {self.pair} with TP {tp}; SL {sl}")
@@ -209,10 +210,14 @@ class tradingData:
                             j['long'] = False
                             j['longIDs'] = ['-1', '-1', '-1']
                             generalLogger.info(f"Long order on {self.pair} level {j['price']} triggered TP/SL")
+                            tradingLogger.info(f"Long order on {self.pair} level {j['price']} triggered TP/SL")
+                            self.orderCounter -= 1
                         if orderID in shortIDs:
                             j['short'] = False
                             j['shortIDs'] = ['-1', '-1', '-1']
                             generalLogger.info(f"Short order on {self.pair} level {j['price']} triggered TP/SL")
+                            tradingLogger.info(f"Short order on {self.pair} level {j['price']} triggered TP/SL")
+                            self.orderCounter -= 1
                 if orderStatus == 'Filled':
                     for j in self.levels:
                         longIDs = j['longIDs']
@@ -221,6 +226,7 @@ class tradingData:
                             generalLogger.info(f"Long order on {self.pair} level {j['price']} filled with P&L {i['closedPnl']} and qty {i['qty']}")
                             tradingLogger.info(f"Long order on {self.pair} level {j['price']} filled with P&L {i['closedPnl']} and qty {i['qty']}")
                         if orderID in shortIDs:
+                            generalLogger.info(f"Short order on {self.pair} level {j['price']} filled with P&L {i['closedPnl']} and qty {i['qty']}")
                             tradingLogger.info(f"Short order on {self.pair} level {j['price']} filled with P&L {i['closedPnl']} and qty {i['qty']}")
 
 
@@ -244,6 +250,7 @@ async def getClient(apiKey, apiSecret, testnet, demoTrading):
 
 async def strategy(pair: str, params):
     generalLogger.info('Starting strategy with ' + pair)
+    tradingLogger.info('Starting strategy with ' + pair)
 
     paramsDict = await jsonProcessing.parseParams(params)
     

src/jsonProcessing.py

@@ -32,6 +32,9 @@ async def parseParams(params):
     # Returnes dictionary of string params as paramsLines in options
     paramsList = params.split()
     paramsDict = {}
+    if len(paramsList) != len(options.paramsLines):
+        return -1
+
     for i in range(len(options.paramsLines)):
         paramsDict[options.paramsLines[i]] = paramsList[i]
     return paramsDict

src/main.py

@@ -27,10 +27,11 @@ import strings
 import options
 
 
-async def set_commands():
+async def setCommands():
     commands = [BotCommand(command='start', description='Старт'),
                 BotCommand(command='help', description='Инструкция'),
-                BotCommand(command='info', description='Статус'),
+                BotCommand(command='info', description='Информация о стратегиях'),
+                BotCommand(command='status', description='Статус'),
                 BotCommand(command='strategy', description='Запустить стратегию'),
                 BotCommand(command='stop', description='Остановить стратегию')
                 ]
@@ -51,8 +52,8 @@ bot = Bot(
     default=DefaultBotProperties(parse_mode=ParseMode.HTML),
 )
 
-strategy_router = Router()
+strategyRouter = Router()
-stop_router = Router()
+stopRouter = Router()
 
 
 @dp.message(Command("start"))
@@ -86,13 +87,13 @@ async def commandInfo(message: Message) -> None:
     await message.answer(msgText)
 
 
-@strategy_router.message(Command("strategy"), F.chat.id.in_(whitelist.chatIDs))
+@strategyRouter.message(Command("strategy"), F.chat.id.in_(whitelist.chatIDs))
 async def commandStrategy(message: Message, state: FSMContext):
     await message.answer(strings.strategyCommand + '\n' + strings.askPair)
     await state.set_state(startForm.pair)
 
-@strategy_router.message(F.text, startForm.pair)
+@strategyRouter.message(F.text, startForm.pair)
-async def capture_start_pair(message: Message, state: FSMContext):
+async def captureStartPair(message: Message, state: FSMContext):
     await state.update_data(pair=message.text)
     data = await state.get_data()
 
@@ -109,14 +110,14 @@ async def capture_start_pair(message: Message, state: FSMContext):
     else:
         await state.set_state(startForm.params)
 
-@strategy_router.message(F.text, startForm.params)
+@strategyRouter.message(F.text, startForm.params)
-async def capture_params(message: Message, state: FSMContext):
+async def captureParams(message: Message, state: FSMContext):
     await state.update_data(params=message.text)
 
     data = await state.get_data()
     t = await jsonProcessing.savePairParams(pair=data.get("pair"), params=data.get("params"))
-    params = await jsonProcessing.parseParams(params=data.get("params"))
     if t == 0:
+        params = await jsonProcessing.parseParams(params=data.get("params"))
         client = await bybit.getClient(
             credentials.api_key,
             credentials.api_secret,
@@ -160,13 +161,13 @@ async def capture_params(message: Message, state: FSMContext):
     await state.clear()
 
 
-@stop_router.message(Command("stop"), F.chat.id.in_(whitelist.chatIDs))
+@stopRouter.message(Command("stop"), F.chat.id.in_(whitelist.chatIDs))
 async def commandStop(message: Message, state: FSMContext):
     await message.answer(strings.stopCommand + '\n' + strings.askPair)
     await state.set_state(stopForm.pair)
 
-@stop_router.message(F.text, stopForm.pair)
+@stopRouter.message(F.text, stopForm.pair)
-async def capture_stop_pair(message: Message, state: FSMContext):
+async def captureStopPair(message: Message, state: FSMContext):
     await state.update_data(pair=message.text)
     data = await state.get_data()
 
@@ -180,13 +181,26 @@ async def capture_stop_pair(message: Message, state: FSMContext):
     await state.clear()
 
 
-async def start_bot():
+async def startBot():
-    await set_commands()
+    await setCommands()
+    try:
+        for i in whitelist.chatIDs:
+            await bot.send_message(chat_id=i, text=strings.startBot)
+    except Exception as e:
+        generalLogger.error(e)
+
+async def stopBot():
+    try:
+        for i in whitelist.chatIDs:
+            await bot.send_message(chat_id=i, text=strings.stopBot)
+    except Exception as e:
+        generalLogger.error(e)
 
 async def main() -> None:
-    dp.include_router(strategy_router)
+    dp.include_router(strategyRouter)
-    dp.include_router(stop_router)
+    dp.include_router(stopRouter)
-    dp.startup.register(start_bot)
+    dp.startup.register(startBot)
+    dp.shutdown.register(stopBot)
     await dp.start_polling(bot)