OctoBot-Trading 2.4.118__tar.gz → 2.4.120__tar.gz

{OctoBot-Trading-2.4.118 → OctoBot-Trading-2.4.120}/CHANGELOG.md

@@ -4,6 +4,14 @@ 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.120] - 2024-11-05
+### Fixed
+[Exchanges] Authorization header
+
+## [2.4.119] - 2024-10-30
+### Updated
+[Exchanges] fix orders and portfolio update spam
+
 ## [2.4.118] - 2024-10-27
 ### Updated
 [Exchanges] market status cache time

{OctoBot-Trading-2.4.118 → OctoBot-Trading-2.4.120/OctoBot_Trading.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.118
+Version: 2.4.120
 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.118](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.120](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.118/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.120}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OctoBot-Trading
-Version: 2.4.118
+Version: 2.4.120
 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.118](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.120](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.118 → OctoBot-Trading-2.4.120}/README.md

@@ -1,4 +1,4 @@
-# OctoBot-Trading [2.4.118](https://github.com/Drakkar-Software/OctoBot-Trading/blob/master/CHANGELOG.md)
+# OctoBot-Trading [2.4.120](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.118 → OctoBot-Trading-2.4.120}/octobot_trading/__init__.py

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

{OctoBot-Trading-2.4.118 → OctoBot-Trading-2.4.120}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -275,7 +275,7 @@ def _get_client_config(
     api_key=None, secret=None, password=None, uid=None,
     auth_token=None, auth_token_header_prefix=None
 ):
-    if auth_token is not None:
+    if auth_token:
         headers["Authorization"] = f"{auth_token_header_prefix or ''}{auth_token}"
     config = {
         'verbose': constants.ENABLE_CCXT_VERBOSE,

{OctoBot-Trading-2.4.118 → OctoBot-Trading-2.4.120}/octobot_trading/exchanges/exchanges.py

@@ -71,6 +71,9 @@ class Exchanges(singleton.Singleton):
             self.get_exchange(exchange_manager.exchange_name, exchange_manager.id).matrix_id
         )
 
+    def get_matrix_id(self, exchange_manager) -> str:
+        return self.get_exchange(exchange_manager.exchange_name, exchange_manager.id).matrix_id
+
     def del_exchange(self, exchange_name, exchange_manager_id, should_warn=True) -> None:
         try:
             self.exchanges[exchange_name].pop(exchange_manager_id, None)

{OctoBot-Trading-2.4.118 → OctoBot-Trading-2.4.120}/octobot_trading/storage/abstract_storage.py

@@ -14,8 +14,10 @@
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library
 import asyncio
+import contextlib
 import copy
 import decimal
+import time
 import types
 
 import octobot_commons.display as commons_display
@@ -23,6 +25,7 @@ import octobot_commons.logging as logging
 
 import octobot_trading.exchange_channel as exchanges_channel
 import octobot_trading.constants as trading_constants
+import octobot_trading.exchanges as exchanges
 
 
 class AbstractStorage:
@@ -32,6 +35,8 @@ class AbstractStorage:
     IS_HISTORICAL = True
     HISTORY_TABLE = None
     FLUSH_DEBOUNCE_DURATION = 5   # avoid disc spam on multiple quick live updated
+    IS_MULTI_EXCHANGE_STORAGE = False   # set True when this storage is updating data from all other exchanges as well
+    LAST_UPDATE_TIME_PER_MATRIX_ID = {}
 
     def __init__(self, exchange_manager, plot_settings: commons_display.PlotSettings,
                  use_live_consumer_in_backtesting=None, is_historical=None):
@@ -122,8 +127,15 @@ class AbstractStorage:
 
     async def _waiting_update_auth_data(self, reset):
         try:
-            await asyncio.sleep(trading_constants.AUTH_UPDATE_DEBOUNCE_DURATION)
-            await self._update_auth_data(reset)
+            debounce_interval = trading_constants.AUTH_UPDATE_DEBOUNCE_DURATION
+            await asyncio.sleep(debounce_interval)
+            with self._multi_exchange_auth_value_update(debounce_interval) as should_update:
+                if should_update:
+                    await self._update_auth_data(reset)
+                else:
+                    logging.get_logger(self.__class__.__name__).debug(
+                        f"Skip storage update: this multi exchange value has already been updated."
+                    )
         except Exception as err:
             logging.get_logger(self.__class__.__name__).exception(err, True, f"Error when updating auth data: {err}")
 
@@ -131,6 +143,7 @@ class AbstractStorage:
         try:
             await asyncio.sleep(self.FLUSH_DEBOUNCE_DURATION)
             await self.flush()
