OctoBot-Trading 2.4.95__tar.gz → 2.4.96__tar.gz

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.96}/CHANGELOG.md

@@ -4,6 +4,11 @@ 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.96] - 2024-08-13
+### Added
+- [Exchanges] BitMart tests
+- [API] get_usd_like_symbols_from_symbols
+
 ## [2.4.95] - 2024-08-03
 ### Fixed
 - [Exchanges] reduce market status cache time

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.96/OctoBot_Trading.egg-info}/PKG-INFO

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

@@ -449,6 +449,7 @@ tests_additional/real_exchanges/test_bingx.py
 tests_additional/real_exchanges/test_bitfinex.py
 tests_additional/real_exchanges/test_bitget.py
 tests_additional/real_exchanges/test_bithumb.py
+tests_additional/real_exchanges/test_bitmart.py
 tests_additional/real_exchanges/test_bitso.py
 tests_additional/real_exchanges/test_bitstamp.py
 tests_additional/real_exchanges/test_bybit.py

{OctoBot-Trading-2.4.95/OctoBot_Trading.egg-info → OctoBot-Trading-2.4.96}/PKG-INFO

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

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

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

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.96}/octobot_trading/api/__init__.py

@@ -163,6 +163,7 @@ from octobot_trading.api.portfolio import (
     get_draw_down,
     get_coefficient_of_determination,
     get_usd_like_symbol_from_symbols,
+    get_usd_like_symbols_from_symbols,
     can_convert_symbol_to_usd_like,
     is_usd_like_coin,
     get_global_portfolio_currencies_values,
@@ -338,6 +339,7 @@ __all__ = [
     "get_draw_down",
     "get_coefficient_of_determination",
     "get_usd_like_symbol_from_symbols",
+    "get_usd_like_symbols_from_symbols",
     "can_convert_symbol_to_usd_like",
     "is_usd_like_coin",
     "get_global_portfolio_currencies_values",

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.96}/octobot_trading/api/portfolio.py

@@ -96,6 +96,10 @@ def get_usd_like_symbol_from_symbols(currency: str, symbols) -> str:
     return personal_data.ValueConverter.get_usd_like_symbol_from_symbols(currency, symbols)
 
 
+def get_usd_like_symbols_from_symbols(currency: str, symbols) -> list:
+    return personal_data.ValueConverter.get_usd_like_symbols_from_symbols(currency, symbols)
+
+
 def can_convert_symbol_to_usd_like(symbol: str) -> bool:
     return personal_data.ValueConverter.can_convert_symbol_to_usd_like(symbol)
 

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.96}/octobot_trading/constants.py

@@ -99,6 +99,7 @@ FULL_CANDLE_HISTORY_EXCHANGES = [
     "mexc",
     "coinbase",
     "binanceus",
+    "bitmart",
 ]
 
 DEFAULT_FUTURE_EXCHANGES = ["binanceusdm", "bybit"]
@@ -124,7 +125,7 @@ TESTED_EXCHANGES = [
 DEFAULT_FUTURE_EXCHANGES = sorted(["bybit"])
 SIMULATOR_TESTED_EXCHANGES = sorted(["bitfinex2", "bithumb", "bitstamp", "bittrex",
                               "hitbtc", "kraken", "poloniex", "bitso", "ndax", "upbit",
-                              "wavesexchange"])
+                              "wavesexchange", "bitmart",])
 
 # text content of errors due to exchange compliancy rules
 # Warning: should never be a false positive

{OctoBot-Trading-2.4.95 → OctoBot-Trading-2.4.96}/octobot_trading/personal_data/portfolios/value_converter.py

@@ -92,13 +92,21 @@ class ValueConverter:
 
     @staticmethod
     def get_usd_like_symbol_from_symbols(currency: str, symbols) -> str:
+        try:
+            return ValueConverter.get_usd_like_symbols_from_symbols(currency, symbols)[0]
+        except IndexError:
+            return None
+
+    @staticmethod
+    def get_usd_like_symbols_from_symbols(currency: str, symbols) -> list:
         # look for symbols using USD_LIKE_COINS priorities
