OctoBot-Trading 2.4.197__tar.gz → 2.4.199__tar.gz

{OctoBot-Trading-2.4.197 → OctoBot-Trading-2.4.199}/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.199] - 2025-07-09
+### Fixed
+[Proxy] add retriable error
+
+## [2.4.198] - 2025-07-05
+### Fixed
+[Orders] fix _is_synchronization_enabled on cleared orders
+
 ## [2.4.197] - 2025-06-26
 ### Fixed
 [Proxy] handle all aiohttp proxy errors

{OctoBot-Trading-2.4.197 → OctoBot-Trading-2.4.199/OctoBot_Trading.egg-info}/PKG-INFO

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

@@ -349,6 +349,7 @@ tests/exchanges/test_exchange_manager.py
 tests/exchanges/test_exchange_simulator.py
 tests/exchanges/test_exchanges.py
 tests/exchanges/connectors/__init__.py
+tests/exchanges/connectors/test_util.py
 tests/exchanges/connectors/ccxt/__init__.py
 tests/exchanges/connectors/ccxt/mock_exchanges_data.py
 tests/exchanges/connectors/ccxt/test_ccxt_connector.py

{OctoBot-Trading-2.4.197/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.199}/PKG-INFO

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

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

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

{OctoBot-Trading-2.4.197 → OctoBot-Trading-2.4.199}/octobot_trading/constants.py

@@ -15,7 +15,6 @@
 #  License along with this library
 import decimal
 import os
-import typing
 
 import octobot_trading.enums as enums
 import octobot_commons.enums as commons_enums
@@ -74,6 +73,7 @@ DEFAULT_CANDLE_HISTORY_SIZE = 200
 NO_DATA_LIMIT = -1
 DEFAULT_FAILED_REQUEST_RETRY_TIME = 1
 FAILED_NETWORK_REQUEST_RETRY_ATTEMPTS = 5
+FAILED_PROXY_NETWORK_REQUEST_RETRY_ATTEMPTS = 2
 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
@@ -158,19 +158,8 @@ SIMULATOR_TESTED_EXCHANGES = sorted(["bitfinex", "bithumb", "bitstamp", "bitmex"
                               "hitbtc", "kraken", "poloniex", "bitso", "ndax", "upbit",
                               "wavesexchange",])
 
-# text content of errors due to exchange compliancy rules
-# Warning: should never be a false positive
-EXCHANGE_COMPLIANCY_ERRORS: typing.List[typing.Iterable[str]] = [
-    # OKX ex: Trading of this pair or contract is restricted due to local compliance requirements
-    ("restricted", "compliance"),
-]
-
-# text content of errors due to exchange local account permissions (ex: accounts from X country can't trade XYZ)
-EXCHANGE_ACCOUNT_TRADED_SYMBOL_PERMISSION_ERRORS: typing.List[typing.Iterable[str]] = [
-    # Binance ex: InvalidOrder binance {"code":-2010,"msg":"This symbol is not permitted for this account."}
-    ("symbol", "not permitted", "for this account"),
-]
 
+# exchanges
 CONFIG_DEFAULT_FEES = 0.001
 CONFIG_DEFAULT_SIMULATOR_FEES = 0
 FEES_SAFETY_MARGIN = decimal.Decimal("1.25")    # allow 25% error margin when simulating fees
@@ -184,6 +173,11 @@ DEFAULT_SYMBOL_POSITION_MODE = enums.PositionMode.ONE_WAY
 DEFAULT_SYMBOL_FUNDING_RATE = decimal.Decimal("0.00005")
 DEFAULT_SYMBOL_MAINTENANCE_MARGIN_RATE = decimal.Decimal("0.01")
 
+# exchange proxy
+RETRIABLE_EXCHANGE_PROXY_ERRORS_DESC: set[str] = set(os.getenv(
+    "RETRIABLE_EXCHANGE_PROXY_ERROR_DESC", "message='Service Unavailable'"
+).split(":"))
+
 # used to force margin type update before positions init (if necessary)
 FORCED_MARGIN_TYPE = enums.MarginType(os.getenv("FORCED_MARGIN_TYPE", enums.MarginType.ISOLATED.value))
 

