OctoBot-Trading 2.4.145__tar.gz → 2.4.146__tar.gz

{OctoBot-Trading-2.4.145 → OctoBot-Trading-2.4.146}/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.146] - 2025-01-12
+### Added
+[Exceptions] add UntradableSymbolError
+
 ## [2.4.145] - 2025-01-11
 ### Added
 [Exceptions] add UnsupportedOrderTypeError

{OctoBot-Trading-2.4.145 → OctoBot-Trading-2.4.146/OctoBot_Trading.egg-info}/PKG-INFO

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

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

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

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

{OctoBot-Trading-2.4.145 → OctoBot-Trading-2.4.146}/octobot_trading/errors.py

@@ -51,6 +51,12 @@ class UnsupportedOrderTypeError(OrderCreationError):
     """
 
 
+class UntradableSymbolError(OrderCreationError):
+    """
+    Raised when a symbol can't currently be traded on the exchange (not in exchange.get_all_tradable_symbols)
+    """
+
+
 class OrderEditError(OctoBotExchangeError):
     """
     Raised upon a failed order edition

{OctoBot-Trading-2.4.145 → OctoBot-Trading-2.4.146}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -181,7 +181,7 @@ def get_ccxt_client_login_options(exchange_manager):
     return {'defaultType': 'spot'}
 
 
-def get_symbols(client, active_only):
+def get_symbols(client, active_only) -> set[str]:
     try:
         if active_only:
             return set(

{OctoBot-Trading-2.4.145 → OctoBot-Trading-2.4.146}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -207,7 +207,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
                 else:
                     raise
 
-    def get_client_symbols(self, active_only=True):
+    def get_client_symbols(self, active_only=True) -> set[str]:
         return ccxt_client_util.get_symbols(self.client, active_only)
 
     def get_client_time_frames(self):

{OctoBot-Trading-2.4.145 → OctoBot-Trading-2.4.146}/octobot_trading/exchanges/exchange_manager.py

@@ -30,20 +30,21 @@ import octobot_trading.enums as enums
 import octobot_trading.util as util
 import octobot_trading.errors as errors
 import octobot_trading.storage as storage
+import trading_backend.exchanges
 
 
 class ExchangeManager(util.Initializable):
     def __init__(self, config, exchange_class_string):
         super().__init__()
-        self.id = str(uuid.uuid4())
-        self.bot_id = None
-        self.config = config
+        self.id : str= str(uuid.uuid4())
+        self.bot_id: str = None
+        self.config: dict = config
         self.tentacles_setup_config = None
-        self.exchange_class_string = exchange_class_string
-        self.exchange_name = exchange_class_string
+        self.exchange_class_string: str = exchange_class_string
+        self.exchange_name: str = exchange_class_string
         self.logger = logging.get_logger(self.__class__.__name__)
 
-        self.is_ready = False
+        self.is_ready: bool = False
         self.is_simulated: bool = False
         self.is_backtesting: bool = False
         self.rest_only: bool = False
@@ -65,24 +66,24 @@ class ExchangeManager(util.Initializable):
 
         self.backtesting = None
 
-        self.is_trader_simulated = util.is_trader_simulator_enabled(self.config)
-        self.has_websocket = False
+        self.is_trader_simulated: bool = util.is_trader_simulator_enabled(self.config)
+        self.has_websocket: bool = False
 
-        self.trader = None
-        self.exchange = None
-        self.exchange_backend = None
-        self.is_broker_enabled = False
-        self.trading_modes = []
+        self.trader: exchanges.Trader = None
+        self.exchange: exchanges.RestExchange = None
+        self.exchange_backend: trading_backend.exchanges.Exchange = None
+        self.is_broker_enabled: bool = False
+        self.trading_modes: list = []
 
         self.exchange_web_socket = None
 
-        self.client_symbols = []
-        self.client_time_frames = []
+        self.client_symbols: list[str] = []
+        self.client_time_frames: list[str] = []
 
-        self.storage_manager = storage.StorageManager(self)
-        self.exchange_config = exchanges.ExchangeConfig(self)
-        self.exchange_personal_data = personal_data.ExchangePersonalData(self)
-        self.exchange_symbols_data = exchange_data.ExchangeSymbolsData(self)
+        self.storage_manager: storage.StorageManager = storage.StorageManager(self)
+        self.exchange_config: exchanges.ExchangeConfig = exchanges.ExchangeConfig(self)
+        self.exchange_personal_data: personal_data.ExchangePersonalData = personal_data.ExchangePersonalData(self)
+        self.exchange_symbols_data: exchange_data.ExchangeSymbolsData = exchange_data.ExchangeSymbolsData(self)
 
         self.debug_info = {}
 

{OctoBot-Trading-2.4.145 → OctoBot-Trading-2.4.146}/octobot_trading/exchanges/traders/trader.py

@@ -122,7 +122,10 @@ 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, errors.AuthenticationError, errors.ExchangeCompliancyError):
+        except (
+            errors.MissingFunds, errors.AuthenticationError,
+            errors.ExchangeCompliancyError, errors.OrderCreationError
+        ):
             # forward errors that require actions to fix the situation
             raise
         except Exception as e:

{OctoBot-Trading-2.4.145 → OctoBot-Trading-2.4.146}/octobot_trading/exchanges/types/rest_exchange.py

@@ -1,3 +1,4 @@
+# pylint: disable=W0706
 #  Drakkar-Software OctoBot-Trading
 #  Copyright (c) Drakkar-Software, All rights reserved.
 #
@@ -263,7 +264,7 @@ class RestExchange(abstract_exchange.AbstractExchange):
             raise errors.FailedRequest(
                 f"Failed order operation: {e.__class__.__name__} {html_util.get_html_summary_if_relevant(e)}"
             ) from e
-        except errors.OctoBotExchangeError:
+        except (errors.OctoBotExchangeError, errors.OrderCreationError):
             # custom error: forward it
             raise
         except Exception as e:
@@ -726,6 +727,19 @@ class RestExchange(abstract_exchange.AbstractExchange):
     def get_rate_limit(self):
         return self.connector.get_rate_limit()
 
+    def get_all_available_symbols(self, active_only=True) -> set[str]:
+        """
+        :return: the list of all symbols supported by the exchange
+        """
+        return self.connector.get_client_symbols(active_only=active_only)
+
+    async def get_all_tradable_symbols(self, active_only=True) -> set[str]:
+        """
+        Override if the exchange is not allowing trading for all available symbols (ex: MEXC)
+        :return: the list of all symbols supported by the exchange that can currently be traded through API
+        """
+        return self.get_all_available_symbols(active_only=active_only)
+
     async def switch_to_account(self, account_type: enums.AccountTypes):
         return await self.connector.switch_to_account(account_type=account_type)
 

{OctoBot-Trading-2.4.145 → OctoBot-Trading-2.4.146}/tests_additional/real_exchanges/real_exchange_tester.py

@@ -277,10 +277,10 @@ class RealExchangeTester:
     async def inner_test_active_symbols(self, expected_active_symbols_count: int, expected_total_symbols_count: int):
         async with self.get_exchange_manager() as exchange_manager:
             # ensure active symbols are correctly parsed by ccxt
-            active_symbols = exchange_manager.exchange.connector.get_client_symbols(active_only=True)
+            active_symbols = exchange_manager.exchange.get_all_available_symbols(active_only=True)
             assert expected_active_symbols_count <= len(active_symbols) <= expected_active_symbols_count * 1.5, \
                 f"{len(active_symbols)=}, {expected_active_symbols_count=}"
-            all_symbols = exchange_manager.exchange.connector.get_client_symbols(active_only=False)
+            all_symbols = exchange_manager.exchange.get_all_available_symbols(active_only=False)
             assert expected_total_symbols_count <= len(all_symbols) <= expected_total_symbols_count * 1.5, \
                 f"{len(all_symbols)=}, {expected_total_symbols_count=}"