+
         except Exception as err:
             logging.get_logger(self.__class__.__name__).exception(err, True, f"Error when flushing database: {err}")
 
@@ -152,6 +165,43 @@ class AbstractStorage:
     async def flush(self):
         await self._get_db().flush()
 
+    @contextlib.contextmanager
+    def _multi_exchange_auth_value_update(self, interval):
+        """
+        yields True if the auth updated value should be updated at the current time or if it already just got updated
+        """
+        if not self.IS_MULTI_EXCHANGE_STORAGE:
+            yield True
+            return
+        should_update = time.time() - self._get_multi_exchange_last_update_time() > interval
+        if should_update:
+            # update time twice to prevent concurrent updated during yield
+            self._register_multi_exchange_last_update_time()
+            yield True
+            self._register_multi_exchange_last_update_time()
+        else:
+            yield False
+
+    def _get_multi_exchange_last_update_time(self) -> float:
+        try:
+            return AbstractStorage.LAST_UPDATE_TIME_PER_MATRIX_ID[
+                exchanges.Exchanges.instance().get_matrix_id(self.exchange_manager)
+            ][self.__class__.__name__]
+        except KeyError:
+            return 0
+
+    def _register_multi_exchange_last_update_time(self):
+        try:
+            AbstractStorage.LAST_UPDATE_TIME_PER_MATRIX_ID[
+                exchanges.Exchanges.instance().get_matrix_id(self.exchange_manager)
+            ][self.__class__.__name__] = time.time()
+        except KeyError:
+            AbstractStorage.LAST_UPDATE_TIME_PER_MATRIX_ID[
+                exchanges.Exchanges.instance().get_matrix_id(self.exchange_manager)
+            ] = {
+                self.__class__.__name__: time.time()
+            }
+
     @classmethod
     async def clear_database_history(cls, database, flush=True):
         if cls.HISTORY_TABLE is None:

{OctoBot-Trading-2.4.118 → OctoBot-Trading-2.4.120}/octobot_trading/storage/orders_storage.py

@@ -35,6 +35,7 @@ class OrdersStorage(abstract_storage.AbstractStorage):
     HISTORY_TABLE = commons_enums.DBTables.ORDERS.value
     HISTORICAL_OPEN_ORDERS_TABLE = commons_enums.DBTables.HISTORICAL_ORDERS_UPDATES.value
     ENABLE_HISTORICAL_ORDER_UPDATES_STORAGE = constants.ENABLE_HISTORICAL_ORDERS_UPDATES_STORAGE
+    IS_MULTI_EXCHANGE_STORAGE = True   # set True when this storage is updating data from all other exchanges as well
 
     def __init__(self, exchange_manager, use_live_consumer_in_backtesting=None, is_historical=None):
         super().__init__(

{OctoBot-Trading-2.4.118 → OctoBot-Trading-2.4.120}/octobot_trading/storage/portfolio_storage.py

@@ -30,6 +30,7 @@ class PortfolioStorage(abstract_storage.AbstractStorage):
     IS_HISTORICAL = True
     PRICE_INIT_TIMEOUT = 30
     HISTORY_TABLE = commons_enums.RunDatabases.HISTORICAL_PORTFOLIO_VALUE.value
+    IS_MULTI_EXCHANGE_STORAGE = True   # set True when this storage is updating data from all other exchanges as well
 
     @abstract_storage.AbstractStorage.hard_reset_and_retry_if_necessary
     async def store_history(self, reset=False):

{OctoBot-Trading-2.4.118 → OctoBot-Trading-2.4.120}/tests/modes/script_keywords/dsl/test_quantity.py

@@ -72,8 +72,11 @@ def test_parse_quantity_types():
         script_keywords.QuantityType.ENTRY, decimal.Decimal("-0.11"))
 
     assert script_keywords.parse_quantity("p%") == (script_keywords.QuantityType.POSITION_PERCENT, None)
+    assert script_keywords.parse_quantity("%p") == (script_keywords.QuantityType.POSITION_PERCENT, None)
     assert script_keywords.parse_quantity("-0.11p%") == (
         script_keywords.QuantityType.POSITION_PERCENT, decimal.Decimal("-0.11"))
+    assert script_keywords.parse_quantity("-0.11%p") == (
+        script_keywords.QuantityType.POSITION_PERCENT, decimal.Decimal("-0.11"))
     assert script_keywords.parse_quantity("%p-0.11") == (
         script_keywords.QuantityType.POSITION_PERCENT, decimal.Decimal("-0.11"))