+        usd_like_symbols = []
         for usd_like_coin in commons_constants.USD_LIKE_COINS:
             for symbol in symbols:
                 base_and_quote = symbol_util.parse_symbol(symbol).base_and_quote()
                 if currency in base_and_quote and usd_like_coin in base_and_quote:
-                    return symbol
-        return None
+                    usd_like_symbols.append(symbol)
+        return usd_like_symbols
 
     @staticmethod
     def can_convert_symbol_to_usd_like(symbol: str) -> bool:

OctoBot-Trading-2.4.96/tests_additional/real_exchanges/test_bitmart.py

@@ -0,0 +1,178 @@
+#  Drakkar-Software OctoBot-Trading
+#  Copyright (c) Drakkar-Software, All rights reserved.
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library.
+import pytest
+
+from octobot_commons.enums import TimeFrames, PriceIndexes
+from octobot_trading.enums import ExchangeConstantsMarketStatusColumns as Ecmsc, \
+    ExchangeConstantsOrderBookInfoColumns as Ecobic, ExchangeConstantsOrderColumns as Ecoc, \
+    ExchangeConstantsTickersColumns as Ectc
+import octobot_trading.exchanges.connectors.ccxt.constants as ccxt_constants
+from tests_additional.real_exchanges.real_exchange_tester import RealExchangeTester
+# required to catch async loop context exceptions
+from tests import event_loop
+
+# All test coroutines will be treated as marked.
+pytestmark = pytest.mark.asyncio
+
+
+class TestBitMartRealExchangeTester(RealExchangeTester):
+    EXCHANGE_NAME = "bitmart"
+    SYMBOL = "BTC/USDT"
+    SYMBOL_2 = "ETH/BTC"
+    SYMBOL_3 = "TRX/BTC"
+
+    async def test_time_frames(self):
+        time_frames = await self.time_frames()
+        assert all(time_frame in time_frames for time_frame in (
+            TimeFrames.ONE_MINUTE.value,
+            TimeFrames.THREE_MINUTES.value,
+            TimeFrames.FIVE_MINUTES.value,
+            TimeFrames.FIFTEEN_MINUTES.value,
+            TimeFrames.THIRTY_MINUTES.value,
+            TimeFrames.ONE_HOUR.value,
+            TimeFrames.TWO_HOURS.value,
+            TimeFrames.FOUR_HOURS.value,
+            TimeFrames.ONE_DAY.value,
+            TimeFrames.ONE_WEEK.value,
+            TimeFrames.ONE_MONTH.value,
+        ))
+
+    async def test_get_market_status(self):
+        for market_status in await self.get_market_statuses():
+            self.ensure_required_market_status_values(market_status)
+            # on this exchange, 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 this exchange tentacle
+            assert 0 < market_status[Ecmsc.PRECISION.value][
+                Ecmsc.PRECISION_PRICE.value] <= 1  # to be fixed in this exchange tentacle
+            assert all(elem in market_status[Ecmsc.LIMITS.value]
+                       for elem in (Ecmsc.LIMITS_AMOUNT.value,
+                                    Ecmsc.LIMITS_PRICE.value,
+                                    Ecmsc.LIMITS_COST.value))
+            self.check_market_status_limits(
+                market_status,
+                has_price_limits=False
+            )
+
+    async def test_get_symbol_prices(self):
+        # without limit
+        symbol_prices = await self.get_symbol_prices()
+        assert len(symbol_prices) == 100
+        # check candles order (oldest first)
+        self.ensure_elements_order(symbol_prices, PriceIndexes.IND_PRICE_TIME.value)
+        # check last candle is the current candle
+        assert symbol_prices[-1][PriceIndexes.IND_PRICE_TIME.value] >= self.get_time() - self.get_allowed_time_delta()
+
+        # try with candles limit (used in candled updater)
+        symbol_prices = await self.get_symbol_prices(limit=100)
+        assert len(symbol_prices) == 100
+        # check candles order (oldest first)
+        self.ensure_elements_order(symbol_prices, PriceIndexes.IND_PRICE_TIME.value)
+        # check last candle is the current candle
+        assert symbol_prices[-1][PriceIndexes.IND_PRICE_TIME.value] >= self.get_time() - self.get_allowed_time_delta()
+
+    async def test_get_historical_symbol_prices(self):
+        # try with since and limit (used in data collector)
+        for limit in (50, None):
+            symbol_prices = await self.get_symbol_prices(since=self.CANDLE_SINCE, limit=limit)
+            if limit:
+                assert len(symbol_prices) == limit
+            else:
+                assert len(symbol_prices) > 5
+            # check candles order (oldest first)
+            self.ensure_elements_order(symbol_prices, PriceIndexes.IND_PRICE_TIME.value)
+            # check that fetched candles are historical candles
+            max_candle_time = self.get_time_after_time_frames(self.CANDLE_SINCE_SEC, len(symbol_prices))
+            assert max_candle_time <= self.get_time()
+            for candle in symbol_prices:
+                assert self.CANDLE_SINCE_SEC <= candle[PriceIndexes.IND_PRICE_TIME.value] <= max_candle_time
+
+    async def test_get_historical_ohlcv(self):
+        await super().test_get_historical_ohlcv()
+
+    async def test_get_kline_price(self):
+        kline_price = await self.get_kline_price()
+        assert len(kline_price) == 1
+        assert len(kline_price[0]) == 6
+        kline_start_time = kline_price[0][PriceIndexes.IND_PRICE_TIME.value]
+        # assert kline is the current candle
+        assert kline_start_time >= self.get_time() - self.get_allowed_time_delta()
+
+    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][0]) == 2
+        assert len(order_book[Ecobic.BIDS.value]) == 5
+        assert len(order_book[Ecobic.BIDS.value][0]) == 2
+
+    async def test_get_recent_trades(self):
+        recent_trades = await self.get_recent_trades()
+        assert len(recent_trades) == 50
+        # check trades order (oldest first)
+        self.ensure_elements_order(recent_trades, Ecoc.TIMESTAMP.value)
+
+    async def test_get_price_ticker(self):
+        ticker = await self.get_price_ticker()
+        self._check_ticker(ticker, self.SYMBOL, check_content=True)
+
+    async def test_get_all_currencies_price_ticker(self):
+        tickers = await self.get_all_currencies_price_ticker()
+        for symbol, ticker in tickers.items():
+            self._check_ticker(ticker, symbol)
+
+    async def test_get_all_currencies_price_ticker_with_market_filter(self):
+        tickers = await self.get_all_currencies_price_ticker(market_filter=self.get_market_filter())
+        assert len(tickers) > 2    # all tickers
+        assert self.SYMBOL in tickers
+        assert self.SYMBOL_2 in tickers
+        assert self.SYMBOL_3 in tickers  # symbol not correctly parsed as not in available markets (but luckily bitmart also uses the same syntax)
+        tickers = await self.get_all_currencies_price_ticker(
+            symbols=[self.SYMBOL, self.SYMBOL_2],
+            market_filter=self.get_market_filter()
+        )
+        assert sorted(list(tickers)) == sorted([self.SYMBOL, self.SYMBOL_2])    # ticker for self.SYMBOL, self.SYMBOL_2
+        for symbol, ticker in tickers.items():
+            self._check_ticker(ticker, symbol)
+
+    @staticmethod
+    def _check_ticker(ticker, symbol, check_content=False):
+        assert ticker[Ectc.SYMBOL.value] == symbol
+        assert all(key in ticker for key in (
+            Ectc.HIGH.value,
+            Ectc.LOW.value,
+            Ectc.BID.value,
+            Ectc.BID_VOLUME.value,
+            Ectc.ASK.value,
+            Ectc.ASK_VOLUME.value,
+            Ectc.OPEN.value,
+            Ectc.CLOSE.value,
+            Ectc.LAST.value,
+            Ectc.PREVIOUS_CLOSE.value
+        ))
+        if check_content:
+            assert ticker[Ectc.HIGH.value]
+            assert ticker[Ectc.LOW.value]
+            assert ticker[Ectc.BID.value]
+            assert ticker[Ectc.BID_VOLUME.value]
+            assert ticker[Ectc.ASK.value]
+            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)