{OctoBot-Trading-2.4.197 → OctoBot-Trading-2.4.199}/octobot_trading/errors.py

@@ -39,6 +39,12 @@ class ExchangeProxyError(OctoBotExchangeError):
     """
 
 
+class RetriableExchangeProxyError(ExchangeProxyError):
+    """
+    Raised when an issue related to an exchange proxy that can be instantly retried is encountered
+    """
+
+
 class TradingModeIncompatibility(Exception):
     """
     Raised when a trading mode is incompatible with the current situation

{OctoBot-Trading-2.4.197 → OctoBot-Trading-2.4.199}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -514,6 +514,20 @@ def was_latest_request_proxied(ccxt_connector) -> (bool, str):
     return False, ""
 
 
+def get_proxy_error_class(proxy_error: Exception):
+    if _is_retriable_proxy_error(proxy_error):
+        return errors.RetriableExchangeProxyError
+    return errors.ExchangeProxyError
+
+
+def _is_retriable_proxy_error(proxy_error: Exception) -> bool:
+    str_err = str(proxy_error)
+    for desc in constants.RETRIABLE_EXCHANGE_PROXY_ERRORS_DESC:
+        if desc in str_err:
+            return True
+    return False
+
+
 def get_proxy_error_if_any(ccxt_connector, error: Exception) -> typing.Optional[Exception]:
     if not ccxt_connector.exchange_manager.proxy_config:
         return None

{OctoBot-Trading-2.4.197 → OctoBot-Trading-2.4.199}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -128,7 +128,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
         except Exception as err:
             # ensure this is not a proxy error, raise dedicated error if it is
             if proxy_error := ccxt_client_util.get_proxy_error_if_any(self, err):
-                raise octobot_trading.errors.ExchangeProxyError(proxy_error) from err
+                raise ccxt_client_util.get_proxy_error_class(proxy_error)(proxy_error) from err
             raise
 
     @ccxt_client_util.converted_ccxt_common_errors
@@ -1068,7 +1068,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
         Will re-raise a "[Proxied request] " prefix given error message if relevant, otherwise will just raise the error
         """
         if proxy_error := ccxt_client_util.get_proxy_error_if_any(self, cause_error):
-            raise octobot_trading.errors.ExchangeProxyError(proxy_error) from cause_error
+            raise ccxt_client_util.get_proxy_error_class(proxy_error)(proxy_error) from cause_error
         # when api key is wrong or proxy is unavailable
         ccxt_client_util.reraise_with_proxy_prefix_if_relevant(self, cause_error, raised_error)
         # reraise_with_proxy_prefix_if_relevant did not raise, raise the error as is

{OctoBot-Trading-2.4.197 → OctoBot-Trading-2.4.199}/octobot_trading/exchanges/connectors/util.py

@@ -23,12 +23,14 @@ 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,
+    attempts: int = constants.FAILED_NETWORK_REQUEST_RETRY_ATTEMPTS,
+    retriable_proxy_errors_attempts: int = constants.FAILED_PROXY_NETWORK_REQUEST_RETRY_ATTEMPTS,
+    delay: float = 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):
+            proxy_error_attempts = 0
             for attempt in range(attempts):
                 try:
                     resp = await func(*args, **kwargs)
@@ -38,8 +40,19 @@ def retried_failed_network_request(
                         )
                     return resp
                 except (
-                    ccxt.RequestTimeout, ccxt.ExchangeNotAvailable, ccxt.InvalidNonce, errors.RetriableFailedRequest
+                    ccxt.RequestTimeout, ccxt.ExchangeNotAvailable, ccxt.InvalidNonce,
+                    errors.RetriableFailedRequest, errors.RetriableExchangeProxyError
                 ) as err:
+                    if isinstance(err, errors.RetriableExchangeProxyError):
+                        if proxy_error_attempts >= retriable_proxy_errors_attempts - 1:
+                            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__}) [proxy error attempts "
+                                f"{proxy_error_attempts+1}/{retriable_proxy_errors_attempts}]. "
+                                f"Aborting retry attempts."
+                            )
+                            raise err
+                        proxy_error_attempts += 1
                     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."

{OctoBot-Trading-2.4.197 → OctoBot-Trading-2.4.199}/octobot_trading/personal_data/orders/order_state.py

@@ -148,11 +148,15 @@ class OrderState(state_class.State):
 
     @staticmethod
     def ensure_not_cleared(order):
-        if order.is_cleared():
+        if order is None or order.is_cleared():
             raise octobot_trading.errors.InvalidOrderState(f"Order has already been cleared. Order: {order}")
 
     def _is_synchronization_enabled(self):
-        return self.order.is_synchronization_enabled()
+        try:
+            self.ensure_not_cleared(self.order)
+            return self.order.is_synchronization_enabled()
+        except octobot_trading.errors.InvalidOrderState:
+            return super()._is_synchronization_enabled()
 
     def clear(self):
         """

