3.0.21

Author: DogsTailFarmer

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.21 - 2025-02-07
+### Update
+* Some minor improvements
+
 ## 3.0.20 - 2025-02-06
 ### Update
 * `Bybit`: checking for the minimum/maximum Buy/Sell orders price is [excluded](https://announcements.bybit.com/article/title-adjustments-to-bybit-s-spot-trading-limit-order-mechanism-blt786c0c5abf865983/)

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://github.com/DogsTailFarmer/martin-binance/raw/public/doc/Modified%20martingale.svg" width="200"></p>
+<p align="center"><img src="https://raw.githubusercontent.com/DogsTailFarmer/martin-binance/55758a8d32b08c4deb1b34add01c5e259b88f738/doc/Modified%20martingale.svg" width="200"></p>
 <h3 align="center">Profitable, fault-tolerant, adaptable to the market</h3>
 
 ***

martin_binance/__init__.py

@@ -6,7 +6,7 @@
 __author__ = "Jerry Fedorenko"
 __copyright__ = "Copyright © 2021 Jerry Fedorenko aka VM"
 __license__ = "MIT"
-__version__ = "3.0.20"
+__version__ = "3.0.21"
 __maintainer__ = "Jerry Fedorenko"
 __contact__ = "https://github.com/DogsTailFarmer"
 
@@ -52,6 +52,7 @@ def init():
             "cli_2_TESTBTCTESTUSDT.py",
             "cli_3_BTCUSDT.py"
         ]
+        # skipcq: PYL-W0106
         [copy(Path(templates, file_name), Path(WORK_PATH, file_name)) for file_name in files_to_copy]
 
         print(f"Before the first run, set the parameters in {CONFIG_FILE}")

martin_binance/executor.py

@@ -794,6 +794,7 @@ def start(self, profit_f: Decimal = O_DEC, profit_s: Decimal = O_DEC) -> None:
         self.over_price = OVER_PRICE
         self.order_q = ORDER_Q
         self.grid_update_started = None
+        self.place_grid_part_after_tp = True
         #
         start_cycle_output = not self.start_after_shift or self.first_run
         if self.cycle_buy:

martin_binance/service/funds_rate_exporter.py

@@ -99,7 +99,7 @@
 VPS_MEMORY = Gauge("margin_vps_memory", "average memory use in %", ['vps_name'])
 
 SET_ACTIVE = Gauge("margin_set_active", "mark rows as loaded and reset some metrics", ['vps_name'])
-SET_ACTIVE.labels(VPS_NAME).set_function(lambda: set_active())
+SET_ACTIVE.labels(VPS_NAME).set_function(lambda: set_active())  # skipcq: PYL-W0108
 
 ''' Cycle parameters for future use
 PRICE_SHIFT = Gauge("margin_price_shift", "price shift", ['exchange', 'pair'])

martin_binance/strategy_base.py

@@ -1524,8 +1524,7 @@ def wss_cancel_tasks(self):
 
     async def tlg_get_command(self):
         while True:
-            res = await self.tlg_client.get_update()
-            command = json.loads(res.data) if res else None
+            command = await self.tlg_client.get_update()
             if command:
                 self.command = command
             await asyncio.sleep(TLG_DELAY)

martin_binance/telegram_proxy/tlg_client.py

@@ -19,14 +19,15 @@
 __author__ = "Jerry Fedorenko"
 __copyright__ = "Copyright © 2025 Jerry Fedorenko aka VM"
 __license__ = "MIT"
-__version__ = "3.0.20"
+__version__ = "3.0.21"
 __maintainer__ = "Jerry Fedorenko"
 __contact__ = "https://github.com/DogsTailFarmer"
 
 import ssl
 from pathlib import Path
 import asyncio
-
+from typing import Any
+import ujson as json
 import toml
 import random
 import logging.handlers
@@ -89,7 +90,7 @@ def tasks_manage(self, coro, name=None, add_done_callback=True):
             _t.add_done_callback(self.tasks.discard)
 
     def task_cancel(self):
-        [task.cancel() for task in self.tasks if not task.done()]
+        [task.cancel() for task in self.tasks if not task.done()]  # skipcq: PYL-W0106
 
     async def connect(self):
         self.init_event.clear()
@@ -111,7 +112,7 @@ async def connect(self):
                 logger.error(f"Connect to Telegram proxy failed: {e}")
                 break
 
-    async def post_message(self, text, inline_buttons=False, reraise=False) -> tlg.Response:
+    async def post_message(self, text, inline_buttons=False, reraise=False):
         try:
             res = await self.stub.post_message(
                 tlg.Request(
@@ -133,14 +134,14 @@ async def post_message(self, text, inline_buttons=False, reraise=False) -> tlg.R
         except (asyncio.CancelledError, KeyboardInterrupt):
             pass  # user interrupt
 
-    async def get_update(self) -> tlg.Response:
+    async def get_update(self) -> Any | None:
         try:
             res = await self.stub.get_update(
                 tlg.Request(
                     bot_id=self.bot_id,
                 )
             )
-            return res
+            return json.loads(res.data) if res else None
         except (ConnectionRefusedError, exceptions.StreamTerminatedError):
             if self.init_event.is_set():
                 self.tasks_manage(self.connect())