OctoBot-Trading 2.4.88__tar.gz → 2.4.90__tar.gz

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90}/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.90] - 2024-07-05
+### Updated
+- [CCXT] update to ccxt 4.3.56
+
+## [2.4.89] - 2024-07-03
+### Updated
+- [Portfolio] handle coins_whitelist in get_holdings_ratio
+
 ## [2.4.88] - 2024-06-20
 ### Updated
 - [API] add default_price to get_minimal_order_cost

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90/OctoBot_Trading.egg-info}/PKG-INFO

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

@@ -4,7 +4,7 @@ Async-Channel<2.3,>=2.2
 OctoBot-Commons<1.10,>=1.9.43
 OctoBot-Tentacles-Manager<2.10,>=2.9
 trading-backend>=1.2.7
-ccxt==4.2.95
+ccxt==4.3.56
 cryptography
 sortedcontainers==2.4.0
 tinydb==4.5.2

{OctoBot-Trading-2.4.88/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.90}/PKG-INFO

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

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

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

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90}/octobot_trading/exchanges/connectors/ccxt/ccxt_adapter.py

@@ -403,6 +403,8 @@ class CCXTAdapter(adapters.AbstractAdapter):
 
     def fix_market_status(self, raw, remove_price_limits=False, **kwargs):
         fixed = super().fix_market_status(raw, remove_price_limits=remove_price_limits, **kwargs)
+        if not fixed:
+            return fixed
         # CCXT standard market_status fixing logic
         fixed[enums.ExchangeConstantsMarketStatusColumns.PRECISION.value][
             enums.ExchangeConstantsMarketStatusColumns.PRECISION_AMOUNT.value] = number_util.get_digits_count(

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90}/octobot_trading/exchanges/connectors/ccxt/ccxt_client_util.py

@@ -147,7 +147,7 @@ def get_symbols(client, active_only):
                 for symbol in client.symbols
                 if client.markets.get(symbol, {}).get(
                     enums.ExchangeConstantsMarketStatusColumns.ACTIVE.value, True
-                )
+                ) in (True, None)
             )
         return set(client.symbols)
     except (AttributeError, TypeError):

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90}/octobot_trading/personal_data/portfolios/portfolio_value_holder.py

@@ -14,6 +14,7 @@
 #  You should have received a copy of the GNU Lesser General Public
 #  License along with this library.
 import copy
+import typing
 
 import octobot_commons.logging as logging
 import octobot_commons.symbols as symbol_util
@@ -131,18 +132,28 @@ class PortfolioValueHolder:
                 self.logger.info(f"Missing {asset} price conversion, ignoring {float(asset_holdings.total)} holdings.")
         return total_value
 
-    def get_traded_assets_holdings_value(self, unit):
+    def get_traded_assets_holdings_value(self, unit: str, coins_whitelist: typing.Optional[typing.Iterable]):
         assets = set()
         for symbol in self.portfolio_manager.exchange_manager.exchange_config.traded_symbols:
-            assets.add(symbol.base)
-            assets.add(symbol.quote)
+            if coins_whitelist is None or symbol.base in coins_whitelist:
+                assets.add(symbol.base)
+            if coins_whitelist is None or symbol.quote in coins_whitelist:
+                assets.add(symbol.quote)
         return self.get_assets_holdings_value(
             assets, unit
         )
 
-    def get_holdings_ratio(self, currency, traded_symbols_only=False, include_assets_in_open_orders=False):
-        if traded_symbols_only:
-            total_holdings_value = self.get_traded_assets_holdings_value(self.portfolio_manager.reference_market)
+    def get_holdings_ratio(
+        self, currency, traded_symbols_only=False, include_assets_in_open_orders=False, coins_whitelist=None
+    ):
+        if coins_whitelist and not traded_symbols_only:
+            total_holdings_value = self.get_assets_holdings_value(
+                coins_whitelist, self.portfolio_manager.reference_market
+            )
+        elif traded_symbols_only:
+            total_holdings_value = self.get_traded_assets_holdings_value(
+                self.portfolio_manager.reference_market, coins_whitelist
+            )
         else:
             # consider all assets for total_holdings_value
             total_holdings_value = self.portfolio_current_value

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90}/requirements.txt

