OctoBot-Trading 2.4.82__tar.gz → 2.4.84__tar.gz

{OctoBot-Trading-2.4.82 → OctoBot-Trading-2.4.84}/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.84] - 2024-05-26
+### Added
+- [ExchangeData] IncompatibleAssetDetails
+
+## [2.4.83] - 2024-05-16
+### Updated
+- [Orders] log unparsable orders 
+
 ## [2.4.82] - 2024-05-15
 ### Updated
 - [Exchanges] auto-remove leading and trailing whitespaces 

{OctoBot-Trading-2.4.82 → OctoBot-Trading-2.4.84/OctoBot_Trading.egg-info}/PKG-INFO

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

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

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

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

{OctoBot-Trading-2.4.82 → OctoBot-Trading-2.4.84}/octobot_trading/constants.py

@@ -146,6 +146,12 @@ EXCHANGE_COMPLIANCY_ERRORS: typing.List[typing.Iterable[str]] = [
     ("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"),
+]
+
 CONFIG_DEFAULT_FEES = 0.001
 CONFIG_DEFAULT_SIMULATOR_FEES = 0
 

{OctoBot-Trading-2.4.82 → OctoBot-Trading-2.4.84}/octobot_trading/errors.py

@@ -117,6 +117,13 @@ class ExchangeCompliancyError(Exception):
     """
 
 
+class ExchangeAccountSymbolPermissionError(Exception):
+    """
+    Raised when an exchange failed to execute the given request because of allowed traded symbols
+    on the current user account
+    """
+
+
 class PortfolioNegativeValueError(Exception):
     """
     Raised when the portfolio is being updated with a negative value

{OctoBot-Trading-2.4.82 → OctoBot-Trading-2.4.84}/octobot_trading/exchanges/types/rest_exchange.py

@@ -215,6 +215,8 @@ class RestExchange(abstract_exchange.AbstractExchange):
             if self.should_log_on_ddos_exception(e):
                 self.connector.log_ddos_error(e)
             raise errors.FailedRequest(f"Failed to order operation: {e.__class__.__name__} {e}") from e
+        except errors.ExchangeAccountSymbolPermissionError:
+            raise
         except Exception as e:
             if not self.is_market_open_for_order_type(symbol, order_type):
                 raise errors.UnavailableOrderTypeForMarketError(
@@ -273,9 +275,14 @@ class RestExchange(abstract_exchange.AbstractExchange):
                                                      stop_price=stop_price, side=side,
                                                      current_price=current_price, 
                                                      reduce_only=reduce_only, params=params)
-        except (ccxt.InvalidOrder, ccxt.BadRequest) as e:
+        except (ccxt.InvalidOrder, ccxt.BadRequest) as err:
+            if exchanges_util.is_exchange_account_traded_symbol_permission_error(err):
+                # exchange won't let this order create: raise
+                raise errors.ExchangeAccountSymbolPermissionError(
+                    f"Error when creating {symbol} {order_type} order on {self.exchange_manager.exchange_name}: {err}"
+                ) from err
             # can be raised when exchange precision/limits rules change
