OctoBot-Trading 2.4.191__tar.gz → 2.4.193__tar.gz

{OctoBot-Trading-2.4.191 → OctoBot-Trading-2.4.193}/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.193] - 2025-06-14
+### Updated
+[Exchanges] add ccxt.ExchangeNotAvailable, ccxt.InvalidNonce to default retry policy
+
+## [2.4.192] - 2025-06-11
+### Updated
+[Exchanges] improve retry policy
+
 ## [2.4.191] - 2025-06-10
 ### Updated
 [Orders] fix get_minimal_order_cost

{OctoBot-Trading-2.4.191 → OctoBot-Trading-2.4.193/OctoBot_Trading.egg-info}/PKG-INFO

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

@@ -99,6 +99,7 @@ octobot_trading/exchanges/config/exchange_config_data.py
 octobot_trading/exchanges/config/exchange_credentials_data.py
 octobot_trading/exchanges/config/proxy_config.py
 octobot_trading/exchanges/connectors/__init__.py
+octobot_trading/exchanges/connectors/util.py
 octobot_trading/exchanges/connectors/ccxt/__init__.py
 octobot_trading/exchanges/connectors/ccxt/ccxt_adapter.py
 octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

{OctoBot-Trading-2.4.191/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.193}/PKG-INFO

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

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

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

{OctoBot-Trading-2.4.191 → OctoBot-Trading-2.4.193}/octobot_trading/constants.py

@@ -74,6 +74,8 @@ DEFAULT_CANDLE_HISTORY_SIZE = 200
 NO_DATA_LIMIT = -1
 DEFAULT_FAILED_REQUEST_RETRY_TIME = 1
 FAILED_NETWORK_REQUEST_RETRY_ATTEMPTS = 5