@@ -9,7 +9,7 @@ trading-backend>=1.2.7
 
 # Exchange connection requirements
 # issue from 96, need ccxt==4.2.99
-ccxt==4.2.95 # always ensure real exchanges tests (in tests_additional and authenticated exchange tests) are passing before changing the ccxt version
+ccxt==4.3.56 # always ensure real exchanges tests (in tests_additional and authenticated exchange tests) are passing before changing the ccxt version
 
 cryptography # Never specify a version (managed by https://github.com/Drakkar-Software/OctoBot-PyPi-Linux-Deployer)
 

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90}/tests/exchanges/__init__.py

@@ -76,6 +76,7 @@ class MockedCCXTConnector(CCXTConnector):
 
 class MockedRestExchange(DefaultRestExchange):
     DEFAULT_CONNECTOR_CLASS = MockedCCXTConnector
+    FIX_MARKET_STATUS = True    # true as binanceus needs this and is mainly used
 
     @classmethod
     def get_exchange_connector_class(cls, exchange_manager):

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90}/tests_additional/real_exchanges/test_binance.py

@@ -57,10 +57,15 @@ class TestBinanceRealExchangeTester(RealExchangeTester):
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
             self.ensure_required_market_status_values(market_status)
-            assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]) == \
-                   market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]
-            assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_PRICE.value]) == \
-                   market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_PRICE.value]
+            # on Binance, precision is a decimal instead of a number of digits
+            if market_status[Ecmsc.SYMBOL.value] == self.SYMBOL_3:
+                assert 0 < market_status[Ecmsc.PRECISION.value][
+                    Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in Binance tentacle
+            else:
+                assert 0 < market_status[Ecmsc.PRECISION.value][
+                    Ecmsc.PRECISION_AMOUNT.value] < 1  # to be fixed in Binance tentacle
+            assert 0 < market_status[Ecmsc.PRECISION.value][
+                Ecmsc.PRECISION_PRICE.value] < 1  # to be fixed in Binance tentacle
             assert all(elem in market_status[Ecmsc.LIMITS.value]
                        for elem in (Ecmsc.LIMITS_AMOUNT.value,
                                     Ecmsc.LIMITS_PRICE.value,

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90}/tests_additional/real_exchanges/test_binance_futures.py

@@ -60,10 +60,11 @@ class TestBinanceFuturesRealExchangeTester(RealFuturesExchangeTester):
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
             self.ensure_required_market_status_values(market_status)
-            assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]) == \
-                   market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]
-            assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_PRICE.value]) == \
-                   market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_PRICE.value]
+            # on Binance, precision is a decimal instead of a number of digits
+            assert 0 < market_status[Ecmsc.PRECISION.value][
+                Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in Binance tentacle
+            assert 0 < market_status[Ecmsc.PRECISION.value][
+                Ecmsc.PRECISION_PRICE.value] < 1  # to be fixed in Binance tentacle
             assert all(elem in market_status[Ecmsc.LIMITS.value]
                        for elem in (Ecmsc.LIMITS_AMOUNT.value,
                                     Ecmsc.LIMITS_PRICE.value,

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90}/tests_additional/real_exchanges/test_bingx.py

@@ -56,19 +56,15 @@ class TestBingxRealExchangeTester(RealExchangeTester):
 
     async def test_get_market_status(self):
         for market_status in await self.get_market_statuses():
-            self.ensure_required_market_status_values(market_status)
-            assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]) == \
-                   market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value]
-            assert int(market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_PRICE.value]) == \
-                   market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_PRICE.value]
-
-            assert market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_PRICE.value] > 1
+            # on Bingx, precision is a decimal instead of a number of digits
             if market_status[Ecmsc.SYMBOL.value] == self.SYMBOL_3:
