OctoBot-Trading 2.4.152__tar.gz → 2.4.154__tar.gz

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/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.154] - 2025-01-31
+### Added
+[Exchanges] handle InvalidAPIKeyIPWhitelistError
+
+## [2.4.153] - 2025-01-29
+### Updated
+[TradingMode] make register_chained_order more flexible
+
 ## [2.4.152] - 2025-01-28
 ### Fixed
 [Proxy] type error

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154/OctoBot_Trading.egg-info}/PKG-INFO

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

@@ -3,7 +3,7 @@ OctoBot-Backtesting<1.10,>=1.9
 Async-Channel<2.3,>=2.2
 OctoBot-Commons<1.10,>=1.9.64
 OctoBot-Tentacles-Manager<2.10,>=2.9
-trading-backend>=1.2.7
+trading-backend>=1.2.35
 ccxt==4.3.85
 cryptography
 sortedcontainers==2.4.0

{OctoBot-Trading-2.4.152/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.154}/PKG-INFO

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

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

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

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/octobot_trading/errors.py

@@ -147,6 +147,12 @@ class AuthenticationError(OctoBotExchangeError):
     """
 
 
+class InvalidAPIKeyIPWhitelistError(AuthenticationError):
+    """
+    Raised when an exchange failed to authenticate due to an IP whitelist issue
+    """
+
+
 class ExchangeInternalSyncError(OctoBotExchangeError):
     """
     Raised when an exchange is returning an error due to its internal sync process

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/octobot_trading/exchanges/config/proxy_config.py

@@ -36,6 +36,9 @@ class ProxyConfig:
     get_last_proxied_request_url: typing.Optional[typing.Callable] = None
     # the host of this proxy, used to identify proxy connexion errors
     proxy_host: str = "DEFAULT PROXY HOST"
+    # if DNS cache should be disabled with this proxy config. Warning: in this case, DNS cache will be
+    # completely disabled for this exchange
+    disable_dns_cache: bool = False
 
     @classmethod
     def default_env_var_config(cls):

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -15,6 +15,7 @@
 #  License along with this library.
 import asyncio
 import os
+import ssl
 import aiohttp
 import copy
 import logging
