OctoBot-Trading 2.4.108__tar.gz → 2.4.110__tar.gz

{OctoBot-Trading-2.4.108 → OctoBot-Trading-2.4.110}/CHANGELOG.md

@@ -4,6 +4,16 @@ 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.110] - 2024-09-05
+### Updated
+[TradingModes] handle NEUTRAL trigger checks
+## Fixed
+[Exchanges] fix order descriptor
+
+## [2.4.109] - 2024-09-01
+### Added
+[Exchanges] is_authentication_error
+
 ## [2.4.108] - 2024-08-28
 ### Added
 - [CCXT] cache size env variables

{OctoBot-Trading-2.4.108 → OctoBot-Trading-2.4.110/OctoBot_Trading.egg-info}/PKG-INFO

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

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

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

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

{OctoBot-Trading-2.4.108 → OctoBot-Trading-2.4.110}/octobot_trading/exchanges/abstract_exchange.py

@@ -742,9 +742,17 @@ class AbstractExchange(tentacles_management.AbstractTentacle):
     def is_creating_order(
         self, order: dict, symbol: str
     ) -> bool:
-        quantity = decimal.Decimal(str(order[enums.ExchangeConstantsOrderColumns.AMOUNT.value]))
-        price = decimal.Decimal(str(order[enums.ExchangeConstantsOrderColumns.PRICE.value]))
-        side = enums.TradeOrderSide(str(order[enums.ExchangeConstantsOrderColumns.SIDE.value]))
+        try:
+            quantity = decimal.Decimal(str(order[enums.ExchangeConstantsOrderColumns.AMOUNT.value] or 0))
+        except decimal.DecimalException:
+            quantity = octobot_trading.constants.ZERO
+        try:
+            price = decimal.Decimal(str(order[enums.ExchangeConstantsOrderColumns.PRICE.value] or 0))
+        except decimal.DecimalException:
+            price = octobot_trading.constants.ZERO
+        side = enums.TradeOrderSide(
+            str(order[enums.ExchangeConstantsOrderColumns.SIDE.value]) or enums.TradeOrderSide.BUY.value
+        )
         return self._get_order_description(side, symbol, quantity, price) in self._creating_exchange_order_descriptions
 
     def _get_order_description(

{OctoBot-Trading-2.4.108 → OctoBot-Trading-2.4.110}/octobot_trading/exchanges/connectors/ccxt/ccxt_connector.py

@@ -102,8 +102,6 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
 
         except (ccxt.ExchangeNotAvailable, ccxt.RequestTimeout) as e:
             raise octobot_trading.errors.UnreachableExchange(e) from e
-        except ccxt.AuthenticationError:
-            raise ccxt.AuthenticationError
 
     def get_adapter_class(self, adapter_class):
         return adapter_class or ccxt_adapter.CCXTAdapter
@@ -202,7 +200,7 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
     async def _ensure_auth(self):
         try:
             await self.get_balance()
-        except ccxt.AuthenticationError as e:
+        except (octobot_trading.errors.AuthenticationError, ccxt.AuthenticationError) as e:
             await self.client.close()
             self.unauthenticated_exchange_fallback(e)
         except Exception as e:
@@ -254,13 +252,10 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
         """
         if not kwargs:
             kwargs = {}
-        try:
-            with self.error_describer():
-                return self.adapter.adapt_balance(
-                    await self.client.fetch_balance(params=kwargs)
-                )
-        except ccxt.NotSupported:
-            raise octobot_trading.errors.NotSupported
+        with self.error_describer():
+            return self.adapter.adapt_balance(
+                await self.client.fetch_balance(params=kwargs)
+            )
 
     @ccxt_client_util.converted_ccxt_common_errors
     async def get_symbol_prices(self,
@@ -927,3 +922,11 @@ class CCXTConnector(abstract_exchange.AbstractExchange):
             raise octobot_trading.errors.FailedRequest(err) from err
         except ccxt.RequestTimeout as e:
             raise octobot_trading.errors.FailedRequest(f"Request timeout: {e}") from e
+        except ccxt.AuthenticationError as err:
+            raise octobot_trading.errors.AuthenticationError(err) from err
+        except ccxt.ExchangeError as err:
+            if self.exchange_manager.exchange.is_authentication_error(err):
+                # ensure this is not an unhandled authentication error
+                raise octobot_trading.errors.AuthenticationError(err) from err
+            # otherwise just forward exception
+            raise

{OctoBot-Trading-2.4.108 → OctoBot-Trading-2.4.110}/octobot_trading/exchanges/types/rest_exchange.py

@@ -107,6 +107,8 @@ class RestExchange(abstract_exchange.AbstractExchange):
     # text content of errors due to exchange local account permissions (ex: accounts from X country can't trade XYZ)
     # text content of errors due to traded assets for account
     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]] = []
 
     DEFAULT_CONNECTOR_CLASS = ccxt_connector.CCXTConnector
 
@@ -218,7 +220,7 @@ class RestExchange(abstract_exchange.AbstractExchange):
             raise errors.MissingFunds(e) from e
         except ccxt.NotSupported as err:
             raise errors.NotSupported from err
-        except ccxt.AuthenticationError as err:
+        except (errors.AuthenticationError, ccxt.AuthenticationError) as err:
             # invalid api key or missing trading rights
             raise errors.AuthenticationError(
                 f"Error when handling order {err}. Please make sure that trading permissions are on for this API key."
@@ -495,10 +497,7 @@ class RestExchange(abstract_exchange.AbstractExchange):
         raise NotImplementedError(f"get_account_id is not implemented on {self.exchange_manager.exchange_name}")
 
     async def get_balance(self, **kwargs: dict):
-        try:
-            return await self.connector.get_balance(**kwargs)
-        except ccxt.AuthenticationError as err:
-            raise errors.AuthenticationError(err) from err
+        return await self.connector.get_balance(**kwargs)
 
     async def get_symbol_prices(self, symbol: str, time_frame: commons_enums.TimeFrames, limit: int = None,
                                 **kwargs: dict) -> typing.Optional[list]:
@@ -954,6 +953,11 @@ class RestExchange(abstract_exchange.AbstractExchange):
             return exchanges_util.is_error_on_this_type(error, self.EXCHANGE_ACCOUNT_TRADED_SYMBOL_PERMISSION_ERRORS)
         return False
 
+    def is_authentication_error(self, error: BaseException) -> bool:
+        if self.EXCHANGE_AUTHENTICATION_ERRORS:
+            return exchanges_util.is_error_on_this_type(error, self.EXCHANGE_AUTHENTICATION_ERRORS)
+        return False
+
     """
     Auto fetched and filled exchanges
     """

{OctoBot-Trading-2.4.108 → OctoBot-Trading-2.4.110}/octobot_trading/modes/channel/abstract_mode_consumer.py

@@ -198,6 +198,10 @@ class AbstractTradingModeConsumer(modes_channel.ModeChannelConsumer):
             )
             return can_create_order
 
+        elif state == enums.EvaluatorStates.NEUTRAL.value:
+            self.logger.debug(f"can_create_order: True. No check to perform for {state} state")
+            return True
+
         # other cases like neutral state or unfulfilled previous conditions
         self.logger.debug("can_create_order: return False")
         return False

{OctoBot-Trading-2.4.108 → OctoBot-Trading-2.4.110}/tests/modes/test_abstract_mode_consumer.py

@@ -66,8 +66,8 @@ async def test_can_create_order():
     min_trigger_symbol = "SUB/BTC"
     min_trigger_market = "ADA/BNB"
 
-    # order from neutral state => false
-    assert not await consumer.can_create_order(symbol, EvaluatorStates.NEUTRAL.value)
+    # order from neutral state => true
+    assert await consumer.can_create_order(symbol, EvaluatorStates.NEUTRAL.value)
 
     # sell order using a currency with 0 available
     assert not await consumer.can_create_order(not_owned_symbol, EvaluatorStates.SHORT.value)
@@ -113,9 +113,9 @@ async def test_can_create_order_unknown_symbols():
     assert await consumer.can_create_order(unknown_symbol, EvaluatorStates.VERY_LONG.value)
 
     # neutral state with unknown symbol, market and everything
-    assert not await consumer.can_create_order(unknown_symbol, EvaluatorStates.NEUTRAL.value)
-    assert not await consumer.can_create_order(unknown_market, EvaluatorStates.NEUTRAL.value)
-    assert not await consumer.can_create_order(unknown_everything,  EvaluatorStates.NEUTRAL.value)
+    assert await consumer.can_create_order(unknown_symbol, EvaluatorStates.NEUTRAL.value)
+    assert await consumer.can_create_order(unknown_market, EvaluatorStates.NEUTRAL.value)
+    assert await consumer.can_create_order(unknown_everything,  EvaluatorStates.NEUTRAL.value)
 
 
 async def test_valid_create_new_order():