{OctoBot-Trading-2.4.197 → OctoBot-Trading-2.4.199}/tests/exchanges/connectors/ccxt/test_ccxt_connector.py

@@ -25,6 +25,7 @@ from mock import patch
 import octobot_trading.exchanges.connectors as exchange_connectors
 import octobot_trading.enums as enums
 import octobot_trading.errors
+import octobot_trading.constants
 import octobot_trading.exchange_data.contracts as contracts
 import octobot_trading.exchanges.connectors.ccxt.ccxt_client_util as ccxt_client_util
 import pytest
@@ -262,10 +263,26 @@ async def test_error_describer(ccxt_connector):
                 aiohttp.client_reqrep.ConnectionKey("host", 11, True, True, None, None, None), OSError("plop")
             )
     with pytest.raises(octobot_trading.errors.ExchangeProxyError):
+        # non retriable proxy client error
+        with ccxt_connector.error_describer():
+            raise ccxt.ExchangeError from aiohttp.ClientHttpProxyError(
+                aiohttp.client_reqrep.RequestInfo("www.google.com", "GET", {}, "www.google.com"), OSError("plop")
+            )
+    with pytest.raises(octobot_trading.errors.ExchangeProxyError):
+        # non retriable proxy client error
+        with ccxt_connector.error_describer():
+            raise ccxt.ExchangeError from aiohttp.ClientHttpProxyError(
+                aiohttp.client_reqrep.RequestInfo("www.google.com", "GET", {}, "www.google.com"),
+                OSError("plop"),
+                message="random"
+            )
+    with pytest.raises(octobot_trading.errors.RetriableExchangeProxyError):
         # proxy client error
         with ccxt_connector.error_describer():
             raise ccxt.ExchangeError from aiohttp.ClientHttpProxyError(
-                aiohttp.client_reqrep.ConnectionKey("host", 11, True, True, None, None, None), OSError("plop")
+                aiohttp.client_reqrep.RequestInfo("www.google.com", "GET", {}, "www.google.com"),
+                OSError("plop"),
+                message=f"random{next(iter(octobot_trading.constants.RETRIABLE_EXCHANGE_PROXY_ERRORS_DESC))}"
             )
     with pytest.raises(octobot_trading.errors.ExchangeProxyError):
         # socks proxy error

OctoBot-Trading-2.4.199/tests/exchanges/connectors/test_util.py