-                assert market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value] == 0
+                assert 0 < market_status[Ecmsc.PRECISION.value][
+                    Ecmsc.PRECISION_AMOUNT.value] <= 1  # to be fixed in Bingx tentacle
             else:
-                assert market_status[Ecmsc.PRECISION.value][Ecmsc.PRECISION_AMOUNT.value] > 2
-
-
+                assert 0 < market_status[Ecmsc.PRECISION.value][
+                    Ecmsc.PRECISION_AMOUNT.value] < 1  # to be fixed in Bingx tentacle
+            assert 0 < market_status[Ecmsc.PRECISION.value][
+                Ecmsc.PRECISION_PRICE.value] < 1  # to be fixed in Bingx tentacle
             assert all(elem in market_status[Ecmsc.LIMITS.value]
                        for elem in (Ecmsc.LIMITS_AMOUNT.value,
                                     Ecmsc.LIMITS_PRICE.value,

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90}/tests_additional/real_exchanges/test_bitget.py

@@ -123,9 +123,9 @@ class TestBitgetRealExchangeTester(RealExchangeTester):
 
     async def test_get_order_book(self):
         order_book = await self.get_order_book()
-        assert len(order_book[Ecobic.ASKS.value]) == 5
+        assert len(order_book[Ecobic.ASKS.value]) == 150
         assert len(order_book[Ecobic.ASKS.value][0]) == 2
-        assert len(order_book[Ecobic.BIDS.value]) == 5
+        assert len(order_book[Ecobic.BIDS.value]) == 150
         assert len(order_book[Ecobic.BIDS.value][0]) == 2
 
     async def test_get_recent_trades(self):

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90}/tests_additional/real_exchanges/test_coinex.py

@@ -154,14 +154,14 @@ class TestCoinexRealExchangeTester(RealExchangeTester):
         if check_content:
             assert ticker[Ectc.HIGH.value]
             assert ticker[Ectc.LOW.value]
-            assert ticker[Ectc.BID.value]
+            assert ticker[Ectc.BID.value] is None
             assert ticker[Ectc.BID_VOLUME.value]
-            assert ticker[Ectc.ASK.value]
+            assert ticker[Ectc.ASK.value] is None
             assert ticker[Ectc.ASK_VOLUME.value]
             assert ticker[Ectc.OPEN.value]
             assert ticker[Ectc.CLOSE.value]
             assert ticker[Ectc.LAST.value]
             assert ticker[Ectc.PREVIOUS_CLOSE.value] is None
             assert ticker[Ectc.BASE_VOLUME.value]
-            assert ticker[Ectc.TIMESTAMP.value]
-            RealExchangeTester.check_ticker_typing(ticker)
+            assert ticker[Ectc.TIMESTAMP.value] is None  # will trigger an 'Ignored incomplete ticker'
+            RealExchangeTester.check_ticker_typing(ticker, check_timestamp=False)

{OctoBot-Trading-2.4.88 → OctoBot-Trading-2.4.90}/tests_additional/real_exchanges/test_okx.py

@@ -56,7 +56,7 @@ class TestOkxRealExchangeTester(RealExchangeTester):
             self.ensure_required_market_status_values(market_status)
             assert 1e-08 <= market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_AMOUNT.value] < 1   # to be fixed in tentacle
-            assert 1e-08 <= market_status[Ecmsc.PRECISION.value][
+            assert 1e-09 <= market_status[Ecmsc.PRECISION.value][
                 Ecmsc.PRECISION_PRICE.value] < 1    # to be fixed in tentacle
             assert all(elem in market_status[Ecmsc.LIMITS.value]
                        for elem in (Ecmsc.LIMITS_AMOUNT.value,