OctoBot-Trading 2.4.91__tar.gz → 2.4.92__tar.gz

{OctoBot-Trading-2.4.91 → OctoBot-Trading-2.4.92}/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.92] - 2024-07-15
+### Fixed
+- [Trades] optimize trade storage RAM
+
 ## [2.4.91] - 2024-07-12
 ### Added
 - [Exchanges] add get_cancelled_orders

{OctoBot-Trading-2.4.91 → OctoBot-Trading-2.4.92/OctoBot_Trading.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.91
+Version: 2.4.92
 Summary: OctoBot project trading package
 Home-page: https://github.com/Drakkar-Software/OctoBot-Trading
 Author: Drakkar-Software
@@ -16,7 +16,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: >=3.8
 License-File: LICENSE
 
-# OctoBot-Trading [2.4.91](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.92](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/903b6b22bceb4661b608a86fea655f69)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Trading?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Trading&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Trading.svg)](https://pypi.python.org/pypi/OctoBot-Trading/)
 [![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Trading/badge.svg?branch=master)](https://coveralls.io/github/Drakkar-Software/OctoBot-Trading?branch=master)

{OctoBot-Trading-2.4.91/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.92}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.91
+Version: 2.4.92
 Summary: OctoBot project trading package
 Home-page: https://github.com/Drakkar-Software/OctoBot-Trading
 Author: Drakkar-Software
@@ -16,7 +16,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: >=3.8
 License-File: LICENSE
 
-# OctoBot-Trading [2.4.91](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.92](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/903b6b22bceb4661b608a86fea655f69)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Trading?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Trading&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Trading.svg)](https://pypi.python.org/pypi/OctoBot-Trading/)
 [![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Trading/badge.svg?branch=master)](https://coveralls.io/github/Drakkar-Software/OctoBot-Trading?branch=master)

{OctoBot-Trading-2.4.91 → OctoBot-Trading-2.4.92}/README.md

@@ -1,4 +1,4 @@
-# OctoBot-Trading [2.4.91](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.92](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/903b6b22bceb4661b608a86fea655f69)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Trading?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Trading&utm_campaign=Badge_Grade_Dashboard)
 [![PyPI](https://img.shields.io/pypi/v/OctoBot-Trading.svg)](https://pypi.python.org/pypi/OctoBot-Trading/)
 [![Coverage Status](https://coveralls.io/repos/github/Drakkar-Software/OctoBot-Trading/badge.svg?branch=master)](https://coveralls.io/github/Drakkar-Software/OctoBot-Trading?branch=master)

{OctoBot-Trading-2.4.91 → OctoBot-Trading-2.4.92}/octobot_trading/__init__.py

@@ -15,4 +15,4 @@
 #  License along with this library.
 
 PROJECT_NAME = "OctoBot-Trading"
-VERSION = "2.4.91"  # major.minor.revision
+VERSION = "2.4.92"  # major.minor.revision

{OctoBot-Trading-2.4.91 → OctoBot-Trading-2.4.92}/octobot_trading/constants.py

@@ -177,6 +177,7 @@ BALANCE_CHANNEL = "Balance"
 BALANCE_PROFITABILITY_CHANNEL = "BalanceProfitability"
 POSITIONS_CHANNEL = "Positions"
 INDIVIDUAL_ORDER_SYNC_TIMEOUT = 1 * commons_constants.MINUTE_TO_SECONDS
+MAX_TRADES_COUNT = int(os.getenv("MAX_TRADES_COUNT", "2000"))    # larger values can use a large part of ram
 
 # History
 DEFAULT_SAVED_HISTORICAL_TIMEFRAMES = [commons_enums.TimeFrames.ONE_DAY]

{OctoBot-Trading-2.4.91 → OctoBot-Trading-2.4.92}/octobot_trading/personal_data/trades/trades_manager.py

@@ -19,6 +19,7 @@ import octobot_commons.logging as logging
 import octobot_commons.tree as commons_tree
 import octobot_commons.enums as commons_enums
 
+import octobot_trading.constants as constants
 import octobot_trading.enums as enums
 import octobot_trading.personal_data as personal_data
 import octobot_trading.personal_data.trades.trade_pnl as trade_pnl
@@ -27,7 +28,7 @@ import octobot_trading.util as util
 
 class TradesManager(util.Initializable):
     # memory usage for 100000 trades: approx 180 Mo
-    MAX_TRADES_COUNT = 100000
+    MAX_TRADES_COUNT = constants.MAX_TRADES_COUNT
 
     def __init__(self, trader):
         super().__init__()
@@ -136,13 +137,22 @@ class TradesManager(util.Initializable):
             return
         try:
             if self.trader.exchange_manager.storage_manager.trades_storage:
-                for trade_dict in await self.trader.exchange_manager.storage_manager.trades_storage.get_history():
+                full_history = await self.trader.exchange_manager.storage_manager.trades_storage.get_history()
+                self.logger.debug(f"Loaded {len(full_history)} trades")
+                for trade_dict in full_history:
                     self.upsert_trade_instance(personal_data.Trade.from_dict(self.trader, trade_dict))
                 if reset:
                     # reset uploaded trades history
                     await self.trader.exchange_manager.storage_manager.trades_storage.trigger_debounced_update_auth_data(
                         True
                     )
+                if len(full_history) > len(self.trades):
+                    # clear removed trades from db
+                    self.logger.debug(
+                        f"Removed {len(full_history) - len(self.trades)} beyond limit trades from storage"
+                    )
+                    await self.trader.exchange_manager.storage_manager.trades_storage.store_history()
+
         except Exception as err:
             self.logger.exception(err, True, f"Error when loading local trade history {err}")
 

{OctoBot-Trading-2.4.91 → OctoBot-Trading-2.4.92}/octobot_trading/storage/trades_storage.py

@@ -171,7 +171,8 @@ def _format_trade(trade_dict, exchange_manager, chart, x_multiplier, kind, mode)
         commons_enums.DBRows.FEES_CURRENCY.value: fee[enums.FeePropertyColumns.CURRENCY.value]
         if trade_dict[enums.ExchangeConstantsOrderColumns.FEE.value] else "",
         commons_enums.DBRows.ID.value: trade_dict[enums.ExchangeConstantsOrderColumns.ID.value],
-        commons_enums.DBRows.TRADING_MODE.value: exchange_manager.trading_modes[0].get_name(),
+        commons_enums.DBRows.TRADING_MODE.value: exchange_manager.trading_modes[0].get_name()
+        if exchange_manager.trading_modes else None,
         commons_enums.PlotAttributes.X.value: trade_dict[enums.ExchangeConstantsOrderColumns.TIMESTAMP.value] * x_multiplier,
         commons_enums.PlotAttributes.TEXT.value: f"{tag}{trade_dict[enums.ExchangeConstantsOrderColumns.TYPE.value]} "
                 f"{trade_dict[enums.ExchangeConstantsOrderColumns.SIDE.value]} "