-            self.logger.debug(f"Failed to create order ({e}) : order_type: {order_type}, symbol: {symbol}. "
+            self.logger.debug(f"Failed to create order ({err}) : order_type: {order_type}, symbol: {symbol}. "
                               f"This might be due to an update on {self.name} market rules. Fetching updated rules.")
             await self.connector.load_symbol_markets(reload=True, market_filter=self.exchange_manager.market_filter)
             # retry order creation with updated markets (ccxt will use the updated market values)

{OctoBot-Trading-2.4.82 → OctoBot-Trading-2.4.84}/octobot_trading/exchanges/util/__init__.py

@@ -46,6 +46,7 @@ from octobot_trading.exchanges.util.exchange_util import (
     get_exchange_details,
     is_api_permission_error,
     is_exchange_rules_compliancy_error,
+    is_exchange_account_traded_symbol_permission_error,
     is_error_on_this_type,
 )
 from octobot_trading.exchanges.util import websockets_util
@@ -81,6 +82,7 @@ __all__ = [
     "get_exchange_details",
     "is_api_permission_error",
     "is_exchange_rules_compliancy_error",
+    "is_exchange_account_traded_symbol_permission_error",
     "is_error_on_this_type",
     "force_disable_web_socket",
     "check_web_socket_config",

{OctoBot-Trading-2.4.82 → OctoBot-Trading-2.4.84}/octobot_trading/exchanges/util/exchange_util.py

@@ -436,6 +436,10 @@ def is_exchange_rules_compliancy_error(error: BaseException) -> bool:
     return is_error_on_this_type(error, constants.EXCHANGE_COMPLIANCY_ERRORS)
 
 
+def is_exchange_account_traded_symbol_permission_error(error: BaseException) -> bool:
+    return is_error_on_this_type(error, constants.EXCHANGE_ACCOUNT_TRADED_SYMBOL_PERMISSION_ERRORS)
+
+
 def is_error_on_this_type(error: BaseException, descriptions: typing.List[typing.Iterable[str]]) -> bool:
     lower_error = str(error).lower()
     for identifiers in descriptions:

{OctoBot-Trading-2.4.82 → OctoBot-Trading-2.4.84}/octobot_trading/personal_data/orders/order_factory.py

@@ -28,14 +28,21 @@ def create_order_from_raw(trader, raw_order):
 def create_order_instance_from_raw(
     trader, raw_order, force_open_or_pending_creation=False, has_just_been_created=False
 ):
-    order = create_order_from_raw(trader, raw_order)
-    order.update_from_raw(raw_order)
-    if has_just_been_created:
-        order.register_broker_applied_if_enabled()
-    if force_open_or_pending_creation \
-            and order.status not in (enums.OrderStatus.OPEN, enums.OrderStatus.PENDING_CREATION):
-        order.status = enums.OrderStatus.OPEN
-    return order
+    try:
+        order = create_order_from_raw(trader, raw_order)
+        order.update_from_raw(raw_order)
+        if has_just_been_created:
+            order.register_broker_applied_if_enabled()
+        if force_open_or_pending_creation \
+                and order.status not in (enums.OrderStatus.OPEN, enums.OrderStatus.PENDING_CREATION):
+            order.status = enums.OrderStatus.OPEN
+        return order
+    except Exception as err:
+        # log unparsable order to fix it
+        logging.get_logger(__name__).exception(
+            err, True, f"Unexpected {err} ({err.__class__.__name__}) error when parsing row order {raw_order}"
+        )
+        raise
 
 
 def create_order_from_type(trader, order_type, side=None):

{OctoBot-Trading-2.4.82 → OctoBot-Trading-2.4.84}/octobot_trading/util/__init__.py

@@ -38,6 +38,7 @@ from octobot_trading.util.config_util import (
     is_trader_simulator_enabled,
     is_trade_history_loading_enabled,
     is_currency_enabled,
+    is_symbol_disabled,
     get_symbols,
     get_symbol_trading_type,
     get_symbol_types_counts,
@@ -59,6 +60,7 @@ __all__ = [
     "is_trader_simulator_enabled",
     "is_trade_history_loading_enabled",
     "is_currency_enabled",
+    "is_symbol_disabled",
     "get_symbols",
     "get_symbol_trading_type",
     "get_symbol_types_counts",

{OctoBot-Trading-2.4.82 → OctoBot-Trading-2.4.84}/octobot_trading/util/config_util.py

@@ -52,6 +52,18 @@ def is_currency_enabled(config, currency, default_value) -> bool:
         return default_value
 
 
+def is_symbol_disabled(config, symbol) -> bool:
+    for currency_details in config[commons_constants.CONFIG_CRYPTO_CURRENCIES].values():
+        for pair in currency_details[commons_constants.CONFIG_CRYPTO_PAIRS]:
+            if (
+                symbol == symbol_util.parse_symbol(pair).base
+                and currency_details.get(commons_constants.CONFIG_ENABLED_OPTION, True) is False
+            ):
+                return True
+    return False
+
+
+
 def get_symbols(config, enabled_only) -> list:
     if commons_constants.CONFIG_CRYPTO_CURRENCIES in config \
             and isinstance(config[commons_constants.CONFIG_CRYPTO_CURRENCIES], dict):

{OctoBot-Trading-2.4.82 → OctoBot-Trading-2.4.84}/octobot_trading/util/test_tools/exchange_data.py

@@ -14,12 +14,20 @@
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library.
 import dataclasses
-
+import typing
 
 import octobot_commons.dataclasses
 import octobot_trading.exchanges
 
 
+@dataclasses.dataclass
+class IncompatibleAssetDetails(
+    octobot_commons.dataclasses.FlexibleDataclass, octobot_commons.dataclasses.UpdatableDataclass
+):
+    symbol: str = ""
+    updated_at: float = 0
+
+
 @dataclasses.dataclass
 class ExchangeAuthDetails(octobot_commons.dataclasses.FlexibleDataclass, octobot_commons.dataclasses.UpdatableDataclass):
     api_key: str = ""
@@ -29,6 +37,16 @@ class ExchangeAuthDetails(octobot_commons.dataclasses.FlexibleDataclass, octobot
     sandboxed: bool = False
     broker_enabled: bool = False
     encrypted: str = ""
+    exchange_account_id: typing.Union[str, None] = None
+    incompatible_assets: typing.Union[list[IncompatibleAssetDetails], None] = dataclasses.field(default_factory=list)
+
+    # pylint: disable=E1134
+    def __post_init__(self):
+        if self.incompatible_assets and isinstance(self.incompatible_assets[0], dict):
+            self.incompatible_assets = (
+                [IncompatibleAssetDetails.from_dict(asset) for asset in self.incompatible_assets]
+                if self.incompatible_assets else []
+            )
 
 
 @dataclasses.dataclass