OctoBot-Trading 2.4.200__tar.gz → 2.4.201__tar.gz

{OctoBot-Trading-2.4.200 → OctoBot-Trading-2.4.201}/CHANGELOG.md

@@ -4,6 +4,12 @@ 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.201] - 2025-07-15
+### Added
+[Exchange] MarketClosedError
+### Updated
+[Exchanges] instant retry "Internal Server Error"
+
 ## [2.4.200] - 2025-07-12
 ### Fixed
 [Modes] add get_historical_configs

{OctoBot-Trading-2.4.200 → OctoBot-Trading-2.4.201/OctoBot_Trading.egg-info}/PKG-INFO

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

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

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

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

{OctoBot-Trading-2.4.200 → OctoBot-Trading-2.4.201}/octobot_trading/constants.py

@@ -172,10 +172,13 @@ DEFAULT_SYMBOL_CONTRACT_SIZE = ONE
 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")
+RETRIABLE_EXCHANGE_ERRORS_DESC: set[str] = set(os.getenv(
+    "RETRIABLE_EXCHANGE_ERRORS_DESC", 'Internal Server Error'
+).split(":"))
 
 # exchange proxy
 RETRIABLE_EXCHANGE_PROXY_ERRORS_DESC: set[str] = set(os.getenv(
-    "RETRIABLE_EXCHANGE_PROXY_ERROR_DESC", "message='Service Unavailable'"
+    "RETRIABLE_EXCHANGE_PROXY_ERRORS_DESC", "message='Service Unavailable'"
 ).split(":"))
 
 # used to force margin type update before positions init (if necessary)

{OctoBot-Trading-2.4.200 → OctoBot-Trading-2.4.201}/octobot_trading/errors.py

@@ -75,6 +75,12 @@ class MaxOpenOrderReachedForSymbolError(OrderCreationError):
     """
 
 
+class MarketClosedError(OrderCreationError):
+    """
+    Raised when a new order is impossible to create because the market is closed
+    """
+
+
 class OrderEditError(OctoBotExchangeError):
     """
     Raised upon a failed order edition

{OctoBot-Trading-2.4.200 → OctoBot-Trading-2.4.201}/octobot_trading/exchanges/connectors/simulator/exchange_simulator_connector.py

@@ -213,7 +213,7 @@ class ExchangeSimulatorConnector(abstract_exchange.AbstractExchange):
     def get_uniform_timestamp(self, timestamp):
         return timestamp / 1000
 
-    def get_fees(self, symbol):
+    def get_fees(self, symbol: str):
         if self._forced_market_statuses and symbol in self._forced_market_statuses:
             # use self._forced_market_statuses when possible
             return ccxt_client_simulation.get_fees(self._forced_market_statuses[symbol])

{OctoBot-Trading-2.4.200 → OctoBot-Trading-2.4.201}/octobot_trading/exchanges/connectors/util.py

@@ -32,6 +32,7 @@ def retried_failed_network_request(
         async def _retried_failed_network_request_wrapper(*args, **kwargs):
             proxy_error_attempts = 0
             for attempt in range(attempts):
+                retriable_error = False
                 try:
                     resp = await func(*args, **kwargs)
                     if attempt > 0:
@@ -43,6 +44,7 @@ def retried_failed_network_request(
                     ccxt.RequestTimeout, ccxt.ExchangeNotAvailable, ccxt.InvalidNonce,
                     errors.RetriableFailedRequest, errors.RetriableExchangeProxyError
                 ) as err:
+                    retriable_error = 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(
@@ -51,18 +53,27 @@ def retried_failed_network_request(
                                 f"{proxy_error_attempts+1}/{retriable_proxy_errors_attempts}]. "
                                 f"Aborting retry attempts."
                             )
-                            raise err
+                            raise
                         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."
-                    )
-                    if attempt < attempts - 1:
-                        # can happen: retry
-                        await asyncio.sleep(delay)
-                    else:
+                    if attempt >= attempts - 1:
+                        # no more attempt remaining
                         raise
-                # raise any other error
+                except ccxt.ExchangeError as err:
+                    retriable_error = err
+                    is_retriable_error = False
+                    for error_message in constants.RETRIABLE_EXCHANGE_ERRORS_DESC:
+                        if error_message in str(err):
+                            is_retriable_error = True
+                    if attempt >= attempts - 1 or not is_retriable_error:
+                        raise
+                # propagate any other error
+
+                # did not propagate error, retry after delay
+                commons_logging.get_logger(f"retried_failed_network_request").warning(
+                    f"{func.__name__} raised {html_util.get_html_summary_if_relevant(retriable_error)} "
+                    f"({retriable_error.__class__.__name__}) [attempts {attempt+1}/{attempts}]. Retrying in {delay} seconds."
+                )
+                await asyncio.sleep(delay)
             return None
         return _retried_failed_network_request_wrapper
     return inner_retried_failed_network_request

{OctoBot-Trading-2.4.200 → OctoBot-Trading-2.4.201}/octobot_trading/exchanges/types/rest_exchange.py

@@ -258,6 +258,8 @@ class RestExchange(abstract_exchange.AbstractExchange):
             yield
         except ccxt.InsufficientFunds as e:
             self._on_missing_funds_err(e, order_type, symbol, quantity, price, stop_price)
+        except ccxt.MarketClosed as err:
+            raise errors.MarketClosedError(html_util.get_html_summary_if_relevant(err)) from err
         except (ccxt.NotSupported, NotImplementedError) as err:
             raise errors.NotSupported(err) from err
         except (errors.AuthenticationError, ccxt.AuthenticationError) as err:

{OctoBot-Trading-2.4.200 → OctoBot-Trading-2.4.201}/tests/exchanges/connectors/test_util.py

@@ -29,7 +29,6 @@ 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):
@@ -40,7 +39,24 @@ async def test_retried_failed_network_request():
     assert await _fetch_request("arg1", kw1=1) == 1
     request_mock.assert_awaited_once_with("arg1", kw1=1)
     sleep_mock.assert_not_called()
-    
+
+    # non retriable errors
+    for raised_error in [
+      ccxt.ExchangeError("Exchange error"),
+      KeyError("random key error"),
+      ValueError("random value error"),
+      ZeroDivisionError("random zero division 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 == 1
+      assert sleep_mock.call_count == 0
+      sleep_mock.reset_mock()
+
     # retriable errors
     for raised_error in [
       ccxt.ExchangeNotAvailable("Exchange not available"), 
@@ -59,6 +75,22 @@ async def test_retried_failed_network_request():
       assert sleep_mock.mock_calls[0].args == (constants.DEFAULT_FAILED_REQUEST_RETRY_TIME,)
       sleep_mock.reset_mock()
 
+    # retriable exchange errors
+    for raised_error in [
+      ccxt.ExchangeError("Internal Server Error"),
+      ccxt.ExchangeError('mexc {"code":700022,"msg":"Internal Server 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_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"),