@@ -0,0 +1,102 @@
+#  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 ccxt
+import mock
+import pytest
+import asyncio
+
+import octobot_trading.exchanges as exchanges
+import octobot_trading.constants as constants
+import octobot_trading.errors as errors
+
+
+
+# All test coroutines will be treated as marked.
+pytestmark = pytest.mark.asyncio
+
+
+async def test_retried_failed_network_request():
+  
+  request_mock = mock.AsyncMock(return_value=1)
+  @exchanges.connectors.util.retried_failed_network_request()
+  async def _fetch_request(*args, **kwargs):
+    return await request_mock(*args, **kwargs)
+
+  with mock.patch.object(asyncio, "sleep") as sleep_mock:
+    # no error
+    assert await _fetch_request("arg1", kw1=1) == 1
+    request_mock.assert_awaited_once_with("arg1", kw1=1)
+    sleep_mock.assert_not_called()
+    
+    # retriable errors
+    for raised_error in [
+      ccxt.ExchangeNotAvailable("Exchange not available"), 
+      ccxt.RequestTimeout("Request timeout"), 
+      ccxt.InvalidNonce("Invalid nonce"),
+      errors.RetriableFailedRequest("Retriable failed request"),
+    ]:
+      request_mock = mock.AsyncMock(side_effect=raised_error)
+      @exchanges.connectors.util.retried_failed_network_request()
+      async def _fetch_request(*args, **kwargs):
+        return await request_mock(*args, **kwargs)
+      with pytest.raises(raised_error.__class__):
+        await _fetch_request("arg1", kw1=1)
+      assert request_mock.call_count == constants.FAILED_NETWORK_REQUEST_RETRY_ATTEMPTS
+      assert sleep_mock.call_count == constants.FAILED_NETWORK_REQUEST_RETRY_ATTEMPTS - 1
+      assert sleep_mock.mock_calls[0].args == (constants.DEFAULT_FAILED_REQUEST_RETRY_TIME,)
+      sleep_mock.reset_mock()
+
+    # retriable proxy errors
+    for raised_error in [
+      errors.RetriableExchangeProxyError("Retriable exchange proxy error"),
+    ]:
+      request_mock = mock.AsyncMock(side_effect=raised_error)
+      @exchanges.connectors.util.retried_failed_network_request()
+      async def _fetch_request(*args, **kwargs):
+        return await request_mock(*args, **kwargs)
+      with pytest.raises(raised_error.__class__):
+        await _fetch_request("arg1", kw1=1)
+      assert request_mock.call_count == constants.FAILED_PROXY_NETWORK_REQUEST_RETRY_ATTEMPTS
+      assert sleep_mock.call_count == constants.FAILED_PROXY_NETWORK_REQUEST_RETRY_ATTEMPTS - 1
+      assert sleep_mock.mock_calls[0].args == (constants.DEFAULT_FAILED_REQUEST_RETRY_TIME,)
+      sleep_mock.reset_mock()
+
+    # custom params
+    request_mock = mock.AsyncMock(side_effect=ccxt.ExchangeNotAvailable("Exchange not available"))
+    @exchanges.connectors.util.retried_failed_network_request(
+      attempts=3, retriable_proxy_errors_attempts=1, delay=0.1
+    )
+    async def _fetch_request(*args, **kwargs):
+      return await request_mock(*args, **kwargs)
+    with pytest.raises(ccxt.ExchangeNotAvailable):
+      await _fetch_request("arg1", kw1=1)
+    assert request_mock.call_count == 3
+    assert sleep_mock.call_count == 2
+    assert sleep_mock.mock_calls[0].args == (0.1,)
+    sleep_mock.reset_mock()
+
+    request_mock = mock.AsyncMock(side_effect=errors.RetriableExchangeProxyError("Retriable exchange proxy error"))
+    @exchanges.connectors.util.retried_failed_network_request(
+      attempts=4, retriable_proxy_errors_attempts=4, delay=0.2
+    )
+    async def _fetch_request(*args, **kwargs):
+      return await request_mock(*args, **kwargs)
+    with pytest.raises(errors.RetriableExchangeProxyError):
+      await _fetch_request("arg1", kw1=1)
+    assert request_mock.call_count == 4
+    assert sleep_mock.call_count == 3
+    assert sleep_mock.mock_calls[0].args == (0.2,)
+    sleep_mock.reset_mock()