@@ -143,7 +144,7 @@ def instantiate_exchange(
     client = exchange_class(config)
     _use_proxy_if_necessary(client, proxy_config)
     if constants.ENABLE_CCXT_REQUESTS_COUNTER and allow_request_counter:
-        _use_request_counter(identifier, client)
+        _use_request_counter(identifier, client, proxy_config)
     return client
 
 
@@ -304,6 +305,27 @@ def _use_proxy_if_necessary(client, proxy_config: proxy_config_import.ProxyConfi
         client.socks_proxy = proxy_config.socks_proxy
     if proxy_config.socks_proxy_callback:
         client.socks_proxy_callback = proxy_config.socks_proxy_callback
+    if proxy_config.disable_dns_cache:
+        # rewrite of async_ccxt.exchange.client.open()
+        if client.asyncio_loop is None:
+            client.asyncio_loop = asyncio.get_running_loop()
+            client.throttle.loop = client.asyncio_loop
+
+        if client.ssl_context is None:
+            # Create our SSL context object with our CA cert file
+            client.ssl_context = ssl.create_default_context(cafile=client.cafile) if client.verify else client.verify
+        if client.session:
+            # should not happen
+            asyncio.create_task(client.session.close())
+        connector = aiohttp.TCPConnector(
+            ssl=client.ssl_context, loop=client.asyncio_loop, enable_cleanup_closed=True,
+            # local overrides
+            use_dns_cache=False
+            # end local overrides
+        )
+        client.session = aiohttp.ClientSession(
+            loop=client.asyncio_loop, connector=connector, trust_env=client.aiohttp_trust_env
+        )
 
 
 def _get_client_config(
@@ -372,7 +394,9 @@ def _get_patched_url_config(url_config: dict, old: str, new: str):
     return updated_config
 
 
-def _use_request_counter(identifier: str, ccxt_client: async_ccxt.Exchange):
+def _use_request_counter(
+    identifier: str, ccxt_client: async_ccxt.Exchange, proxy_config: proxy_config_import.ProxyConfig
+):
     """
     Replaces the given exchange async session by an aiohttp_util.CounterClientSession
     WARNING: should only be called right after creating the exchange and on the same async loop as
@@ -387,7 +411,8 @@ def _use_request_counter(identifier: str, ccxt_client: async_ccxt.Exchange):
         # same as in ccxt.async_support.exchange.py#open()
         # connector = aiohttp.TCPConnector(ssl=self.ssl_context, loop=self.asyncio_loop, enable_cleanup_closed=True)
         new_connector = aiohttp.TCPConnector(
-            ssl=ccxt_client.ssl_context, loop=ccxt_client.asyncio_loop, enable_cleanup_closed=True
+            ssl=ccxt_client.ssl_context, loop=ccxt_client.asyncio_loop,
+            enable_cleanup_closed=True, use_dns_cache=not proxy_config.disable_dns_cache
         )
         counter_session = aiohttp_util.CounterClientSession(
             identifier,

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -79,7 +79,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
         self, config, exchange_manager, adapter_class=None, additional_config=None, rest_name=None, force_auth=False
     ):
         super().__init__(config, exchange_manager, None)
-        self.client = None
+        self.client: ccxt.Exchange = None
         self.exchange_type = None
         self.adapter = self.get_adapter_class(adapter_class)(self)
         self.all_currencies_price_ticker = None
@@ -1033,9 +1033,14 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                 f"Request timeout: {html_util.get_html_summary_if_relevant(err)}"
             ) from err
         except ccxt.AuthenticationError as err:
+            error_class = (
+                octobot_trading.errors.InvalidAPIKeyIPWhitelistError
+                if self.exchange_manager.exchange.is_ip_whitelist_error(err)
+                else octobot_trading.errors.AuthenticationError
+            )
             self.raise_or_prefix_proxy_error_if_relevant(
                 err,
-                octobot_trading.errors.AuthenticationError(html_util.get_html_summary_if_relevant(err))
+                error_class(html_util.get_html_summary_if_relevant(err))
             )
         except ccxt.ExchangeNotAvailable as err:
             self.raise_or_prefix_proxy_error_if_relevant(
@@ -1045,8 +1050,12 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                 )
             )
         except ccxt.ExchangeError as err:
+            error_message = html_util.get_html_summary_if_relevant(err)
+            if self.exchange_manager.exchange.is_ip_whitelist_error(err):
+                # ensure this is not an IP whitelist error
+                raise octobot_trading.errors.InvalidAPIKeyIPWhitelistError(error_message) from err
             if self.exchange_manager.exchange.is_authentication_error(err):
                 # ensure this is not an unhandled authentication error
-                raise octobot_trading.errors.AuthenticationError(html_util.get_html_summary_if_relevant(err)) from err
+                raise octobot_trading.errors.AuthenticationError(error_message) from err
             # otherwise just forward exception
             raise

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/octobot_trading/exchanges/exchange_builder.py

@@ -257,6 +257,10 @@ class ExchangeBuilder:
         self.exchange_manager.without_auth = True
         return self
 
+    def disable_unauth_retry(self, disabled):
+        self.exchange_manager.disable_unauth_retry = disabled
+        return self
+
     def is_checking_credentials(self, check_credentials):
         self.exchange_manager.check_credentials = check_credentials
         return self

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/octobot_trading/exchanges/exchange_factory.py

@@ -62,10 +62,13 @@ async def create_real_exchange(exchange_manager, exchange_config_by_exchange: ty
             return
         await _initialize_exchange_backend(exchange_manager)
     except errors.AuthenticationError as err:
-        if exchange_manager.without_auth or exchange_manager.exchange.REQUIRES_AUTHENTICATION:
+        if (
+            exchange_manager.without_auth or exchange_manager.exchange.REQUIRES_AUTHENTICATION
+            or exchange_manager.disable_unauth_retry
+        ):
             # auth is required or already retried, don't loop
             exchange_manager.logger.error(
-                f"Authentication is required and created an error: impossible to connect to "
+                f"Authentication is required and raised an error: impossible to connect to "
                 f"{exchange_manager.exchange_name} exchange: {err}"
             )
             raise

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/octobot_trading/exchanges/exchange_manager.py

@@ -57,6 +57,7 @@ class ExchangeManager(util.Initializable):
         self.is_sandboxed: bool = False
         self.is_trading: bool = True
         self.without_auth: bool = False
+        self.disable_unauth_retry: bool = False
         self.check_credentials: bool = True
         self.enable_storage: bool = True
         self.proxy_config: exchanges.ProxyConfig = exchanges.ProxyConfig.default_env_var_config()

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/octobot_trading/exchanges/types/rest_exchange.py

@@ -124,6 +124,8 @@ class RestExchange(abstract_exchange.AbstractExchange):
     EXCHANGE_ACCOUNT_TRADED_SYMBOL_PERMISSION_ERRORS: typing.List[typing.Iterable[str]] = []
     # text content of errors due to unhandled authentication issues
     EXCHANGE_AUTHENTICATION_ERRORS: typing.List[typing.Iterable[str]] = []
+    # text content of errors due to unhandled IP white list issues
+    EXCHANGE_IP_WHITELIST_ERRORS: typing.List[typing.Iterable[str]] = []
     # text content of errors due to a closed position on the exchange. Relevant for reduce-only orders
     EXCHANGE_CLOSED_POSITION_ERRORS: typing.List[typing.Iterable[str]] = []
     # text content of errors due to an order that would immediately trigger if created. Relevant for stop losses
@@ -1063,6 +1065,11 @@ class RestExchange(abstract_exchange.AbstractExchange):
             return exchanges_util.is_error_on_this_type(error, self.EXCHANGE_AUTHENTICATION_ERRORS)
         return False
 
+    def is_ip_whitelist_error(self, error: BaseException) -> bool:
+        if self.EXCHANGE_IP_WHITELIST_ERRORS:
+            return exchanges_util.is_error_on_this_type(error, self.EXCHANGE_IP_WHITELIST_ERRORS)
+        return False
+
     """
     Auto fetched and filled exchanges
     """

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/octobot_trading/exchanges/util/exchange_util.py

@@ -221,6 +221,7 @@ async def get_local_exchange_manager(
     exchange_name: str, exchange_config: dict, tentacles_setup_config,
     is_sandboxed: bool, ignore_config=False, builder=None, use_cached_markets=True,
     is_broker_enabled: bool = False, exchange_config_by_exchange: typing.Optional[dict[str, dict]] = None,
+    disable_unauth_retry: bool = False,
     market_filter: typing.Union[None, typing.Callable[[dict], bool]] = None
 ):
     exchange_type = exchange_config.get(common_constants.CONFIG_EXCHANGE_TYPE, get_default_exchange_type(exchange_name))
@@ -230,6 +231,7 @@ async def get_local_exchange_manager(
     )
     exchange_manager = await builder.use_tentacles_setup_config(tentacles_setup_config) \
         .is_checking_credentials(False) \
+        .disable_unauth_retry(disable_unauth_retry) \
         .is_sandboxed(is_sandboxed) \
         .is_using_exchange_type(exchange_type) \
         .use_exchange_config_by_exchange(exchange_config_by_exchange) \
@@ -289,6 +291,12 @@ async def is_compatible_account(exchange_name: str, exchange_config: dict, tenta
                 return True, True, None
         except trading_backend.TimeSyncError:
             return False, False, _get_time_sync_error_message(exchange_name, "backend.is_valid_account")
+        except trading_backend.APIKeyPermissionsError as err:
+            return False, False, f"Please update your API Key permissions: {err}"
+        except trading_backend.APIKeyIPWhitelistError as err:
+            return False, False, f"Please update your API Key IP whitelist: {err}"
+        except trading_backend.UnexpectedError as err:
+            return False, False, f"Impossible to check API key: {err}"
         except trading_backend.ExchangeAuthError:
             message = f"Invalid {exchange_name.capitalize()} authentication details"
             if is_sandboxed:
@@ -297,8 +305,6 @@ async def is_compatible_account(exchange_name: str, exchange_config: dict, tenta
                           f"{exchange_name.capitalize()} to trade and validate your api key. " \
                           f"Disable sandbox in your accounts configuration if this is not intended."
             return False, False, message
-        except trading_backend.APIKeyPermissionsError as err:
-            return False, False, f"Please update your API Key permissions: {err}"
         except (AttributeError, Exception) as e:
             return True, False, f"Error when loading exchange account: {e}"
 

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/octobot_trading/modes/channel/abstract_mode_consumer.py

@@ -257,7 +257,8 @@ class AbstractTradingModeConsumer(modes_channel.ModeChannelConsumer):
         return position.state.is_active()
 
     async def register_chained_order(
-        self, main_order, price, order_type, side, quantity=None, allow_bundling=True, tag=None, reduce_only=False
+        self, main_order, price, order_type, side, quantity=None, allow_bundling=True, tag=None, reduce_only=False,
+        update_with_triggering_order_fees=None
     ) -> tuple:
         chained_order = personal_data.create_order_instance(
             trader=self.exchange_manager.trader,
@@ -273,7 +274,8 @@ class AbstractTradingModeConsumer(modes_channel.ModeChannelConsumer):
         )
         params = {}
         # do not reduce chained order amounts to account for fees when trading futures
-        update_with_triggering_order_fees = not self.exchange_manager.is_future
+        if update_with_triggering_order_fees is None:
+            update_with_triggering_order_fees = not self.exchange_manager.is_future
         if allow_bundling:
             params = await self.exchange_manager.trader.bundle_chained_order_with_uncreated_order(
                 main_order, chained_order, update_with_triggering_order_fees

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/octobot_trading/personal_data/orders/order.py

@@ -491,8 +491,8 @@ class Order(util.Initializable):
             return True
         return False
 
-    def update_quantity_with_order_fees(self, other_order):
-        relevant_fees_amount = order_util.get_fees_for_currency(other_order.fee, self.quantity_currency)
+    def update_quantity_with_order_fees(self, other_order_or_trade):
+        relevant_fees_amount = order_util.get_fees_for_currency(other_order_or_trade.fee, self.quantity_currency)
         if relevant_fees_amount:
             logger = logging.get_logger(self.get_logger_name())
             fees_str = f"Paid {self.quantity_currency} fees: {relevant_fees_amount}, " \

{OctoBot-Trading-2.4.152 → OctoBot-Trading-2.4.154}/requirements.txt

@@ -5,7 +5,7 @@ OctoBot-Backtesting>=1.9, <1.10
 Async-Channel>=2.2, <2.3
 OctoBot-Commons>=1.9.64, <1.10
 OctoBot-Tentacles-Manager>=2.9, <2.10
-trading-backend>=1.2.7
+trading-backend>=1.2.35
 
 # Exchange connection requirements
 ccxt==4.3.85 # always ensure real exchanges tests (in tests_additional and authenticated exchange tests) are passing before changing the ccxt version