OctoBot-Trading 2.4.72__tar.gz → 2.4.74__tar.gz

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/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.74] - 2024-04-07
+### Added
+- [Exchanges] ExchangeCompliancyError error
+
+## [2.4.73] - 2024-04-04
+### Added
+- [Exchanges] BinanceUS to full history exchanges
+
 ## [2.4.72] - 2024-04-03
 ### Added
 - [Exchanges] IS_SKIPPING_EMPTY_CANDLES_IN_OHLCV_FETCH

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74/OctoBot_Trading.egg-info}/PKG-INFO

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

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

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

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

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/octobot_trading/api/__init__.py

@@ -121,6 +121,7 @@ from octobot_trading.api.exchange import (
     get_auto_filled_exchange_names,
     get_exchange_details,
     is_api_permission_error,
+    is_exchange_rules_compliancy_error,
     cancel_ccxt_throttle_task,
     stop_exchange,
 )
@@ -301,6 +302,7 @@ __all__ = [
     "get_auto_filled_exchange_names",
     "get_exchange_details",
     "is_api_permission_error",
+    "is_exchange_rules_compliancy_error",
     "cancel_ccxt_throttle_task",
     "stop_exchange",
     "get_trading_modes",

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/octobot_trading/api/exchange.py

@@ -326,6 +326,10 @@ def is_api_permission_error(error: BaseException) -> bool:
     return exchanges.is_api_permission_error(error)
 
 
+def is_exchange_rules_compliancy_error(error: BaseException) -> bool:
+    return exchanges.is_exchange_rules_compliancy_error(error)
+
+
 def cancel_ccxt_throttle_task():
     for task in asyncio.all_tasks():
         # manually cancel ccxt async throttle task since it apparently can't be cancelled otherwise

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/octobot_trading/constants.py

@@ -95,6 +95,7 @@ FULL_CANDLE_HISTORY_EXCHANGES = [
     "okx",
     "mexc",
     "coinbase",
+    "binanceus",
 ]
 
 DEFAULT_FUTURE_EXCHANGES = ["binanceusdm", "bybit"]
@@ -103,6 +104,7 @@ TESTED_EXCHANGES = [
     "kucoin",
     "okx",
 ] + sorted([
+    "binanceus",
     "coinbase",
     "cryptocom",
     "htx",
@@ -114,7 +116,6 @@ TESTED_EXCHANGES = [
     "hollaex",
     "mexc",
     "bingx",
-    "bitget",
     "coinex",
 ])
 DEFAULT_FUTURE_EXCHANGES = sorted(["bybit"])
@@ -132,6 +133,12 @@ EXCHANGE_PERMISSION_ERRORS: typing.List[typing.Iterable[str]] = [
     ("permission_denied", )
 ]
 
+# text content of errors due to exchange compliancy rules
+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"),
+]
+
 CONFIG_DEFAULT_FEES = 0.001
 CONFIG_DEFAULT_SIMULATOR_FEES = 0
 

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/octobot_trading/errors.py

@@ -99,6 +99,12 @@ class AuthenticationError(Exception):
     """
 
 
+class ExchangeCompliancyError(Exception):
+    """
+    Raised when an exchange failed to execute the given request because of compliance rules for the current user account
+    """
+
+
 class PortfolioNegativeValueError(Exception):
     """
     Raised when the portfolio is being updated with a negative value

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/octobot_trading/exchanges/__init__.py

@@ -77,6 +77,7 @@ from octobot_trading.exchanges.util import (
     get_auto_filled_exchange_names,
     get_exchange_details,
     is_api_permission_error,
+    is_exchange_rules_compliancy_error,
     force_disable_web_socket,
     check_web_socket_config,
     search_websocket_class,
@@ -162,6 +163,7 @@ __all__ = [
     "get_auto_filled_exchange_names",
     "get_exchange_details",
     "is_api_permission_error",
+    "is_exchange_rules_compliancy_error",
     "AbstractExchange",
     "is_channel_managed_by_websocket",
     "is_channel_fully_managed_by_websocket",

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -46,7 +46,7 @@ def create_client(exchange_class, exchange_manager, logger,
             if not (key and secret) and not exchange_manager.is_simulated and not exchange_manager.ignore_config:
                 logger.warning(f"No exchange API key set for {exchange_manager.exchange_name}. "
                                f"Enter your account details to enable real trading on this exchange.")
-            if should_authenticate:
+            if should_authenticate and not exchange_manager.is_backtesting:
                 client = exchange_class(_get_client_config(options, headers, additional_config,
                                                            key, secret, password))
                 is_authenticated = True

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/octobot_trading/exchanges/traders/trader.py

@@ -1,3 +1,4 @@
+# pylint: disable=W0706
 #  Drakkar-Software OctoBot-Trading
 #  Copyright (c) Drakkar-Software, All rights reserved.
 #
@@ -117,7 +118,7 @@ class Trader(util.Initializable):
                 self.logger.warning(f"Order not created on {self.exchange_manager.exchange_name} "
                                     f"(failed attempt to create: {order}). This is likely due to "
                                     f"the order being refused by the exchange.")
-        except errors.MissingFunds:
+        except (errors.MissingFunds, errors.AuthenticationError, errors.ExchangeCompliancyError):
             # forward errors that require actions to fix the situation
             raise
         except Exception as e:

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/octobot_trading/exchanges/types/rest_exchange.py

@@ -211,6 +211,11 @@ class RestExchange(abstract_exchange.AbstractExchange):
                 raise errors.AuthenticationError(
                     f"Error when handling order {e}. Please make sure that trading permissions are on for this API key."
                 )
+            if exchanges_util.is_exchange_rules_compliancy_error(e):
+                raise errors.ExchangeCompliancyError(
+                    f"Error when handling order {e}. Exchange is refusing this order request on this account because "
+                    f"of its compliancy requirements."
+                )
             self.log_order_creation_error(e, order_type, symbol, quantity, price, stop_price)
             print(traceback.format_exc(), file=sys.stderr)
             self.logger.exception(e, False, f"Unexpected error during order operation: {e}")

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/octobot_trading/exchanges/util/__init__.py

@@ -45,6 +45,7 @@ from octobot_trading.exchanges.util.exchange_util import (
     get_auto_filled_exchange_names,
     get_exchange_details,
     is_api_permission_error,
+    is_exchange_rules_compliancy_error,
 )
 from octobot_trading.exchanges.util import websockets_util
 from octobot_trading.exchanges.util.websockets_util import (
@@ -78,6 +79,7 @@ __all__ = [
     "get_auto_filled_exchange_names",
     "get_exchange_details",
     "is_api_permission_error",
+    "is_exchange_rules_compliancy_error",
     "force_disable_web_socket",
     "check_web_socket_config",
     "search_websocket_class",

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/octobot_trading/exchanges/util/exchange_util.py

@@ -429,8 +429,16 @@ def get_associated_symbol(exchange_manager, asset: str, target_asset: str) -> (t
 
 
 def is_api_permission_error(error: BaseException) -> bool:
+    return _is_error_on_this_type(error, constants.EXCHANGE_PERMISSION_ERRORS)
+
+
+def is_exchange_rules_compliancy_error(error: BaseException) -> bool:
+    return _is_error_on_this_type(error, constants.EXCHANGE_COMPLIANCY_ERRORS)
+
+
+def _is_error_on_this_type(error: BaseException, descriptions: typing.List[typing.Iterable[str]]) -> bool:
     lower_error = str(error).lower()
-    for identifiers in constants.EXCHANGE_PERMISSION_ERRORS:
+    for identifiers in descriptions:
         if all(identifier in lower_error for identifier in identifiers):
             return True
     return False

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/tests/exchanges/traders/test_trader.py

@@ -18,6 +18,7 @@ import os
 import ccxt.async_support
 import decimal
 
+import mock
 import pytest
 import time
 from mock import AsyncMock, patch, Mock
@@ -28,6 +29,7 @@ import octobot_commons.constants as commons_constants
 from octobot_commons.asyncio_tools import wait_asyncio_next_cycle
 from octobot_commons.tests.test_config import load_test_config
 from octobot_trading.personal_data.orders import Order
+import octobot_trading.errors as errors
 from octobot_trading.enums import TraderOrderType, TradeOrderSide, TradeOrderType, OrderStatus, \
     ExchangeConstantsPositionColumns, PositionMode, MarginType, TakeProfitStopLossMode, ExchangeSupportedElements
 from octobot_trading.exchanges.exchange_manager import ExchangeManager
@@ -1080,6 +1082,37 @@ async def test__has_open_position(future_trader_simulator_with_default_linear):
     assert trader_inst._has_open_position(DEFAULT_FUTURE_SYMBOL)
 
 
+async def test_create_order(future_trader_simulator_with_default_linear):
+    _, exchange_manager_inst, trader_inst, default_contract = future_trader_simulator_with_default_linear
+    order_mock = mock.Mock()
+    with mock.patch.object(trader_inst, "_create_new_order", mock.AsyncMock()) as _create_new_order_mock:
+        assert await trader_inst.create_order(order_mock)
+        _create_new_order_mock.assert_called_once_with(
+            order_mock, {}, wait_for_creation=True, creation_timeout=constants.INDIVIDUAL_ORDER_SYNC_TIMEOUT
+        )
+    for err in (errors.MissingFunds, errors.AuthenticationError, errors.ExchangeCompliancyError):
+        with mock.patch.object(
+                trader_inst, "_create_new_order", mock.AsyncMock(side_effect=err)
+        ) as _create_new_order_mock:
+            with pytest.raises(err):
+                assert await trader_inst.create_order(
+                    order_mock, params="params", wait_for_creation=False, creation_timeout=1
+                )
+            _create_new_order_mock.assert_called_once_with(
+                order_mock, "params", wait_for_creation=False, creation_timeout=1
+            )
+        with mock.patch.object(
+            trader_inst, "_create_new_order", mock.AsyncMock(side_effect=ZeroDivisionError)
+        ) as _create_new_order_mock:
+            # does not raise
+            assert await trader_inst.create_order(
+                order_mock, params="params", wait_for_creation=False, creation_timeout=1
+            ) is None
+            _create_new_order_mock.assert_called_once_with(
+                order_mock, "params", wait_for_creation=False, creation_timeout=1
+            )
+
+
 def make_coroutine(response):
     async def coroutine(*args, **kwargs):
         return response

{OctoBot-Trading-2.4.72 → OctoBot-Trading-2.4.74}/tests/exchanges/util/test_exchange_util.py

@@ -19,7 +19,9 @@ import mock
 import trading_backend.exchanges
 import octobot_commons.constants as commons_constants
 import octobot_commons.configuration as commons_configuration
+import octobot_trading.constants as constants
 import octobot_trading.exchanges as exchanges
+import octobot_trading.exchanges.util.exchange_util as exchange_util
 
 from tests import event_loop
 from tests.exchanges import MockedRestExchange, MockedAutoFillRestExchange
@@ -240,3 +242,28 @@ async def test_get_exchange_details(tentacles_setup_config, supported_exchanges)
             )
             assert details == supported_exchanges["blip"]
             get_tentacle_config_mock.assert_called_once()
+
+
+def test_is_api_permission_error():
+    with mock.patch.object(exchange_util, "_is_error_on_this_type") as _is_error_on_this_type_mock:
+        err = Exception("plop")
+        exchanges.is_api_permission_error(err)
+        _is_error_on_this_type_mock.assert_called_once_with(
+            err, constants.EXCHANGE_PERMISSION_ERRORS
+        )
+
+
+def test_is_exchange_rules_compliancy_error():
+    with mock.patch.object(exchange_util, "_is_error_on_this_type") as _is_error_on_this_type_mock:
+        err = Exception("plop")
+        exchanges.is_exchange_rules_compliancy_error(err)
+        _is_error_on_this_type_mock.assert_called_once_with(
+            err, constants.EXCHANGE_COMPLIANCY_ERRORS
+        )
+
+
+def test_is_error_on_this_type():
+    assert exchange_util._is_error_on_this_type(Exception("plop"), constants.EXCHANGE_PERMISSION_ERRORS) is False
+    assert exchange_util._is_error_on_this_type(Exception("api key"), constants.EXCHANGE_PERMISSION_ERRORS) is True
+    assert exchange_util._is_error_on_this_type(Exception("api"), constants.EXCHANGE_PERMISSION_ERRORS) is False
+    assert exchange_util._is_error_on_this_type(Exception("api"), constants.EXCHANGE_COMPLIANCY_ERRORS) is False