+TOOLS_FAILED_NETWORK_REQUEST_ATTEMPTS = int(os.getenv("TOOLS_FAILED_NETWORK_REQUEST_ATTEMPTS", "2"))
+TOOLS_FAILED_NETWORK_REQUEST_RETRY_DELAY = int(os.getenv("TOOLS_FAILED_NETWORK_REQUEST_RETRY_DELAY", "5"))
 DEFAULT_REQUEST_TIMEOUT = int(os.getenv("DEFAULT_REQUEST_TIMEOUT", "20000"))    # default ccxt is 10s, use 20
 ENABLE_EXCHANGE_HTTP_PROXY_FROM_ENV = os_util.parse_boolean_environment_var(
     "ENABLE_EXCHANGE_HTTP_PROXY_FROM_ENV", "True"

{OctoBot-Trading-2.4.191 → OctoBot-Trading-2.4.193}/octobot_trading/errors.py

@@ -135,7 +135,7 @@ class FailedRequest(OctoBotExchangeError):
     """
 
 
-class RetriableFailedRequest(OctoBotExchangeError):
+class RetriableFailedRequest(FailedRequest):
     """
     Raised upon a failed request on an exchange API which can be instantly retried
     """

{OctoBot-Trading-2.4.191 → OctoBot-Trading-2.4.193}/octobot_trading/exchanges/__init__.py

@@ -125,6 +125,7 @@ from octobot_trading.exchanges.connectors import (
     CCXTAdapter,
     ExchangeSimulatorConnector,
     ExchangeSimulatorAdapter,
+    retried_failed_network_request,
 )
 from octobot_trading.exchanges import exchange_details
 from octobot_trading.exchanges.exchange_details import (
@@ -197,5 +198,6 @@ __all__ = [
     "CCXTAdapter",
     "ExchangeSimulatorConnector",
     "ExchangeSimulatorAdapter",
+    "retried_failed_network_request",
     "ExchangeDetails",
 ]

{OctoBot-Trading-2.4.191 → OctoBot-Trading-2.4.193}/octobot_trading/exchanges/connectors/__init__.py

@@ -27,10 +27,16 @@ from octobot_trading.exchanges.connectors.simulator import (
     ExchangeSimulatorConnector,
 )
 
+from octobot_trading.exchanges.connectors import util
+from octobot_trading.exchanges.connectors.util import (
+    retried_failed_network_request,
+)
+
 __all__ = [
     "CCXTAdapter",
     "CCXTConnector",
     "CCXTWebsocketConnector",
     "ExchangeSimulatorAdapter",
     "ExchangeSimulatorConnector",
+    "retried_failed_network_request",
 ]

{OctoBot-Trading-2.4.191 → OctoBot-Trading-2.4.193}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -40,34 +40,11 @@ import octobot_trading.exchanges.connectors.ccxt.ccxt_adapter as ccxt_adapter
 import octobot_trading.exchanges.connectors.ccxt.ccxt_client_util as ccxt_client_util
 import octobot_trading.exchanges.connectors.ccxt.enums as ccxt_enums
 import octobot_trading.exchanges.connectors.ccxt.constants as ccxt_constants
+import octobot_trading.exchanges.connectors.util as connectors_util
 import octobot_trading.personal_data as personal_data
 from octobot_trading.enums import ExchangeConstantsOrderColumns as ecoc
 
 
-def _retried_failed_network_request(func):
-    async def _retried_failed_network_request_wrapper(*args, raise_errors=False, **kwargs):
-        for i in range(constants.FAILED_NETWORK_REQUEST_RETRY_ATTEMPTS):
-            try:
-                resp = await func(*args, **kwargs)
-                if i > 0:
-                    octobot_commons.logging.get_logger(f"_retried_failed_network_request").info(
-                        f"{func.__name__} succeeded after {i+1} attempts."
-                    )
-                return resp
-            except ccxt.RequestTimeout as err:
-                octobot_commons.logging.get_logger(f"_retried_failed_network_request").warning(
-                    f"{func.__name__} raised {html_util.get_html_summary_if_relevant(err)} ({err.__class__.__name__}) "
-                    f"[attempts {i+1}/{constants.FAILED_NETWORK_REQUEST_RETRY_ATTEMPTS}]."
-                )
-                if i < constants.FAILED_NETWORK_REQUEST_RETRY_ATTEMPTS - 1:
-                    # can happen: retry
-                    pass
-                else:
-                    raise
-        # raise any other error
-    return _retried_failed_network_request_wrapper
-
-
 class CCXTConnector(abstract_exchange.AbstractExchange):
     """
     CCXT library connector. Everything ccxt related should be in this connector.
@@ -149,7 +126,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
         await client.load_markets(reload=reload)
 
     @ccxt_client_util.converted_ccxt_common_errors
-    @_retried_failed_network_request
+    @connectors_util.retried_failed_network_request()
     async def load_symbol_markets(
         self,
         reload=False,
@@ -186,8 +163,8 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                     # unexpected: notify
                     self.logger.error(f"Unexpected error when loading markets: {err} ({err.__class__.__name__})")
                 raise
-            except ccxt.ExchangeNotAvailable as err:
-                raise octobot_trading.errors.FailedRequest(
+            except ccxt.NetworkError as err:
+                raise octobot_trading.errors.NetworkError(
                     f"Failed to load_symbol_markets: {err.__class__.__name__} "
                     f"on {html_util.get_html_summary_if_relevant(err)}"
                 ) from err
@@ -1120,13 +1097,13 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
         except (ccxt.ExchangeNotAvailable, aiohttp_socks.ProxyConnectionError) as err:
             self.raise_or_prefix_proxy_error_if_relevant(
                 err,
-                octobot_trading.errors.FailedRequest(
+                octobot_trading.errors.NetworkError(
                     f"Failed to execute request: {err.__class__.__name__}: {html_util.get_html_summary_if_relevant(err)}"
                 )
             )
         except ccxt.NetworkError as err:
             raise octobot_trading.errors.NetworkError(
-                f"Request timeout: {html_util.get_html_summary_if_relevant(err)}"
+                f"Request network error ({err.__class__.__name__}): {html_util.get_html_summary_if_relevant(err)}"
             ) from err
         except ccxt.AuthenticationError as err:
             error_class = (

OctoBot-Trading-2.4.193/octobot_trading/exchanges/connectors/util.py

@@ -0,0 +1,55 @@
+#  Drakkar-Software OctoBot-Trading
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+import asyncio
+import ccxt
+
+import octobot_commons.logging as commons_logging
+import octobot_commons.html_util as html_util
+import octobot_trading.constants as constants
+import octobot_trading.errors as errors
+
+
+def retried_failed_network_request(
+    attempts=constants.FAILED_NETWORK_REQUEST_RETRY_ATTEMPTS,
+    delay=constants.DEFAULT_FAILED_REQUEST_RETRY_TIME,
+):
+    # inner level to allow passing params to the decorator
+    def inner_retried_failed_network_request(func):
+        async def _retried_failed_network_request_wrapper(*args, **kwargs):
+            for attempt in range(attempts):
+                try:
+                    resp = await func(*args, **kwargs)
+                    if attempt > 0:
+                        commons_logging.get_logger(f"retried_failed_network_request").info(
+                            f"{func.__name__} succeeded after {attempt+1} attempts."
+                        )
+                    return resp
+                except (
+                    ccxt.RequestTimeout, ccxt.ExchangeNotAvailable, ccxt.InvalidNonce, errors.RetriableFailedRequest
+                ) as err:
+                    commons_logging.get_logger(f"retried_failed_network_request").warning(
+                        f"{func.__name__} raised {html_util.get_html_summary_if_relevant(err)} "
+                        f"({err.__class__.__name__}) [attempts {attempt+1}/{attempts}]. Retrying in {delay} seconds."
+                    )
+                    if attempt < attempts - 1:
+                        # can happen: retry
+                        await asyncio.sleep(delay)
+                    else:
+                        raise
+                # raise any other error
+            return None
+        return _retried_failed_network_request_wrapper
+    return inner_retried_failed_network_request

{OctoBot-Trading-2.4.191 → OctoBot-Trading-2.4.193}/octobot_trading/exchanges/util/exchange_util.py

@@ -15,7 +15,6 @@
 #  License along with this library.
 import contextlib
 import typing
-
 import ccxt
 import trading_backend
 

{OctoBot-Trading-2.4.191 → OctoBot-Trading-2.4.193}/octobot_trading/personal_data/portfolios/sub_portfolio_data.py

@@ -83,7 +83,7 @@ class SubPortfolioData:
         for asset, values in updated_content.items():
             locked_funds = self.locked_funds_by_asset.get(asset, constants.ZERO)
             if locked_funds > values[commons_constants.PORTFOLIO_TOTAL]:
-                commons_logging.get_logger(__name__).error(
+                commons_logging.get_logger(__name__).warning(
                     f"Unexpected: negative {asset} available value after applying {locked_funds} locked funds to {values}"
                 )
             values[commons_constants.PORTFOLIO_AVAILABLE] = values[commons_constants.PORTFOLIO_TOTAL] - locked_funds

{OctoBot-Trading-2.4.191 → OctoBot-Trading-2.4.193}/octobot_trading/util/test_tools/exchanges_test_tools.py

@@ -78,6 +78,15 @@ async def stop_test_exchange_manager(exchange_manager_instance: exchanges.Exchan
     # let updaters gracefully shutdown
     await asyncio_tools.wait_asyncio_next_cycle()
 
+
+@exchanges.retried_failed_network_request(
+    attempts=constants.TOOLS_FAILED_NETWORK_REQUEST_ATTEMPTS,
+    delay=constants.TOOLS_FAILED_NETWORK_REQUEST_RETRY_DELAY
+)
+async def _get_symbol_prices(exchange_manager, symbol, parsed_tf, limit):
+    return await exchange_manager.exchange.get_symbol_prices(symbol, parsed_tf, limit=limit)
+
+
 async def _update_ohlcv(
     exchange_manager, symbol: str, time_frame: str, exchange_data: exchange_data_import.ExchangeData,
     history_size=1, start_time=0, end_time=0, close_price_only=False,
@@ -85,7 +94,7 @@ async def _update_ohlcv(
 ):
     parsed_tf = common_enums.TimeFrames(time_frame)
     if start_time == 0:
-        ohlcvs = await exchange_manager.exchange.get_symbol_prices(symbol, parsed_tf, limit=history_size)
+        ohlcvs = await _get_symbol_prices(exchange_manager, symbol, parsed_tf, history_size)
     else:
         ohlcvs = []
         async for ohlcv in exchanges.get_historical_ohlcv(
@@ -141,6 +150,10 @@ async def ensure_symbol_markets(
         await exchange_manager.exchange.connector.load_symbol_markets(reload=reload, market_filter=market_filter)
 
 
+@exchanges.retried_failed_network_request(
+    attempts=constants.TOOLS_FAILED_NETWORK_REQUEST_ATTEMPTS,
+    delay=constants.TOOLS_FAILED_NETWORK_REQUEST_RETRY_DELAY
+)
 async def get_portfolio(exchange_manager, as_float=False, clear_empty=True) -> dict:
     balance = await exchange_manager.exchange.get_balance()
     # filter out 0 values
@@ -194,10 +207,16 @@ def _parse_order_into_dict(
     return None
 
 
+@exchanges.retried_failed_network_request(
+    attempts=constants.TOOLS_FAILED_NETWORK_REQUEST_ATTEMPTS,
+    delay=constants.TOOLS_FAILED_NETWORK_REQUEST_RETRY_DELAY
+)
 async def _get_open_orders(exchange_manager, symbol: str, open_orders: list, ignore_unsupported_orders: bool):
     orders = await exchange_manager.exchange.get_open_orders(symbol=symbol)
     for order in orders:
-        if order_dict := _parse_order_into_dict(exchange_manager, order, True,  ignore_unsupported_orders):
+        if order_dict := _parse_order_into_dict(
+            exchange_manager, order, True,  ignore_unsupported_orders
+        ):
             open_orders.append(order_dict)
 
 
@@ -218,6 +237,10 @@ async def get_open_orders(
     return open_orders
 
 
+@exchanges.retried_failed_network_request(
+    attempts=constants.TOOLS_FAILED_NETWORK_REQUEST_ATTEMPTS,
+    delay=constants.TOOLS_FAILED_NETWORK_REQUEST_RETRY_DELAY
+)
 async def get_order(
     exchange_manager,
     exchange_order_id: str,
@@ -226,6 +249,10 @@ async def get_order(
     return await exchange_manager.exchange.get_order(exchange_order_id, symbol=symbol)
 
 
+@exchanges.retried_failed_network_request(
+    attempts=constants.TOOLS_FAILED_NETWORK_REQUEST_ATTEMPTS,
+    delay=constants.TOOLS_FAILED_NETWORK_REQUEST_RETRY_DELAY
+)
 async def _get_cancelled_orders(exchange_manager, symbol: str, cancelled_orders: list, ignore_unsupported_orders: bool):
     orders = await exchange_manager.exchange.get_cancelled_orders(symbol=symbol)
     for order in orders:
@@ -253,6 +280,10 @@ async def get_cancelled_orders(
     return cancelled_orders
 
 
+@exchanges.retried_failed_network_request(
+    attempts=constants.TOOLS_FAILED_NETWORK_REQUEST_ATTEMPTS,
+    delay=constants.TOOLS_FAILED_NETWORK_REQUEST_RETRY_DELAY
+)
 async def _get_trades(exchange_manager, symbol: str, trades: list):
     row_trades = await exchange_manager.exchange.get_my_recent_trades(symbol=symbol)
     trades.extend(
@@ -351,6 +382,10 @@ async def wait_for_other_status(order: personal_data.Order, timeout) -> personal
     raise TimeoutError(f"Order was not found with another status than {origin_status} within {timeout} seconds")
 
 
+@exchanges.retried_failed_network_request(
+    attempts=constants.TOOLS_FAILED_NETWORK_REQUEST_ATTEMPTS,
+    delay=constants.TOOLS_FAILED_NETWORK_REQUEST_RETRY_DELAY
+)
 async def get_positions(
     exchange_manager,
     exchange_data: exchange_data_import.ExchangeData,

{OctoBot-Trading-2.4.191 → OctoBot-Trading-2.4.193}/tests/personal_data/portfolios/test_sub_portfolio_data.py

@@ -44,8 +44,8 @@ def test_get_content_after_deltas():
 
 
 def test_get_content_from_total_deltas_and_locked_funds():
-    error_log = mock.Mock()
-    with mock.patch.object(octobot_commons.logging, "get_logger", mock.Mock(return_value=mock.Mock(error=error_log))):
+    warning_log = mock.Mock()
+    with mock.patch.object(octobot_commons.logging, "get_logger", mock.Mock(return_value=mock.Mock(warning=warning_log))):
         sub_pf = _sub_pf(
             0,
             _content_with_available({
@@ -56,7 +56,7 @@ def test_get_content_from_total_deltas_and_locked_funds():
         assert sub_pf.get_content_from_total_deltas_and_locked_funds() == _content_with_available({
             "BTC": (0.1, 0.1), "ETH": (0.1, 0.1), "USDT": (10.1, 10.1), "SOL": (1, 1), "USDC": (2, 2)
         })
-        error_log.assert_not_called()
+        warning_log.assert_not_called()
 
         # with delta, no locked funds: only consider total holdings
         sub_pf.funds_deltas = _content_with_available({
@@ -65,7 +65,7 @@ def test_get_content_from_total_deltas_and_locked_funds():
         assert sub_pf.get_content_from_total_deltas_and_locked_funds() == _content_with_available({
             "BTC": (0.2, 0.2), "ETH": (0.05, 0.05), "USDT": (10.1, 10.1), "SOL": (1, 1), "USDC": (4, 4)
         })
-        error_log.assert_not_called()
+        warning_log.assert_not_called()
 
         # with delta, and locked funds: consider total holdings and lock available
         sub_pf.locked_funds_by_asset = _locked_amounts_by_asset({
@@ -74,14 +74,14 @@ def test_get_content_from_total_deltas_and_locked_funds():
         assert sub_pf.get_content_from_total_deltas_and_locked_funds() == _content_with_available({
             "BTC": (0.1, 0.2), "ETH": (0.05, 0.05), "USDT": (0, 10.1), "SOL": (1, 1), "USDC": (4, 4)
         })
-        error_log.assert_not_called()
+        warning_log.assert_not_called()
 
         # no delta but locked funds are set: updated available when lock funds are set
         sub_pf.funds_deltas = {}
         assert sub_pf.get_content_from_total_deltas_and_locked_funds() == _content_with_available({
             "BTC": (0, 0.1), "ETH": (0.1, 0.1), "USDT": (0, 10.1), "SOL": (1, 1), "USDC": (2, 2)
         })
-        error_log.assert_not_called()
+        warning_log.assert_not_called()
 
         # invalid locked funds: log error
         sub_pf.locked_funds_by_asset = _locked_amounts_by_asset({
@@ -91,7 +91,7 @@ def test_get_content_from_total_deltas_and_locked_funds():
         assert sub_pf.get_content_from_total_deltas_and_locked_funds() == _content_with_available({
             "BTC": (-0.9, 0.1), "ETH": (0.1, 0.1), "USDT": (0, 10.1), "SOL": (1, 1), "USDC": (2, 2)
         })
-        error_log.assert_called_once()
+        warning_log.assert_called_once()
 
 
 def _sub_pf(